[macruby-changes] [4216] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 4216
          http://trac.macosforge.org/projects/ruby/changeset/4216
Author:   lsansonetti at apple.com
Date:     2010-06-09 18:03:00 -0700 (Wed, 09 Jun 2010)
Log Message:
-----------
removing unnecessary state variables

Modified Paths:
--------------
    MacRuby/trunk/compiler.cpp
    MacRuby/trunk/compiler.h

Modified: MacRuby/trunk/compiler.cpp
===================================================================
--- MacRuby/trunk/compiler.cpp	2010-06-09 06:11:08 UTC (rev 4215)
+++ MacRuby/trunk/compiler.cpp	2010-06-10 01:03:00 UTC (rev 4216)
@@ -54,7 +54,6 @@
     ensure_bb = NULL;
     current_mid = 0;
     current_arity = rb_vm_arity(-1);
-    current_instance_method = false;
     self_id = rb_intern("self");
     current_self = NULL;
     current_var_uses = NULL;
@@ -67,7 +66,6 @@
     current_non_block_func = NULL;
     current_opened_class = NULL;
     dynamic_class = false;
-    current_module = false;
     current_loop_begin_bb = NULL;
     current_loop_body_bb = NULL;
     current_loop_end_bb = NULL;
@@ -604,7 +602,6 @@
 
     const ID old_current_mid = current_mid;
     current_mid = mid;
-    current_instance_method = !singleton_method;
     const bool old_current_block_chain = current_block_chain;
     current_block_chain = false;
     const bool old_block_declaration = block_declaration;
@@ -621,7 +618,6 @@
     block_declaration = old_block_declaration;
     current_block_chain = old_current_block_chain;
     current_mid = old_current_mid;
-    current_instance_method = false;
 
     Value *classVal;
     if (singleton_method) {
@@ -3714,7 +3710,6 @@
 				*RoxorCompiler::module, RubyObjTy, false,
 				GlobalValue::InternalLinkage, nilVal, "");
 
-			bool old_current_module = current_module;
 			bool old_current_block_chain = current_block_chain;
 			bool old_dynamic_class = dynamic_class;
 
@@ -3723,8 +3718,6 @@
 
 			new StoreInst(classVal, current_opened_class, bb);
 
-			current_module = nd_type(node) == NODE_MODULE;
-
 			compile_set_current_scope(classVal, publicScope);
 
 			bool old_block_declaration = block_declaration;
@@ -3755,7 +3748,6 @@
 
 			current_self = old_self;
 			current_opened_class = old_class;
-			current_module = old_current_module;
 			current_block_chain = old_current_block_chain;
 
 			return val;
@@ -4639,7 +4631,6 @@
 Function *
 RoxorCompiler::compile_main_function(NODE *node, bool *can_interpret_p)
 {
-    current_instance_method = true;
     should_interpret = true;
     can_interpret = false;
 
@@ -4657,8 +4648,6 @@
 Function *
 RoxorAOTCompiler::compile_main_function(NODE *node, bool *can_be_interpreted)
 {
-    current_instance_method = true;
-
     Value *val = compile_node(node);
     assert(Function::classof(val));
     Function *function = cast<Function>(val);

Modified: MacRuby/trunk/compiler.h
===================================================================
--- MacRuby/trunk/compiler.h	2010-06-09 06:11:08 UTC (rev 4215)
+++ MacRuby/trunk/compiler.h	2010-06-10 01:03:00 UTC (rev 4216)
@@ -105,7 +105,6 @@
 	BasicBlock *entry_bb;
 	ID current_mid;
 	rb_vm_arity_t current_arity;
-	bool current_instance_method;
 	ID self_id;
 	Value *current_self;
 	bool current_block;
@@ -125,7 +124,6 @@
 	Function *current_non_block_func;
 	GlobalVariable *current_opened_class;
 	bool dynamic_class;
-	bool current_module;
 	BasicBlock *current_loop_begin_bb;
 	BasicBlock *current_loop_body_bb;
 	BasicBlock *current_loop_end_bb;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100609/958eb2b2/attachment.html>