rev 439 - in trunk: include/prothon src

Author: mark
Date: 2004-05-01 02:55:49 -0400 (Sat, 01 May 2004)
New Revision: 439

Modified:
   trunk/include/prothon/prothon.h
   trunk/src/interp.c
   trunk/src/src.vcproj
Log:
fixed bug in code dump, turned off debug flags, 
all test files run now except prosist.pr and re.pr

Modified: trunk/include/prothon/prothon.h
===================================================================
--- trunk/include/prothon/prothon.h	2004-05-01 06:39:33 UTC (rev 438)
+++ trunk/include/prothon/prothon.h	2004-05-01 06:55:49 UTC (rev 439)
@@ -60,8 +60,8 @@
 //#define DEBUG_THREADS
 //#define DEBUG_MEM_MGR
 //#define TRACE_PARSER
-#define DUMP_MODULE_CODE
-#define TRACE_INTERPRETER
+//#define DUMP_MODULE_CODE
+//#define TRACE_INTERPRETER
 //#define DUMP_OBJECTS_AT_END
 //#define PROSIST_DEBUG
 

Modified: trunk/src/interp.c
===================================================================
--- trunk/src/interp.c	2004-05-01 06:39:33 UTC (rev 438)
+++ trunk/src/interp.c	2004-05-01 06:55:49 UTC (rev 439)
@@ -1828,10 +1828,18 @@
 		int llen = (int) list_len(ist, lbl_value_list);
 		if (llen) fprintf(fout,"\nFormal Params:\n");
 		for (i=0; i < llen; i += 2) {
-			char *lbl_str = NULL, *val_str = NULL;
+			char *lbl_str = NULL, *val_str = NULL, buf[10];
 			obj_p lbl = list_item(ist, lbl_value_list, i);
 			obj_p val = list_item(ist, lbl_value_list, i+1);
-			if (lbl) lbl_str = as_str(ist, lbl);
+			if (lbl) {
+				if      ((intptr_t) lbl == 1) lbl_str = "*";
+				else if ((intptr_t) lbl == 2) lbl_str = "**";
+				else if ((intptr_t) lbl < 10) {
+					apr_snprintf(buf, sizeof(buf), "<lbl:%d>", (intptr_t) lbl);
+					lbl_str = buf;
+				} else
+					lbl_str = as_str(ist, lbl);
+			}
 			if (val) val_str = as_str(ist, val);
 			fprintf(fout,"    %s = %s\n", lbl_str, val_str);
 		}

Modified: trunk/src/src.vcproj
===================================================================
--- trunk/src/src.vcproj	2004-05-01 06:39:33 UTC (rev 438)
+++ trunk/src/src.vcproj	2004-05-01 06:55:49 UTC (rev 439)
@@ -250,10 +250,10 @@
 				RelativePath="..\pr\bin.pr">
 			</File>
 			<File
-				RelativePath="..\pr\dict.pr">
+				RelativePath="init.pth">
 			</File>
 			<File
-				RelativePath="init.pth">
+				RelativePath="..\pr\prosist.pr">
 			</File>
 			<File
 				RelativePath="prothon.y">