From 1d71a43cca77e1576cc1568298d5886a60c9b884 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Wed, 19 Sep 2007 15:30:04 +0000 Subject: 2007-09-19 Gabriel Dos Reis * Makefile.pamphlet (all-interpsys): Now depend on all-depsys. src/interp/ 2007-09-19 Gabriel Dos Reis * util.lisp.pamphlet ($directory-list): Move to sys-globals.boot. ($library-directory-list): Likewise. * spad.lisp.pamphlet: Import "bootlex". * preparse.lisp.pamphlet: Import "fnewmeta". * postprop.lisp: Import "macros". * postpar.boot.pamphlet: Import "postprop". * nlib.lisp.pamphlet (rdefiostream): Define unconditionally. (get-io-index-stream): Likewise. (makedir): Likewise. (get-directory-list): Don't use $current-diretory. ($filetype-table): Move to sys-constants.boot. * patches.lisp.pamphlet ($current-directory): Remove. (|cd|): Simplify implementation. * newaux.lisp.pamphlet: Import "macros". (|PARSE-NewKEY|): Define. * metalex.lisp: Move various file, line, stack, character utilities to here. * macros.lisp.pamphlet (NREVERSE0): Move to sys-macros.lisp. Tidy. * fnewmeta.lisp.pamphlet: Import "parsing". * comp.lisp: Import "macros". * def.lisp: Likewise. (B-MDEF): Fix thinko. * bootlex.lisp: Import "preparse", "def", and "nlib". (BOOT-LINE-STACK): Move to metalex.lisp. (NEXT-LINES-CLEAR): Likewise. (NEXT-LINES-SHOW): Likewise. (XCAPE): Likewise. (KEYWORDS): Likewise. * Makefile.pamphlet (${DEPSYS}): Now have all Lisp in compiled form and load them. * bookvol5.pamphlet ($current-directory): Remove. --- src/interp/spad.lisp.pamphlet | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src/interp/spad.lisp.pamphlet') diff --git a/src/interp/spad.lisp.pamphlet b/src/interp/spad.lisp.pamphlet index bfd0a1be..010aa043 100644 --- a/src/interp/spad.lisp.pamphlet +++ b/src/interp/spad.lisp.pamphlet @@ -57,11 +57,11 @@ ; NAME: Scratchpad Package ; PURPOSE: This is an initialization and system-building file for Scratchpad. +(IMPORT-MODULE "bootlex") (in-package "BOOT") ;;; Common Block -(defvar |$UserLevel| '|development|) (defvar |$preserveSystemLisplib| t "if nil finalizeLisplib does MA REP") (defvar |$incrementalLisplibFlag| nil "checked in compDefineLisplib") (defvar |$reportInstantiations| nil) @@ -146,7 +146,6 @@ (RETURN (PROGN (S-PROCESS X) NIL)))) ;; NIL needed below since END\_UNIT is not generated by current parser -(defun |isTokenDelimiter| () (MEMBER (CURRENT-SYMBOL) '(\) END\_UNIT NIL))) (defun |traceComp| () (SETQ |$compCount| 0) @@ -365,11 +364,11 @@ (declare (special CURSTRM |$s| |$x| |$m| CUROUTSTREAM)) (SETQ |$exitModeStack| ()) (SETQ |$postStack| nil) - (SETQ $TRACEFLAG T) + (SETQ |$TraceFlag| T) (if (NOT X) (RETURN NIL)) (setq X (if $BOOT (DEF-RENAME (|new2OldLisp| X)) (|parseTransform| (|postTransform| X)))) - (if |$TranslateOnly| (RETURN (SETQ |$Translation| X))) + ;; (if |$TranslateOnly| (RETURN (SETQ |$Translation| X))) (when |$postStack| (|displayPreCompilationErrors|) (RETURN NIL)) (COND (|$PrintOnly| (format t "~S =====>~%" |$currentLine|) @@ -432,12 +431,6 @@ (setq *prompt* 'new) -(defun parserState () - (PRINT (LIST 'CHR= CHR 'NBLNK= NBLNK 'TOK= TOK 'ISID= ISID - 'COUNT= COUNT 'COLUMN= COLUMN)) - (PRINT (LIST 'STACK= STACK 'STACKX= STACKX)) - (PRINT (LIST '$TOKSTACK= $TOKSTACK 'INPUTSTREAM= INPUTSTREAM))) - (defmacro try (X) `(LET ((|$autoLine|)) (declare (special |$autoLine|)) -- cgit v1.2.3