Better errors when (Sub)SmallExtension is filled.

Previously, FORM warns only about SmallExtension, even if it is a sub-buffer sort.

This prompts the user to adjust the wrong buffer in the setup.

Author: jodavies

check/fixes.frm

@@ -2827,3 +2827,62 @@ print;
 assert succeeded?
 assert result("F") =~ expr("5000")
 *--#] Issue508 :
+*--#[ Issue512_1 :
+#-
+* Sort which fills SmallExtension:
+
+#: SmallSize 1000K
+#: SmallExtension 1200K
+#: SubSmallSize 1000K
+#: SubSmallExtension 1200K
+#: SubTermsInSmall 2M
+
+Symbol x,n;
+CFunction f,g,prf;
+
+Local test = (<f(1)>+...+<f(150)>)*(<g(1)>+...+<g(100)>);
+.sort
+
+Off parallel;
+PolyRatFun prf;
+
+Identify f(x?) = prf(n-x,n+x);
+
+.end
+# Fails due to polynomial size on 32bit builds
+#require wordsize >= 4
+# Runtime errors may freeze ParFORM.
+#pend_if mpi?
+assert runtime_error?("Please increase SmallExtension setup parameter.")
+*--#] Issue512_1 :
+*--#[ Issue512_2 :
+#-
+
+* Sort which fills SubSmallExtension:
+
+#: SmallSize 1000K
+#: SmallExtension 1200K
+#: TermsInSmall 2M
+#: SubSmallSize 1000K
+#: SubSmallExtension 1200K
+#: SubTermsInSmall 2M
+
+Symbol x,n;
+CFunction f,g,prf;
+
+Local test = 1;
+.sort
+
+PolyRatFun prf;
+Term;
+	Multiply (<f(1)>+...+<f(150)>)*(<g(1)>+...+<g(100)>);
+	Identify f(x?) = prf(n-x,n+x);
+EndTerm;
+
+.end
+# Fails due to polynomial size on 32bit builds
+#require wordsize >= 4
+# Runtime errors may freeze ParFORM.
+#pend_if mpi?
+assert runtime_error?("Please increase SubSmallExtension setup parameter.")
+*--#] Issue512_2 :

sources/sort.c

@@ -2234,11 +2234,21 @@ WORD AddPoly(PHEAD WORD **ps1, WORD **ps2)
 					TalToLine((UWORD)(*s2++)); TokenToLine((UBYTE *)"  ");
 				}
 				FiniLine();
-				MesPrint("Please increase SmallExtension in %s",setupfilename);
+				if ( AR.sLevel > 0 ) {
+					MesPrint("Please increase SubSmallExtension setup parameter.");
+				}
+				else {
+					MesPrint("Please increase SmallExtension setup parameter.");
+				}
 				MUNLOCK(ErrorMessageLock);
 #else
 				MLOCK(ErrorMessageLock);
-				MesPrint("Please increase SmallExtension in %s",setupfilename);
+				if ( AR.sLevel > 0 ) {
+					MesPrint("Please increase SubSmallExtension setup parameter.");
+				}
+				else {
+					MesPrint("Please increase SmallExtension setup parameter.");
+				}
 				MUNLOCK(ErrorMessageLock);
 #endif
 				Terminate(-1);