rev 221 - in trunk: include/prothon pr src

Author: mark
Date: 2004-03-30 18:51:20 -0500 (Tue, 30 Mar 2004)
New Revision: 221

Modified:
   trunk/include/prothon/prothon.h
   trunk/pr/test.pr
   trunk/src/parser_routines.c
   trunk/src/src.vcproj
Log:
fixed bug 10 --> formal param (label=value) was coming out 
(label = label), also must remember no to end __init__ 
routines with "return ."

Modified: trunk/include/prothon/prothon.h
===================================================================
--- trunk/include/prothon/prothon.h	2004-03-30 22:44:32 UTC (rev 220)
+++ trunk/include/prothon/prothon.h	2004-03-30 23:51:20 UTC (rev 221)
@@ -91,7 +91,7 @@
 //#define DEBUG_THREADS
 //#define DEBUG_MEM_MGR
 //#define TRACE_PARSER
-//#define TRACE_INTERPRETER
+#define TRACE_INTERPRETER
 //#define DUMP_MODULE_CODE
 #define DUMP_OBJECTS_AT_END
 

Modified: trunk/pr/test.pr
===================================================================
--- trunk/pr/test.pr	2004-03-30 22:44:32 UTC (rev 220)
+++ trunk/pr/test.pr	2004-03-30 23:51:20 UTC (rev 221)
@@ -4,7 +4,9 @@
 with Point:
 	.x0 = 0
 	def .__init__( x = 1 ):
+		print 'x:', x
 		.x0 = x
+		return .
 
 p1 = Point()
 p2 = Point(2)

Modified: trunk/src/parser_routines.c
===================================================================
--- trunk/src/parser_routines.c	2004-03-30 22:44:32 UTC (rev 220)
+++ trunk/src/parser_routines.c	2004-03-30 23:51:20 UTC (rev 221)
@@ -451,10 +451,10 @@
 	expr->stack_depth++;
 	expr->max_stack_depth++;
 	expr = pr_realloc(expr, sizeof(code)+(expr->len)*sizeof(code_t));
+	memmove(expr->code_data+2, expr->code_data, ((expr->len)-2)*sizeof(code_t));
 	expr->code_data[0].bytecode.opcode = OP_PUSH;
 	expr->code_data[0].bytecode.param  = 2;
 	expr->code_data[1].data = sym(INTRP, label);
-	memmove(expr->code_data+2, expr->code_data, ((expr->len)-2)*sizeof(code_t));
 	return debug_retrn(__LINE__, expr);
 }
 code* star_ref_to_formparm(void* param, char* label){

Modified: trunk/src/src.vcproj
===================================================================
--- trunk/src/src.vcproj	2004-03-30 22:44:32 UTC (rev 220)
+++ trunk/src/src.vcproj	2004-03-30 23:51:20 UTC (rev 221)
@@ -72,13 +72,16 @@
 				AdditionalIncludeDirectories="c:\prothon\include;c:\prothon\apr\apr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;APR_DECLARE_STATIC;APU_DECLARE_STATIC"
 				StringPooling="TRUE"
+				ExceptionHandling="FALSE"
 				RuntimeLibrary="1"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="0"
+				AssemblerListingLocation="asm-list.txt"
 				WarningLevel="3"
 				WarnAsError="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
+				DebugInformationFormat="3"
+				CompileAs="1"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool