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

[1073] MacRuby/branches/experimental/spec/frozen/language
by source_changes＠macosforge.org 23 Mar '09

23 Mar '09

Revision: 1073 http://trac.macosforge.org/projects/ruby/changeset/1073 Author: eloy.de.enige(a)gmail.com Date: 2009-03-22 17:35:19 -0700 (Sun, 22 Mar 2009) Log Message: ----------- Moved some case specs into a 1.8 version specific file. And make use of a semi-colon instead of a colon for examples where it doesn't matter as a colon is no longer supported on 1.9. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/case_spec.rb Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/language/versions/case_1.8.rb MacRuby/branches/experimental/spec/frozen/language/versions/case_1.9.rb Modified: MacRuby/branches/experimental/spec/frozen/language/case_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/case_spec.rb 2009-03-23 00:16:37 UTC (rev 1072) +++ MacRuby/branches/experimental/spec/frozen/language/case_spec.rb 2009-03-23 00:35:19 UTC (rev 1073) @@ -3,22 +3,22 @@ describe "The 'case'-construct" do it "evaluates the body of the when clause matching the case target expression" do case 1 - when 2: false - when 1: true + when 2; false + when 1; true end.should == true end it "evaluates the body of the when clause whose array expression includes the case target expression" do case 2 - when 3, 4: false - when 1, 2: true + when 3, 4; false + when 1, 2; true end.should == true end it "evaluates the body of the when clause whose range expression includes the case target expression" do case 5 - when 21..30: false - when 1..20: true + when 21..30; false + when 1..20; true end.should == true end @@ -31,16 +31,16 @@ it "evaluates the 'else'-body when no other expression matches" do case "c" - when "a": 'foo' - when "b": 'bar' + when "a"; 'foo' + when "b"; 'bar' else 'zzz' end.should == 'zzz' end it "returns nil when no expression matches and 'else'-body is empty" do case "c" - when "a": "a" - when "b": "b" + when "a"; "a" + when "b"; "b" else end.should == nil end @@ -56,27 +56,13 @@ end.should == 2 end - it "returns the statement following ':'" do - case "a" - when "a": 'foo' - when "b": 'bar' - end.should == 'foo' - end - it "returns the statement following 'then'" do case "a" when "a" then 'foo' when "b" then 'bar' end.should == 'foo' end - - it "allows mixing ':' and 'then'" do - case "b" - when "a": 'foo' - when "b" then 'bar' - end.should == 'bar' - end - + it "tests classes with case equality" do case "a" when String @@ -85,14 +71,14 @@ 'bar' end.should == 'foo' end - + it "tests with matching regexps" do case "hello" - when /abc/: false - when /^hell/: true + when /abc/; false + when /^hell/; true end.should == true end - + it "does not test with equality when given classes" do case :symbol.class when Symbol @@ -246,42 +232,42 @@ describe "The 'case'-construct with no target expression" do it "evaluates the body of the first clause when at least one of its condition expressions is true" do - case - when true, false: 'foo' - end.should == 'foo' - end - + case + when true, false; 'foo' + end.should == 'foo' + end + it "evaluates the body of the first when clause that is not false/nil" do case - when false: 'foo' - when 2: 'bar' - when 1 == 1: 'baz' + when false; 'foo' + when 2; 'bar' + when 1 == 1; 'baz' end.should == 'bar' - + case - when false: 'foo' - when nil: 'foo' - when 1 == 1: 'bar' + when false; 'foo' + when nil; 'foo' + when 1 == 1; 'bar' end.should == 'bar' end - + it "evaluates the body of the else clause if all when clauses are false/nil" do case - when false: 'foo' - when nil: 'foo' - when 1 == 2: 'bar' + when false; 'foo' + when nil; 'foo' + when 1 == 2; 'bar' else 'baz' end.should == 'baz' end - + it "evaluates multiple conditional expressions as a boolean disjunction" do case - when true, false: 'foo' + when true, false; 'foo' else 'bar' end.should == 'foo' case - when false, true: 'foo' + when false, true; 'foo' else 'bar' end.should == 'foo' end @@ -307,3 +293,5 @@ end.should == 'good' end end + +language_version __FILE__, "case" \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/language/versions/case_1.8.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/case_1.8.rb (rev 0) +++ MacRuby/branches/experimental/spec/frozen/language/versions/case_1.8.rb 2009-03-23 00:35:19 UTC (rev 1073) @@ -0,0 +1,15 @@ +describe "The 'case'-construct" do + it "returns the statement following ':'" do + case "a" + when "a": 'foo' + when "b": 'bar' + end.should == 'foo' + end + + it "allows mixing ':' and 'then'" do + case "b" + when "a": 'foo' + when "b" then 'bar' + end.should == 'bar' + end +end \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/language/versions/case_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/case_1.9.rb (rev 0) +++ MacRuby/branches/experimental/spec/frozen/language/versions/case_1.9.rb 2009-03-23 00:35:19 UTC (rev 1073) @@ -0,0 +1 @@ +# TODO \ No newline at end of file

1 0

[1072] MacRuby/branches/experimental/spec/frozen/language/block_spec.rb
by source_changes＠macosforge.org 23 Mar '09

23 Mar '09

Revision: 1072 http://trac.macosforge.org/projects/ruby/changeset/1072 Author: eloy.de.enige(a)gmail.com Date: 2009-03-22 17:16:37 -0700 (Sun, 22 Mar 2009) Log Message: ----------- Tagged an example in the block spec, which cause a seg fault, as critical. (With a comment for now.) Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/block_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/language/block_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/block_spec.rb 2009-03-23 00:08:54 UTC (rev 1071) +++ MacRuby/branches/experimental/spec/frozen/language/block_spec.rb 2009-03-23 00:16:37 UTC (rev 1072) @@ -29,6 +29,7 @@ a.should == [[[1, 2]]] end + # MR: critical it "yields the correct arguments in a nested block" do a = [] BlockSpecs::Yield.new.yield_splat_inside_block {|a1, a2| a << [a1, a2]}

1 0

[1071] MacRuby/branches/experimental/spec/frozen/language/versions
by source_changes＠macosforge.org 23 Mar '09

23 Mar '09

Revision: 1071 http://trac.macosforge.org/projects/ruby/changeset/1071 Author: eloy.de.enige(a)gmail.com Date: 2009-03-22 17:08:54 -0700 (Sun, 22 Mar 2009) Log Message: ----------- For now use instance_eval instead of eval until this is fixed in macruby. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/versions/block_1.9.rb MacRuby/branches/experimental/spec/frozen/language/versions/redo_1.9.rb Modified: MacRuby/branches/experimental/spec/frozen/language/versions/block_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/block_1.9.rb 2009-03-23 00:04:02 UTC (rev 1070) +++ MacRuby/branches/experimental/spec/frozen/language/versions/block_1.9.rb 2009-03-23 00:08:54 UTC (rev 1071) @@ -19,13 +19,13 @@ describe "Block parameters (to be removed from MRI)" do it "raises a SyntaxError when using a global variable" do lambda do - eval "[].each {|$global_for_block_assignment| ;}" + instance_eval "[].each {|$global_for_block_assignment| ;}" end.should raise_error(SyntaxError) end it "raises a SyntaxError when making a method call" do lambda do - eval "o = Object.new; [].each {|o.id| }" + instance_eval "o = Object.new; [].each {|o.id| }" end.should raise_error(SyntaxError) end end \ No newline at end of file Modified: MacRuby/branches/experimental/spec/frozen/language/versions/redo_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/redo_1.9.rb 2009-03-23 00:04:02 UTC (rev 1070) +++ MacRuby/branches/experimental/spec/frozen/language/versions/redo_1.9.rb 2009-03-23 00:08:54 UTC (rev 1071) @@ -1,7 +1,7 @@ describe "The redo statement" do it "raises a SyntaxError if used not within block or while/for loop" do lambda do - eval "def bad_meth_redo; redo; end" + instance_eval "def bad_meth_redo; redo; end" end.should raise_error(SyntaxError) end end \ No newline at end of file

1 0

[1070] MacRuby/branches/experimental/spec/frozen/language
by source_changes＠macosforge.org 23 Mar '09

23 Mar '09

Revision: 1070 http://trac.macosforge.org/projects/ruby/changeset/1070 Author: eloy.de.enige(a)gmail.com Date: 2009-03-22 17:04:02 -0700 (Sun, 22 Mar 2009) Log Message: ----------- Moved block argument specs into version specific files and added Ruby 1.9 behaviour examples. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/block_spec.rb Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/language/versions/block_1.8.rb MacRuby/branches/experimental/spec/frozen/language/versions/block_1.9.rb Modified: MacRuby/branches/experimental/spec/frozen/language/block_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/block_spec.rb 2009-03-22 23:34:17 UTC (rev 1069) +++ MacRuby/branches/experimental/spec/frozen/language/block_spec.rb 2009-03-23 00:04:02 UTC (rev 1070) @@ -16,24 +16,6 @@ end end -describe "Block parameters" do - it "assign to local variable" do - i = 0 - a = [1,2,3] - a.each {|i| ;} - i.should == 3 - end - - it "captures variables from the outer scope" do - a = [1,2,3] - sum = 0 - var = nil - a.each {|var| sum += var} - sum.should == 6 - var.should == 3 - end -end - describe "A block whose arguments are splatted" do it "captures the arguments passed to the block in an array" do a = [] @@ -54,24 +36,4 @@ end end -describe "Block parameters (to be removed from MRI)" do - it "assigns to a global variable" do - $global_for_block_assignment = 0 - a = [1,2,3] - a.each {|$global_for_block_assignment| ;} - $global_for_block_assignment.should == 3 - end - - it "calls method=" do - class T - def n; return @n; end - def n=(val); @n = val + 1; end - def initialize; @n = 0; end - end - t = T.new - t.n.should == 0 - a = [1,2,3] - a.each {|t.n| } - t.n.should == 4 - end -end +language_version __FILE__, "block" \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/language/versions/block_1.8.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/block_1.8.rb (rev 0) +++ MacRuby/branches/experimental/spec/frozen/language/versions/block_1.8.rb 2009-03-23 00:04:02 UTC (rev 1070) @@ -0,0 +1,39 @@ +describe "Block parameters" do + it "assign to local variable" do + i = 0 + a = [1,2,3] + a.each {|i| ;} + i.should == 3 + end + + it "captures variables from the outer scope" do + a = [1,2,3] + sum = 0 + var = nil + a.each {|var| sum += var} + sum.should == 6 + var.should == 3 + end +end + +describe "Block parameters (to be removed from MRI)" do + it "assigns to a global variable" do + $global_for_block_assignment = 0 + a = [1,2,3] + a.each {|$global_for_block_assignment| ;} + $global_for_block_assignment.should == 3 + end + + it "calls method=" do + class T + def n; return @n; end + def n=(val); @n = val + 1; end + def initialize; @n = 0; end + end + t = T.new + t.n.should == 0 + a = [1,2,3] + a.each {|t.n| } + t.n.should == 4 + end +end \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/language/versions/block_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/block_1.9.rb (rev 0) +++ MacRuby/branches/experimental/spec/frozen/language/versions/block_1.9.rb 2009-03-23 00:04:02 UTC (rev 1070) @@ -0,0 +1,31 @@ +describe "Block parameters" do + it "does not override a shadowed variable from the outer scope" do + i = 0 + a = [1,2,3] + a.each {|i| ;} + i.should == 0 + end + + it "captures variables from the outer scope" do + a = [1,2,3] + sum = 0 + var = nil + a.each {|var| sum += var} + sum.should == 6 + var.should == nil + end +end + +describe "Block parameters (to be removed from MRI)" do + it "raises a SyntaxError when using a global variable" do + lambda do + eval "[].each {|$global_for_block_assignment| ;}" + end.should raise_error(SyntaxError) + end + + it "raises a SyntaxError when making a method call" do + lambda do + eval "o = Object.new; [].each {|o.id| }" + end.should raise_error(SyntaxError) + end +end \ No newline at end of file

1 0

[1069] MacRuby/branches/experimental/spec/frozen/language
by source_changes＠macosforge.org 22 Mar '09

22 Mar '09

Revision: 1069 http://trac.macosforge.org/projects/ruby/changeset/1069 Author: eloy.de.enige(a)gmail.com Date: 2009-03-22 16:34:17 -0700 (Sun, 22 Mar 2009) Log Message: ----------- Using the 'redo' keyword outside a block or while/for loop on Ruby 1.9 results in a SyntaxError instead of LocalJumpError. Moved the example into a 1.8 version spec file and added a new one which describes the behaviour on Ruby 1.9. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/redo_spec.rb Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/language/versions/redo_1.8.rb MacRuby/branches/experimental/spec/frozen/language/versions/redo_1.9.rb Modified: MacRuby/branches/experimental/spec/frozen/language/redo_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/redo_spec.rb 2009-03-22 22:35:50 UTC (rev 1068) +++ MacRuby/branches/experimental/spec/frozen/language/redo_spec.rb 2009-03-22 23:34:17 UTC (rev 1069) @@ -1,11 +1,6 @@ require File.dirname(__FILE__) + '/../spec_helper' describe "The redo statement" do - it "raises a LocalJumpError if used not within block or while/for loop" do - def bad_meth_redo; redo; end - lambda { bad_meth_redo() }.should raise_error(LocalJumpError) - end - it "restarts block execution if used within block" do a = [] lambda { @@ -66,3 +61,5 @@ end end end + +language_version __FILE__, "redo" \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/language/versions/redo_1.8.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/redo_1.8.rb (rev 0) +++ MacRuby/branches/experimental/spec/frozen/language/versions/redo_1.8.rb 2009-03-22 23:34:17 UTC (rev 1069) @@ -0,0 +1,6 @@ +describe "The redo statement" do + it "raises a LocalJumpError if used not within block or while/for loop" do + def bad_meth_redo; redo; end + lambda { bad_meth_redo() }.should raise_error(LocalJumpError) + end +end \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/language/versions/redo_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/redo_1.9.rb (rev 0) +++ MacRuby/branches/experimental/spec/frozen/language/versions/redo_1.9.rb 2009-03-22 23:34:17 UTC (rev 1069) @@ -0,0 +1,7 @@ +describe "The redo statement" do + it "raises a SyntaxError if used not within block or while/for loop" do + lambda do + eval "def bad_meth_redo; redo; end" + end.should raise_error(SyntaxError) + end +end \ No newline at end of file

1 0

[1068] MacRuby/branches/experimental
by source_changes＠macosforge.org 22 Mar '09

22 Mar '09

Revision: 1068 http://trac.macosforge.org/projects/ruby/changeset/1068 Author: lsansonetti(a)apple.com Date: 2009-03-22 15:35:50 -0700 (Sun, 22 Mar 2009) Log Message: ----------- fixed multiple assignment where the left side does not exist + misc fixes Modified Paths: -------------- MacRuby/branches/experimental/class.c MacRuby/branches/experimental/encoding.c MacRuby/branches/experimental/include/ruby/encoding.h MacRuby/branches/experimental/object.c MacRuby/branches/experimental/proc.c MacRuby/branches/experimental/re.c MacRuby/branches/experimental/roxor.cpp MacRuby/branches/experimental/roxor.h MacRuby/branches/experimental/string.c MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/class.c =================================================================== --- MacRuby/branches/experimental/class.c 2009-03-22 22:12:02 UTC (rev 1067) +++ MacRuby/branches/experimental/class.c 2009-03-22 22:35:50 UTC (rev 1068) @@ -464,6 +464,8 @@ return rb_define_module_id(0); } +VALUE rb_mod_initialize(VALUE, SEL); + VALUE rb_define_module_id(ID id) { @@ -474,8 +476,7 @@ if (rb_mKernel != 0) { /* because Module#initialize can accept a block */ - extern VALUE rb_mod_initialize(VALUE); - rb_define_method(*(VALUE *)mdl, "initialize", rb_mod_initialize, 0); + rb_objc_define_method(*(VALUE *)mdl, "initialize", rb_mod_initialize, 0); } return mdl; Modified: MacRuby/branches/experimental/encoding.c =================================================================== --- MacRuby/branches/experimental/encoding.c 2009-03-22 22:12:02 UTC (rev 1067) +++ MacRuby/branches/experimental/encoding.c 2009-03-22 22:35:50 UTC (rev 1068) @@ -164,7 +164,7 @@ */ VALUE -rb_obj_encoding(VALUE obj) +rb_obj_encoding(VALUE obj, SEL sel) { rb_encoding *enc = rb_enc_get(obj); if (!enc) { Modified: MacRuby/branches/experimental/include/ruby/encoding.h =================================================================== --- MacRuby/branches/experimental/include/ruby/encoding.h 2009-03-22 22:12:02 UTC (rev 1067) +++ MacRuby/branches/experimental/include/ruby/encoding.h 2009-03-22 22:35:50 UTC (rev 1068) @@ -107,7 +107,7 @@ VALUE rb_enc_vsprintf(rb_encoding *, const char*, va_list); long rb_enc_strlen(const char*, const char*, rb_encoding*); char* rb_enc_nth(const char*, const char*, int, rb_encoding*); -VALUE rb_obj_encoding(VALUE); +VALUE rb_obj_encoding(VALUE, SEL); VALUE rb_enc_str_buf_cat(VALUE str, const char *ptr, long len, rb_encoding *enc); /* index -> rb_encoding */ Modified: MacRuby/branches/experimental/object.c =================================================================== --- MacRuby/branches/experimental/object.c 2009-03-22 22:12:02 UTC (rev 1067) +++ MacRuby/branches/experimental/object.c 2009-03-22 22:35:50 UTC (rev 1068) @@ -1556,7 +1556,7 @@ VALUE rb_mod_module_exec(VALUE mod, SEL sel, int argc, VALUE *argv); VALUE -rb_mod_initialize(VALUE module) +rb_mod_initialize(VALUE module, SEL sel) { if (rb_block_given_p()) { rb_mod_module_exec(module, 0, 1, &module); @@ -1614,7 +1614,7 @@ rb_define_object_special_methods(klass); rb_class_inherited(super, klass); - rb_mod_initialize(klass); + rb_mod_initialize(klass, 0); return klass; } Modified: MacRuby/branches/experimental/proc.c =================================================================== --- MacRuby/branches/experimental/proc.c 2009-03-22 22:12:02 UTC (rev 1067) +++ MacRuby/branches/experimental/proc.c 2009-03-22 22:35:50 UTC (rev 1068) @@ -43,6 +43,7 @@ { VALUE obj; obj = Data_Wrap_Struct(klass, NULL, NULL, proc); + proc->flags |= VM_BLOCK_PROC; return obj; } @@ -192,7 +193,7 @@ rb_vm_block_t *proc; GetProcPtr(procval, proc); - return proc->is_lambda ? Qtrue : Qfalse; + return proc->flags & VM_BLOCK_LAMBDA ? Qtrue : Qfalse; } /* Binding */ @@ -350,7 +351,6 @@ rb_raise(rb_eArgError, "tried to create Proc object without a block"); } - // FIXME current_block is not from autozone return rb_proc_alloc_with_block(klass, current_block); } Modified: MacRuby/branches/experimental/re.c =================================================================== --- MacRuby/branches/experimental/re.c 2009-03-22 22:12:02 UTC (rev 1067) +++ MacRuby/branches/experimental/re.c 2009-03-22 22:35:50 UTC (rev 1068) @@ -3558,7 +3558,7 @@ rb_objc_define_method(rb_cRegexp, "source", rb_reg_source, 0); rb_objc_define_method(rb_cRegexp, "casefold?", rb_reg_casefold_p, 0); rb_objc_define_method(rb_cRegexp, "options", rb_reg_options_m, 0); - rb_define_method(rb_cRegexp, "encoding", rb_obj_encoding, 0); /* in encoding.c */ + rb_objc_define_method(rb_cRegexp, "encoding", rb_obj_encoding, 0); /* in encoding.c */ rb_objc_define_method(rb_cRegexp, "fixed_encoding?", rb_reg_fixed_encoding_p, 0); rb_objc_define_method(rb_cRegexp, "names", rb_reg_names, 0); rb_objc_define_method(rb_cRegexp, "named_captures", rb_reg_named_captures, 0); Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-22 22:12:02 UTC (rev 1067) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-22 22:35:50 UTC (rev 1068) @@ -2275,16 +2275,18 @@ NODE *rhsn = node->nd_value; assert(rhsn != NULL); - NODE *splatn = node->nd_args; - assert(splatn == NULL); // TODO + Value *ary = compile_node(rhsn); NODE *lhsn = node->nd_head; + + if (lhsn == NULL) { + // * = 1, 2 + return ary; + } + assert(lhsn != NULL); assert(nd_type(lhsn) == NODE_ARRAY); - Value *ary = compile_node(rhsn); // XXX should always build as an array - NODE *l = lhsn; - if (rhsnGetFunc == NULL) { // VALUE rb_vm_rhsn_get(VALUE ary, int offset); rhsnGetFunc = cast<Function>(module->getOrInsertFunction("rb_vm_rhsn_get", @@ -2292,6 +2294,7 @@ } int i = 0; + NODE *l = lhsn; while (l != NULL) { NODE *ln = l->nd_head; @@ -4892,7 +4895,7 @@ b->imp = GET_VM()->compile((Function *)llvm_function); b->arity = rb_vm_node_arity(node); } - b->is_lambda = true; + b->flags = 0; b->dvars_size = dvars_size; rb_objc_retain(b); @@ -5354,6 +5357,16 @@ void rb_vm_break(VALUE val) { +#if 0 + // XXX this doesn't work yet since break is called inside the block and + // we do not have a reference to it. This isn't very important though, + // but since 1.9 doesn't support break without Proc objects we should also + // raise a similar exception. + assert(GET_VM()->current_block != NULL); + if (GET_VM()->current_block->flags & VM_BLOCK_PROC) { + rb_raise(rb_eLocalJumpError, "break from proc-closure"); + } +#endif GET_VM()->broken_with = val; } Modified: MacRuby/branches/experimental/roxor.h =================================================================== --- MacRuby/branches/experimental/roxor.h 2009-03-22 22:12:02 UTC (rev 1067) +++ MacRuby/branches/experimental/roxor.h 2009-03-22 22:35:50 UTC (rev 1068) @@ -94,12 +94,15 @@ short real; } rb_vm_arity_t; +#define VM_BLOCK_PROC 0x0001 // block is a Proc object +#define VM_BLOCK_LAMBDA 0x0002 // block is a lambda + typedef struct { VALUE self; NODE *node; rb_vm_arity_t arity; IMP imp; - bool is_lambda; + int flags; int dvars_size; VALUE *dvars[1]; } rb_vm_block_t; Modified: MacRuby/branches/experimental/string.c =================================================================== --- MacRuby/branches/experimental/string.c 2009-03-22 22:12:02 UTC (rev 1067) +++ MacRuby/branches/experimental/string.c 2009-03-22 22:35:50 UTC (rev 1068) @@ -5507,7 +5507,7 @@ rb_objc_define_method(rb_cString, "partition", rb_str_partition, 1); rb_objc_define_method(rb_cString, "rpartition", rb_str_rpartition, 1); - rb_define_method(rb_cString, "encoding", rb_obj_encoding, 0); /* in encoding.c */ + rb_objc_define_method(rb_cString, "encoding", rb_obj_encoding, 0); /* in encoding.c */ rb_objc_define_method(rb_cString, "force_encoding", rb_str_force_encoding, 1); rb_objc_define_method(rb_cString, "valid_encoding?", rb_str_valid_encoding_p, 0); rb_objc_define_method(rb_cString, "ascii_only?", rb_str_is_ascii_only_p, 0); Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-22 22:12:02 UTC (rev 1067) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-22 22:35:50 UTC (rev 1068) @@ -317,6 +317,7 @@ assert ':ok', "a, b, c = nil; p :ok if a == nil and b == nil and c == nil" assert ':ok', '* = 1,2; p :ok' + assert '[1, 2]', 'x = (* = 1,2); p x' # TODO add more multiple assignments test

1 0

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

22 Mar '09

Revision: 1067 http://trac.macosforge.org/projects/ruby/changeset/1067 Author: vincent.isambart(a)gmail.com Date: 2009-03-22 15:12:02 -0700 (Sun, 22 Mar 2009) Log Message: ----------- fixed the return value of if Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-22 21:48:59 UTC (rev 1066) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-22 22:12:02 UTC (rev 1067) @@ -2722,7 +2722,7 @@ bb = thenBB; DEBUG_LEVEL_INC(); - Value *thenVal = node->nd_body != NULL ? compile_node(node->nd_body) : trueVal; + Value *thenVal = node->nd_body != NULL ? compile_node(node->nd_body) : nilVal; DEBUG_LEVEL_DEC(); thenBB = bb; BranchInst::Create(mergeBB, thenBB);

1 0

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

22 Mar '09

Revision: 1066 http://trac.macosforge.org/projects/ruby/changeset/1066 Author: vincent.isambart(a)gmail.com Date: 2009-03-22 14:48:59 -0700 (Sun, 22 Mar 2009) Log Message: ----------- added failing unless test Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-22 21:30:05 UTC (rev 1065) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-22 21:48:59 UTC (rev 1066) @@ -145,6 +145,8 @@ assert 'false', 'p (not true)' assert 'true', 'p !false' assert 'true', 'p (not false)' + + assert '42', 'puts "4#{:dummy unless true}2"' assert '42', "def foo; 42; end; def bar; p :nok; end; x = (foo || bar); p x" assert ":ok\n42", "def foo; p :ok; nil; end; def bar; 42; end; x = (foo || bar); p x"

1 0

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

22 Mar '09

Revision: 1065 http://trac.macosforge.org/projects/ruby/changeset/1065 Author: lsansonetti(a)apple.com Date: 2009-03-22 14:30:05 -0700 (Sun, 22 Mar 2009) Log Message: ----------- added another 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-22 21:28:36 UTC (rev 1064) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-22 21:30:05 UTC (rev 1065) @@ -314,6 +314,8 @@ assert ':ok', "a, b, c = [1, 2]; p :ok if a == 1 and b == 2 and c == nil" assert ':ok', "a, b, c = nil; p :ok if a == nil and b == nil and c == nil" + assert ':ok', '* = 1,2; p :ok' + # TODO add more multiple assignments test assert '42', "a=[20]; a[0] += 22; p a[0]"

1 0

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

22 Mar '09

Revision: 1064 http://trac.macosforge.org/projects/ruby/changeset/1064 Author: eloy.de.enige(a)gmail.com Date: 2009-03-22 14:28:36 -0700 (Sun, 22 Mar 2009) Log Message: ----------- Updated spec:ci rake task to only run the known good specs without using tags. This is what you'll want to use until we can get mspec with tags to work. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-22 21:17:15 UTC (rev 1063) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-22 21:28:36 UTC (rev 1064) @@ -1,14 +1,11 @@ namespace :spec do - MSPEC = "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec" + MSPEC_RUN = "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run" - desc "Run continuous integration examples for Ruby 1.9 including stdlib" + KNOWN_GOOD = %w{ and or } + + desc "Run continuous integration language examples (known good)" task :ci do - #sh "./mspec/bin/mspec ci -t ./miniruby -B spec/frozen/macruby.mspec" - - # TODO: Still fails at another require statment. - # It seems to spawns yet another process which also needs the proper laod path. - # Anyways load paths are currently broken on roxor. Will find out a tmp workaround tonight. - sh "#{MSPEC} ci -B spec/frozen/macruby.mspec spec/frozen/language" + sh "#{MSPEC_RUN} #{FileList["spec/frozen/language/{#{KNOWN_GOOD.join(',')}}_spec.rb"].join(' ')}" end desc "Run language examples" @@ -20,7 +17,7 @@ desc "Run language examples with a workaround which uses mspec-run on each individual spec" task :language do Dir.glob('spec/frozen/language/**/*_spec.rb').each do |spec| - sh "#{MSPEC}-run #{spec}" rescue nil + sh "#{MSPEC_RUN} #{spec}" rescue nil end end end

1 0