*** empty log message ***

Author: t68

sources/normal.c

@@ -95,7 +95,9 @@ Normalize BARG1(WORD *,term)
 /*
   	#] Declarations :
   	#[ Setup :
+PrintTerm(term,"Normalize");
 */
+
 Restart:
 	didcontr = 0;
 	ReplaceType = -1;
@@ -1628,7 +1630,7 @@ defaultcase:;
 		goto conscan;
 	}
 /*
-  	#] First scan : 
+  	#] First scan :
   	#[ Easy denominators :
 
 	Easy denominators are denominators that can be replaced by
@@ -2875,7 +2877,7 @@ NextI:;
 		}
 #endif
 /*
- 		#] normalize replacements : 
+ 		#] normalize replacements :
 */
 #ifdef OLDNORMREPLACE
 		AT.WorkPointer = termout;
@@ -3104,7 +3106,7 @@ DoTheta ARG1(WORD *,t)
 }
 
 /*
- 		#] DoTheta : 
+ 		#] DoTheta :
  		#[ DoDelta :
 */
 
@@ -3172,7 +3174,7 @@ DoDelta ARG1(WORD *,t)
 }
 
 /*
- 		#] DoDelta : 
+ 		#] DoDelta :
  		#[ DoRevert :
 */
 
@@ -3247,7 +3249,7 @@ void DoRevert ARG2(WORD *,fun,WORD *,tmp)
 }
 
 /*
- 		#] DoRevert : 
+ 		#] DoRevert :
  	#] Normalize :
   	#[ DetCommu :
 
@@ -3310,7 +3312,7 @@ WORD DetCommu ARG1(WORD *,terms)
 }
 
 /*
-  	#] DetCommu : 
+  	#] DetCommu :
   	#[ EvaluateGcd :
 
 	Try to evaluate the GCDFUNCTION gcd_.
@@ -3627,5 +3629,5 @@ gcdisone:;
 }
 
 /*
-  	#] EvaluateGcd : 
+  	#] EvaluateGcd :
 */

sources/symmetr.c

@@ -1519,7 +1519,7 @@ int FunMatchSy ARG4(WORD *,pattern,WORD *,fun,WORD *,inter,WORD,par)
 	if ( argcount == 0 && tcount == 0 && funnycount == 0 ) {
 quicky:
 		AN.RepFunList[AN.RepFunNum++] = offset;
-		AN.RepFunList[AN.RepFunNum++] = 0;
+		AN.RepFunList[AN.RepFunNum++] = signs;
 		newpat = pattern + pattern[1];
 		if ( newpat >= AN.patstop ) {
 			if ( AN.UseFindOnly == 0 ) {
@@ -1850,6 +1850,7 @@ nextiraise:;
 	for ( i = 0; i < tcount; i++ ) cycles[i] = tcount-i;
 	AT.WorkPointer += tcount;
 	signo = 0;
+MesPrint("<1> signs = %d",signs);
 	for (;;) {
 		for ( j = 0; j < argcount; j++ ) {
 			if ( MatchArgument(AT.pWorkSpace[oww+j],AT.pWorkSpace[lhpars+j]) == 0 ) {
@@ -1961,7 +1962,7 @@ nextiraise:;
 }
 
 /*
-  	#] FunMatchSy : 
+  	#] FunMatchSy :
   	#[ MatchArgument :
 */
 

sources/token.c

@@ -12,7 +12,7 @@
 #include "form3.h"
 
 /*
-  	#] Includes :
+  	#] Includes : 
 	#[ Compiler :
  		#[ tokenize :
 
@@ -383,9 +383,9 @@ donumber:		i = 0;
 				else goto IllPos;
 				in++;
 				break;
-			case 5:		/* + - * / ^ : */
+			case 5:		/* + - * % / ^ : */
 				CHECKPOLY
-				if ( *in == ':' ) goto IllPos;
+				if ( *in == ':' || *in == '%' ) goto IllPos;
 				if ( *in == '*' || *in == '/' || *in == '^' ) {
 					if ( object <= 0 ) {
 						MesPrint("&Illegal position for operator: %s",in);
@@ -563,7 +563,7 @@ WriteTokens ARG1(SBYTE *,in)
 }
 
 /*
- 		#] WriteTokens :
+ 		#] WriteTokens : 
  		#[ simp1token :
 
 		Routine substitutes set elements if possible.
@@ -643,7 +643,7 @@ if ( n < 0 ) {
 }
 
 /*
- 		#] simp1token :
+ 		#] simp1token : 
  		#[ simpwtoken :
 
 		Only to be called in the LHS.
@@ -804,7 +804,7 @@ firsterr:		if ( first ) {
 }
 
 /*
- 		#] simpwtoken :
+ 		#] simpwtoken : 
  		#[ simp2token :
 
 		Deals with function arguments.
@@ -985,7 +985,7 @@ tcommon:				v++; while ( *v >= 0 ) v++;
 }
 
 /*
- 		#] simp2token :
+ 		#] simp2token : 
  		#[ simp3atoken :
 
 		We hunt for denominators and exponents that seem hidden.
@@ -1219,7 +1219,7 @@ nodot:				MesPrint("&Illegal second element in dotproduct");
 }
 
 /*
- 		#] simp3atoken :
+ 		#] simp3atoken : 
  		#[ simp3btoken :
 */
 
@@ -1593,7 +1593,7 @@ doublepower:;
 }
 
 /*
- 		#] simp3btoken :
+ 		#] simp3btoken : 
  		#[ simp4token :
 
 		Deal with the set[n] objects in the RHS.
@@ -1750,7 +1750,7 @@ simp4token ARG1(SBYTE *,s)
 }
 
 /*
- 		#] simp4token :
+ 		#] simp4token : 
  		#[ simp5token :
 
 	Making sure that first argument of sumfunction is not a wildcard already
@@ -1797,7 +1797,7 @@ simp5token ARG2(SBYTE *,s,int,mode)
 }
 
 /*
- 		#] simp5token :
+ 		#] simp5token : 
  		#[ simp6token :
 
 int
@@ -1811,7 +1811,7 @@ simp6token ARG2(SBYTE *,s,int,mode)
 	return(error);
 }
 
- 		#] simp6token :
+ 		#] simp6token : 
 	#] Compiler :
 */
 /* temporary commentary for forcing cvs merge */

sources/wildcard.c

@@ -40,7 +40,7 @@ WORD
 WildFill BARG3(WORD *,to,WORD *,from,WORD *,sub)
 {
 	GETBIDENTITY
-	WORD i, j, *s, *t, *m, len, dflag, odirt;
+	WORD i, j, *s, *t, *m, len, dflag, odirt, adirt;
 	WORD *r, *u, *v, *w, *z, *zst, *zz, *subs, *accu, na, dirty = 0, *tstop;
 	WORD *temp = 0, *uu, *oldcpointer, sgn;
 	WORD subcount, setflag, *setlist = 0, si;
@@ -1172,22 +1172,27 @@ ss10:							*m++ = *t++;
 							NEXTARG(zz)
 							odirt = AN.WildDirt; AN.WildDirt = 0;
 							AR.CompressPointer = accu + na;
-							m += ARGHEAD;
-							t += ARGHEAD;
+							for ( j = 0; j < ARGHEAD; j++ ) *m++ = *t++;
 							j = 0;
+							adirt = 0;
 							while ( t < zz ) {	/* do a term */
 								if ( ( len = WildFill(BHEAD m,t,sub) ) < 0 ) {
 									LOCK(ErrorMessageLock);
 									MesCall("WildFill");
 									UNLOCK(ErrorMessageLock);
 									SETERROR(-1)
 								}
+								if ( AN.WildDirt ) {
+									adirt = AN.WildDirt;
+									AN.WildDirt = 0;
+								}
 								m += len;
 								t += *t;
 							}
 							*w = WORDDIF(m,w);	/* Fill parameter length */
-							if ( AN.WildDirt ) {
+							if ( adirt ) {
 								dirty = w[1] = 1; v[2] |= DIRTYFLAG;
+								AN.WildDirt = adirt;
 							}
 							else {
 								AN.WildDirt = odirt;