Merge 14aaa3c into 467c769

PackageInfo.g

@@ -78,7 +78,39 @@ AvailabilityTest := function()
  return f<>fail;
 end,
 
-BannerString := Concatenation(~.PackageName, " ", String(~.Version), " ...\n"),
+BannerFunction := function(info)
+ local str, modules;
+
+ str:= DefaultPackageBannerString(info);
+ modules := [];
+
+ if IsBound(MPFR_INT) then
+ Add(modules,"mpfr");
+ fi;
+ if IsBound(MPFI_INT) then
+ Add(modules,"mpfi");
+ fi;
+ if IsBound(MPC_INT) then
+ Add(modules,"mpc");
+ fi;
+ if IsBound(@FPLLL) then
+ Add(modules,"fplll");
+ fi;
+ if IsBound(CXSC_INT) then
+ Add(modules,"cxsc");
+ fi;
+ if Length(modules) = 0 then
+ modules := "none";
+ else
+ modules := JoinStringsWithSeparator(modules, ", ");
+ fi;
+
+ return ReplacedString(str, "Homepage",
+ Concatenation( "Loaded modules: ", modules, "\n",
+ "Homepage") );
+end,
+
+
 TestFile := "tst/testall.g",
 Keywords := ["floating-point"]
 ));

read.g

@@ -17,31 +17,22 @@
 ReadPackage("float", "lib/polynomial.gi");
 ReadPackage("float", "lib/pslq.gi");
 
-modules@ := [];
 if IsBound(MPFR_INT) then
- Add(modules@,"mpfr");
  ReadPackage("float", "lib/mpfr.gi");
 fi;
 if IsBound(MPFI_INT) then
- Add(modules@,"mpfi");
  ReadPackage("float", "lib/mpfi.gi");
 fi;
 if IsBound(MPC_INT) then
- Add(modules@,"mpc");
  ReadPackage("float", "lib/mpc.gi");
 fi;
 if IsBound(@FPLLL) then
- Add(modules@,"fplll");
  ReadPackage("float", "lib/fplll.gi");
 fi;
 if IsBound(CXSC_INT) then
- Add(modules@,"cxsc");
  ReadPackage("float", "lib/cxsc.gi");
 fi;
 
-PackageInfo("float")[1].BannerString := Concatenation("Loading modules [",JoinStringsWithSeparator(modules@,", "),"] for ",PackageInfo("float")[1].BannerString);
-Unbind(modules@);
-
 if IsBound(IO_Pickle) then
  ReadPackage("float","lib/pickle.g");
 else