* interp/trace.boot (untraceDomainLocalOps): Tidy.

	* interp/spaderror.lisp (|$quitTag|): Define as constant.
	(|$numericFailure|): Likewise.
	* interp/spad.lisp: Import "postpar" and "debug".
	($): Remove toplevel assignment.
	(|traceComp|): Tidy.
	(/FLAG): Remove.
	(*PROMPT*): Remove.
	(|New,ENTRY,1|): Don't declare it.  Tidy.
	(|New,ENTRY,2|): Fix typo.
	* interp/sfsfun-l.lisp (rbesselj): Remove extraneous right
	parenthesis. 
	(rbesseli): Likewise.
	* interp/patches.lisp: Import "sockio" instead of "debug"
	(|$useInternalHistoryTable|): Don't define here.
	(user::start): Remove.
	(/RF-1): Declare ECHO-META special.
	(READSPADEXPR): Declare IN-STREAM special.
	(|$ViewportProcessToWatch|): Declare.
	(echo-meta): Don't set here.
	* interp/packtran.boot (rePackageTran): Tidy.
	* interp/nspadaux.lisp (|$underscoreChar|): Define.
	(|$markChoices|): Likewise.
	(|$convert2NewCompiler|): Likewise.
	(|$AnalyzeOnly|): Likewise.
	(|$categoryPart|): Likewise.
	(|$insideCAPSULE|): Likewise.
	(|$insideEXPORTS|): Likewise.
	(|$originalSignature|): Likewise.
	(|$insideDEF|): Likewise.
	(|$insideTypeExpression|): Likewise.
	(|$spadTightList|): Likewise.
	(|$PerCentVariableList|): Likewise.
	* interp/nrunopt.boot (augmentPredCode): Fix typo.
	* interp/nlib.lisp (*LISP-BIN-FILETYPE*): Remove.
	(recompile-lib-file-if-necessary): Use $faslType.  Unconditionally
	define.
	* interp/lisplib.boot (compDefineLisplib): Tidy.
	* interp/interop.boot (SExprToDName): Tidy.
	(oldAxiomPreCategoryDevaluate): Likewise.
	(hashNewLookupInCategories): Likewise.
	* interp/g-util.boot (get): Adjust return type.
	(get0): Likewise.
	(get1): Likewise.
	(get2): Likewise.
	* interp/foam_l.lisp: Tidy.
	* interp/define.boot (maybeInsertViewMorphisms): Fix typo.
	* interp/debug.lisp (/breakcondition): Declare.
	* interp/sys-utility.boot (getSystemModulePath): New.
	* interp/daase.lisp (|with|): Remove
	(|library|): Move i-syscmd.boot
	(initial-getdatabase): Use getSystemModulePath.
	(getdatabase): Likewise.
	(addoperations): Don't reference package LISP.
	(localdatabase): Likewise.
	(write-interpdb): Don't declare *print-prett* special.
	(write-browsedb): Likewise.
	(write-categorydb): Likewise.

1 files changed, 8 insertions, 19 deletions

diff --git a/src/interp/spad.lisp b/src/interp/spad.lisp
index 21b3d8b8..5ef272b0 100644
--- a/src/interp/spad.lisp
+++ b/src/interp/spad.lisp
@@ -1,6 +1,6 @@
 ;; Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 ;; All rights reserved.
-;; Copyright (C) 2007, Gabriel Dos Reis.
+;; Copyright (C) 2007-2008, Gabriel Dos Reis.
 ;; All rights reserved.
 ;;
 ;; Redistribution and use in source and binary forms, with or without
@@ -36,6 +36,8 @@
 ; PURPOSE: This is an initialization and system-building file for Scratchpad.
 
 (IMPORT-MODULE "bootlex")
+(import-module "postpar")
+(import-module "debug")
 (in-package "BOOT")
 
 ;;; Common  Block
@@ -53,9 +55,6 @@
 (defvar |$newCompAtTopLevel| nil "if t uses new compiler")
 (defvar |$doNotCompileJustPrint| nil "switch for compile")
 (defvar |$Rep| '|$Rep| "should be bound to gensym? checked in coerce")
-;; the following initialization of $ must not be a defvar
-;; since that make $ special
-(setq $ '$) ;; used in def of Ring which is Algebra($)
 (defvar |$scanIfTrue| nil "if t continue compiling after errors")
 (defvar |$Representation| nil "checked in compNoStacking")
 (defvar |$definition| nil "checked in DomainSubstitutionFunction")
@@ -128,7 +127,7 @@
                                     (LIST X " --> " Y '|%b| |yesOrNo| '|%d|)))
                (SETQ |$compCount| (1- |$compCount|))
                (RETURN U)  )))
-  (|comp| $x $m $f)
+  (|comp| |$x| |$m| |$f|)
   (UNEMBED '|comp|))
 
 (defun READ-SPAD (FN FM TO)
@@ -223,11 +222,6 @@
 
 (defun CPSAY (X) (let (n) (if (EQ 0 (setq N (OBEY X))) NIL (PRINT N))))
 
-(defun /FLAG (L)
-  (MAKEPROP (FIRST L) 'FLAGS (LET ((X (UNION (CDR L)))) (GET (FIRST L) 'FLAGS)))
-  (SAY (FIRST L) " has flags: " X)
-  (TERSYSCOMMAND))
-
 (defun |fin| ()
   (SETQ *EOF* 'T)
   (THROW 'SPAD_READER NIL))
@@ -351,10 +345,8 @@
 
 (defun |evalSharpOne| (x \#1) (declare (special \#1)) (EVAL x))
 
-(setq *PROMPT* 'LISP)
-
 (defun |New,ENTRY,1| ()
-    (let (ZZ str N RLGENSYMFG RLGENSYMLST |NewFLAG| XCAPE *PROMPT*
+    (let (ZZ str N RLGENSYMFG RLGENSYMLST |NewFLAG| XCAPE
           SINGLELINEMODE OK ISID NBLNK COUNT CHR ULCASEFG ($LINESTACK 'BEGIN_UNIT)
           $TOKSTACK COMMENTCHR TOK LINE BACK INPUTSTREAM XTRANS
           XTOKENREADER STACK STACKX TRAPFLAG)
@@ -362,12 +354,11 @@
             XTOKENREADER 'NewSYSTOK
             SYNTAX_ERROR 'SPAD_SYNTAX_ERROR)
       (FLAG |boot-NewKEY| 'KEY)
-      (SETQ *PROMPT* 'Scratchpad-II)
       (PROMPT)
       (SETQ XCAPE '_)
       (SETQ COMMENTCHR 'IGNORE)
-      (SETQ COLUMN 0)
-      (SETQ SINGLINEMODE T)   ; SEE NewSYSTOK
+      (SETQ INITCOLUMN 0)
+      (SETQ SINGLELINEMODE T)   ; SEE NewSYSTOK
       (SETQ NewFLAG T)
       (SETQ ULCASEFG T)
       (setq STR (|New,ENTRY,2| '|PARSE-NewEXPR| '|process| curinstream))
@@ -379,7 +370,7 @@
 (defun |New,ENTRY,2| (RULE FN INPUTSTREAM) (declare (special INPUTSTREAM))
   (let (zz)
       (INITIALIZE)
-      (SETQ $previousTime (TEMPUS-FUGIT))
+      (SETQ |$previousTime| (TEMPUS-FUGIT))
       (setq ZZ (CONVERSATION '|PARSE-NewExpr| '|process|))
       (REMFLAG |boot-NewKEY| 'KEY)
       INPUTSTREAM))
@@ -388,8 +379,6 @@
   (init-boot/spad-reader)
   (initialize-preparse INPUTSTREAM))
 
-(setq *prompt* 'new)
-
 (defmacro try (X)
   `(LET ((|$autoLine|))
         (declare (special |$autoLine|))