Fix flags equality check when using a workspace

gap-system · Jan 12, 2024 · 588eff9 · 588eff9
1 parent d9e0a21
commit 588eff9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/modules_builtin.c b/src/modules_builtin.c
@@ -53,6 +53,9 @@ const InitInfoFunc InitFuncsBuiltinModules[] = {
     InitInfoHookIntrprtr,
     InitInfoTracing,
 
+    // arithmetic operations
+    InitInfoAriths,
+
     // reader, interpreter, coder, caller, compiler, ...
     InitInfoIO,
     InitInfoRead,
@@ -67,9 +70,6 @@ const InitInfoFunc InitFuncsBuiltinModules[] = {
     InitInfoIntrprtr,
     InitInfoCompiler,
 
-    // arithmetic operations
-    InitInfoAriths,
-
     // record packages
     InitInfoRecords,
     InitInfoPRecord,

diff --git a/src/opers.cc b/src/opers.cc
@@ -3798,6 +3798,9 @@ static Int InitKernel (
     // install the printing function
     PrintObjFuncs[ T_FLAGS ] = PrintFlags;
 
+    // install the comparison methods
+    EqFuncs[T_FLAGS][T_FLAGS] = EqFlags;
+
 #ifdef GAP_ENABLE_SAVELOAD
     // and the saving function
     SaveObjFuncs[ T_FLAGS ] = SaveFlags;
@@ -3837,12 +3840,8 @@ static Int PostRestore(StructInitInfo * module)
 **
 *F  InitLibrary( <module> ) . . . . . . .  initialise library data structures
 */
-static Int InitLibrary (
-    StructInitInfo *    module )
+static Int InitLibrary(StructInitInfo * module)
 {
-    // HACK: move this here, instead of InitKernel, to avoid ariths.c overwriting it
-    EqFuncs[T_FLAGS][T_FLAGS] = EqFlags;
-
     ExportAsConstantGVar(BASE_SIZE_METHODS_OPER_ENTRY);
 
     HIDDEN_IMPS = NEW_PLIST(T_PLIST, 0);