Additional MaxTermSize related messages

vermaseren · Aug 12, 2018 · e494197 · e494197
1 parent 6ca4aca
commit e494197
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/sources/proces.c b/sources/proces.c
@@ -2593,7 +2593,7 @@ ComAct:		if ( t < u ) do { *m++ = *t++; } while ( t < u );
 			*termout = WORDDIF(m,termout);
 			if ( (*termout)*((LONG)sizeof(WORD)) > AM.MaxTer ) {
 				MLOCK(ErrorMessageLock);
-				MesPrint("Term too complex during substitution. MaxTermSize of %l is too small",AM.MaxTer);
+				MesPrint("Term too complex during substitution: %l words. MaxTermSize of %l words is too small", *termout, AM.MaxTer/(LONG)sizeof(WORD) );
 				goto InsCall2;
 			}
 			AT.WorkPointer = coef;
@@ -5453,7 +5453,7 @@ WORD PolyFunMul(PHEAD WORD *term)
 	*AT.WorkPointer = n1 = WORDDIF(t,AT.WorkPointer);
 	if ( n1*((LONG)sizeof(WORD)) > AM.MaxTer ) {
 		MLOCK(ErrorMessageLock);
-		MesPrint("Term too complex. Maybe increasing MaxTermSize can help");
+		MesPrint("Term too complex: %d words. Maybe increasing MaxTermSize (%d words) can help", n1, AM.MaxTer/(LONG)sizeof(WORD) );
 		goto PolyCall2;
 	}
 	m = term; t = AT.WorkPointer;

diff --git a/sources/sort.c b/sources/sort.c
@@ -995,7 +995,12 @@ LONG EndSort(PHEAD WORD *buffer, int par)
 							to = buffer;
 							if ( to >= AT.WorkSpace && to < AT.WorkTop && to+j > AT.WorkTop )
 								goto WorkSpaceError;
-							if ( j > AM.MaxTer ) goto TooLarge;
+							if ( j > AM.MaxTer ) {
+								MLOCK(ErrorMessageLock);
+								MesPrint("Encountered term of size: %d words.", j/(LONG)sizeof(WORD) );
+								MUNLOCK(ErrorMessageLock);
+								goto TooLarge;
+							}
 							NCOPY(to,t,j);
 						}
 					}