Return int, not WORD, for error codes and the like

Also, drop declarations of some non-existing functions, and
change a few (but not all) of the functions that always succeed
to void.

Author: magv

sources/argument.c

@@ -53,14 +53,15 @@
 	need to insert a different value (C->lhs[level][2]).
 */
 
-WORD execarg(PHEAD WORD *term, WORD level)
+int execarg(PHEAD WORD *term, WORD level)
 {
 	GETBIDENTITY
 	WORD *t, *r, *m, *v;
 	WORD *start, *stop, *rstop, *r1, *r2 = 0, *r3 = 0, *r4, *r5, *r6, *r7, *r8, *r9;
 	WORD *mm, *mstop, *rnext, *rr, *factor, type, ngcd, nq;
 	CBUF *C = cbuf+AM.rbufnum, *CC = cbuf+AT.ebufnum;
-	WORD i, j, k, oldnumlhs = AR.Cnumlhs, count, action = 0, olddefer = AR.DeferFlag;
+	WORD i, j, k, oldnumlhs = AR.Cnumlhs, count, olddefer = AR.DeferFlag;
+	int action = 0;
 	WORD oldnumrhs = CC->numrhs, size, pow, jj;
 	LONG oldcpointer = CC->Pointer - CC->Buffer, oldppointer = AT.pWorkPointer, lp;
 	WORD *oldwork = AT.WorkPointer, *oldwork2, scale, renorm;
@@ -1766,7 +1767,7 @@ oneterm:;
   	#[ execterm :
 */
 
-WORD execterm(PHEAD WORD *term, WORD level)
+int execterm(PHEAD WORD *term, WORD level)
 {
 	GETBIDENTITY
 	CBUF *C = cbuf+AM.rbufnum;
@@ -2534,7 +2535,7 @@ WORD FindArg(PHEAD WORD *a)
  *	If par == 1 it inserts in the cache defined with the FactorCache statement
  */
 
-WORD InsertArg(PHEAD WORD *argin, WORD *argout,int par)
+int InsertArg(PHEAD WORD *argin, WORD *argout,int par)
 {
 	CBUF *C;
 	WORD *a, i, bufnum;

sources/compiler.c

@@ -2244,7 +2244,7 @@ int CodeFactors(SBYTE *tokens)
 
 WORD GenerateFactors(WORD n,WORD inc)
 {
-	WORD subexp;
+	int subexp;
 	int i, error = 0;
 	SBYTE *s;
 	SBYTE *tokenbuffer = (SBYTE *)Malloc1(8*n*sizeof(SBYTE),"GenerateFactors");

sources/declare.h

@@ -347,12 +347,12 @@ int DoCanonicalize(PHEAD WORD *term, WORD *params)
 
 #ifdef OLDTOPO
 
-WORD GenTopologies(PHEAD WORD *term,WORD level)
+int GenTopologies(PHEAD WORD *term,WORD level)
 {
 	WORD *t1, *tt1, *tstop, *t, *tt;
 	WORD *oldworkpointer = AT.WorkPointer;
 	WORD option1 = 0, option2 = 0, setoption = -1;
-	WORD retval;
+	int retval;
 /*
 
 	We have to go through the testing procedure again, because there could

sources/diagrams.c

@@ -729,7 +729,7 @@ Bool ProcessTopology(EGraph *eg, void *ti)
 //	#] ProcessTopology : 
 //	#[ GenDiagrams :
 
-WORD GenDiagrams(PHEAD WORD *term, WORD level)
+int GenDiagrams(PHEAD WORD *term, WORD level)
 {
 	Model *model;
 	MODEL *m;
@@ -959,7 +959,7 @@ int processVertex(TOPOTYPE *TopoInf, int pointsremaining, int level)
 
 #define TOPO_MAXVERT 10
 
-WORD GenTopologies(PHEAD WORD *term, WORD level)
+int GenTopologies(PHEAD WORD *term, WORD level)
 {
 	Options *opt = new Options;
 	int nlegs, nloops, i, identical;

sources/diawrap.cc

@@ -44,7 +44,7 @@
 		par == 0 after .sort
 */
 
-WORD CleanExpr(WORD par)
+int CleanExpr(WORD par)
 {
 	GETIDENTITY
 	WORD j, n, i;
@@ -208,10 +208,11 @@ WORD CleanExpr(WORD par)
 
 */
 
-WORD PopVariables(void)
+int PopVariables(void)
 {
 	GETIDENTITY
-	WORD i, j, retval;
+	WORD i, j;
+	int retval;
 	UBYTE *s;
 
 	retval = CleanExpr(1);
@@ -612,10 +613,10 @@ restart:;
  		#[ DoExecute :
 */
 
-WORD DoExecute(WORD par, WORD skip)
+int DoExecute(WORD par, WORD skip)
 {
 	GETIDENTITY
-	WORD RetCode = 0;
+	int RetCode = 0;
 	int i, oldmultithreaded = AS.MultiThreaded;
 #ifdef PARALLELCODE
 	int j;
@@ -1108,7 +1109,7 @@ if ( AC.SwitchInArray > 0 ) {
 	15-oct-1991
 */
 
-WORD PutBracket(PHEAD WORD *termin)
+int PutBracket(PHEAD WORD *termin)
 {
 	GETBIDENTITY
 	WORD *t, *t1, *b, i, j, *lastfun;

sources/execute.c

@@ -58,7 +58,7 @@
 	to any of these sets.
 */
 
-WORD FindOnly(PHEAD WORD *term, WORD *pattern)
+int FindOnly(PHEAD WORD *term, WORD *pattern)
 {
 	GETBIDENTITY
 	WORD *t, *m;
@@ -416,7 +416,7 @@ EndLoop:;
 
 */
 
-WORD FindOnce(PHEAD WORD *term, WORD *pattern)
+int FindOnce(PHEAD WORD *term, WORD *pattern)
 {
 	GETBIDENTITY
 	WORD *t, *m;
@@ -1067,7 +1067,7 @@ WORD FindMulti(PHEAD WORD *term, WORD *pattern)
 
 */
 
-WORD FindRest(PHEAD WORD *term, WORD *pattern)
+int FindRest(PHEAD WORD *term, WORD *pattern)
 {
 	GETBIDENTITY
 	WORD *t, *m, *tt, wild, regular;

sources/findpat.c

@@ -1436,7 +1436,7 @@ int ToRat(PHEAD WORD *term, WORD level)
  		#[ AddWithFloat :
 */
 
-WORD AddWithFloat(PHEAD WORD **ps1, WORD **ps2)
+int AddWithFloat(PHEAD WORD **ps1, WORD **ps2)
 {
 	GETBIDENTITY
 	SORTING *S = AT.SS;
@@ -1557,11 +1557,12 @@ WORD AddWithFloat(PHEAD WORD **ps1, WORD **ps2)
 		does this as well.
 */
 
-WORD MergeWithFloat(PHEAD WORD **interm1, WORD **interm2)
+int MergeWithFloat(PHEAD WORD **interm1, WORD **interm2)
 {
 	GETBIDENTITY
 	WORD *coef1, *coef2, size1, size2, *fun1, *fun2, *fun3, *tt;
-	WORD sign3,j,jj, *t1, *t2, i, *term1 = *interm1, *term2 = *interm2, retval = 0;
+	WORD sign3,j,jj, *t1, *t2, i, *term1 = *interm1, *term2 = *interm2;
+	int retval = 0;
 	coef1 = term1+*term1; size1 = coef1[-1]; coef1 -= ABS(size1);
 	coef2 = term2+*term2; size2 = coef2[-1]; coef2 -= ABS(size2);
 	if ( AT.SortFloatMode == 3 ) {

sources/float.c

@@ -48,7 +48,7 @@
 		function
 */
 
-WORD MakeDirty(WORD *term, WORD *x, WORD par)
+int MakeDirty(WORD *term, WORD *x, WORD par)
 {
 	WORD *next, *n;
 	if ( !par ) {
@@ -370,7 +370,7 @@ WORD Symmetrize(PHEAD WORD *func, WORD *Lijst, WORD ngroups, WORD gsize,
 			1 if they are OK.
 */
 
-WORD CompGroup(PHEAD WORD type, WORD **args, WORD *a1, WORD *a2, WORD num)
+int CompGroup(PHEAD WORD type, WORD **args, WORD *a1, WORD *a2, WORD num)
 {
 	GETBIDENTITY
 	WORD *t1, *t2, i1, i2, n, k;
@@ -515,7 +515,7 @@ int FullSymmetrize(PHEAD WORD *fun, int type)
 					   >0 -> must have right number of arguments
 */
 
-WORD SymGen(PHEAD WORD *term, WORD *params, WORD num, WORD level)
+int SymGen(PHEAD WORD *term, WORD *params, WORD num, WORD level)
 {
 	GETBIDENTITY
 	WORD *t, *r, *m;
@@ -630,7 +630,7 @@ NextGroup:;
 
 */
 
-WORD SymFind(PHEAD WORD *term, WORD *params)
+int SymFind(PHEAD WORD *term, WORD *params)
 {
 	GETBIDENTITY
 	WORD *t, *r, *m;
@@ -823,7 +823,7 @@ int ChainOut(PHEAD WORD *term, WORD funnum)
 		?a,?b give a match that later turns out to be useless.
 */
 
-WORD MatchFunction(PHEAD WORD *pattern, WORD *interm, WORD *wilds)
+int MatchFunction(PHEAD WORD *pattern, WORD *interm, WORD *wilds)
 {
 	GETBIDENTITY
 	WORD *m, *t, *r, i;
@@ -1613,7 +1613,7 @@ endoloop:;
 	function. This will take care of whatever happens in MatchE etc.
 */
 
-WORD ScanFunctions(PHEAD WORD *inpat, WORD *inter, WORD par)
+int ScanFunctions(PHEAD WORD *inpat, WORD *inter, WORD par)
 {
 	GETBIDENTITY
 	WORD i, *m, *t, *r, sym, psym;

sources/function.c

@@ -277,7 +277,7 @@ int FindVar(WORD *v, WORD *term)
 		Note that the whole setup asks for recursions.
 */
 
-WORD DoIfStatement(PHEAD WORD *ifcode, WORD *term)
+int DoIfStatement(PHEAD WORD *ifcode, WORD *term)
 {
 	GETBIDENTITY
 	WORD *ifstop, *ifp;