Remove arg representing variadic arguments in function lists, except when it is the only argument

Author: ChrisJefferson

lib/function.gi

@@ -20,7 +20,7 @@
 ##
 
 InstallGlobalFunction(CallWithTimeout, 
-        function( timeout, func, arg )
+        function( timeout, func, arg... )
     return CallWithTimeoutList(timeout, func, arg);
 end );
 
@@ -83,4 +83,3 @@ end);
 
 
 
-

lib/gpprmsya.gi

@@ -910,7 +910,7 @@ end);
 ##
 #M  StabilizerOp( <nat-sym-grp>, ...... )
 ##
-SYMGP_STABILIZER := function(sym, arg)
+SYMGP_STABILIZER := function(sym, arg...)
     local  k, act, pt, mov, stab, nat, diff, int, bls, mov1, parts, 
            part, bl, i, gens, size;
     k := Length(arg);
@@ -1012,7 +1012,7 @@ InstallOtherMethod( StabilizerOp,"alternating group", true,
   # the objects might be a group element: rank up	
         RankFilter(IsMultiplicativeElementWithInverse) + 
         RankFilter(IsSolvableGroup),
-        function(g, arg) 
+        function(g, arg...) 
     return AlternatingSubgroup(CallFuncList(Stabilizer, Concatenation([SymmetricParentGroup(g)], arg)));
 end);
 
@@ -1022,7 +1022,7 @@ InstallOtherMethod( StabilizerOp,"alternating group", true,
   # the objects might be a group element: rank up	
         RankFilter(IsMultiplicativeElementWithInverse) + 
         RankFilter(IsSolvableGroup),
-        function(g, arg) 
+        function(g, arg...)
     return AlternatingSubgroup(CallFuncList(Stabilizer, Concatenation([SymmetricParentGroup(g)], arg)));
 end);
 

src/read.c

@@ -1114,7 +1114,7 @@ void ReadFuncExpr (
 {
     volatile Obj        nams;           /* list of local variables names   */
     volatile Obj        name;           /* one local variable name         */
-    volatile UInt       narg;           /* number of arguments             */
+    volatile Int        narg;           /* number of arguments             */
     volatile UInt       isvarg = 0;     /* does function have varargs?     */
     volatile UInt       nloc;           /* number of locals                */
     volatile UInt       nr;             /* number of statements            */
@@ -1278,12 +1278,9 @@ void ReadFuncExpr (
     /* Also, we special case function(arg)                                   */
     if (isvarg || ( narg == 1 && ! strcmp( "arg", CSTR_STRING( ELM_LIST(nams, narg) ) )) )
       {
-	/* TODO: remove this before the next non-beta release */
-	if (narg > 1 && ! strcmp( "arg", CSTR_STRING( ELM_LIST(nams, narg) ) ) )
-	  SyntaxWarning("New syntax used -- intentional?");
 	narg = -narg;
       }
-	
+      
     /*     if ( narg == 1 && ! strcmp( "arg", CSTR_STRING( ELM_LIST(nams,1) ) ) )
 	   narg = -1; */
 

tst/testinstall/timeout.tst

@@ -1,13 +1,10 @@
 gap> START_TEST("timeout.tst");
-gap> spinFor := function(ms, arg) local t;
+gap> spinFor := function(ms, arg...) local t;
 > t := Runtimes().user_time + Runtimes().system_time;
 > while Runtimes().user_time + Runtimes().system_time < t + ms do od;
 > if Length(arg) >= 1
 > then return arg[1]; else return; fi; end;
-Syntax warning: New syntax used -- intentional? in stream line 2
-t := Runtimes().user_time + Runtimes().system_time;
-^
-function( ms, arg ) ... end
+function( ms, arg... ) ... end
 gap> spinFor(10);
 gap> spinFor(10,0);
 0