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

[1253] MacRuby/branches/experimental
by source_changes＠macosforge.org 29 Mar '09

29 Mar '09

Revision: 1253 http://trac.macosforge.org/projects/ruby/changeset/1253 Author: eloy.de.enige(a)gmail.com Date: 2009-03-29 03:11:41 -0700 (Sun, 29 Mar 2009) Log Message: ----------- Added alias spec to partially good files and tagged all examples as fails. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/alias_tags.txt Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-29 10:11:29 UTC (rev 1252) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-29 10:11:41 UTC (rev 1253) @@ -28,6 +28,7 @@ } KNOWN_PARTIALLY_GOOD = %w{ + alias block break catch Added: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/alias_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/alias_tags.txt (rev 0) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/alias_tags.txt 2009-03-29 10:11:41 UTC (rev 1253) @@ -0,0 +1,7 @@ +fails:The alias keyword creates a new name for an existing method +fails:The alias keyword adds the new method to the list of methods +fails:The alias keyword adds the new method to the list of public methods +fails:The alias keyword overwrites an existing method with the target name +fails:The alias keyword is reversible +fails:The alias keyword operates on the object's metaclass when used in instance_eval +fails:The alias keyword operates on methods defined via attr, attr_reader, and attr_accessor \ No newline at end of file

1 0

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

29 Mar '09

Revision: 1252 http://trac.macosforge.org/projects/ruby/changeset/1252 Author: eloy.de.enige(a)gmail.com Date: 2009-03-29 03:11:29 -0700 (Sun, 29 Mar 2009) Log Message: ----------- Added spec:list:unloadable which prints a list of the language spec files that do not load yet. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-29 04:38:54 UTC (rev 1251) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-29 10:11:29 UTC (rev 1252) @@ -71,6 +71,13 @@ sh "./mspec/bin/mspec run -g fails -B ./spec/frozen/macruby.mspec #{KNOWN_GOOD_AND_PARTIALLY_GOOD_FILES.join(' ')}" end + namespace :list do + desc "List all spec language spec files which do not load yet" + task :unloadable do + puts((Dir['spec/frozen/language/*_spec.rb'] - KNOWN_GOOD_AND_PARTIALLY_GOOD_FILES).join("\n")) + end + end + %w{ fails critical }.each do |tag| namespace :list do # We cheat by using the fact that currently the ruby.1.9.mspec script uses the macruby tags,

1 0

[1251] MacRuby/branches/experimental
by source_changes＠macosforge.org 29 Mar '09

29 Mar '09

Revision: 1251 http://trac.macosforge.org/projects/ruby/changeset/1251 Author: lsansonetti(a)apple.com Date: 2009-03-28 21:38:54 -0700 (Sat, 28 Mar 2009) Log Message: ----------- added regexp_spec.rb to the not-yet-green list and marked current failing tests Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/regexp_tags.txt Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-29 04:38:07 UTC (rev 1250) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-29 04:38:54 UTC (rev 1251) @@ -43,6 +43,7 @@ next predefined private + regexp rescue return throw Added: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/regexp_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/regexp_tags.txt (rev 0) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/regexp_tags.txt 2009-03-29 04:38:54 UTC (rev 1251) @@ -0,0 +1,8 @@ +fails:Literal Regexps matches against $_ (last input) in a conditional if no explicit matchee provided +fails:Literal Regexps allow substitution of literal regexps +fails:Literal Regexps throws NoMethodError on missing to_s +fails:Literal Regexps allows substitution which mixes modifiers +fails:Literal Regexps supports \b (word boundary) +fails:Literal Regexps supports \B (non-word-boundary) +fails:Literal Regexps supports /o (once) +fails:Literal Regexps invokes substitutions for /o only once Property changes on: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/regexp_tags.txt ___________________________________________________________________ Added: svn:eol-style + native

1 0

[1250] MacRuby/branches/experimental/spec/frozen/language/regexp_spec.rb
by source_changes＠macosforge.org 29 Mar '09

29 Mar '09

Revision: 1250 http://trac.macosforge.org/projects/ruby/changeset/1250 Author: lsansonetti(a)apple.com Date: 2009-03-28 21:38:07 -0700 (Sat, 28 Mar 2009) Log Message: ----------- marked some specs as not running on 1.9 Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/regexp_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/language/regexp_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/regexp_spec.rb 2009-03-29 04:30:47 UTC (rev 1249) +++ MacRuby/branches/experimental/spec/frozen/language/regexp_spec.rb 2009-03-29 04:38:07 UTC (rev 1250) @@ -642,29 +642,31 @@ 2.times { /#{o}/o } ScratchPad.recorded.should == [:to_s_callback] end + + ruby_version_is "" ... "1.9" do + it 'does not do thread synchronization for /o' do + ScratchPad.record [] + + to_s_callback2 = Proc.new do + ScratchPad << :to_s_callback2 + "class_with_to_s2" + end - it 'does not do thread synchronization for /o' do - ScratchPad.record [] - - to_s_callback2 = Proc.new do - ScratchPad << :to_s_callback2 - "class_with_to_s2" - end - - to_s_callback1 = Proc.new do - ScratchPad << :to_s_callback1 - t2 = Thread.new do - o2 = LanguageSpecs::ClassWith_to_s.new(to_s_callback2) - ScratchPad << LanguageSpecs.get_regexp_with_substitution(o2) + to_s_callback1 = Proc.new do + ScratchPad << :to_s_callback1 + t2 = Thread.new do + o2 = LanguageSpecs::ClassWith_to_s.new(to_s_callback2) + ScratchPad << LanguageSpecs.get_regexp_with_substitution(o2) + end + t2.join + "class_with_to_s1" end - t2.join - "class_with_to_s1" + + o1 = LanguageSpecs::ClassWith_to_s.new(to_s_callback1) + ScratchPad << LanguageSpecs.get_regexp_with_substitution(o1) + + ScratchPad.recorded.should == [:to_s_callback1, :to_s_callback2, /class_with_to_s2/, /class_with_to_s2/] end - - o1 = LanguageSpecs::ClassWith_to_s.new(to_s_callback1) - ScratchPad << LanguageSpecs.get_regexp_with_substitution(o1) - - ScratchPad.recorded.should == [:to_s_callback1, :to_s_callback2, /class_with_to_s2/, /class_with_to_s2/] end it 'supports modifier combinations' do @@ -678,7 +680,10 @@ # Encodings ############################################################################# - not_compliant_on :ruby19 do + # These specs won't run on MacRuby too, and this #not_compliant_on method doesn't + # seem to work. Eloy? + #not_compliant_on :ruby19 do + ruby_version_is "" ... "1.9" do it 'supports /e (EUC encoding)' do /./e.match("\303\251").to_a.should == ["\303\251"] end

1 0

[1249] MacRuby/branches/experimental
by source_changes＠macosforge.org 29 Mar '09

29 Mar '09

Revision: 1249 http://trac.macosforge.org/projects/ruby/changeset/1249 Author: lsansonetti(a)apple.com Date: 2009-03-28 21:30:47 -0700 (Sat, 28 Mar 2009) Log Message: ----------- more compiler-side of regexp support Modified Paths: -------------- MacRuby/branches/experimental/eval.c MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/eval.c =================================================================== --- MacRuby/branches/experimental/eval.c 2009-03-29 03:48:11 UTC (rev 1248) +++ MacRuby/branches/experimental/eval.c 2009-03-29 04:30:47 UTC (rev 1249) @@ -693,22 +693,6 @@ } VALUE -rb_errinfo(void) -{ - // TODO - return Qnil; -} - -void -rb_set_errinfo(VALUE err) -{ - if (!NIL_P(err) && !rb_obj_is_kind_of(err, rb_eException)) { - rb_raise(rb_eTypeError, "assigning non-exception to $!"); - } - // TODO -} - -VALUE rb_rubylevel_errinfo(void) { return get_errinfo(); Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-29 03:48:11 UTC (rev 1248) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-29 04:30:47 UTC (rev 1249) @@ -408,6 +408,7 @@ VALUE backref; VALUE broken_with; VALUE last_status; + VALUE errinfo; int safe_level; std::map<NODE *, rb_vm_block_t *> blocks; std::map<double, struct rb_float_cache *> float_cache; @@ -1957,6 +1958,7 @@ backref = Qnil; broken_with = Qundef; last_status = Qnil; + errinfo = Qnil; current_block = NULL; previous_block = NULL; @@ -2869,12 +2871,14 @@ return compile_dstr(node); case NODE_DREGX: + case NODE_DREGX_ONCE: // TODO optimize NODE_DREGX_ONCE { Value *val = compile_dstr(node); const int flag = node->nd_cflag; if (newRegexpFunc == NULL) { - newRegexpFunc = cast<Function>(module->getOrInsertFunction("rb_reg_new_str", + newRegexpFunc = cast<Function>(module->getOrInsertFunction( + "rb_reg_new_str", RubyObjTy, RubyObjTy, Type::Int32Ty, NULL)); } @@ -3597,14 +3601,30 @@ } break; + case NODE_MATCH: case NODE_MATCH2: case NODE_MATCH3: { - assert(node->nd_recv); - assert(node->nd_value); + Value *reTarget; + Value *reSource; - Value *reSource = compile_node(node->nd_recv); - Value *reTarget = compile_node(node->nd_value); + if (nd_type(node) == NODE_MATCH) { + assert(node->nd_lit != 0); + reTarget = ConstantInt::get(RubyObjTy, node->nd_lit); + reSource = nilVal; // TODO this should get $_ + } + else { + assert(node->nd_recv); + assert(node->nd_value); + if (nd_type(node) == NODE_MATCH2) { + reTarget = compile_node(node->nd_recv); + reSource = compile_node(node->nd_value); + } + else { + reTarget = compile_node(node->nd_value); + reSource = compile_node(node->nd_recv); + } + } std::vector<Value *> params; void *cache = GET_VM()->method_cache_get(selEqTilde, false); @@ -6192,6 +6212,27 @@ } extern "C" +VALUE +rb_errinfo(void) +{ + return GET_VM()->errinfo; +} + +void +rb_set_errinfo(VALUE err) +{ + if (!NIL_P(err) && !rb_obj_is_kind_of(err, rb_eException)) { + rb_raise(rb_eTypeError, "assigning non-exception to $!"); + } + if (GET_VM()->errinfo != Qnil) { + rb_objc_release((void *)GET_VM()->errinfo); + } + GET_VM()->errinfo = err; + rb_objc_retain((void *)err); +} + + +extern "C" const char * rb_sourcefile(void) {

1 0

[1248] MacRuby/branches/experimental
by source_changes＠macosforge.org 29 Mar '09

29 Mar '09

Revision: 1248 http://trac.macosforge.org/projects/ruby/changeset/1248 Author: lsansonetti(a)apple.com Date: 2009-03-28 20:48:11 -0700 (Sat, 28 Mar 2009) Log Message: ----------- moved the undef spec in the not-green-yet list and marked the only test as failing (it's not implemented yet) Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/undef_tags.txt Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-29 03:41:44 UTC (rev 1247) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-29 03:48:11 UTC (rev 1248) @@ -46,6 +46,7 @@ rescue return throw + undef variables yield } Added: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/undef_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/undef_tags.txt (rev 0) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/undef_tags.txt 2009-03-29 03:48:11 UTC (rev 1248) @@ -0,0 +1 @@ +fails:The undef keyword undefines 'meth=' Property changes on: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/undef_tags.txt ___________________________________________________________________ Added: svn:eol-style + native

1 0

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

29 Mar '09

Revision: 1247 http://trac.macosforge.org/projects/ruby/changeset/1247 Author: lsansonetti(a)apple.com Date: 2009-03-28 20:41:44 -0700 (Sat, 28 Mar 2009) Log Message: ----------- super_spec.rb is now green Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-29 03:40:24 UTC (rev 1246) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-29 03:41:44 UTC (rev 1247) @@ -20,6 +20,7 @@ redo retry string + super symbol unless until

1 0

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

29 Mar '09

Revision: 1246 http://trac.macosforge.org/projects/ruby/changeset/1246 Author: lsansonetti(a)apple.com Date: 2009-03-28 20:40:24 -0700 (Sat, 28 Mar 2009) Log Message: ----------- Array#<< is supposed to return self and not the given object Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-29 03:36:51 UTC (rev 1245) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-29 03:40:24 UTC (rev 1246) @@ -5333,7 +5333,7 @@ { if (overriden == 0 && TYPE(obj) == T_ARRAY) { rb_ary_push(obj, other); - return other; + return obj; } return __rb_vm_dispatch(cache, obj, NULL, selLTLT, 0, 1, &other); }

1 0

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

29 Mar '09

Revision: 1245 http://trac.macosforge.org/projects/ruby/changeset/1245 Author: lsansonetti(a)apple.com Date: 2009-03-28 20:36:51 -0700 (Sat, 28 Mar 2009) Log Message: ----------- in case the super method cannot be found, let's go through method_missing instead of aborting Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-29 03:32:31 UTC (rev 1244) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-29 03:36:51 UTC (rev 1245) @@ -4999,9 +4999,7 @@ } } - printf("could not identify the superclass of %s from the ancestors chain %s\n", - class_getName((Class)klass), RSTRING_PTR(rb_inspect(ary))); - abort(); + return NULL; } extern "C"

1 0

[1244] MacRuby/branches/experimental
by source_changes＠macosforge.org 29 Mar '09

29 Mar '09

Revision: 1244 http://trac.macosforge.org/projects/ruby/changeset/1244 Author: lsansonetti(a)apple.com Date: 2009-03-28 20:32:31 -0700 (Sat, 28 Mar 2009) Log Message: ----------- fixed const lookup from a metaclass Modified Paths: -------------- MacRuby/branches/experimental/class.c MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/class.c =================================================================== --- MacRuby/branches/experimental/class.c 2009-03-29 03:31:28 UTC (rev 1243) +++ MacRuby/branches/experimental/class.c 2009-03-29 03:32:31 UTC (rev 1244) @@ -351,8 +351,9 @@ { if (RCLASS_SINGLETON(klass)) { static ID attachedId = 0; - if (attachedId == 0) + if (attachedId == 0) { attachedId = rb_intern("__attached__"); + } rb_ivar_set(klass, attachedId, obj); } } @@ -1158,7 +1159,9 @@ case T_CLASS: case T_MODULE: klass = *(VALUE *)obj; + rb_vm_set_outer(klass, obj); break; + default: klass = rb_make_metaclass(obj, RBASIC(obj)->klass); break; Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-29 03:31:28 UTC (rev 1243) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-29 03:32:31 UTC (rev 1244) @@ -504,11 +504,17 @@ void set_outer(Class klass, Class mod) { struct rb_vm_outer *mod_outer = get_outer(mod); - struct rb_vm_outer *class_outer = (struct rb_vm_outer *) - malloc(sizeof(struct rb_vm_outer)); - class_outer->klass = klass; - class_outer->outer = mod_outer; - outers[klass] = class_outer; + struct rb_vm_outer *class_outer = get_outer(klass); + if (class_outer == NULL || class_outer->outer != mod_outer) { + if (class_outer != NULL) { + free(class_outer); + } + class_outer = (struct rb_vm_outer *) + malloc(sizeof(struct rb_vm_outer)); + class_outer->klass = klass; + class_outer->outer = mod_outer; + outers[klass] = class_outer; + } } };

1 0