[macruby-changes] [1539] MacRuby/branches/experimental/roxor.cpp

[source_changes at macosforge.org]

Revision: 1539
          http://trac.macosforge.org/projects/ruby/changeset/1539
Author:   lsansonetti at apple.com
Date:     2009-05-05 20:04:33 -0700 (Tue, 05 May 2009)
Log Message:
-----------
make sure to compile lvars defined within a class definition

Modified Paths:
--------------
    MacRuby/branches/experimental/roxor.cpp

Modified: MacRuby/branches/experimental/roxor.cpp
===================================================================
--- MacRuby/branches/experimental/roxor.cpp	2009-05-06 02:26:32 UTC (rev 1538)
+++ MacRuby/branches/experimental/roxor.cpp	2009-05-06 03:04:33 UTC (rev 1539)
@@ -368,6 +368,7 @@
 	void compile_landing_pad_footer(void);
 	void compile_rethrow_exception(void);
 	Value *compile_lvar_slot(ID name);
+	bool compile_lvars(ID *tbl);
 	Value *compile_new_struct(Value *klass, std::vector<Value *> &fields);
 	Value *compile_new_opaque(Value *klass, Value *val);
 	void compile_get_struct_fields(Value *val, Value *buf,
@@ -3108,21 +3109,8 @@
 
 		    // local vars must be created before the optional arguments
 		    // because they can be used in them, for instance with def f(a=b=c=1)
-		    int lvar_count = (int)node->nd_tbl[args_count + 1];
-		    for (i = 0; i < lvar_count; i++) {
-			ID id = node->nd_tbl[i + args_count + 2];
-			if (lvars.find(id) != lvars.end()) {
-			    continue;
-			}
-			if (std::find(dvars.begin(), dvars.end(), id) == dvars.end()) {
-#if ROXOR_COMPILER_DEBUG
-			    printf("lvar %s\n", rb_id2name(id));
-#endif
-			    Value *store = new AllocaInst(RubyObjTy, "", bb);
-			    new StoreInst(nilVal, store, bb);
-			    lvars[id] = store;
-			    has_vars_to_save = true;
-			}
+		    if (compile_lvars(&node->nd_tbl[args_count + 1])) {
+			has_vars_to_save = true;
 		    }
 
 		    if (has_vars_to_save) {
@@ -3798,6 +3786,11 @@
 		NODE *body = node->nd_body;
 		if (body != NULL) {
 		    assert(nd_type(body) == NODE_SCOPE);
+		    ID *tbl = body->nd_tbl;
+		    if (tbl != NULL) {
+			const int args_count = (int)tbl[0];
+			compile_lvars(&tbl[args_count + 1]);
+		    }
 		    if (body->nd_body != NULL) {	
 			Value *old_self = current_self;
 			current_self = classVal;
@@ -5977,6 +5970,27 @@
     return f;
 }
 
+bool
+RoxorCompiler::compile_lvars(ID *tbl)
+{
+    int lvar_count = (int)tbl[0];
+    for (int i = 0; i < lvar_count; i++) {
+	ID id = tbl[i + 1];
+	if (lvars.find(id) != lvars.end()) {
+	    continue;
+	}
+	if (std::find(dvars.begin(), dvars.end(), id) == dvars.end()) {
+#if ROXOR_COMPILER_DEBUG
+	    printf("lvar %s\n", rb_id2name(id));
+#endif
+	    Value *store = new AllocaInst(RubyObjTy, "", bb);
+	    new StoreInst(nilVal, store, bb);
+	    lvars[id] = store;
+	}
+    }
+    return lvar_count > 0;
+}
+
 Value *
 RoxorCompiler::compile_lvar_slot(ID name)
 {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090505/2a4cac8f/attachment.html>