WIP: gap root path unification

lib/package.gi

@@ -1862,19 +1862,19 @@
 #F  ExtendRootDirectories( <paths> )
 ##
 InstallGlobalFunction( ExtendRootDirectories, function( rootpaths )
-    local i;
-
-    rootpaths:= Filtered( rootpaths, path -> not path in GAPInfo.RootPaths );
-    if not IsEmpty( rootpaths ) then
-      # 'DirectoriesLibrary' concatenates root paths with directory names.
-      for i in [ 1 .. Length( rootpaths ) ] do
-        if not EndsWith( rootpaths[i], "/" ) then
-          rootpaths[i]:= Concatenation( rootpaths[i], "/" );
-        fi;
-      od;
-      # Append the new root paths.
-      GAPInfo.RootPaths:= Immutable( Concatenation( GAPInfo.RootPaths,
-          rootpaths ) );
+    local path, changed;
+
+    changed:= false;
+    for path in rootpaths do
+      if not EndsWith( path, "/" ) then
+        path:= Concatenation( path, "/" );
+      fi;
+      if not path in GAPInfo.RootPaths then
+        Add( GAPInfo.RootPaths, path );
+        changed:= true;
+      fi;
+    od;
+    if changed then
       # Clear the cache.
       GAPInfo.DirectoriesLibrary:= AtomicRecord( rec() );
       # Reread the package information.

src/gap.c

@@ -405,7 +405,7 @@ int realmain(int argc, const char * argv[])
   Int4                crc;                    // crc of file to compile
 
   // initialize everything and read init.g which runs the GAP session
-  InitializeGap(&argc, argv, 1);
+  InitializeGap(&argc, argc, argv, 1);
   if (!STATE(UserHasQUIT)) {         /* maybe the user QUIT from the initial
                                    read of init.g  somehow*/
     // maybe compile in which case init.g got skipped
@@ -1335,6 +1335,8 @@ static Int InitKernel (
     InitGlobalBag( &WindowCmdString, "src/gap.c:WindowCmdString" );
     InitGlobalBag( &KernelArgs, "src/gap.c:KernelArgs" );
 
+    InitGlobalBag( &SyGapRootPaths, "src/gap.c:SyGapRootPaths" ); // FIXME
+
     // init filters and functions
     InitHdlrFuncsFromTable( GVarFuncs );
 
@@ -1452,21 +1454,18 @@ StructInitInfo * InitInfoGap ( void )
 **  function. We use the resulting pointer as a hint to the garbage collector
 **  as to where the execution stack (might) start.
 */
-void InitializeGap(int * pargc, const char * argv[], BOOL handleSignals)
+void InitializeGap(void * stackBottom, int argc, const char * argv[], BOOL handleSignals)
 {
-    const int argc = *pargc;
-
     // initialize the basic system and gasman
     InitSystem(argc, argv, handleSignals);
 
     // Initialise memory  -- have to do this here to make sure we are at top of C stack
-    InitBags(
+    Bag * alignedStackBottom = (Bag *)(((UInt)stackBottom / C_STACK_ALIGN) * C_STACK_ALIGN);
 #if defined(USE_GASMAN)
-        SyStorMin,
+    InitBags(SyStorMin, alignedStackBottom);
 #else
-        0,
+    InitBags(0, alignedStackBottom);
 #endif
-             (Bag *)(((UInt)pargc / C_STACK_ALIGN) * C_STACK_ALIGN));
 
     STATE(UserHasQUIT) = FALSE;
     STATE(UserHasQuit) = FALSE;
@@ -1478,6 +1477,8 @@ void InitializeGap(int * pargc, const char * argv[], BOOL handleSignals)
     // call kernel initialisation
     ModulesInitKernel();
 
+    InitRootPaths(argc, argv);
+
 #ifdef HPCGAP
     InitMainThread();
 #endif

src/gap.h

@@ -83,9 +83,9 @@ BOOL IsUsingLibGap(void);
 
 /****************************************************************************
 **
-*F  InitializeGap( <argc>, <argv>, <handleSignals> )  . . . . . . .  init GAP
+*F  InitializeGap() . . . . . . . . . . . . . . . . . . . . .  initialize GAP
 */
-void InitializeGap(int * pargc, const char * argv[], BOOL handleSignals);
+void InitializeGap(void * stackBottom, int argc, const char * argv[], BOOL handleSignals);
 
 
 /****************************************************************************

src/libgap-api.c

@@ -59,7 +59,7 @@
 {
     UsingLibGap = TRUE;
 
-    InitializeGap(&argc, (const char **)argv, handleSignals);
+    InitializeGap(&argc, argc, (const char **)argv, handleSignals);
     SetExtraMarkFuncBags(markBagsCallback);
     STATE(JumpToCatchCallback) = errorCallback;
 

src/listfunc.c

@@ -44,95 +44,96 @@
 */
 static void AddList3(Obj list, Obj obj, Int pos)
 {
-    Int                 len;
-    Int                 i;
+    Int len;
+    Int i;
     len = LEN_LIST(list);
-    if (pos == (Int) -1)
-      pos = len + 1;
-    for (i = len +1; i > pos; i--)
-      ASS_LIST(list, i, ELM_LIST(list, i-1));
-    ASS_LIST( list, pos, obj );
+    if (pos == (Int)-1)
+        pos = len + 1;
+    for (i = len + 1; i > pos; i--)
+        ASS_LIST(list, i, ELM_LIST(list, i - 1));
+    ASS_LIST(list, pos, obj);
 }
 
-void            AddList (
-    Obj                 list,
-    Obj                 obj)
+void AddList(Obj list, Obj obj)
 {
-  AddList3(list, obj, -1);
+    AddList3(list, obj, -1);
 }
 
 
-static void AddPlist3(Obj list, Obj obj, Int pos)
+void AddPlist3(Obj list, Obj obj, Int pos)
 {
-  UInt len;
+    UInt len;
 
-    if ( ! IS_PLIST_MUTABLE(list) ) {
+    if (!IS_PLIST_MUTABLE(list)) {
         ErrorMayQuit("List Assignment: <list> must be a mutable list", 0, 0);
     }
     // in order to be optimistic when building list call assignment
-    len = LEN_PLIST( list );
+    len = LEN_PLIST(list);
     if (pos == (Int)-1)
-      pos = len + 1;
-    if ( len == 0) {
-        AssPlistEmpty( list, pos, obj );
+        pos = len + 1;
+    if (len == 0) {
+        AssPlistEmpty(list, pos, obj);
         return;
     }
     if (pos <= len) {
-      GROW_PLIST(list, len+1);
-      SET_LEN_PLIST(list, len+1);
-      Obj * ptr = ADDR_OBJ(list) + pos;
-      SyMemmove(ptr + 1, ptr, sizeof(Obj) * (len - pos + 1));
+        GROW_PLIST(list, len + 1);
+        SET_LEN_PLIST(list, len + 1);
+        Obj * ptr = ADDR_OBJ(list) + pos;
+        SyMemmove(ptr + 1, ptr, sizeof(Obj) * (len - pos + 1));
     }
     ASS_LIST(list, pos, obj);
 }
 
-void            AddPlist (
-    Obj                 list,
-    Obj                 obj)
+void AddPlist(Obj list, Obj obj)
 {
-
-  AddPlist3(list, obj, -1);
+    AddPlist3(list, obj, -1);
 }
 
 static Obj AddListOper;
 
 static Obj FuncADD_LIST3(Obj self, Obj list, Obj obj, Obj pos)
 {
-    // dispatch
-  Int ipos;
-  if (pos == (Obj)0)
-    ipos = -1;
-  else if (IS_POS_INTOBJ(pos))
-    ipos = INT_INTOBJ(pos);
-  else {
-    DoOperation3Args( self, list,  obj, pos);
-    return (Obj) 0;
-  }
-  UInt tnum = TNUM_OBJ(list);
-  if ( IS_PLIST( list ) ) {
-    AddPlist3( list, obj, ipos );
-  } else if ( FIRST_LIST_TNUM <= tnum && tnum <= LAST_LIST_TNUM ) {
-    AddList3( list, obj, ipos );
-#ifdef HPCGAP
-  // Only support adding to end of atomic lists
-  } else if ( tnum == T_ALIST && pos == (Obj)0 ) {
-    AddAList( list, obj );
-#endif
-  } else {
-    if (pos == 0)
-      DoOperation2Args( self, list, obj );
-    else
-      DoOperation3Args( self, list, obj, pos);
-  }
+    if (!IS_POS_INTOBJ(pos)) {
+        DoOperation3Args(self, list, obj, pos);
+        return 0;
+    }
+
+    UInt tnum = TNUM_OBJ(list);
+    if (FIRST_PLIST_TNUM <= tnum && tnum <= LAST_PLIST_TNUM) {
+        AddPlist3(list, obj, INT_INTOBJ(pos));
+        return 0;
+    }
+    else if (FIRST_LIST_TNUM <= tnum && tnum <= LAST_LIST_TNUM) {
+        AddList3(list, obj, INT_INTOBJ(pos));
+        return 0;
+    }
+    else {
+        DoOperation3Args(self, list, obj, pos);
+    }
 
     return 0;
 }
 
 
 static Obj FuncADD_LIST(Obj self, Obj list, Obj obj)
 {
-  FuncADD_LIST3(self, list, obj, (Obj)0);
-  return (Obj) 0;
+    UInt tnum = TNUM_OBJ(list);
+    if (FIRST_PLIST_TNUM <= tnum && tnum <= LAST_PLIST_TNUM) {
+        AddPlist3(list, obj, -1);
+    }
+    else if (FIRST_LIST_TNUM <= tnum && tnum <= LAST_LIST_TNUM) {
+        AddList3(list, obj, -1);
+    }
+#ifdef HPCGAP
+    else if (tnum == T_ALIST) {
+        AddAList(list, obj);
+    }
+#endif
+    else {
+        DoOperation2Args(self, list, obj);
+    }
+
+    return 0;
 }
 
 

src/listfunc.h

@@ -28,6 +28,7 @@ void AddList(Obj list, Obj obj);
 
 void AddPlist(Obj list, Obj obj);
 
+void AddPlist3(Obj list, Obj obj, Int pos);
 
 /****************************************************************************
 **

src/main.c

@@ -41,7 +41,7 @@ extern int realmain(int argc, const char * argv[]);
 
 static void SetupInitialGapRoot(const char * argv0)
 {
-    SySetGapRootPath(SYS_DEFAULT_PATHS);
+    gap_strlcpy(SyDefaultRootPath, SYS_DEFAULT_PATHS, sizeof(SyDefaultRootPath));
 }
 
 #else
@@ -165,19 +165,14 @@ static void SySetInitialGapRootPaths(const char * GAPExecLocation)
             strxcat(initgbuf, "lib/init.g", sizeof(initgbuf));
 
             if (SyIsReadableFile(initgbuf) == 0) {
-                SySetGapRootPath(pathbuf);
+                gap_strlcpy(SyDefaultRootPath, pathbuf, sizeof(SyDefaultRootPath));
                 // escape from loop
                 return;
             }
             // try up a directory level
             strxcat(pathbuf, "../", sizeof(pathbuf));
         }
     }
-
-    // Set GAP root path to current directory, if we have no other
-    // idea, and for backwards compatibility.
-    // Note that GAPExecLocation must always end with a slash.
-    SySetGapRootPath("./");
 }
 
 static void SetupInitialGapRoot(const char * argv0)

src/streams.c

@@ -358,10 +358,8 @@ Obj READ_AS_FUNC(TypInputFile * input)
 */
 Int READ_GAP_ROOT ( const Char * filename )
 {
-    char path[GAP_PATH_MAX];
-
     // try to find the GAP file
-    SyFindGapRootFile(filename, path, sizeof(path));
+    Obj path = SyFindGapRootFile(filename);
 
     // try to find compiled version of the GAP file
     if (SyUseModule) {
@@ -378,7 +376,7 @@ Int READ_GAP_ROOT ( const Char * filename )
         if (info) {
             // found a matching statically linked module; if there is also
             // a GAP file, compare their CRC
-            if (*path && info->crc != SyGAPCRC(path)) {
+            if (path && info->crc != SyGAPCRC(CSTR_STRING(path))) {
                 Pr("#W Static module %s has CRC mismatch, ignoring\n",
                    (Int)filename, 0);
             }
@@ -395,7 +393,7 @@ Int READ_GAP_ROOT ( const Char * filename )
     }
 
     // not found?
-    if (*path == 0)
+    if (path == 0)
         return 0;
 
 #ifdef GAP_ENABLE_SAVELOAD
@@ -415,7 +413,7 @@ Int READ_GAP_ROOT ( const Char * filename )
     }
 
     TypInputFile input;
-    if (!OpenInput(&input, path))
+    if (!OpenInput(&input, CSTR_STRING(path)))
         return 0;
 
     GAP_TRY