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

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

26 Mar '09

Revision: 1173 http://trac.macosforge.org/projects/ruby/changeset/1173 Author: eloy.de.enige(a)gmail.com Date: 2009-03-26 15:54:29 -0700 (Thu, 26 Mar 2009) Log Message: ----------- Tagged failing examples of the catch spec and added it to the green list. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/catch_tags.txt Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-26 22:54:17 UTC (rev 1172) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-26 22:54:29 UTC (rev 1173) @@ -5,6 +5,7 @@ block break case + catch class class_variable defined Added: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/catch_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/catch_tags.txt (rev 0) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/catch_tags.txt 2009-03-26 22:54:29 UTC (rev 1173) @@ -0,0 +1,5 @@ +fails:The catch keyword only allows symbols and strings +fails:The catch keyword returns the last value of the block if it nothing is thrown +fails:The catch keyword requires a block +fails:The catch keyword supports nesting +fails:The catch keyword supports nesting with the same name \ No newline at end of file

1 0

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

26 Mar '09

Revision: 1172 http://trac.macosforge.org/projects/ruby/changeset/1172 Author: eloy.de.enige(a)gmail.com Date: 2009-03-26 15:54:17 -0700 (Thu, 26 Mar 2009) Log Message: ----------- Tagged critical and failing examples of the class spec and added it to the green list. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake MacRuby/branches/experimental/spec/frozen/tags/macruby/language/class_tags.txt Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-26 22:54:05 UTC (rev 1171) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-26 22:54:17 UTC (rev 1172) @@ -5,6 +5,7 @@ block break case + class class_variable defined else Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/class_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/class_tags.txt 2009-03-26 22:54:05 UTC (rev 1171) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/class_tags.txt 2009-03-26 22:54:17 UTC (rev 1172) @@ -1,4 +1,10 @@ critical:A class definition raises TypeError if the constant qualifying the class is nil +critical:A class definition raises TypeError if any constant qualifying the class is not a Module critical:A class definition allows using self as the superclass if self is a class critical:A Class Definitions extending an object raises a TypeError when trying to extend numbers critical:Reopening a class raises a TypeError when superclasses mismatch +fails:A class definition raises TypeError if constant given as class name exists and is not a Module +fails:A class definition allows the declaration of class variables in the body +fails:A class definition allows the declaration of class variables in a class method +fails:A class definition allows the declaration of class variables in an instance method +fails:A class definition returns the value of the last statement in the body \ No newline at end of file

1 0

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

26 Mar '09

Revision: 1171 http://trac.macosforge.org/projects/ruby/changeset/1171 Author: eloy.de.enige(a)gmail.com Date: 2009-03-26 15:54:05 -0700 (Thu, 26 Mar 2009) Log Message: ----------- Tagged current failing examples in block and break specs and added them to the green list of specs. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake MacRuby/branches/experimental/spec/frozen/tags/macruby/language/block_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/break_tags.txt Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-26 22:53:50 UTC (rev 1170) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-26 22:54:05 UTC (rev 1171) @@ -2,6 +2,8 @@ KNOWN_GOOD = %w{ and array + block + break case class_variable defined Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/block_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/block_tags.txt 2009-03-26 22:53:50 UTC (rev 1170) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/block_tags.txt 2009-03-26 22:54:05 UTC (rev 1171) @@ -1 +1,2 @@ +fails:A block with a 'rest' arg collects all of the arguments passed to yield critical:A block whose arguments are splatted yields the correct arguments in a nested block \ No newline at end of file Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/break_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/break_tags.txt 2009-03-26 22:53:50 UTC (rev 1170) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/break_tags.txt 2009-03-26 22:54:05 UTC (rev 1171) @@ -1 +1,12 @@ -critical:The break statement raises a SyntaxError if used not within block or while/for loop \ No newline at end of file +fails:Executing break from within a block returns from the invoking singleton method +fails:Executing break from within a block returns from the invoking method with the argument to break +fails:Executing break from within a block returns from the original invoking method even in case of chained calls +fails:Breaking out of a loop with a value assigns objects +fails:Breaking out of a loop with a value assigns splatted objects +fails:Breaking out of a loop with a value assigns to a splatted reference +fails:Breaking out of a loop with a value assigns splatted objects to a splatted reference +fails:Breaking out of a loop with a value assigns splatted objects to a splatted reference from a splatted loop +fails:Breaking out of a loop with a value assigns objects to multiple block variables +fails:Breaking out of a loop with a value assigns splatted objects to multiple block variables +fails:Breaking out of a loop with a value stops any loop type at the correct spot +fails:Breaking out of a loop with a value stops a yielded method at the correct spot \ No newline at end of file

1 0

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

26 Mar '09

Revision: 1170 http://trac.macosforge.org/projects/ruby/changeset/1170 Author: eloy.de.enige(a)gmail.com Date: 2009-03-26 15:53:50 -0700 (Thu, 26 Mar 2009) Log Message: ----------- Removed all copied 1.9 language tags. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake MacRuby/branches/experimental/spec/frozen/tags/macruby/language/block_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/class_tags.txt Removed Paths: ------------- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/catch_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/constants_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/defined_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/file_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/metaclass_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/module_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/numbers_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/precedence_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/private_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/return_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/symbol_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/throw_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/undef_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/variables_tags.txt Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-26 18:35:50 UTC (rev 1169) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-26 22:53:50 UTC (rev 1170) @@ -1,6 +1,4 @@ namespace :spec do - MSPEC_RUN = "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run" - KNOWN_GOOD = %w{ and array @@ -28,7 +26,8 @@ desc "Run continuous integration language examples (known good)" task :ci do - sh "#{MSPEC_RUN} #{FileList["spec/frozen/language/{#{KNOWN_GOOD.join(',')}}_spec.rb"].join(' ')}" + files = FileList["spec/frozen/language/{#{KNOWN_GOOD.join(',')}}_spec.rb"] + sh "./mspec/bin/mspec ci -B ./spec/frozen/macruby.mspec #{files.join(' ')}" end desc "Run language examples that are known to fail" @@ -36,7 +35,7 @@ files = FileList["spec/frozen/language/*_spec.rb"] files -= files.grep(/\/(#{KNOWN_GOOD.join('|')})_spec\.rb$/) files.each do |spec| - sh "#{MSPEC_RUN} --format spec #{spec}" rescue nil + sh "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run --format spec #{spec}" rescue nil end end Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/block_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/block_tags.txt 2009-03-26 18:35:50 UTC (rev 1169) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/block_tags.txt 2009-03-26 22:53:50 UTC (rev 1170) @@ -1 +1 @@ -critical:A block whose arguments are splatted yields the correct arguments in a nested block +critical:A block whose arguments are splatted yields the correct arguments in a nested block \ No newline at end of file Deleted: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/catch_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/catch_tags.txt 2009-03-26 18:35:50 UTC (rev 1169) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/catch_tags.txt 2009-03-26 22:53:50 UTC (rev 1170) @@ -1,2 +0,0 @@ -fails:The catch keyword only allows symbols and strings -fails:The catch keyword matches strings as symbols Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/class_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/class_tags.txt 2009-03-26 18:35:50 UTC (rev 1169) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/class_tags.txt 2009-03-26 22:53:50 UTC (rev 1170) @@ -1,11 +1,3 @@ -fails:A class definition raises TypeError if constant given as class name exists and is not a Module -fails:A class definition raises TypeError if any constant qualifying the class is not a Module -fails:A class definition allows the declaration of class variables in the body -fails:A class definition stores instance variables defined in the class body in the class object -fails:A class definition allows the declaration of class variables in a class method -fails:A class definition allows the definition of class-level instance variables in a class method -fails:A class definition allows the declaration of class variables in an instance method -fails:An outer class definition contains the inner classes critical:A class definition raises TypeError if the constant qualifying the class is nil critical:A class definition allows using self as the superclass if self is a class critical:A Class Definitions extending an object raises a TypeError when trying to extend numbers Deleted: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/constants_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/constants_tags.txt 2009-03-26 18:35:50 UTC (rev 1169) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/constants_tags.txt 2009-03-26 22:53:50 UTC (rev 1170) @@ -1,24 +0,0 @@ -fails:Literal (A::X) constant resolution with dynamically assigned constants returns the updated value when a constant is reassigned -fails:Constant resolution within methods sends #const_missing to the original class or module scope -fails:Constant resolution within methods with statically assigned constants searches the immediate class or module scope first -fails:Constant resolution within methods with statically assigned constants searches a module included in the immediate class before the superclass -fails:Constant resolution within methods with statically assigned constants searches the superclass before a module included in the superclass -fails:Constant resolution within methods with statically assigned constants searches a module included in the superclass -fails:Constant resolution within methods with statically assigned constants searches the superclass chain -fails:Constant resolution within methods with statically assigned constants searches the lexical scope of the method not the receiver's immediate class -fails:Constant resolution within methods with statically assigned constants searches the lexical scope of a singleton method -fails:Constant resolution within methods with statically assigned constants searches the lexical scope of a block -fails:Constant resolution within methods with statically assigned constants searches Object as a lexical scope only if Object is explicitly opened -fails:Constant resolution within methods with dynamically assigned constants searches the immediate class or module scope first -fails:Constant resolution within methods with dynamically assigned constants searches a module included in the immediate class before the superclass -fails:Constant resolution within methods with dynamically assigned constants searches the superclass before a module included in the superclass -fails:Constant resolution within methods with dynamically assigned constants searches a module included in the superclass -fails:Constant resolution within methods with dynamically assigned constants searches the superclass chain -fails:Constant resolution within methods with dynamically assigned constants searches the lexical scope of the method not the receiver's immediate class -fails:Constant resolution within methods with dynamically assigned constants searches the lexical scope of a singleton method -fails:Constant resolution within methods with dynamically assigned constants does not search the lexical scope of the caller -fails:Constant resolution within methods with dynamically assigned constants searches the lexical scope of a block -fails:Constant resolution within methods with dynamically assigned constants searches Object as a lexical scope only if Object is explicitly opened -fails:Constant resolution within methods with dynamically assigned constants returns the updated value when a constant is reassigned -fails:Constant resolution within methods with dynamically assigned constants does not search the lexical scope of qualifying modules -fails:Literal (A::X) constant resolution sends #const_missing to the original class or module scope Deleted: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/defined_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/defined_tags.txt 2009-03-26 18:35:50 UTC (rev 1169) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/defined_tags.txt 2009-03-26 22:53:50 UTC (rev 1170) @@ -1 +0,0 @@ -fails:The defined? keyword follows normal lexical and hierarchical scoping for constants Deleted: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/file_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/file_tags.txt 2009-03-26 18:35:50 UTC (rev 1169) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/file_tags.txt 2009-03-26 22:53:50 UTC (rev 1170) @@ -1 +0,0 @@ -critical:The __FILE__ constant equals (eval) inside an eval \ No newline at end of file Deleted: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/metaclass_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/metaclass_tags.txt 2009-03-26 18:35:50 UTC (rev 1169) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/metaclass_tags.txt 2009-03-26 22:53:50 UTC (rev 1170) @@ -1 +0,0 @@ -fails:A constant on a metaclass appears in the metaclass constant list Deleted: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/module_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/module_tags.txt 2009-03-26 18:35:50 UTC (rev 1169) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/module_tags.txt 2009-03-26 22:53:50 UTC (rev 1170) @@ -1 +0,0 @@ -fails:module gets a name when assigned to a constant Deleted: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/numbers_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/numbers_tags.txt 2009-03-26 18:35:50 UTC (rev 1169) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/numbers_tags.txt 2009-03-26 22:53:50 UTC (rev 1170) @@ -1,2 +0,0 @@ -fails:Ruby numbers in various ways character to numeric shortcut -fails:Ruby numbers in various ways character with control character to numeric shortcut Deleted: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/precedence_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/precedence_tags.txt 2009-03-26 18:35:50 UTC (rev 1169) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/precedence_tags.txt 2009-03-26 22:53:50 UTC (rev 1170) @@ -1,2 +0,0 @@ -fails:Operators ! ~ + have a higher precedence than ** -fails:Operators <= < > >= have higher precedence than <=> == === != =~ !~ Deleted: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/private_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/private_tags.txt 2009-03-26 18:35:50 UTC (rev 1169) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/private_tags.txt 2009-03-26 22:53:50 UTC (rev 1170) @@ -1,5 +0,0 @@ -fails:The private keyword is overridden when a new class is opened -fails:The private keyword is no longer in effect when the class is closed -fails:The private keyword changes visibility of previously called method -fails:The private keyword changes visiblity of previously called methods with same send/call site -fails:The private keyword changes the visibility of the existing method in the subclass Deleted: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/return_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/return_tags.txt 2009-03-26 18:35:50 UTC (rev 1169) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/return_tags.txt 2009-03-26 22:53:50 UTC (rev 1170) @@ -1,7 +0,0 @@ -fails:The return keyword in a Thread raises a ThreadError if used to exit a thread -fails:The return keyword when passed a splat returns nil when the ary is empty -fails:The return keyword when passed a splat returns the first element when the array is size of 1 -fails:The return keyword when passed a splat returns a non-array when used as a splat -fails:The return keyword when passed a splat calls 'to_a' on the splatted value first -fails:The return keyword when passed a splat calls 'to_ary' on the splatted value first -fails:The return keyword within a block raises a LocalJumpError if there is no lexicaly enclosing method Deleted: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/symbol_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/symbol_tags.txt 2009-03-26 18:35:50 UTC (rev 1169) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/symbol_tags.txt 2009-03-26 22:53:50 UTC (rev 1170) @@ -1 +0,0 @@ -fails:A Symbol literal must not be an empty string Deleted: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/throw_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/throw_tags.txt 2009-03-26 18:35:50 UTC (rev 1169) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/throw_tags.txt 2009-03-26 22:53:50 UTC (rev 1170) @@ -1,4 +0,0 @@ -fails:The throw keyword only allows symbols and strings as it's argument -fails:The throw keyword converts strings to a symbol -fails:The throw keyword raises a name error if outside of scope of a matching catch -fails:The throw keyword raises a ThreadError if used to exit a thread Deleted: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/undef_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/undef_tags.txt 2009-03-26 18:35:50 UTC (rev 1169) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/undef_tags.txt 2009-03-26 22:53:50 UTC (rev 1170) @@ -1 +0,0 @@ -fails:The undef keyword undefines 'meth=' Deleted: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/variables_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/variables_tags.txt 2009-03-26 18:35:50 UTC (rev 1169) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/variables_tags.txt 2009-03-26 22:53:50 UTC (rev 1170) @@ -1,9 +0,0 @@ -fails:Basic assignment assigns nil to lhs when rhs is an empty expression -fails:Basic assignment allows the assignment of the rhs to the lhs using the rhs splat operator -fails:Basic assignment allows the assignment of the rhs to the lhs using the lhs splat operator -fails:Basic assignment allows the assignment of rhs to the lhs using the lhs and rhs splat operators simultaneously -fails:Assignment using expansion succeeds without conversion -fails:Assigning multiple values calls #to_ary on rhs arg if rhs has only a single arg -fails:Operator assignment 'obj[idx] op= expr' returns result of rhs not result of []= -fails:Multiple assignments with splats * on the lhs has to be applied to the last parameter -fails:Multiple assignments with splats * on the lhs collects all parameters from its position onwards as an Array or an empty Array

1 0

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

26 Mar '09

Revision: 1169 http://trac.macosforge.org/projects/ruby/changeset/1169 Author: lsansonetti(a)apple.com Date: 2009-03-26 11:35:50 -0700 (Thu, 26 Mar 2009) Log Message: ----------- added missing Symbol#eql? Modified Paths: -------------- MacRuby/branches/experimental/string.c Modified: MacRuby/branches/experimental/string.c =================================================================== --- MacRuby/branches/experimental/string.c 2009-03-26 17:37:09 UTC (rev 1168) +++ MacRuby/branches/experimental/string.c 2009-03-26 18:35:50 UTC (rev 1169) @@ -5546,6 +5546,7 @@ rb_define_singleton_method(rb_cSymbol, "all_symbols", rb_sym_all_symbols, 0); /* in parse.y */ rb_objc_define_method(rb_cSymbol, "==", sym_equal, 1); + rb_objc_define_method(rb_cSymbol, "eql?", sym_equal, 1); rb_objc_define_method(rb_cSymbol, "<=>", sym_cmp, 1); rb_objc_define_method(rb_cSymbol, "inspect", sym_inspect, 0); rb_objc_define_method(rb_cSymbol, "description", sym_inspect, 0);

1 0

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

26 Mar '09

Revision: 1168 http://trac.macosforge.org/projects/ruby/changeset/1168 Author: pthomson(a)apple.com Date: 2009-03-26 10:37:09 -0700 (Thu, 26 Mar 2009) Log Message: ----------- Precommit; implemented rb_io_pid. Modified Paths: -------------- MacRuby/branches/experimental/io.c Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-26 13:33:03 UTC (rev 1167) +++ MacRuby/branches/experimental/io.c 2009-03-26 17:37:09 UTC (rev 1168) @@ -782,7 +782,8 @@ static VALUE rb_io_pid(VALUE io, SEL sel) { - rb_notimplement(); + rb_io_t *io_struct = ExtractIOStruct(io); + return ((io_struct->pid == -1) ? Qnil : INT2FIX(io_struct->pid)); } @@ -3059,7 +3060,7 @@ static VALUE rb_io_s_pipe(VALUE recv, SEL sel, int argc, VALUE *argv) { -rb_notimplement(); + rb_notimplement(); } /*

1 0

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

26 Mar '09

Revision: 1167 http://trac.macosforge.org/projects/ruby/changeset/1167 Author: eloy.de.enige(a)gmail.com Date: 2009-03-26 06:33:03 -0700 (Thu, 26 Mar 2009) Log Message: ----------- Added green specs: class_variable, line, retry. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-26 12:35:17 UTC (rev 1166) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-26 13:33:03 UTC (rev 1167) @@ -5,17 +5,20 @@ and array case + class_variable defined else execution file hash if + line module numbers not or order + retry string symbol unless

1 0

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

26 Mar '09

Revision: 1166 http://trac.macosforge.org/projects/ruby/changeset/1166 Author: vincent.isambart(a)gmail.com Date: 2009-03-26 05:35:17 -0700 (Thu, 26 Mar 2009) Log Message: ----------- modified assertion for {|x,|} Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-26 11:43:50 UTC (rev 1165) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-26 12:35:17 UTC (rev 1166) @@ -2299,7 +2299,9 @@ if (node->nd_tbl != NULL) { int i, args_count = (int)node->nd_tbl[0]; - assert(args_count == nargs || args_count == nargs + 1 /* optional block */); + assert(args_count == nargs + || args_count == nargs + 1 /* optional block */ + || args_count == nargs - 1 /* unnamed param (|x,|) */); for (i = 0; i < args_count; i++) { ID id = node->nd_tbl[i + 1]; #if ROXOR_COMPILER_DEBUG

1 0

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

26 Mar '09

Revision: 1165 http://trac.macosforge.org/projects/ruby/changeset/1165 Author: vincent.isambart(a)gmail.com Date: 2009-03-26 04:43:50 -0700 (Thu, 26 Mar 2009) Log Message: ----------- fixed a bug in the compilation of the optional arguments (and also removed a useless loop) Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-26 11:20:16 UTC (rev 1164) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-26 11:43:50 UTC (rev 1165) @@ -2287,7 +2287,7 @@ ++iter) { ID id = iter->first; - assert(iter->second == NULL); + assert(iter->second == NULL); Value *val = arg++; val->setName(std::string("dyna_") + rb_id2name(id)); @@ -2342,11 +2342,11 @@ lvars[id] = store; } - // compile multiple assignment arguments (def f((a, b, v))) - // (this must also be done after the creation of local variables) - NODE *n = node->nd_args; - if (n != NULL) { - NODE *rest_node = n->nd_next; + NODE *args_node = node->nd_args; + if (args_node != NULL) { + // compile multiple assignment arguments (def f((a, b, v))) + // (this must also be done after the creation of local variables) + NODE *rest_node = args_node->nd_next; if (rest_node != NULL) { NODE *right_req_node = rest_node->nd_next; if (right_req_node != NULL) { @@ -2364,22 +2364,19 @@ } } } - } - // Compile optional arguments. - Function::ArgumentListType::iterator iter = f->arg_begin(); - ++iter; // skip self - ++iter; // skip sel - while (n != NULL) { - if (nd_type(n) == NODE_ARGS) { - for (i = 0; i < n->nd_frml; i++) { - ++iter; // skip mandatory argument + // Compile optional arguments. + Function::ArgumentListType::iterator iter = f->arg_begin(); + ++iter; // skip self + ++iter; // skip sel + NODE *opt_node = args_node->nd_opt; + if (opt_node != NULL) { + int to_skip = dvars.size() + args_node->nd_frml; + for (i = 0; i < to_skip; i++) { + ++iter; // skip dvars and args required on the left-side } - if (n->nd_head != NULL) { - iter = compile_optional_arguments(iter, n->nd_head); - } + iter = compile_optional_arguments(iter, opt_node); } - n = n->nd_next; } }

1 0

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

26 Mar '09

Revision: 1164 http://trac.macosforge.org/projects/ruby/changeset/1164 Author: vincent.isambart(a)gmail.com Date: 2009-03-26 04:20:16 -0700 (Thu, 26 Mar 2009) Log Message: ----------- added support for multiple assignment arguments (def f((a, b))) Note that the tests cases not passing seem to be a bug in the normal multiple assignment code Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-26 06:00:53 UTC (rev 1163) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-26 11:20:16 UTC (rev 1164) @@ -2342,8 +2342,31 @@ lvars[id] = store; } + // compile multiple assignment arguments (def f((a, b, v))) + // (this must also be done after the creation of local variables) + NODE *n = node->nd_args; + if (n != NULL) { + NODE *rest_node = n->nd_next; + if (rest_node != NULL) { + NODE *right_req_node = rest_node->nd_next; + if (right_req_node != NULL) { + NODE *last_node = right_req_node->nd_next; + if (last_node != NULL) { + assert(nd_type(last_node) == NODE_AND); + // multiple assignment for the left-side required arguments + if (last_node->nd_1st != NULL) { + compile_node(last_node->nd_1st); + } + // multiple assignment for the right-side required arguments + if (last_node->nd_2nd != NULL) { + compile_node(last_node->nd_2nd); + } + } + } + } + } + // Compile optional arguments. - NODE *n = node->nd_args; Function::ArgumentListType::iterator iter = f->arg_begin(); ++iter; // skip self ++iter; // skip sel

1 0