rev 528 - in trunk: include/prothon src

Author: mark
Date: 2004-05-21 13:28:52 -0400 (Fri, 21 May 2004)
New Revision: 528

Modified:
   trunk/include/prothon/prothon.h
   trunk/src/interp.c
   trunk/src/object.c
   trunk/src/symbol.c
Log:
changed prev_scope_ to prevScope_

Modified: trunk/include/prothon/prothon.h
===================================================================
--- trunk/include/prothon/prothon.h	2004-05-21 05:40:36 UTC (rev 527)
+++ trunk/include/prothon/prothon.h	2004-05-21 17:28:52 UTC (rev 528)
@@ -423,7 +423,7 @@
 	FROMSTORPROXY_,
 	CALL_,
 	BINDOBJ_,
-	PREV_SCOPE_,
+	PREVSCOPE_,
 	ACCLEVEL_,
 
 	SYM_ENUM_COUNT

Modified: trunk/src/interp.c
===================================================================
--- trunk/src/interp.c	2004-05-21 05:40:36 UTC (rev 527)
+++ trunk/src/interp.c	2004-05-21 17:28:52 UTC (rev 528)
@@ -121,10 +121,10 @@
 	if(!frame->dyn_locals) frame->dyn_locals = locals;
 	pr_assert(frame->dyn_locals && frame->locals);
 
-	prev_scope = (func_obj ? get_attr(ist, func_obj, SYM(PREV_SCOPE_)) : syn_locals);
+	prev_scope = (func_obj ? get_attr(ist, func_obj, SYM(PREVSCOPE_)) : syn_locals);
 	if (!prev_scope && syn_locals) prev_scope = syn_locals;
 	if (prev_scope)
-		set_attr(ist, frame->locals, SYM(PREV_SCOPE_), prev_scope);
+		set_attr(ist, frame->locals, SYM(PREVSCOPE_), prev_scope);
 
 	return frame;																				  
 }
@@ -947,7 +947,7 @@
 					listlen(fparams_obj) = fparams_len;
 					set_attr(ist, func,    SYM(FPARAMS_),  fparams_obj);
 				}
-				set_attr(ist, func, SYM(PREV_SCOPE_),  frame->locals);
+				set_attr(ist, func, SYM(PREVSCOPE_),  frame->locals);
 #ifdef DUMP_MODULE_CODE
 				if (dump_module_code) {
 					char dump_name[256];

Modified: trunk/src/object.c
===================================================================
--- trunk/src/object.c	2004-05-21 05:40:36 UTC (rev 527)
+++ trunk/src/object.c	2004-05-21 17:28:52 UTC (rev 528)
@@ -991,7 +991,7 @@
 		}
 		if (scope == super_obj) super_obj = NULL;
 		last_scope = scope;
-		scope = get_attr(ist, scope, SYM(PREV_SCOPE_));
+		scope = get_attr(ist, scope, SYM(PREVSCOPE_));
 	}
 	if (!res && last_scope)
 		return get_proto_attr(ist, last_scope, key, scope_pp, super_obj);

Modified: trunk/src/symbol.c
===================================================================
--- trunk/src/symbol.c	2004-05-21 05:40:36 UTC (rev 527)
+++ trunk/src/symbol.c	2004-05-21 17:28:52 UTC (rev 528)
@@ -151,7 +151,7 @@
 	{ "fromStorProxy_", 0},
 	{ "call_",          0},
 	{ "bindObj_",		0},
-	{ "prev_scope_",    0},
+	{ "prevScope_",    0},
 	{ "accLevel_",      0}
 };