aboutsummaryrefslogtreecommitdiff
path: root/src/interp
diff options
context:
space:
mode:
Diffstat (limited to 'src/interp')
-rw-r--r--src/interp/ChangeLog6
-rw-r--r--src/interp/Makefile.in5
-rw-r--r--src/interp/Makefile.pamphlet5
-rw-r--r--src/interp/i-toplev.boot53
-rw-r--r--src/interp/intint.lisp149
5 files changed, 61 insertions, 157 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index 653eb421..3796a75e 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,5 +1,11 @@
2007-11-28 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * Makefile.pamphlet (INOBJS): Don't include intint.$(FASLEXT).
+ (intint.$(FASLEXT)): Remove rule.
+ * intint.lisp: Move essential content to i-toplev.boot. Remove.
+
+2007-11-28 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* postprop.$(FASLEXT): Remove rule.
* Makefile.pamphlet (OPOBJS): Don't include it anymore.
(postpar.$(FASLEXT)): Update requirement.
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 1dda3f17..70bfb783 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -80,7 +80,7 @@ OBJS= vmlisp.$(FASLEXT) hash.$(FASLEXT) \
interpsys_modules = $(patsubst %.$(FASLEXT), "%", $(OBJS))
INOBJS= varini.$(FASLEXT) \
- setvart.$(FASLEXT) intint.$(FASLEXT) \
+ setvart.$(FASLEXT)\
interop.$(FASLEXT) \
patches.$(FASLEXT)
@@ -404,9 +404,6 @@ rulesets.$(FASLEXT): rulesets.boot vmlisp.$(FASLEXT)
osyscmd.$(FASLEXT): osyscmd.boot int-top.$(FASLEXT)
$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
-intint.$(FASLEXT): intint.lisp i-toplev.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
-
int-top.$(FASLEXT): int-top.boot incl.$(FASLEXT) i-toplev.$(FASLEXT) \
unlisp.$(FASLEXT)
$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index 35641fcf..f1d11c57 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -181,7 +181,7 @@ file contains last-minute changes to various functions and
constants.
<<environment>>=
INOBJS= varini.$(FASLEXT) \
- setvart.$(FASLEXT) intint.$(FASLEXT) \
+ setvart.$(FASLEXT)\
interop.$(FASLEXT) \
patches.$(FASLEXT)
@@ -739,9 +739,6 @@ rulesets.$(FASLEXT): rulesets.boot vmlisp.$(FASLEXT)
osyscmd.$(FASLEXT): osyscmd.boot int-top.$(FASLEXT)
$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
-intint.$(FASLEXT): intint.lisp i-toplev.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
-
int-top.$(FASLEXT): int-top.boot incl.$(FASLEXT) i-toplev.$(FASLEXT) \
unlisp.$(FASLEXT)
$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
diff --git a/src/interp/i-toplev.boot b/src/interp/i-toplev.boot
index b94a5ca8..c7b1231d 100644
--- a/src/interp/i-toplev.boot
+++ b/src/interp/i-toplev.boot
@@ -35,6 +35,18 @@ import '"i-analy"
--% Top Level Interpreter Code
+$intCoerceFailure ==
+ "coerceFailure"
+
+$intTopLevel ==
+ "top__level"
+
+$intSpadReader ==
+ "SPAD__READER"
+
+$intRestart ==
+ "restart"
+
-- When $QuiteCommand is true Spad will not produce any output from
-- a top level command
$QuietCommand := NIL
@@ -333,3 +345,44 @@ interpret2(object,m1,posnForm) ==
if (ans := coerceInteractive(object,m1)) then ans
else throwKeyedMsgCannotCoerceWithValue(x,m,m1)
object
+
+--%
+intSayKeyedMsg(key, args) ==
+ sayKeyedMsg(packageTran key, packageTran args)
+
+intProcessSynonyms str ==
+ LINE: fluid := str
+ processSynonyms
+ LINE
+
+intInterpretPform pf ==
+ processInteractive(zeroOneTran packageTran pf2Sex pf, pf)
+
+SpadInterpretFile fn ==
+ SpadInterpretStream(1, fn, nil)
+
+intNewFloat() ==
+ ["Float"]
+
+intSetNeedToSignalSessionManager() ==
+ $NeedToSignalSessionManager := true
+
+setCurrentLine s ==
+ $currentLine :=
+ null $currentLine => s
+ STRINGP $currentLine =>
+ [$currentLine, :(STRINGP s => [s]; s)]
+ RPLACD(lastNode $currentLine, (STRINGP s => [s]; s))
+ $currentLine
+
+
+intnplisp s ==
+ $currentLine := s
+ nplisp $currentLine
+
+intSetQuiet() ==
+ $QuietCommand := true
+
+intUnsetQuiet() ==
+ $QuietCommand := false
+
diff --git a/src/interp/intint.lisp b/src/interp/intint.lisp
deleted file mode 100644
index b3f8de0d..00000000
--- a/src/interp/intint.lisp
+++ /dev/null
@@ -1,149 +0,0 @@
-;; Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
-;; All rights reserved.
-;; Copyright (C) 2007, Gabriel Dos Reis.
-;; All rights reserved.
-;;
-;; Redistribution and use in source and binary forms, with or without
-;; modification, are permitted provided that the following conditions are
-;; met:
-;;
-;; - Redistributions of source code must retain the above copyright
-;; notice, this list of conditions and the following disclaimer.
-;;
-;; - Redistributions in binary form must reproduce the above copyright
-;; notice, this list of conditions and the following disclaimer in
-;; the documentation and/or other materials provided with the
-;; distribution.
-;;
-;; - Neither the name of The Numerical ALgorithms Group Ltd. nor the
-;; names of its contributors may be used to endorse or promote products
-;; derived from this software without specific prior written permission.
-;;
-;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-;; IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-;; TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-;; PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-;; OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-;; EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-;; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-;; PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-import '"i-toplev"
-(in-package "BOOT")
-
-(defun |intSayKeyedMsg| (key args)
- (|sayKeyedMsg| (|packageTran| key) (|packageTran| args)))
-
-;;(defun |intMakeFloat| (int frac len exp)
-;; (MAKE-FLOAT int frac len exp))
-
-;;(defun |intSystemCommand| (command)
-;; (catch 'SPAD_READER
-;; (|systemCommand| (|packageTran| command))))
-
-;;(defun |intUnAbbreviateKeyword| (keyword)
-;; (|unAbbreviateKeyword| (|packageTran| keyword)))
-
-(defun |intProcessSynonyms| (str)
- (let ((LINE str))
- (declare (special LINE))
- (|processSynonyms|)
- LINE))
-
-;; (defun |intNoParseCommands| ()
-;; |$noParseCommands|)
-
-;;(defun |intTokenCommands| ()
-;; |$tokenCommands|)
-
-(defun |intInterpretPform| (pf)
- (|processInteractive| (|zeroOneTran| (|packageTran| (|pf2Sex| pf))) pf))
-
-;;(defun |intSpadThrow| ()
-;; (|spadThrow|))
-
-;;(defun |intMKPROMPT| (should? step)
-;; (if should? (PRINC (MKPROMPT))))
-
-(defvar |$intCoerceFailure| '|coerceFailure|)
-(defvar |$intTopLevel| '|top_level|)
-(defvar |$intSpadReader| 'SPAD_READER)
-(defvar |$intRestart| '|restart|)
-
-;;(defun |intString2BootTree| (str)
-;; (|string2BootTree| str))
-
-;;(defun |intPackageTran| (sex)
-;; (|packageTran| sex))
-
-;;--------------------> NEW DEFINITION (override in i-syscmd.boot.pamphlet)
-(defun |stripSpaces| (str)
- (string-trim '(#\Space) str))
-
-;;(defvar |$SessionManager| |$SessionManager|)
-;;(defvar |$EndOfOutput| |$EndOfOutput|)
-
-;;(defun |intServerReadLine| (foo)
-;; (|serverReadLine| foo))
-
-;; (defun |intProcessSynonym| (str)
-;; (|npProcessSynonym| str))
-
-(defun |SpadInterpretFile| (fn)
- (|SpadInterpretStream| 1 fn nil) )
-
-(defun |intNewFloat| ()
- (list '|Float|))
-
-;; (defun |intDoSystemCommand| (string)
-;; (|doSystemCommand| string))
-
-(defun |intSetNeedToSignalSessionManager| ()
- (setq |$NeedToSignalSessionManager| T))
-
-;; (defun |intKeyedSystemError| (msg args)
-;; (|keyedSystemError| msg args))
-
-;;#-:CCL
-;;(defun |stashInputLines| (l)
-;; (|stashInputLines| l))
-
-;;(defun |setCurrentLine| (s)
-;; (setq |$currentLine| s))
-
-(defun |setCurrentLine| (s)
- (setq |$currentLine|
- (cond ((null |$currentLine|) s)
- ((stringp |$currentLine|)
- (cons |$currentLine|
- (if (stringp s) (cons s nil) s)))
- (t (rplacd (last |$currentLine|)
- (if (stringp s) (cons s nil) s))
- |$currentLine|))))
-
-(defun |intnplisp| (s)
- (setq |$currentLine| s)
- (|nplisp| |$currentLine|))
-
-;; (defun |intResetStackLimits| () (|resetStackLimits|))
-
-(defun |intSetQuiet| ()
- (setq |$QuietCommand| T))
-
-(defun |intUnsetQuiet| ()
- (setq |$QuietCommand| NIL))
-
-;; (defun |expandTabs| (s)
-;; (expand-tabs s))
-
-;; #-:CCL
-;; (defun |leaveScratchpad| ()
-;; (|leaveScratchpad|))
-
-;;(defun |readingFile?| ()
-;; |$ReadingFile|)
-