rev 718 - in trunk: . include/prothon src

Author: mark
Date: 2004-07-09 19:24:58 -0400 (Fri, 09 Jul 2004)
New Revision: 718

Modified:
   trunk/STATUS.txt
   trunk/include/prothon/prothon.h
   trunk/src/interp.c
Log:
fixed a bug in gen

Modified: trunk/STATUS.txt
===================================================================
--- trunk/STATUS.txt	2004-07-08 06:26:41 UTC (rev 717)
+++ trunk/STATUS.txt	2004-07-09 23:24:58 UTC (rev 718)
@@ -1,17 +1,15 @@
 
 ----------------------- TO-DO (highest priority first) ------------------------
 
---- dbgPrt
 
---- File & Dir properites?
-
 --- Make Dir.size() recursive
 
 --- "import as" broken
 
 --- camelcase errors: execpath, fparams, bufsize
 
---- change file.setStdout to property
+--- File & Dir properties?
+
 --- use special stdout for each Main
 
 --- getAttr(name), setAttr(name, value), delAttr(name)
@@ -66,10 +64,14 @@
 
 ----------------------- TUTORIAL TO-DO ------------------------
 
-	Replaced String % operator with String.fmt()
+	security system
+	Inheriting from binary objects, uninitialized objects
+	console line editing
+	command-line parameters
 	changed Len, Cmp, len,  cmp,  chr,  ord to 
 		    len, cmp, len_, cmp_, chr_, ord_  
 	Added cmp_ and eq_? for strings of length 1 and Ints
+	call_
 	Added basic DateTime object
 	Added WeakRef object with callback feature on obj modification
 	Added Slice object
@@ -80,15 +82,10 @@
 	except syntax changed from "except exc, var" to "except exc as var"
 	Function formal params now introspectable via simple attribute
 	Added immutable check to dictionary function key parameter
-	Changed SQLite to sqlite, OS to os, Re to re
 	Fixed crash on printing recursive containers, now prints ...
-	Inheriting from binary objects, uninitialized objects
-	security system
-	console line editing
-	command-line parameters
-	str_, call_
 	credit Ruby
 	
+	Changed SQLite to sqlite, OS to os, Re to re
 	Prosist
 	Re
 	DBM

Modified: trunk/include/prothon/prothon.h
===================================================================
--- trunk/include/prothon/prothon.h	2004-07-08 06:26:41 UTC (rev 717)
+++ trunk/include/prothon/prothon.h	2004-07-09 23:24:58 UTC (rev 718)
@@ -81,7 +81,7 @@
 #endif
  
 #define PROTHON_VERSION_NUMBER	"0.1"
-#define PROTHON_VERSION_BUILD   "$Rev: 710$"  
+#define PROTHON_VERSION_BUILD   "$Rev: 718$"  
 #define PROTHON_VERSION_DATE	__DATE__
 
 #ifndef FALSE

Modified: trunk/src/interp.c
===================================================================
--- trunk/src/interp.c	2004-07-08 06:26:41 UTC (rev 717)
+++ trunk/src/interp.c	2004-07-09 23:24:58 UTC (rev 718)
@@ -1591,8 +1591,6 @@
 					code_p codep = genp->codep;
 					frame_p new_frame;
 					IF_EXC_BREAK;
-					genp->frame->gen_marker = func_obj;
-					frame->next_frame = genp->frame;
 					new_frame = get_frame_params( ist, &(frame->fparam_proc_state_idx), 
 													   &(frame->fparam_proc_state), 
 									                   &(frame->new_locals), func_obj, param*2, fr_stack+fr_sp+3);
@@ -1607,6 +1605,8 @@
 					}
 					genp->frame = create_frame( ist, NULL, NULL, frame->locals,
 												frame->new_locals, func_obj, codep, NULL );
+					genp->frame->gen_marker = func_obj;
+					frame->next_frame = genp->frame;
 					fr_push(func_obj);
 				} else {
 					obj_p value;