October 2009 - macruby-changes - lists.macosforge.org

[2875] MacRuby/trunk
by source_changes＠macosforge.org 21 Oct '09

21 Oct '09

Revision: 2875 http://trac.macosforge.org/projects/ruby/changeset/2875 Author: lsansonetti(a)apple.com Date: 2009-10-21 13:46:32 -0700 (Wed, 21 Oct 2009) Log Message: ----------- now deleting internal structures, IR and machinec code of main functions created by #eval Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/compiler.h MacRuby/trunk/vm.cpp MacRuby/trunk/vm.h Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2009-10-21 03:17:53 UTC (rev 2874) +++ MacRuby/trunk/compiler.cpp 2009-10-21 20:46:32 UTC (rev 2875) @@ -673,7 +673,6 @@ params.push_back(sel); params.push_back(compile_const_pointer(new_function)); - rb_objc_retain((void *)body); params.push_back(compile_arity(arity)); params.push_back(ConstantInt::get(Int32Ty, rb_vm_node_flags(body))); @@ -4969,7 +4968,6 @@ current_block_func = cast<Function>(block); current_block_node = node->nd_body; - rb_objc_retain((void *)current_block_node); Value *caller; assert(node->nd_iter != NULL); @@ -5177,8 +5175,6 @@ Function * RoxorCompiler::compile_main_function(NODE *node) { - rb_objc_retain((void *)node); - current_instance_method = true; Value *val = compile_node(node); Modified: MacRuby/trunk/compiler.h =================================================================== --- MacRuby/trunk/compiler.h 2009-10-21 03:17:53 UTC (rev 2874) +++ MacRuby/trunk/compiler.h 2009-10-21 20:46:32 UTC (rev 2875) @@ -76,6 +76,16 @@ return i == scopes.end() ? NULL : i->second; } + bool delete_scope(Function *f) { + std::map<Function *, RoxorScope *>::iterator i = scopes.find(f); + if (i != scopes.end()) { + scopes.erase(i); + delete i->second; + return true; + } + return false; + } + void clear_scopes(void) { scopes.clear(); } Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-10-21 03:17:53 UTC (rev 2874) +++ MacRuby/trunk/vm.cpp 2009-10-21 20:46:32 UTC (rev 2875) @@ -64,6 +64,7 @@ unsigned char *start; unsigned char *end; void *imp; + std::vector<unsigned char *> ehs; RoxorFunction(Function *_f, RoxorScope *_scope, unsigned char *_start, unsigned char *_end) { @@ -107,6 +108,20 @@ return NULL; } + RoxorFunction *delete_function(Function *func) { + std::vector<struct RoxorFunction *>::iterator iter = + functions.begin(); + while (iter != functions.end()) { + RoxorFunction *f = *iter; + if (f->f == func) { + functions.erase(iter); + return f; + } + ++iter; + } + return NULL; + } + void setMemoryWritable(void) { mm->setMemoryWritable(); } @@ -170,6 +185,8 @@ void endExceptionTable(const Function *F, uint8_t *TableStart, uint8_t *TableEnd, uint8_t* FrameRegister) { + assert(!functions.empty()); + functions.back()->ehs.push_back(FrameRegister); mm->endExceptionTable(F, TableStart, TableEnd, FrameRegister); } @@ -410,6 +427,42 @@ return imp; } +// in libgcc +extern "C" void __deregister_frame(const void *); + +void +RoxorCore::delenda(Function *func) +{ + assert(func->use_empty()); + + // Remove from cache. + std::map<Function *, IMP>::iterator iter = JITcache.find(func); + if (iter != JITcache.end()) { + JITcache.erase(iter); + } + + // Delete for JIT memory manager list. + RoxorFunction *f = jmm->delete_function(func); + assert(f != NULL); + + // Unregister each dwarf exception handler. + // XXX this should really be done by LLVM... + for (std::vector<unsigned char *>::iterator i = f->ehs.begin(); + i != f->ehs.end(); ++i) { + __deregister_frame((const void *)*i); + } + + // Remove the compiler scope. + RoxorCompiler::shared->delete_scope(func); + delete f; + + // Delete machine code. + ee->freeMachineCodeForFunction(func); + + // Delete IR. + func->eraseFromParent(); +} + bool RoxorCore::symbolize_call_address(void *addr, void **startp, char *path, size_t path_len, unsigned long *ln, char *name, size_t name_len) @@ -3289,35 +3342,43 @@ bool inside_eval) { RoxorVM *vm = GET_VM(); + RoxorCompiler *compiler = RoxorCompiler::shared; + // Compile IR. if (binding != NULL) { vm->push_current_binding(binding, false); } - - RoxorCompiler *compiler = RoxorCompiler::shared; - bool old_inside_eval = compiler->is_inside_eval(); compiler->set_inside_eval(inside_eval); compiler->set_fname(fname); Function *function = compiler->compile_main_function(node); compiler->set_fname(NULL); compiler->set_inside_eval(old_inside_eval); - if (binding != NULL) { vm->pop_current_binding(false); } + // JIT compile the function. IMP imp = GET_CORE()->compile(function); - // For symbolication. + // Register it for symbolication. rb_vm_method_node_t *mnode = GET_CORE()->method_node_get(imp, true); mnode->klass = 0; mnode->arity = rb_vm_arity(2); mnode->sel = sel_registerName("<main>"); mnode->objc_imp = mnode->ruby_imp = imp; mnode->flags = 0; - - return ((VALUE(*)(VALUE, SEL))imp)(vm->get_current_top_object(), 0); + + // Execute the function. + VALUE ret = ((VALUE(*)(VALUE, SEL))imp)(vm->get_current_top_object(), 0); + + if (inside_eval) { + // XXX We only delete functions created by #eval. In theory it should + // also work for other functions, but it makes spec:ci crash. + GET_CORE()->delenda(function); + } + + return ret; } extern "C" Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2009-10-21 03:17:53 UTC (rev 2874) +++ MacRuby/trunk/vm.h 2009-10-21 20:46:32 UTC (rev 2875) @@ -633,6 +633,7 @@ void optimize(Function *func); IMP compile(Function *func); + void delenda(Function *func); void load_bridge_support(const char *path, const char *framework_path, int options);

1 0

[2874] MacRuby/trunk
by source_changes＠macosforge.org 21 Oct '09

21 Oct '09

Revision: 2874 http://trac.macosforge.org/projects/ruby/changeset/2874 Author: lsansonetti(a)apple.com Date: 2009-10-20 20:17:53 -0700 (Tue, 20 Oct 2009) Log Message: ----------- aot_compile_stdlib becomes stdlib:build + added stdlib:touch for lazy developers Modified Paths: -------------- MacRuby/trunk/Rakefile MacRuby/trunk/rakelib/builder.rake Modified: MacRuby/trunk/Rakefile =================================================================== --- MacRuby/trunk/Rakefile 2009-10-21 03:16:49 UTC (rev 2873) +++ MacRuby/trunk/Rakefile 2009-10-21 03:17:53 UTC (rev 2874) @@ -46,7 +46,7 @@ task :clean => ['clean:local', 'clean:rbo', 'clean:ext'] desc "Build MacRuby and extensions" -task :all => [:macruby, :aot_compile_stdlib, :extensions] +task :all => [:macruby, 'stdlib:build', :extensions] desc "Create an archive (GIT only)" task :git_archive do Modified: MacRuby/trunk/rakelib/builder.rake =================================================================== --- MacRuby/trunk/rakelib/builder.rake 2009-10-21 03:16:49 UTC (rev 2873) +++ MacRuby/trunk/rakelib/builder.rake 2009-10-21 03:17:53 UTC (rev 2874) @@ -381,17 +381,25 @@ 'lib/yaml.rb', 'lib/yaml/rubytypes.rb', ] -desc "AOT compile parts of the stdlib" -task :aot_compile_stdlib => [:miniruby, 'macruby:dylib'] do - AOT_STDLIB.each do |pat| - Dir.glob(pat).each do |path| - out = File.join(File.dirname(path), File.basename(path, '.rb') + '.rbo') - if !File.exist?(out) or File.mtime(path) > File.mtime(out) or File.mtime('./miniruby') > File.mtime(out) - archf = ARCHS.map { |x| "--arch #{x}" }.join(' ') - sh "./miniruby -I. -I./lib bin/rubyc --internal #{archf} -C \"#{path}\" -o \"#{out}\"" +namespace :stdlib do + desc "AOT compile the stdlib" + task :build => [:miniruby, 'macruby:dylib'] do + AOT_STDLIB.each do |pat| + Dir.glob(pat).each do |path| + out = File.join(File.dirname(path), File.basename(path, '.rb') + '.rbo') + if !File.exist?(out) or File.mtime(path) > File.mtime(out) or File.mtime('./miniruby') > File.mtime(out) + archf = ARCHS.map { |x| "--arch #{x}" }.join(' ') + sh "./miniruby -I. -I./lib bin/rubyc --internal #{archf} -C \"#{path}\" -o \"#{out}\"" + end end end - end + end + + desc "Touch .rbo files to ignore their build" + task :touch do + files = ["*.rbo", "lib/**/*.rbo"] + files.each { |pat| Dir.glob(pat) }.flatten.each { |p| sh "/usr/bin/touch #{p}" } + end end desc "Same as extensions"

1 0

[2873] MacRuby/trunk/re.c
by source_changes＠macosforge.org 21 Oct '09

21 Oct '09

Revision: 2873 http://trac.macosforge.org/projects/ruby/changeset/2873 Author: lsansonetti(a)apple.com Date: 2009-10-20 20:16:49 -0700 (Tue, 20 Oct 2009) Log Message: ----------- do not leak Regexp objects Modified Paths: -------------- MacRuby/trunk/re.c Modified: MacRuby/trunk/re.c =================================================================== --- MacRuby/trunk/re.c 2009-10-21 00:38:16 UTC (rev 2872) +++ MacRuby/trunk/re.c 2009-10-21 03:16:49 UTC (rev 2873) @@ -15,6 +15,7 @@ #include "ruby/encoding.h" #include "ruby/util.h" #include "regint.h" +#include "objc.h" #include <ctype.h> VALUE rb_eRegexpError; @@ -2657,6 +2658,18 @@ return (VALUE)re; } +static IMP rb_objc_reg_finalize_super = NULL; + +static void +rb_objc_reg_finalize(void *rcv, SEL sel) +{ + struct RRegexp *re = RREGEXP(rcv); + onig_free(re->ptr); + if (rb_objc_reg_finalize_super != NULL) { + ((void(*)(void *, SEL))rb_objc_reg_finalize_super)(rcv, sel); + } +} + VALUE rb_reg_new_str(VALUE s, int options) { @@ -3700,6 +3713,9 @@ rb_objc_define_method(*(VALUE *)rb_cRegexp, "last_match", rb_reg_s_last_match, -1); rb_objc_define_method(*(VALUE *)rb_cRegexp, "try_convert", rb_reg_s_try_convert, 1); + rb_objc_reg_finalize_super = rb_objc_install_method2((Class)rb_cRegexp, + "finalize", (IMP)rb_objc_reg_finalize); + rb_objc_define_method(rb_cRegexp, "initialize", rb_reg_initialize_m, -1); rb_objc_define_method(rb_cRegexp, "initialize_copy", rb_reg_init_copy, 1); rb_objc_define_method(rb_cRegexp, "hash", rb_reg_hash, 0);

1 0

[2872] MacRuby/trunk/io.c
by source_changes＠macosforge.org 21 Oct '09

21 Oct '09

Revision: 2872 http://trac.macosforge.org/projects/ruby/changeset/2872 Author: lsansonetti(a)apple.com Date: 2009-10-20 17:38:16 -0700 (Tue, 20 Oct 2009) Log Message: ----------- fixed a bug in Kernel#open when the given file was opened twice Modified Paths: -------------- MacRuby/trunk/io.c Modified: MacRuby/trunk/io.c =================================================================== --- MacRuby/trunk/io.c 2009-10-21 00:18:15 UTC (rev 2871) +++ MacRuby/trunk/io.c 2009-10-21 00:38:16 UTC (rev 2872) @@ -2296,7 +2296,6 @@ rb_f_open(VALUE klass, SEL sel, int argc, VALUE *argv) { VALUE io = rb_class_new_instance(argc, argv, rb_cFile); - io = rb_file_open(io, argc, argv); if (rb_block_given_p()) { return rb_ensure(f_open_body, io, f_open_ensure, io); }

1 0

[2871] MacRuby/trunk/struct.c
by source_changes＠macosforge.org 21 Oct '09

21 Oct '09

Revision: 2871 http://trac.macosforge.org/projects/ruby/changeset/2871 Author: lsansonetti(a)apple.com Date: 2009-10-20 17:18:15 -0700 (Tue, 20 Oct 2009) Log Message: ----------- adding missing write barriers Modified Paths: -------------- MacRuby/trunk/struct.c Modified: MacRuby/trunk/struct.c =================================================================== --- MacRuby/trunk/struct.c 2009-10-21 00:17:32 UTC (rev 2870) +++ MacRuby/trunk/struct.c 2009-10-21 00:18:15 UTC (rev 2871) @@ -171,7 +171,8 @@ for (i=0; i<RARRAY_LEN(members); i++) { slot = RARRAY_AT(members, i); if (SYM2ID(slot) == field) { - return RSTRUCT_PTR(obj)[i] = val; + GC_WB(&RSTRUCT_PTR(obj)[i], val); + return val; } } rb_name_error(rb_frame_this_func(), "`%s' is not a struct member", @@ -375,10 +376,13 @@ if (n < RARRAY_LEN(values)) { rb_raise(rb_eArgError, "struct size differs"); } - MEMCPY(RSTRUCT_PTR(self), RARRAY_PTR(values), VALUE, RARRAY_LEN(values)); + for (int i = 0; i < RARRAY_LEN(values); i++) { + GC_WB(&RSTRUCT_PTR(self)[i], RARRAY_AT(values, i)); + } if (n > RARRAY_LEN(values)) { - rb_mem_clear(RSTRUCT_PTR(self)+RARRAY_LEN(values), - n-RARRAY_LEN(values)); + for (int i = RARRAY_LEN(values); i < n; i++) { + RSTRUCT_PTR(self)[i] = Qnil; + } } return Qnil; } @@ -583,7 +587,9 @@ if (RSTRUCT_LEN(copy) != RSTRUCT_LEN(s)) { rb_raise(rb_eTypeError, "struct size mismatch"); } - MEMCPY(RSTRUCT_PTR(copy), RSTRUCT_PTR(s), VALUE, RSTRUCT_LEN(copy)); + for (int i = 0; i < RSTRUCT_LEN(copy); i++) { + GC_WB(&RSTRUCT_PTR(copy)[i], RSTRUCT_PTR(s)[i]); + } return copy; } @@ -665,7 +671,7 @@ } for (i=0; i<len; i++) { if (SYM2ID(RARRAY_AT(members, i)) == id) { - RSTRUCT_PTR(s)[i] = val; + GC_WB(&RSTRUCT_PTR(s)[i], val); return val; } } @@ -713,7 +719,8 @@ i, RSTRUCT_LEN(s)); } rb_struct_modify(s); - return RSTRUCT_PTR(s)[i] = val; + GC_WB(&RSTRUCT_PTR(s)[i], val); + return val; } VALUE

1 0

[2870] MacRuby/trunk/onig/enc/unicode.c
by source_changes＠macosforge.org 21 Oct '09

21 Oct '09

Revision: 2870 http://trac.macosforge.org/projects/ruby/changeset/2870 Author: lsansonetti(a)apple.com Date: 2009-10-20 17:17:32 -0700 (Tue, 20 Oct 2009) Log Message: ----------- do not leak some internal hash tables Modified Paths: -------------- MacRuby/trunk/onig/enc/unicode.c Modified: MacRuby/trunk/onig/enc/unicode.c =================================================================== --- MacRuby/trunk/onig/enc/unicode.c 2009-10-20 23:33:59 UTC (rev 2869) +++ MacRuby/trunk/onig/enc/unicode.c 2009-10-21 00:17:32 UTC (rev 2870) @@ -10901,7 +10901,7 @@ THREAD_ATOMIC_START; - FoldTable = st_init_numtable_with_size(1200); + FoldTable = onig_st_init_numtable_with_size(1200); if (ONIG_IS_NULL(FoldTable)) return ONIGERR_MEMORY; for (i = 0; i < (int )(sizeof(CaseFold)/sizeof(CaseFold_11_Type)); i++) { p = &CaseFold[i]; @@ -10913,7 +10913,7 @@ st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )&(p->to)); } - Unfold1Table = st_init_numtable_with_size(1000); + Unfold1Table = onig_st_init_numtable_with_size(1000); if (ONIG_IS_NULL(Unfold1Table)) return ONIGERR_MEMORY; for (i = 0; i < (int )(sizeof(CaseUnfold_11)/sizeof(CaseUnfold_11_Type)); @@ -10928,7 +10928,7 @@ st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )&(p1->to)); } - Unfold2Table = st_init_table_with_size(&type_code2_hash, 200); + Unfold2Table = onig_st_init_table_with_size(&type_code2_hash, 200); if (ONIG_IS_NULL(Unfold2Table)) return ONIGERR_MEMORY; for (i = 0; i < (int )(sizeof(CaseUnfold_12)/sizeof(CaseUnfold_12_Type)); @@ -10943,7 +10943,7 @@ st_add_direct(Unfold2Table, (st_data_t )p2->from, (st_data_t )(&p2->to)); } - Unfold3Table = st_init_table_with_size(&type_code3_hash, 30); + Unfold3Table = onig_st_init_table_with_size(&type_code3_hash, 30); if (ONIG_IS_NULL(Unfold3Table)) return ONIGERR_MEMORY; for (i = 0; i < (int )(sizeof(CaseUnfold_13)/sizeof(CaseUnfold_13_Type));

1 0

[2869] MacRuby/trunk
by source_changes＠macosforge.org 20 Oct '09

20 Oct '09

Revision: 2869 http://trac.macosforge.org/projects/ruby/changeset/2869 Author: lsansonetti(a)apple.com Date: 2009-10-20 16:33:59 -0700 (Tue, 20 Oct 2009) Log Message: ----------- fixed a couple of ivar slot bugs Modified Paths: -------------- MacRuby/trunk/object.c MacRuby/trunk/vm.h Modified: MacRuby/trunk/object.c =================================================================== --- MacRuby/trunk/object.c 2009-10-20 22:11:43 UTC (rev 2868) +++ MacRuby/trunk/object.c 2009-10-20 23:33:59 UTC (rev 2869) @@ -222,13 +222,16 @@ else { ROBJECT(dest)->tbl = NULL; } - ROBJECT(dest)->num_slots = ROBJECT(obj)->num_slots; - if (ROBJECT(dest)->num_slots > 0) { - int i; - for (i = 0; i < ROBJECT(obj)->num_slots; i++) { - ROBJECT(dest)->slots[i] = ROBJECT(obj)->slots[i]; + if (ROBJECT(obj)->num_slots > 0) { + if (ROBJECT(dest)->num_slots < ROBJECT(obj)->num_slots) { + rb_vm_regrow_robject_slots(ROBJECT(dest), + ROBJECT(obj)->num_slots); } + for (int i = 0; i < ROBJECT(obj)->num_slots; i++) { + GC_WB(&ROBJECT(dest)->slots[i], ROBJECT(obj)->slots[i]); + } } + ROBJECT(dest)->num_slots = ROBJECT(obj)->num_slots; break; case T_CLASS: case T_MODULE: Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2009-10-20 22:11:43 UTC (rev 2868) +++ MacRuby/trunk/vm.h 2009-10-20 23:33:59 UTC (rev 2869) @@ -314,11 +314,11 @@ { unsigned int i; VALUE *new_slots = (VALUE *)xmalloc(sizeof(VALUE) * (new_num_slot + 1)); - for (i = 0; i <= obj->num_slots; i++) { + for (i = 0; i < obj->num_slots; i++) { GC_WB(&new_slots[i], obj->slots[i]); } GC_WB(&obj->slots, new_slots); - for (i = obj->num_slots + 1; i < new_num_slot; i++) { + for (i = obj->num_slots; i <= new_num_slot; i++) { obj->slots[i] = Qundef; } obj->num_slots = new_num_slot + 1;

1 0

[2868] MacRuby/trunk/string.c
by source_changes＠macosforge.org 20 Oct '09

20 Oct '09

Revision: 2868 http://trac.macosforge.org/projects/ruby/changeset/2868 Author: lsansonetti(a)apple.com Date: 2009-10-20 15:11:43 -0700 (Tue, 20 Oct 2009) Log Message: ----------- removed buggy implementation of String#dump and use #inspect for now Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2009-10-20 08:09:07 UTC (rev 2867) +++ MacRuby/trunk/string.c 2009-10-20 22:11:43 UTC (rev 2868) @@ -2619,7 +2619,11 @@ } __append(out, '"'); - return (VALUE)CFMakeCollectable(out); + VALUE res = (VALUE)CFMakeCollectable(out); + if (OBJ_TAINTED(str)) { + OBJ_TAINT(res); + } + return res; } #define IS_EVSTR(p,e) ((p) < (e) && (*(p) == '$' || *(p) == '@' || *(p) == '{')) @@ -2635,117 +2639,13 @@ static VALUE rb_str_dump(VALUE str, SEL sel) { - rb_encoding *enc0 = rb_enc_get(str); - long len; - const char *p, *pend; - char *q, *qend; - - len = 2; /* "" */ - p = RSTRING_PTR(str); - pend = p + RSTRING_LEN(str); - while (p < pend) { - unsigned char c = *p++; - switch (c) { - case '"': case '\\': - case '\n': case '\r': - case '\t': case '\f': - case '\013': case '\010': case '\007': case '\033': - len += 2; - break; - - case '#': - len += IS_EVSTR(p, pend) ? 2 : 1; - break; - - default: - if (ISPRINT(c)) { - len++; - } - else { - len += 4; /* \xNN */ - } - break; - } - } - if (!rb_enc_asciicompat(enc0)) { - len += 19; /* ".force_encoding('')" */ - len += strlen(rb_enc_name(enc0)); - } - - p = RSTRING_PTR(str); - pend = p + RSTRING_LEN(str); - - char *q_beg = q = (char *)alloca(len); - qend = q + len; - - *q++ = '"'; - while (p < pend) { - unsigned char c = *p++; - - if (c == '"' || c == '\\') { - *q++ = '\\'; - *q++ = c; - } - else if (c == '#') { - if (IS_EVSTR(p, pend)) *q++ = '\\'; - *q++ = '#'; - } - else if (c == '\n') { - *q++ = '\\'; - *q++ = 'n'; - } - else if (c == '\r') { - *q++ = '\\'; - *q++ = 'r'; - } - else if (c == '\t') { - *q++ = '\\'; - *q++ = 't'; - } - else if (c == '\f') { - *q++ = '\\'; - *q++ = 'f'; - } - else if (c == '\013') { - *q++ = '\\'; - *q++ = 'v'; - } - else if (c == '\010') { - *q++ = '\\'; - *q++ = 'b'; - } - else if (c == '\007') { - *q++ = '\\'; - *q++ = 'a'; - } - else if (c == '\033') { - *q++ = '\\'; - *q++ = 'e'; - } - else if (ISPRINT(c)) { - *q++ = c; - } - else { - *q++ = '\\'; - sprintf(q, "x%02X", c); - q += 3; - } - } - *q++ = '"'; - if (!rb_enc_asciicompat(enc0)) { - sprintf(q, ".force_encoding(\"%s\")", rb_enc_name(enc0)); - } - - /* result from dump is ASCII */ - - VALUE res = rb_str_new5(str, q_beg, strlen(q_beg)); - if (OBJ_TAINTED(str)) { - OBJ_TAINT(res); - } + // XXX #dump and #inspect have some slight differences, let's fix that + // later. + VALUE res = rb_str_inspect(str, 0); + *(VALUE *)res = *(VALUE *)str; return res; } - /* * call-seq: * str.upcase! => str or nil

1 0

[2867] MacRuby/trunk
by source_changes＠macosforge.org 20 Oct '09

20 Oct '09

Revision: 2867 http://trac.macosforge.org/projects/ruby/changeset/2867 Author: neeracher(a)apple.com Date: 2009-10-20 01:09:07 -0700 (Tue, 20 Oct 2009) Log Message: ----------- Implement YAML support for date/time Modified Paths: -------------- MacRuby/trunk/ext/libyaml/rubyext.c MacRuby/trunk/lib/yaml/rubytypes.rb MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/to_yaml_tags.txt Removed Paths: ------------- MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/load_tags.txt Modified: MacRuby/trunk/ext/libyaml/rubyext.c =================================================================== --- MacRuby/trunk/ext/libyaml/rubyext.c 2009-10-20 07:05:21 UTC (rev 2866) +++ MacRuby/trunk/ext/libyaml/rubyext.c 2009-10-20 08:09:07 UTC (rev 2867) @@ -359,6 +359,121 @@ return true; } +static inline bool +is_timestamp(const char *str, size_t length) +{ + // TODO: This probably should be coded as a regex and/or in ruby + bool canonical = true; + if (length < 10) { + return false; + } + /* 4 digit year - */ + if (!isdigit(str[0]) || + !isdigit(str[1]) || + !isdigit(str[2]) || + !isdigit(str[3]) || + str[4] != '-') { + return false; + } + str += 5; + /* 1/2 digit month - */ + if (!isdigit(*str++)) { + return false; + } + if (isdigit(*str)) { + ++str; + } + else { + canonical = false; + } + if (*str++ != '-') { + return false; + } + /* 1/2 digit day */ + if (!isdigit(*str++)) { + return false; + } + if (isdigit(*str)) { + ++str; + } + else { + canonical = false; + } + /* Date alone must be YYYY-MM-DD */ + if (*str == '\0') { + return canonical; + } + else if (*str == 't' || *str == 'T') { + ++str; + } + else if (*str == ' ' || *str == '\t') { + do { + ++str; + } while (*str == ' ' || *str == '\t'); + } + else { + return false; + } + /* 1/2 digit hour : */ + if (!isdigit(*str++)) { + return false; + } + if (isdigit(*str)) { + ++str; + } + if (*str++ != ':') { + return false; + } + /* 2 digit minute:second */ + if (!isdigit(str[0]) || + !isdigit(str[1]) || + (str[2] != ':') || + !isdigit(str[3]) || + !isdigit(str[4])) { + return false; + } + str += 5; + /* Optional fraction */ + if (*str == '.') { + do { + ++str; + } while (isdigit(*str)); + } + if (*str == '\0') { + return true; /* Assumed UTC */ + } + while (*str == ' ' || *str == '\t') { + ++str; + } + if (str[0] == 'Z' && str[1] == '\0') { + return true; /* UTC */ + } + else if (str[0] != '+' && str[0] != '-') { + return false; + } + ++str; + /* 1/2 digit time zone hour */ + if (!isdigit(*str++)) { + return false; + } + if (isdigit(*str)) { + ++str; + } + if (*str == '\0') { + return true; + } + /* Optional minute */ + if ((str[0] != ':') || + !isdigit(str[1]) || + !isdigit(str[2]) || + (str[3] != '\0')) { + return false; + } + else { + return true; + } +} + static char * detect_scalar_type(const char * val, size_t length) { @@ -380,6 +495,9 @@ else if (strcmp(val, "false") == 0) { return "tag:yaml.org,2002:false"; } + else if (is_timestamp(val, length)) { + return "tag:yaml.org,2002:timestamp"; + } else { return NULL; } @@ -576,6 +694,7 @@ (strcmp(tag, "tag:yaml.org,2002:true") == 0) || (strcmp(tag, "tag:yaml.org,2002:false") == 0) || (strcmp(tag, "tag:yaml.org,2002:null") == 0) || + (strcmp(tag, "tag:yaml.org,2002:timestamp") == 0) || (strcmp(tag, YAML_DEFAULT_SEQUENCE_TAG) == 0) || (strcmp(tag, YAML_DEFAULT_MAPPING_TAG) == 0)) { *can_omit_tag = 1; Modified: MacRuby/trunk/lib/yaml/rubytypes.rb =================================================================== --- MacRuby/trunk/lib/yaml/rubytypes.rb 2009-10-20 07:05:21 UTC (rev 2866) +++ MacRuby/trunk/lib/yaml/rubytypes.rb 2009-10-20 08:09:07 UTC (rev 2867) @@ -1,5 +1,5 @@ # -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4 -# require 'date' +require 'date' require 'libyaml' class Class @@ -258,7 +258,69 @@ end end +class DateTime + yaml_as "tag:yaml.org,2002:timestamp" + def self.yaml_new(val) + if val.length <= 10 + Date.strptime(val) + else + format = "%F %T" + if val =~ /([tT])/ + format = "%F#{$1}%T" + end + if val =~ /\./ + format += ".%N%z" + else + format += "%z" + end + val = val.tr(" \t", "") + if val !~ /(Z|[-+]\d\d?(?::\d\d)?)$/ + val = val + "Z" + end + strptime(val, format).to_time + end + end + def to_yaml(output = nil) + to_time.to_yaml(output) + end +end +class Time + def to_yaml(output = nil) + # Not exactly canonical YAML format, but legal, and consistent with syck + YAML::quick_emit(output) do |out| + tz = "Z" + # from the tidy Tobias Peters <t-peters(a)gmx.de> Thanks! + unless self.utc? + utc_same_instant = self.dup.utc + utc_same_writing = Time.utc(year,month,day,hour,min,sec,usec) + difference_to_utc = utc_same_writing - utc_same_instant + if (difference_to_utc < 0) + difference_sign = '-' + absolute_difference = -difference_to_utc + else + difference_sign = '+' + absolute_difference = difference_to_utc + end + difference_minutes = (absolute_difference/60).round + tz = "%s%02d:%02d" % [ difference_sign, difference_minutes / 60, difference_minutes % 60] + end + standard = self.strftime( "%Y-%m-%d %H:%M:%S" ) + standard += ".%06d" % [usec] if usec.nonzero? + standard += " %s" % [tz] + out.scalar("tag:yaml.org,2002:timestamp", standard, :plain) + end + end +end + +class Date + def to_yaml(output = nil) + YAML::quick_emit(output) do |out| + out.scalar("tag:yaml.org,2002:timestamp", self.to_s, :plain) + end + end +end + =begin class Hash Deleted: MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/load_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/load_tags.txt 2009-10-20 07:05:21 UTC (rev 2866) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/load_tags.txt 2009-10-20 08:09:07 UTC (rev 2867) @@ -1 +0,0 @@ -fails:YAML.load works on complex keys Modified: MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/to_yaml_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/to_yaml_tags.txt 2009-10-20 07:05:21 UTC (rev 2866) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/to_yaml_tags.txt 2009-10-20 08:09:07 UTC (rev 2867) @@ -1,7 +1,4 @@ fails:Object#to_yaml returns the YAML representation of a Struct object -fails:Object#to_yaml returns the YAML representation of an Array object -fails:Object#to_yaml returns the YAML representation of a Date object fails:Object#to_yaml returns the YAML represenation of a RegExp object -fails:Object#to_yaml returns the YAML representation of a Time object fails:Object#to_yaml returns the YAML representation of a Error object fails:Object#to_yaml returns the YAML representation for Range objects

1 0

[2866] MacRuby/trunk/bridgesupport.cpp
by source_changes＠macosforge.org 20 Oct '09

20 Oct '09

Revision: 2866 http://trac.macosforge.org/projects/ruby/changeset/2866 Author: lsansonetti(a)apple.com Date: 2009-10-20 00:05:21 -0700 (Tue, 20 Oct 2009) Log Message: ----------- better comment with the radar ID Modified Paths: -------------- MacRuby/trunk/bridgesupport.cpp Modified: MacRuby/trunk/bridgesupport.cpp =================================================================== --- MacRuby/trunk/bridgesupport.cpp 2009-10-20 07:00:25 UTC (rev 2865) +++ MacRuby/trunk/bridgesupport.cpp 2009-10-20 07:05:21 UTC (rev 2866) @@ -989,8 +989,7 @@ char *type; #if __LP64__ - // XXX workaround a BridgeSupport bug: 64-bit annotations for - // informal_protocol elements are missing! + // XXX workaround <rdar://problem/7318177> 64-bit informal protocol annotations are missing // Manually converting some 32-bit types to 64-bit... const size_t typelen = strlen(bs_inf_prot_method->type) + 1; type = (char *)alloca(typelen);

1 0