Repaired an old bug concerning repeated use of special functions.
Made Valgrind happy.

Author: t68

sources/proces.c

@@ -2864,7 +2864,6 @@ WORD Generator(PHEAD WORD *term, WORD level)
 #endif
 	oldtoprhs = CC->numrhs;
 	oldcpointer = CC->Pointer - CC->Buffer;
-
 ReStart:
 	if ( ( replac = TestSub(BHEAD term,level) ) == 0 ) {
 		if ( applyflag ) { TableReset(); applyflag = 0; }
@@ -3458,18 +3457,40 @@ AutoGen:	i = *AT.TMout;
 		if ( AN.TeInFun < 0 && !AN.TeSuOut ) {
 
 			if ( AR.TePos >= 0 ) goto AutoGen;
-			if ( AN.TeInFun == -1 && DoDistrib(BHEAD term,level) ) goto GenCall;
-			else if ( AN.TeInFun == -2 && DoDelta3(BHEAD term,level) ) goto GenCall;
-			else if ( AN.TeInFun == -3 && DoTableExpansion(term,level) ) goto GenCall;
-			else if ( AN.TeInFun == -4 && FactorIn(BHEAD term,level) ) goto GenCall;
-			else if ( AN.TeInFun == -5 && FactorInExpr(BHEAD term,level) ) goto GenCall;
-			else if ( AN.TeInFun == -6 && TermsInBracket(BHEAD term,level) < 0 ) goto GenCall;
-			else if ( AN.TeInFun == -7 && ExtraSymFun(BHEAD term,level) < 0 ) goto GenCall;
-			else if ( AN.TeInFun == -8 && GCDfunction(BHEAD term,level) < 0 ) goto GenCall;
-			else if ( AN.TeInFun == -9 && DIVfunction(BHEAD term,level,0) < 0 ) goto GenCall;
-			else if ( AN.TeInFun == -10 && DIVfunction(BHEAD term,level,1) < 0 ) goto GenCall;
-			else if ( AN.TeInFun == -11 ) {
-				if ( DIVfunction(BHEAD term,level,2) < 0 ) goto GenCall;
+			switch ( AN.TeInFun ) {
+				case -1:
+					if ( DoDistrib(BHEAD term,level) ) goto GenCall;
+					break;
+				case -2:
+					if ( DoDelta3(BHEAD term,level) ) goto GenCall;
+					break;
+				case -3:
+					if ( DoTableExpansion(term,level) ) goto GenCall;
+					break;
+				case -4:
+					if ( FactorIn(BHEAD term,level) ) goto GenCall;
+					break;
+				case -5:
+					if ( FactorInExpr(BHEAD term,level) ) goto GenCall;
+					break;
+				case -6:
+					if ( TermsInBracket(BHEAD term,level) < 0 ) goto GenCall;
+					break;
+				case -7:
+					if ( ExtraSymFun(BHEAD term,level) < 0 ) goto GenCall;
+					break;
+				case -8:
+					if ( GCDfunction(BHEAD term,level) < 0 ) goto GenCall;
+					break;
+				case -9:
+					if ( DIVfunction(BHEAD term,level,0) < 0 ) goto GenCall;
+					break;
+				case -10:
+					if ( DIVfunction(BHEAD term,level,1) < 0 ) goto GenCall;
+					break;
+				case -11:
+					if ( DIVfunction(BHEAD term,level,2) < 0 ) goto GenCall;
+					break;
 			}
 		}
 		else {

sources/reken.c

@@ -1135,7 +1135,7 @@ WORD DivLong(UWORD *a, WORD na, UWORD *b, WORD nb, UWORD *c,
 			}
 			else {
 				w2 = f+ni+ne; nh = ne+1;
-				while ( !*w2 && ( nh > 0 ) ) { nh--; w2--; }
+				while ( ( nh > 0 ) && !*w2 ) { nh--; w2--; }
 			}
 			if ( BigLong(f+ni,nh,e,ne) >= 0 ) {
 				estim++;
@@ -1207,7 +1207,7 @@ WORD DivLong(UWORD *a, WORD na, UWORD *b, WORD nb, UWORD *c,
 }
 
 /*
- 		#] DivLong : 
+ 		#] DivLong :
  		#[ RaisPow :		WORD RaisPow(a,na,b)
 
 	Raises a to the power b. a is a Long integer and b >= 0.
@@ -2997,7 +2997,7 @@ int ChineseRemainder(PHEAD MODNUM *a1, MODNUM *a2, MODNUM *a)
 
 /*
  		#] ChineseRemainder: 
-  	#] RekenLong : 
+  	#] RekenLong :
   	#[ RekenTerms :
  		#[ CompCoef :		WORD CompCoef(term1,term2)
 

sources/sch.c

@@ -2153,16 +2153,20 @@ WORD WriteAll()
 			}
 			AO.PrintType = prtf;
 			if ( AC.OutputMode == VORTRANMODE ) {
+				UBYTE *oldOutFill = AO.OutFill, *oldOutputLine = AO.OutputLine;
 				AO.OutSkip = 6;
 				if ( Optimize(AO.termbuf[3]) ) goto AboWrite;
 				AO.OutSkip = 3;
+				AO.OutFill = oldOutFill; AO.OutputLine = oldOutputLine;
 				FiniLine();
 				continue;
 			}
 			else if ( AO.OptimizationLevel > 0 ) {
+				UBYTE *oldOutFill = AO.OutFill, *oldOutputLine = AO.OutputLine;
 				AO.OutSkip = 6;
 				if ( Optimize(AO.termbuf[3]) ) goto AboWrite;
 				AO.OutSkip = 3;
+				AO.OutFill = oldOutFill; AO.OutputLine = oldOutputLine;
 				FiniLine();
 				continue;
 			}