Revision

1145

Author

vincent.isambart@gmail.com

Date

2009-03-25 03:56:22 -0700 (Wed, 25 Mar 2009)

Log Message

cleanup up a few things

Modified Paths

• MacRuby/branches/experimental/roxor.cpp
• MacRuby/branches/experimental/test_roxor.rb

Diff

--- MacRuby/branches/experimental/roxor.cpp	2009-03-25 03:26:11 UTC (rev 1144)
+++ MacRuby/branches/experimental/roxor.cpp	2009-03-25 10:56:22 UTC (rev 1145)
@@ -717,15 +717,15 @@
     do {
 	assert(node->nd_value != NULL);
 
-	Value *isNilInst = new ICmpInst(ICmpInst::ICMP_EQ, iter, undefVal, "", bb);
+	Value *isUndefInst = new ICmpInst(ICmpInst::ICMP_EQ, iter, undefVal, "", bb);
 
 	Function *f = bb->getParent();
-	BasicBlock *arg_nil = BasicBlock::Create("arg_nil", f);
+	BasicBlock *arg_undef = BasicBlock::Create("arg_undef", f);
 	BasicBlock *next_bb = BasicBlock::Create("", f);
 
-	BranchInst::Create(arg_nil, next_bb, isNilInst, bb);
+	BranchInst::Create(arg_undef, next_bb, isUndefInst, bb);
 
-	bb = arg_nil;
+	bb = arg_undef;
 	compile_node(node->nd_value);
 	BranchInst::Create(next_bb, bb);
 
@@ -4938,6 +4938,8 @@
 		argc, 
 		(VALUE *)argv);
     }
+#undef rcache
+#undef ocache
 
     printf("BOUH %s\n", (char *)sel);
     abort();

--- MacRuby/branches/experimental/test_roxor.rb	2009-03-25 03:26:11 UTC (rev 1144)
+++ MacRuby/branches/experimental/test_roxor.rb	2009-03-25 10:56:22 UTC (rev 1145)
@@ -834,6 +834,11 @@
     p o.foo
   }
 
+  assert '42', %{
+    def foo; p 42; end
+    def bar(a = foo); end
+    bar
+  }
 end
 
 test "blocks" do