* sys-macros.lisp: New.

	* sys-globals.boot: Import sys-constants.
	* macros.lisp.pamphlet (|$compilingMape): Move to sys-globals.boot.
	(|$definingMap|): Likewise.
	($TRACELETFLAG): Likewise.
	($NEWSPAD): Likewise.
	($BOOT): Likewise.
	(MOAN): Move to diagnostic.boot
	(FAIL): Likewise.
	(KAR): move to sys-macros.lisp
	(KDR): Likewise.
	(KADR): Likewise.
	(KADDR): Likewise.
	(|function|): Likewise.
	(|dispatchFunction|): Likewise.
	(QEQCAR): Likewise.
	(BOOT-EQUAL): Likewise.
	(IDENT-CHAR-LIT): Likewise.
	(EQQUAL): Likewise.
	(NEQUAL): Likewise.
	(EQUABLE): Likewise.
	(MKQ): Likewise.
	(IS): Likewise.
	(LETT): Likewise.
	(SPADLET): Likewise.
	(RPLAC): Likewise.
	(CARCDREXPAND): Likewise.
	(RENAME): Likewise.
	(CARCDRX1): Likewise.
	(APPLYR): Likewise.
	(REPEAT): Likewise.
	(REPEAT-TRAN): Likewise.
	(MKPF): Likewise.
	(MKPFFLATTEN): Likewise.
	(MKPFFLATTEN-1): Likewise.
	(MKPF1): Likewise.
	(-REPEAT): Likewise.
	(SEQOPT): Likewise.
	(SUCHTHATCLAUSE): Likewise.
	(SPADDO): Likewise.
	(SPAD_LET): Likewise.
	(COLLECT): Likewise.
	(COLLECTVEC): Likewise.
	(COLLECTV): Likewise.
	(MKQSADD1): Likewise.
	(YIELD): Likewise.
	(REMFLAG): Likewise.
	(FLAGP): Likewise.
	(INTERNL): Likewise.
	(SPADCATCH): Likewise.
	(SPADTHROW): Likewise.
	(IEQUAL): Likewise.
	(GE): Likewise.
	(GT): Likewise.
	(LE): Likewise.
	(LT): Likewise.
	(QSADDMOD): Likewise.
	(QSDIFMOD): Likewise.
	(QSMULTMOD): Likewise.
	(NLIST): Likewise.
	(SPADREDUCE): Likewise.
	(AND2): Likewise.
	(OR2): Likewise.
	(REDUCE-1): Likewise.
 	(-REDUCE): Likewise.
	(-REDUCE-OP): Likewise.
	(NREVERSE-N): Likewise.
	(CONS-N): Likewise.
	(APPEND-N): Likewise.
	(REDUCE-N): Likewise.
	(REDUCE-N-1): Likewise.
	(REDUCE-N-2): Likewise.
	(THETA): Likewise.
	(THETA1): Likewise.
	(THETA_ERROR): Likewise.
	(SPADFIRST): Likewise.
	(FIRST-ERROR): Likewise.
	(ELEM): Likewise.
	(TAIL): Likewise.
	(PARTCODET): Likewise.
	(SPADCALL): Likewise.
	(S+): Likewise.
	(S*): Likewise.
	(S-): Likewise.
	(DELASC): Likewise.
	(|char|): Likewise.
	(MAKE-BF): Likewise.
	(MAKE-FLOAT): Likewise.
	* def.lisp.pamphlet (MK_LEFORM): Move to sys-macros.lisp.
	(MK_LEFORM-CONS): Likewise.
	* Makefile.pamphlet (${DEPSYS}): Depend on sys-macros.lisp.
	(sys-globals.$(FASLEXT)): New rule.

1 files changed, 0 insertions, 20 deletions

diff --git a/src/interp/def.lisp.pamphlet b/src/interp/def.lisp.pamphlet
index 6b0228c1..de62641d 100644
--- a/src/interp/def.lisp.pamphlet
+++ b/src/interp/def.lisp.pamphlet
@@ -381,25 +381,6 @@ foo defined inside of fum gets renamed as fum,foo.")
                     (LIST ''T (LIST 'LET_ERROR (LIST 'MAKESTRING
                                                   (MK_LEFORM FORM)) G))  ) )))
 
-(defun MK_LEFORM (U)
-  (COND ((IDENTP U) (PNAME U))
-        ((STRINGP U) U)
-        ((ATOM U) (STRINGIMAGE U))
-        ((MEMBER (FIRST U) '(VCONS CONS) :test #'eq)
-         (STRCONC "(" (MK_LEFORM-CONS U) ")") )
-        ((EQ (FIRST U) 'LIST) (STRCONC "(" (MK_LEFORM (SECOND U)) ")") )
-        ((EQ (FIRST U) 'APPEND) (STRCONC "(" (MK_LEFORM-CONS U) ")") )
-        ((EQ (FIRST U) 'QUOTE) (MK_LEFORM (SECOND U)))
-        ((EQ (FIRST U) 'EQUAL) (STRCONC "=" (MK_LEFORM (SECOND U)) ))
-        ((EQ (FIRST U) 'SPADLET) (MK_LEFORM (THIRD U)))
-        ((ERRHUH))))
-
-(defun MK_LEFORM-CONS (U)
-  (COND ((ATOM U) (STRCONC ":" (MK_LEFORM U)))
-        ((EQ (FIRST U) 'APPEND)
-         (STRCONC ":" (MK_LEFORM (SECOND U)) "\," (MK_LEFORM-CONS (THIRD U)) ))
-        ((EQ (THIRD U) NIL) (MK_LEFORM (SECOND U)))
-        ((STRCONC (MK_LEFORM (SECOND U)) "\," (MK_LEFORM-CONS (THIRD U))))))
 
 (defun LET_ERROR (FORM VAL)
   (|systemError| (format nil "~S is not matched by structure ~S~%" FORM VAL)))
@@ -563,7 +544,6 @@ foo defined inside of fum gets renamed as fum,foo.")
     (SETQ $DEFSTACK (CONS (LIST (CONS OP (CDR XP)) Y) $DEFSTACK))
     NIL))
 
-(defun ERRHUH () (|systemError| "problem with BOOT to LISP translation"))
 
 (mapcar #'(lambda (x) (MAKEPROP (first X) 'SEL\,FUNCTION (second X)))
         '((|aTree| 0)           (|aMode| 1)