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

[1163] MacRuby/branches/experimental/test_roxor.rb
by source_changes＠macosforge.org 26 Mar '09

26 Mar '09

Revision: 1163 http://trac.macosforge.org/projects/ruby/changeset/1163 Author: lsansonetti(a)apple.com Date: 2009-03-25 23:00:53 -0700 (Wed, 25 Mar 2009) Log Message: ----------- a new failing test Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-26 06:00:39 UTC (rev 1162) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-26 06:00:53 UTC (rev 1163) @@ -1044,6 +1044,7 @@ assert ":ok", "begin; p :ok; rescue; end" assert ":ok", "begin; raise; p :nok; rescue; p :ok; end" + assert ":ok", "begin; raise; p :nok; ensure; p :ok; end" assert "42", "x = 40; begin; x += 1; rescue; ensure; x += 1; end; p x" assert "42", "x = 40; begin; raise; x = nil; rescue; x += 1; ensure; x += 1; end; p x"

1 0

[1162] MacRuby/branches/experimental/roxor.cpp
by source_changes＠macosforge.org 26 Mar '09

26 Mar '09

Revision: 1162 http://trac.macosforge.org/projects/ruby/changeset/1162 Author: lsansonetti(a)apple.com Date: 2009-03-25 23:00:39 -0700 (Wed, 25 Mar 2009) Log Message: ----------- fixed a bug + added some comments Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-26 05:19:24 UTC (rev 1161) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-26 06:00:39 UTC (rev 1162) @@ -309,6 +309,9 @@ } std::map<ID, int *>::iterator iter = ivar_slots_cache.find(id); if (iter == ivar_slots_cache.end()) { +#if ROXOR_COMPILER_DEBUG + printf("allocating a new slot for ivar %s\n", rb_id2name(id)); +#endif int *slot = (int *)malloc(sizeof(int)); *slot = -1; ivar_slots_cache[id] = slot; @@ -3902,7 +3905,6 @@ { std::map<ID, Value *> old_dvars = dvars; - current_block = true; BasicBlock *old_current_loop_begin_bb = current_loop_begin_bb; BasicBlock *old_current_loop_body_bb = current_loop_body_bb; BasicBlock *old_current_loop_end_bb = current_loop_end_bb; @@ -3910,7 +3912,9 @@ Function *old_current_block_func = current_block_func; NODE *old_current_block_node = current_block_node; ID old_current_mid = current_mid; + bool old_current_block = current_block; current_mid = 0; + current_block = true; assert(node->nd_body != NULL); Value *block = compile_node(node->nd_body); @@ -3919,8 +3923,8 @@ current_loop_begin_bb = old_current_loop_begin_bb; current_loop_body_bb = old_current_loop_body_bb; current_loop_end_bb = old_current_loop_end_bb; - current_block = false; current_mid = old_current_mid; + current_block = old_current_block; current_block_func = cast<Function>(block); current_block_node = node->nd_body; @@ -4149,6 +4153,7 @@ static inline VALUE rb_const_get_direct(VALUE klass, ID id) { + // Search the given class. CFDictionaryRef iv_dict = rb_class_ivar_dict(klass); if (iv_dict != NULL) { VALUE value; @@ -4157,6 +4162,7 @@ return value; } } + // Search the included modules. VALUE mods = rb_attr_get(klass, idIncludedModules); if (mods != Qnil) { int i, count = RARRAY_LEN(mods); @@ -4174,6 +4180,8 @@ rb_vm_const_lookup(VALUE outer, ID path, bool lexical, bool defined) { if (lexical) { + // Let's do a lexical lookup before a hierarchical one, by looking for + // the given constant in all modules under the given outer. struct rb_vm_outer *o = GET_VM()->get_outer((Class)outer); while (o != NULL && o->klass != (Class)rb_cNSObject) { VALUE val = rb_const_get_direct((VALUE)o->klass, path); @@ -4184,6 +4192,7 @@ } } + // Nothing was found earlier so here we do a hierarchical lookup. return defined ? rb_const_defined(outer, path) : rb_const_get(outer, path); }

1 0

[1161] MacRuby/branches/experimental/test_roxor.rb
by source_changes＠macosforge.org 26 Mar '09

26 Mar '09

Revision: 1161 http://trac.macosforge.org/projects/ruby/changeset/1161 Author: lsansonetti(a)apple.com Date: 2009-03-25 22:19:24 -0700 (Wed, 25 Mar 2009) Log Message: ----------- added a const lookup test (currently fails) Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-26 05:09:41 UTC (rev 1160) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-26 05:19:24 UTC (rev 1161) @@ -450,6 +450,15 @@ p o.baz.bar } + assert '42', %q{ + module M + FOO = 42 + class X + class << self; p FOO; end + end + end + } + end test "ranges" do

1 0

[1160] MacRuby/branches/experimental/rakelib/spec.rake
by source_changes＠macosforge.org 26 Mar '09

26 Mar '09

Revision: 1160 http://trac.macosforge.org/projects/ruby/changeset/1160 Author: lsansonetti(a)apple.com Date: 2009-03-25 22:09:41 -0700 (Wed, 25 Mar 2009) Log Message: ----------- symbol_spec.rb is green Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-26 05:09:25 UTC (rev 1159) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-26 05:09:41 UTC (rev 1160) @@ -17,6 +17,7 @@ or order string + symbol unless until while

1 0

[1159] MacRuby/branches/experimental/string.c
by source_changes＠macosforge.org 26 Mar '09

26 Mar '09

Revision: 1159 http://trac.macosforge.org/projects/ruby/changeset/1159 Author: lsansonetti(a)apple.com Date: 2009-03-25 22:09:25 -0700 (Wed, 25 Mar 2009) Log Message: ----------- fix bugs discovered by rubyspec Modified Paths: -------------- MacRuby/branches/experimental/string.c Modified: MacRuby/branches/experimental/string.c =================================================================== --- MacRuby/branches/experimental/string.c 2009-03-26 03:21:33 UTC (rev 1158) +++ MacRuby/branches/experimental/string.c 2009-03-26 05:09:25 UTC (rev 1159) @@ -4923,28 +4923,38 @@ * :fred.inspect #=> ":fred" */ +static inline bool +sym_printable(const char *str, long len) +{ + // TODO multibyte symbols + long i; + for (i = 0; i < len; i++) { + if (!isprint(str[i])) { + return false; + } + } + return true; +} + static VALUE sym_inspect(VALUE sym, SEL sel) { - if (RSTRING_LEN(sym) == 0) { + const char *symstr = RSYMBOL(sym)->str; + + long len = strlen(symstr); + if (len == 0) { return rb_str_new2(":\"\""); } - CFCharacterSetRef letters = - CFCharacterSetGetPredefined(kCFCharacterSetLetter); - const bool should_be_quoted = - !CFCharacterSetIsCharacterMember(letters, - CFStringGetCharacterAtIndex((CFStringRef)sym, 0)); - VALUE str = rb_str_new2(":"); - - if (should_be_quoted) { + if (!rb_symname_p(symstr) || !sym_printable(symstr, len)) { rb_str_buf_cat2(str, "\""); - } - rb_str_buf_append(str, sym); - if (should_be_quoted) { + rb_str_buf_append(str, sym); rb_str_buf_cat2(str, "\""); } + else { + rb_str_buf_append(str, sym); + } return str; }

1 0

[1158] MacRuby/branches/experimental/string.c
by source_changes＠macosforge.org 26 Mar '09

26 Mar '09

Revision: 1158 http://trac.macosforge.org/projects/ruby/changeset/1158 Author: lsansonetti(a)apple.com Date: 2009-03-25 20:21:33 -0700 (Wed, 25 Mar 2009) Log Message: ----------- fixed empty symbols Modified Paths: -------------- MacRuby/branches/experimental/string.c Modified: MacRuby/branches/experimental/string.c =================================================================== --- MacRuby/branches/experimental/string.c 2009-03-26 03:18:03 UTC (rev 1157) +++ MacRuby/branches/experimental/string.c 2009-03-26 03:21:33 UTC (rev 1158) @@ -4926,7 +4926,9 @@ static VALUE sym_inspect(VALUE sym, SEL sel) { - assert(RSTRING_LEN(sym) > 0); + if (RSTRING_LEN(sym) == 0) { + return rb_str_new2(":\"\""); + } CFCharacterSetRef letters = CFCharacterSetGetPredefined(kCFCharacterSetLetter);

1 0

[1157] MacRuby/branches/experimental/spec/frozen/language/symbol_spec.rb
by source_changes＠macosforge.org 26 Mar '09

26 Mar '09

Revision: 1157 http://trac.macosforge.org/projects/ruby/changeset/1157 Author: lsansonetti(a)apple.com Date: 2009-03-25 20:18:03 -0700 (Wed, 25 Mar 2009) Log Message: ----------- forked a spec that has a different behavior since 1.9 Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/symbol_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/language/symbol_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/symbol_spec.rb 2009-03-26 02:32:56 UTC (rev 1156) +++ MacRuby/branches/experimental/spec/frozen/language/symbol_spec.rb 2009-03-26 03:18:03 UTC (rev 1157) @@ -49,10 +49,20 @@ c.inspect.should == ':Foo__9' end - it "must not be an empty string" do - lambda { eval ":''" }.should raise_error(SyntaxError) + ruby_version_is "" ... "1.9" do + it "must not be an empty string" do + lambda { eval ":''" }.should raise_error(SyntaxError) + end end + ruby_version_is "1.9" do + it "can be an empty string" do + c = :'' + c.class.should == Symbol + c.inspect.should == ':""' + end + end + it "can be created by the %s-delimited expression" do a, b = :'foo bar', %s{foo bar} b.class.should == Symbol

1 0

[1156] MacRuby/branches/experimental/rakelib/spec.rake
by source_changes＠macosforge.org 26 Mar '09

26 Mar '09

Revision: 1156 http://trac.macosforge.org/projects/ruby/changeset/1156 Author: lsansonetti(a)apple.com Date: 2009-03-25 19:32:56 -0700 (Wed, 25 Mar 2009) Log Message: ----------- file_spec.rb is green Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-26 01:41:37 UTC (rev 1155) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-26 02:32:56 UTC (rev 1156) @@ -8,6 +8,7 @@ defined else execution + file hash if module

1 0

[1155] MacRuby/branches/experimental/roxor.cpp
by source_changes＠macosforge.org 26 Mar '09

26 Mar '09

Revision: 1155 http://trac.macosforge.org/projects/ruby/changeset/1155 Author: lsansonetti(a)apple.com Date: 2009-03-25 18:41:37 -0700 (Wed, 25 Mar 2009) Log Message: ----------- make sure opt args are evaluated even if we are calling an empty method Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-26 01:31:17 UTC (rev 1154) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-26 01:41:37 UTC (rev 1155) @@ -4977,7 +4977,8 @@ assert(rcache.node != NULL); const int node_type = nd_type(rcache.node); - if (node_type == NODE_SCOPE && rcache.node->nd_body == NULL) { + if (node_type == NODE_SCOPE && rcache.node->nd_body == NULL + && rcache.arity.max == rcache.arity.min) { // Calling an empty method, let's just return nil! return Qnil; }

1 0

[1154] MacRuby/branches/experimental/roxor.h
by source_changes＠macosforge.org 26 Mar '09

26 Mar '09

Revision: 1154 http://trac.macosforge.org/projects/ruby/changeset/1154 Author: lsansonetti(a)apple.com Date: 2009-03-25 18:31:17 -0700 (Wed, 25 Mar 2009) Log Message: ----------- added comments about the rb_vm_arity_t for the mere mortals willing to use it Modified Paths: -------------- MacRuby/branches/experimental/roxor.h Modified: MacRuby/branches/experimental/roxor.h =================================================================== --- MacRuby/branches/experimental/roxor.h 2009-03-26 01:18:56 UTC (rev 1153) +++ MacRuby/branches/experimental/roxor.h 2009-03-26 01:31:17 UTC (rev 1154) @@ -92,10 +92,10 @@ rb_vm_method_t *rb_vm_get_method(VALUE klass, VALUE obj, ID mid, int scope); typedef struct { - short min; - short max; - short left_req; - short real; + short min; // min number of args that we accept + short max; // max number of args that we accept (-1 if rest) + short left_req; // number of args required on the left side + short real; // number of args of the low level function } rb_vm_arity_t; #define VM_BLOCK_PROC 0x0001 // block is a Proc object

1 0