* Makefile.pamphlet (${DEPSYS}): Depend on g-util.$(FASLEXT).

	Load explicitly.
	(<<profile.clisp>>): Remove.
	(<<g-cndata.clisp>>): Likewise.
	(<<g-opt.clisp>>): Likewise.
	(<<g-timer.clisp>>): Likewise.
	(<<hypertex.clisp>>): Likewise.
	(<<rulesets.clisp>>): Likewise.
	(<<ht-util.clisp>>): Likewise.
	(<<htsetvar.clisp>>): Likewise.
	(<<ht-root.clisp>>): Likewise.
	(<<htcheck.clisp>>): Likewise.
	(ht-root.$(FASLEXT)): New rule.
	(htcheck.$(FASLEXT)): Likewise.
	(ht-util.$(FASLEXT)): Likewise.
	(htsetvar.$(FASLEXT)): Likewise.
	(hypertex.$(FASLEXT)): Likewise.
	(profile.$(FASLEXT)): Likewise.
	(rulesets.$(FASLEXT)): Likewise.
	(g-opt.$(FASLEXT)): Likewise.
	(g-timer.$(FASLEXT)): Likewise.
	(g-util.$(FASLEXT)): Likewise.
	(g-cndata.$(FASLEXT)): Likewise.
	* daase.lisp.pamphlet (*attributes*): Move definition to
	sys-constants.boot.
	* g-cndata.boot.pamphlet: Push into package "BOOT".  Fix syntax.
	* g-opt.boot.pamphlet: Likewise.
	(EqualBarGensym): Fix thinko.
	* g-timer.boot.pamphlet: Push into package "BOOT".
	* g-util.boot.pamphlet: Likewise.
	* ht-root.boot.pamphlet: Likewise.  Fix syntax.
	* ht-util.boot.pamphlet: Push into package "BOOT".
	* htcheck.boot.pamphlet: Likewise.
	* htsetvar.boot.pamphlet: Likewise.
	* hypertex.boot.pamphlet: Likewise. Fix syntax.
	* profile.boot.pamphlet: Likewise.
	* rulesets.boot.pamphlet: Likewise.
	* setq.lisp.pamphlet (/VERSION): Move definition to sys-globals.boot.
	* spad.lisp.pamphlet (/WSNAME): Likewise.
	(|rplac|): Move to sys-macros.boot.

1 files changed, 15 insertions, 12 deletions

diff --git a/src/interp/rulesets.boot.pamphlet b/src/interp/rulesets.boot.pamphlet
index b2ceefa6..9c1ccd82 100644
--- a/src/interp/rulesets.boot.pamphlet
+++ b/src/interp/rulesets.boot.pamphlet
@@ -46,6 +46,9 @@
 <<*>>=
 <<license>>
 
+import '"vmlisp"
+)package "BOOT"
+
 --% Mode and Type Resolution Rule Data and Ruleset Creation
 
 --% resolveTT Rules
@@ -62,7 +65,7 @@
 
 -- These first rules will be expanded for each of MP, DMP and NDMP
 
-SETANDFILEQ($mpolyTTRules,'( _
+$mpolyTTRules == '( _
   ((Resolve (RN) (mpoly1 x t1)) . (mpoly1 x (Resolve (RN) t1))) _
   ((Resolve (UP x t1) (mpoly1 y t2)) . _
     (Resolve t1 (mpoly1 (Incl x y) t2))) _
@@ -79,11 +82,11 @@ SETANDFILEQ($mpolyTTRules,'( _
   ((Resolve (mpoly1 x t1) (mpoly1 y t2)) . _
     (mpoly1 (SetInter x y) (Resolve _
       (mpoly1 (SetDiff x y) t1) (mpoly1 (SetDiff y x) t2)))) _
-  ))
+  )
 
 -- These are the general rules, excluding those above.
 
-SETANDFILEQ($generalTTRules, '( _
+$generalTTRules == '( _
   ((Resolve (L (L t1)) (M t2)) . (M (Resolve t1 t2))) _
   ((Resolve (EQ t1) (B)) . (B)) _
   ((Resolve (SY) t1) . (Resolve (P (I)) t1)) _
@@ -149,7 +152,7 @@ SETANDFILEQ($generalTTRules, '( _
   ((Resolve (DMP x t1) (NDMP y t2)) . _
     (DMP (SetInter x y) (Resolve _
       (DMP (SetDiff x y) t1) (NDMP (SetDiff y x) t2)))) _
-  ))
+  )
 
 -- The following creates the ruleset
 
@@ -169,7 +172,7 @@ createResolveTTRules() ==
 
 -- These first rules will be expanded for each of MP, DMP and NDMP
 
-SETANDFILEQ($mpolyTMRules,'( _
+$mpolyTMRules == '( _
   ((Resolve (mpoly1 x t1) (P t2)) . (Resolve t1 (P t2))) _
   ((Resolve (mpoly1 (x) t1) (UP x t2)) . (UP x (Resolve t1 t2))) _
   ((Resolve (mpoly1 x t1) (UP y t2)) . _
@@ -184,11 +187,11 @@ SETANDFILEQ($mpolyTMRules,'( _
     (mpoly2 y (Resolve (mpoly1 (SetComp x y) t1) t2))) _
   ((Resolve (mpoly1 x t1) (mpoly2 y t2)) . _
     (Resolve (mpoly1 (SetDiff x y) t1) (mpoly2 y t2))) _
- ))
+ )
 
 -- These are the general rules, excluding those above.
 
-SETANDFILEQ($generalTMRules,'( _
+$generalTMRules == '( _
   ((Resolve (VARIABLE x) (P t1)) . (P (Resolve (I) t1))) _
   ((Resolve (VARIABLE x) (UP y t1)) . _
     (UP (VarEqual x y) (Resolve (I) t1))) _
@@ -227,10 +230,10 @@ SETANDFILEQ($generalTMRules,'( _
   ((Resolve (V t1) (L t2)) . (L (Resolve t1 t2))) _
   ((Resolve (FF t1) (FR t2)) . (FR (Resolve t1 t2))) _
   ((Resolve (UP x t1) (P t2)) . (Resolve t1 (P t2))) _
- ))
+ )
 
 -- Private abbreviation table for resolve rules
-SETANDFILEQ($resolveAbbreviations, '( _
+$resolveAbbreviations == '( _
     (P .  Polynomial) _
     (G .  Gaussian) _
     (L .  List) _
@@ -260,9 +263,9 @@ SETANDFILEQ($resolveAbbreviations, '( _
     (ELFPS . EllipticFunctionPowerSeries) _
     (EF . ElementaryFunction) _
     (VARIABLE . Variable) _
- ))
+ )
 
-SETANDFILEQ($newResolveAbbreviations, '( _
+$newResolveAbbreviations == '( _
     (P .  Polynomial) _
     (G .  Complex) _
     (L .  List) _
@@ -285,7 +288,7 @@ SETANDFILEQ($newResolveAbbreviations, '( _
     (QF . Fraction) _
     (UPS . UnivariatePowerSeries) _
     (VARIABLE . Variable) _
- ))
+ )
 
 -- The following creates the ruleset