Sorted out the stuff with OLDNUMEXTRASYMBOLS_

Had also repercussions for %X in #write. Now it should be sane.

Author: vermaseren

sources/optimize.cc

@@ -185,7 +185,7 @@ LONG get_expression (int exprnr) {
 }
 
 /*
-  	#] get_expression :
+  	#] get_expression : 
   	#[ PF_get_expression :
 */
 #ifdef WITHMPI
@@ -207,7 +207,7 @@ LONG PF_get_expression (int exprnr) {
 
 #endif
 /*
-  	#] PF_get_expression :
+  	#] PF_get_expression : 
   	#[ get_brackets :
 */
 
@@ -1410,7 +1410,7 @@ inline static void next_MCTS_scheme (PHEAD vector<WORD> *porder, vector<WORD> *p
 }
 
 /*
- 		#] next_MCTS_scheme :
+ 		#] next_MCTS_scheme : 
  		#[ try_MCTS_scheme :
 */
 
@@ -1431,7 +1431,7 @@ inline static void try_MCTS_scheme (PHEAD const vector<WORD> &scheme, int *pnum_
 }
 
 /*
- 		#] try_MCTS_scheme :
+ 		#] try_MCTS_scheme : 
  		#[ update_MCTS_scheme :
 */
 
@@ -1464,7 +1464,7 @@ inline static void update_MCTS_scheme (int num_oper, const vector<WORD> &scheme,
 }
 
 /*
- 		#] update_MCTS_scheme :
+ 		#] update_MCTS_scheme : 
 */
 
 void find_Horner_MCTS_expand_tree () {
@@ -1655,7 +1655,7 @@ void PF_find_Horner_MCTS_expand_tree_slave () {
 
 #endif
 /*
-  	#] PF_find_Horner_MCTS_expand_tree :
+  	#] PF_find_Horner_MCTS_expand_tree : 
   	#[ find_Horner_MCTS :
 */
 
@@ -3430,9 +3430,9 @@ vector<WORD> recycle_variables (const vector<WORD> &all_instr) {
 	}
 
 	// put the number of variables used in a preprocessor variable
-	UBYTE numbuf[24];
-	NumCopy(numvar,numbuf);
-	PutPreVar(AM.oldnumextrasymbols,numbuf,0,1);
+//	UBYTE numbuf[24];
+//	NumCopy(numvar,numbuf);
+//	PutPreVar(AM.oldnumextrasymbols,numbuf,0,1);
 
 	// generate new instructions with the renumbering
 	vector<WORD> newinstr;
@@ -3692,7 +3692,7 @@ void PF_optimize_expression_given_Horner_slave () {
 
 #endif
 /*
-  	#] PF_optimize_expression_given_Horner :
+  	#] PF_optimize_expression_given_Horner : 
   	#[ generate_output :
 */
 
@@ -4312,6 +4312,7 @@ int ClearOptimize()
 		*w = SetExprCases(DROP,1,*w);
 		if ( *w < 0 ) error = 1;
 	}
+	PutPreVar(AM.oldnumextrasymbols,(UBYTE *)("0"),0,0);
 	return(error);
 }
 

sources/pre.c

@@ -5837,7 +5837,16 @@ nodollar:			MesPrint("@$-variable expected in #write instruction");
 			else if ( *fstring == 'X' ) {
 				fstring++;
 				if ( cbuf[AM.sbufnum].numrhs > 0 ) {
-					PrintSubtermList(1,cbuf[AM.sbufnum].numrhs);
+/*
+					This should be only to the value of AM.oldnumextrasymbols
+*/
+					UBYTE *s = GetPreVar(AM.oldnumextrasymbols,0);
+					WORD x = 0;
+					while ( *s >= '0' && *s <= '9' ) x = 10*x + *s++ - '0';
+					if ( x > 0 )
+						PrintSubtermList(1,x);
+					else
+						PrintSubtermList(1,cbuf[AM.sbufnum].numrhs);
 				}
 			}
 			else if ( *fstring == 'O' ) {
@@ -5847,14 +5856,14 @@ nodollar:			MesPrint("@$-variable expected in #write instruction");
 /*
 				First test whether there is an optimization buffer
 */
-				if ( AO.OptimizeResult.code == NULL ) {
+				if ( AO.OptimizeResult.code == NULL && AO.OptimizationLevel != 0 ) {
 					MesPrint("@In #write instruction: no optimization results available!");
 					return(-1);
 				}
 				num = to - Out;
 				WriteString(wtype,Out,num);
 				to = Out;
-				{
+				if ( AO.OptimizationLevel != 0 ) {
 					WORD oldoutskip = AO.OutSkip;
 					AO.OutSkip = number;
 					optimize_print_code(0);
@@ -6256,6 +6265,7 @@ int DoOptimize(UBYTE *s)
 		int firstterm;
 		WORD *term = AT.WorkPointer;
 		ClearOptimize();
+		if ( AO.OptimizationLevel == 0 ) return(0);
 		switch ( e->status ) {
 			case LOCALEXPRESSION:
 			case GLOBALEXPRESSION:
@@ -6277,6 +6287,8 @@ int DoOptimize(UBYTE *s)
 		}
 		for ( i = 0; i < NumExpressions; i++ ) {
 			if ( i == numexpr ) {
+				PutPreVar(AM.oldnumextrasymbols,
+						GetPreVar((UBYTE *)"EXTRASYMBOLS_",0),0,1);
 				Optimize(numexpr, 0);
 				AO.OptimizeResult.nameofexpr = strDup1(exprname,"optimize expression name");
 				continue;

sources/sch.c

@@ -1671,7 +1671,7 @@ WORD WriteSubTerm(WORD *sterm, WORD first)
 }
 
 /*
- 		#] WriteSubTerm :
+ 		#] WriteSubTerm : 
  		#[ WriteInnerTerm :		WORD WriteInnerTerm(term,first)
 
 	Writes the contents of term to the output.
@@ -2217,9 +2217,7 @@ WORD WriteAll()
 					continue;
 			}
 			e->printflag = 0;
-/* Needed? (TU 27 Jul 2013)
 			PutPreVar(AM.oldnumextrasymbols, GetPreVar((UBYTE *)"EXTRASYMBOLS_", 0), 0, 1);
-*/
 			if ( AO.OptimizationLevel > 0 ) {
 				if ( Optimize(0, 1) ) return(-1);
 			}
@@ -2484,16 +2482,9 @@ WORD WriteOne(UBYTE *name, int alreadyinline, int nosemi)
 		MesPrint("@ReadError in expression %s",name);
 		goto AboWrite;
 	}
+/*
 	PutPreVar(AM.oldnumextrasymbols,
 			GetPreVar((UBYTE *)"EXTRASYMBOLS_",0),0,1);
-/*
-	if ( AC.OutputMode == VORTRANMODE ) {
-		AO.OutSkip = 6;
-		if ( Optimize(AO.termbuf[3], 1) ) goto AboWrite;
-		AO.OutSkip = 3;
-		FiniLine();
-	}
-	else
 */
 	/*
 	 * Currently WriteOne() is called only from writeToChannel() with setting