Disable writing to 'last','last2','last3','time','memory_allocated'

gap-system · Jan 23, 2019 · 876de7c · 876de7c
1 parent cf468b1
commit 876de7c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/lib/init.g b/lib/init.g
@@ -95,7 +95,6 @@ Ignore := function ( arg )  end;
 ##
 SetFilterObj := "2b defined";
 infinity := "2b defined";
-last:="2b defined";
 
 
 #############################################################################

diff --git a/src/gap.c b/src/gap.c
@@ -1616,16 +1616,20 @@ static Int PostRestore (
     StructInitInfo *    module )
 {
     /* construct the `ViewObj' variable                                    */
-    ViewObjGVar = GVarName( "ViewObj" ); 
+    ViewObjGVar = GVarName( "ViewObj" );
 
     /* construct the last and time variables                               */
     Last              = GVarName( "last"  );
     Last2             = GVarName( "last2" );
     Last3             = GVarName( "last3" );
     Time              = GVarName( "time"  );
     MemoryAllocated   = GVarName( "memory_allocated"  );
-    AssGVar_NoReadOnlyCheck(Time, INTOBJ_INT(0));
-    AssGVar_NoReadOnlyCheck(MemoryAllocated, INTOBJ_INT(0));
+
+    AssReadOnlyGVar(GVarName("last"), Fail);
+    AssReadOnlyGVar(GVarName("last2"), Fail);
+    AssReadOnlyGVar(GVarName("last3"), Fail);
+    AssReadOnlyGVar(Time, INTOBJ_INT(0));
+    AssReadOnlyGVar(MemoryAllocated, INTOBJ_INT(0));
     QUITTINGGVar      = GVarName( "QUITTING" );
 
     /* return success                                                      */

diff --git a/src/scanner.c b/src/scanner.c
@@ -845,7 +845,6 @@ static void GetChar(void)
 {
   /* skip '\''                                                           */
   Char c = GET_NEXT_CHAR();
-
   /* handle escape equences                                              */
   if ( c == '\n' ) {
     SyntaxError("Character literal must not include <newline>");