Stop usage of ~ in function arguments and as a local variable name

gap-system · Jan 6, 2017 · e3650d1 · e3650d1
1 parent f1ce770
commit e3650d1
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/src/read.c b/src/read.c
@@ -1316,6 +1316,9 @@ struct ArgList ReadFuncArgList(
             SET_LEN_STRING(locks, 1);
             GetSymbol();
         }
+        if ( strcmp("~", TLS(Value)) == 0 ) {
+                SyntaxError("~ is not a valid name for an argument");
+        }
         C_NEW_STRING_DYN( name, TLS(Value) );
         narg += 1;
         ASS_LIST( nams, narg, name );
@@ -1367,6 +1370,9 @@ struct ArgList ReadFuncArgList(
                 SyntaxError("Name used for two arguments");
             }
         }
+        if ( strcmp("~", TLS(Value)) == 0 ) {
+                SyntaxError("~ is not a valid name for an argument");
+        }
         C_NEW_STRING_DYN( name, TLS(Value) );
         narg += 1;
         ASS_LIST( nams, narg, name );
@@ -1452,6 +1458,9 @@ void ReadFuncExpr (
                 SyntaxError("Name used for argument and local");
             }
         }
+        if ( strcmp("~", TLS(Value)) == 0 ) {
+                SyntaxError("~ is not a valid name for a local identifier");
+        }
         C_NEW_STRING_DYN( name, TLS(Value) );
         nloc += 1;
         ASS_LIST( nams, narg+nloc, name );
@@ -1470,6 +1479,9 @@ void ReadFuncExpr (
                     SyntaxError("Name used for two locals");
                 }
             }
+            if ( strcmp("~", TLS(Value)) == 0 ) {
+                SyntaxError("~ is not a valid name for a local identifier");
+            }
             C_NEW_STRING_DYN( name, TLS(Value) );
             nloc += 1;
             ASS_LIST( nams, narg+nloc, name );

diff --git a/tst/testinstall/tilde.tst b/tst/testinstall/tilde.tst
@@ -25,4 +25,32 @@ gap> r.x;
 rec( x := ~, y := [ 1, 2, ~ ] )
 gap> r.y[3];
 rec( x := ~, y := [ 1, 2, ~ ] )
+gap> f := function(~) local a; end;
+Syntax error: ~ is not a valid name for an argument in stream:1
+f := function(~) local a; end;
+              ^
+gap> f := function(a,~) local a; end;
+Syntax error: ~ is not a valid name for an argument in stream:1
+f := function(a,~) local a; end;
+                ^
+gap> f := function(a,b) local ~; end;
+Syntax error: ~ is not a valid name for a local identifier in stream:1
+f := function(a,b) local ~; end;
+                         ^
+gap> f := function(a,b) local x,~; end;
+Syntax error: ~ is not a valid name for a local identifier in stream:1
+f := function(a,b) local x,~; end;
+                           ^
+gap> {~} -> ~;
+Syntax error: ~ is not a valid name for an argument in stream:1
+{~} -> ~;
+ ^
+gap> {~,~} -> 2;
+Syntax error: ~ is not a valid name for an argument in stream:1
+{~,~} -> 2;
+ ^
+gap> ({} -> ~);
+function(  ) ... end
+gap> ({} -> ~)();
+Error, Variable: '~' must have an assigned value
 gap> STOP_TEST( "tilde.tst", 1);