From 3eb3cdcbc53db2af4e6f1cce49da52594c3160d5 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Tue, 4 Sep 2007 19:12:39 +0000
Subject: 	* bootfuns.lisp.pamphlet (|$CategoryFrame|): Move to
 sys-globals.boot. 	* setq.lisp.pamphlet (|$CategoryFrame|): Don't set
 here.

---
 src/interp/ChangeLog              |  5 +++++
 src/interp/bootfuns.lisp.pamphlet | 10 ----------
 src/interp/setq.lisp.pamphlet     | 14 --------------
 src/interp/sys-globals.boot       |  6 ++++++
 4 files changed, 11 insertions(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index 56764550..b2ae9cd6 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-04  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* bootfuns.lisp.pamphlet (|$CategoryFrame|): Move to sys-globals.boot.
+	* setq.lisp.pamphlet (|$CategoryFrame|): Don't set here.
+
 2007-09-03  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* bootfuns.lisp.pamphlet ($LISPLIB): Move to sys-globals.boot.
diff --git a/src/interp/bootfuns.lisp.pamphlet b/src/interp/bootfuns.lisp.pamphlet
index bfb18a6c..ed8b3dc0 100644
--- a/src/interp/bootfuns.lisp.pamphlet
+++ b/src/interp/bootfuns.lisp.pamphlet
@@ -105,16 +105,6 @@ offer it as extensions.
      (export '(,p) "BOOT")))
 
 
-;  modemap:==  ( <map> (p e) (p e) ... (p e) )
-;  modemaplist:= ( modemap ... )
-
-(def-boot-val |$CategoryFrame|
-	  '((((|Category| . ((|modemap| (((|Category|) (|Category|)) (T *)))))
-	      (|Join| . ((|modemap|
-      (((|Category|) (|Category|) (|Category|) (|Category|)) (T *))
-      (((|Category|) (|Category|) (|List| |Category|)) (|Category|)) (T *))
-	)))))
-	"Compiler>CUtil.boot")
 (def-boot-val |$spadLibFT| 'LISPLIB		    "???")
 @
 \eject
diff --git a/src/interp/setq.lisp.pamphlet b/src/interp/setq.lisp.pamphlet
index 11f58eab..a9755811 100644
--- a/src/interp/setq.lisp.pamphlet
+++ b/src/interp/setq.lisp.pamphlet
@@ -348,20 +348,6 @@
      |t#31| |t#32| |t#33| |t#34| |t#35| |t#36| |t#37| |t#38| |t#39| |t#40|
      |t#41| |t#42| |t#43| |t#44| |t#45| |t#46| |t#47| |t#48| |t#49| |t#50|))
 
-;"  modemap:==  ( <map> (p e) (p e) ... (p e) )  "
-;"  modemaplist:= ( modemap ... )  "
-(SETQ |$CategoryFrame| '(((
-  (|Category| .
-    ((|modemap|
-      ( ((|Category|) (|Category|)) (T *) )
-	)))
-  (|Join| .
-    ((|modemap|
-      ( ((|Category|) (|Category|) (|Category|) (|Category|)) (|T| *) )
-      ( ((|Category|) (|Category|) (|List| (|Category|)) (|Category|)) (T *) )
-	)))
-    ))))
-
 (SETQ NRTPARSE NIL)
 (SETQ |$NRTflag| T)
 (SETQ |$NRTaddForm| NIL)
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index 8bcbaf39..a31bf340 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -327,3 +327,9 @@ $reportCompilation := false
 
 ++
 $LISPLIB := false
+
+++
+$CategoryFrame :=
+  '((((Category (modemap (((Category) (Category)) (T *))))_
+      (Join (modemap (((Category) (Category) (Category)) (T *))_
+                     (((Category) (Category) (List Category)) (T *)))))))
-- 
cgit v1.2.3