aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/interp/i-syscmd.boot17
-rw-r--r--src/interp/msgdb.boot4
-rw-r--r--src/interp/osyscmd.boot7
-rw-r--r--src/interp/patches.lisp11
4 files changed, 7 insertions, 32 deletions
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 6c91b725..d829e2aa 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -906,10 +906,9 @@ displayMacros names ==
getParserMacroNames() ==
REMDUP [CAR mac for mac in getParserMacros()]
---------------------> NEW DEFINITION (override in patches.lisp.pamphlet)
clearParserMacro(macro) ==
-- first see if it is one
- not IFCDR assoc(macro, ($pfMacros)) => NIL
+ not IFCDR assoc(macro, $pfMacros) => NIL
$pfMacros := REMALIST($pfMacros, macro)
displayMacro name ==
@@ -2888,7 +2887,6 @@ zsystemdevelopment1(l,im) ==
--% Synonym File Reader
---------------------> NEW DEFINITION (override in util.lisp.pamphlet)
processSynonyms() ==
p := STRPOS('")",LINE,0,NIL)
fill := '""
@@ -3091,15 +3089,11 @@ parseSystemCmd opt ==
[command, pform]
[tokTran tok for tok in dumbTokenize opt]
---------------------> NEW DEFINITION (override in osyscmd.boot.pamphlet)
parseFromString(s) ==
- $useNewParser =>
- ncParseFromString s
- $InteractiveMode :local := true
- $BOOT: local := NIL
- $SPAD: local := true
- $e:local := $InteractiveFrame
- string2SpadTree s
+ s := next(function ncloopParse,
+ next(function lineoftoks,incString s))
+ StreamNull s => nil
+ pf2Sex macroExpanded first rest first s
handleTokensizeSystemCommands(unabr, optionList) ==
optionList := [dumbTokenize opt for opt in optionList]
@@ -3113,7 +3107,6 @@ getFirstWord string ==
ltrace l == trace l
---------------------> NEW DEFINITION (see intint.lisp.pamphlet)
stripSpaces str ==
STRING_-TRIM([char '" "], str)
diff --git a/src/interp/msgdb.boot b/src/interp/msgdb.boot
index 8c38b9d1..0630ae35 100644
--- a/src/interp/msgdb.boot
+++ b/src/interp/msgdb.boot
@@ -841,9 +841,9 @@ brightPrintRightJustify x ==
-- some hooks for older functions
---------------------> NEW DEFINITION (see macros.lisp.pamphlet)
+
BRIGHTPRINT x == brightPrint x
---------------------> NEW DEFINITION (see macros.lisp.pamphlet)
+
BRIGHTPRINT_-0 x == brightPrint0 x
--% Message Formatting Utilities
diff --git a/src/interp/osyscmd.boot b/src/interp/osyscmd.boot
index eaa77cdf..c742d09a 100644
--- a/src/interp/osyscmd.boot
+++ b/src/interp/osyscmd.boot
@@ -47,10 +47,3 @@ ExecuteInterpSystemCommand string ==
string = '"" => nil
doSystemCommand string
---------------------> NEW DEFINITION (see i-syscmd.boot.pamphlet)
-parseFromString(s) ==
- s := next(function ncloopParse,
- next(function lineoftoks,incString s))
- StreamNull s => nil
- pf2Sex macroExpanded first rest first s
-
diff --git a/src/interp/patches.lisp b/src/interp/patches.lisp
index 5f68687b..6d599002 100644
--- a/src/interp/patches.lisp
+++ b/src/interp/patches.lisp
@@ -371,17 +371,6 @@
;; (|xdrRead| xfoo (make-array 10 :element-type 'long-float ))
;; (setq *print-array* NIL)
-;; clearParserMacro has problems as boot code (package notation)
-;; defined here in Lisp
-;;--------------------> NEW DEFINITION (see i-syscmd.boot.pamphlet)
-(DEFUN |clearParserMacro| (|macro|)
- (PROG ()
- (RETURN (COND
- ((NULL (IFCDR (|assoc| |macro| |$pfMacros|))) NIL)
- ((QUOTE T) (SPADLET |$pfMacros|
- (REMALIST |$pfMacros| |macro|)))))))
-;
-
(setq /MAJOR-VERSION 2)
(setq echo-meta nil)
(defun /versioncheck (n) (unless (= n /MAJOR-VERSION) (throw 'versioncheck -1)))