Make it easier to redirect ReadPackage calls

peal · Aug 27, 2024 · 853e435 · 853e435
1 parent 7915ad2
commit 853e435
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/init.g b/init.g
@@ -4,14 +4,18 @@
 # Reading the declaration part of the package.
 #
 
+if not IsBound(_ReadGBPackage) then
+    _ReadGBPackage := {f} -> ReadPackage("GraphBacktracking", f);
+fi;
+
 
 if not IsBound(_BT_SKIP_INTERFACE) and not IsBound(_BTKit.InitInterfaceGB) then
     # _BTKit.InitInterfaceGB := true; in gap/interface.gd
-    ReadPackage( "GraphBacktracking", "gap/interface.gd");
+    _ReadGBPackage( "gap/interface.gd");
 fi;
 
 if not IsBound(_BTKit.FilesInitGB) then
     # _BTKit.FilesInitGB := true; in gap/GraphBacktracking.gd
-    ReadPackage( "GraphBacktracking", "gap/GraphBacktracking.gd");
-    ReadPackage( "GraphBacktracking", "gap/Equitable.gd");
+    _ReadGBPackage( "gap/GraphBacktracking.gd");
+    _ReadGBPackage( "gap/Equitable.gd");
 fi;
diff --git a/read.g b/read.g
@@ -10,19 +10,19 @@ fi;
 
 if not IsBound(_BT_SKIP_INTERFACE) and not IsBound(_BTKit.ReadInterfaceGB) then
     # _BTKit.ReadInterfaceGB := true; in gap/interface.gi
-    ReadPackage( "GraphBacktracking", "gap/interface.gi");
+    _ReadGBPackage( "gap/interface.gi");
 fi;
 
 if not IsBound(_BTKit.FilesReadGB) then
     # _BTKit.FilesReadGB := true; in gap/GraphBacktracking.gi
-    ReadPackage( "GraphBacktracking", "gap/GraphBacktracking.gi");
-    ReadPackage( "GraphBacktracking", "gap/Equitable.gi");
-    ReadPackage( "GraphBacktracking", "gap/constraints/simpleconstraints.g");
-    ReadPackage( "GraphBacktracking", "gap/constraints/normaliser.g");
-    ReadPackage( "GraphBacktracking", "gap/constraints/canonicalconstraints.g");
-    ReadPackage( "GraphBacktracking", "gap/constraints/conjugacy.g");
-    ReadPackage( "GraphBacktracking", "gap/constraints/digraphs.g");
-    ReadPackage( "GraphBacktracking", "gap/refiners.gi");
+    _ReadGBPackage( "gap/GraphBacktracking.gi");
+    _ReadGBPackage( "gap/Equitable.gi");
+    _ReadGBPackage( "gap/constraints/simpleconstraints.g");
+    _ReadGBPackage( "gap/constraints/normaliser.g");
+    _ReadGBPackage( "gap/constraints/canonicalconstraints.g");
+    _ReadGBPackage( "gap/constraints/conjugacy.g");
+    _ReadGBPackage( "gap/constraints/digraphs.g");
+    _ReadGBPackage( "gap/refiners.gi");
 
     Perform(["GB_Con", "_GB"],
             SetNamesForFunctionsInRecord);