aboutsummaryrefslogtreecommitdiff
path: root/src/interp
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2013-05-29 01:43:22 +0000
committerdos-reis <gdr@axiomatics.org>2013-05-29 01:43:22 +0000
commit049fc29643eef2e73755317c7ef0d3bd57e40419 (patch)
tree7b77736adece47665318ed80ea0f7161c93c5ee4 /src/interp
parent73af2d0d8b8c4aa1b009dc85f616915fe2cc8eff (diff)
downloadopen-axiom-049fc29643eef2e73755317c7ef0d3bd57e40419.tar.gz
Remove Lispy junks
Diffstat (limited to 'src/interp')
-rw-r--r--src/interp/c-util.boot2
-rw-r--r--src/interp/define.boot2
-rw-r--r--src/interp/lisplib.boot18
-rw-r--r--src/interp/profile.boot2
-rw-r--r--src/interp/spad.lisp1
-rw-r--r--src/interp/sys-utility.boot4
-rw-r--r--src/interp/vmlisp.lisp13
7 files changed, 14 insertions, 28 deletions
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index af95339b..50b70484 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -196,7 +196,7 @@ macro dbUsedEntities db ==
macro dbEntityCount db ==
rest dbEntityBuffer db
-macro dbOutputStream db ==
+macro dbLibstream db ==
cdOutput dbCompilerData db
++ Return the existential substitution of `db'.
diff --git a/src/interp/define.boot b/src/interp/define.boot
index db416e94..464e8f00 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -1553,7 +1553,7 @@ compDefineFunctor1(db,df is ['DEF,form,signature,body],m,$e,$formalArgList) ==
--either lookupComplete (for forgetful guys) or lookupIncomplete
$NRTslot1PredicateList :=
[simpBool x for x in $NRTslot1PredicateList]
- LAM_,FILEACTQ('loadTimeStuff,
+ printBackendDecl('loadTimeStuff,
['MAKEPROP,MKQ $op,''infovec,getInfovecCode(db,$e)])
$lisplibOperationAlist:= operationAlist
[fun,['Mapping,:signature'],originale]
diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index c954e61a..1dd83d18 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -422,7 +422,7 @@ compDefineLisplib(db,df:=["DEF",[op,:.],:.],m,e,fal,fn) ==
sayMSG ['" finalizing ",$spadLibFT,:bright libName]
ok := finalizeLisplib(db,libName)
finally
- RSHUT dbOutputStream db
+ RSHUT dbLibstream db
if ok then lisplibDoRename(libName)
filearg := makeFullFilePath [libName,$spadLibFT,nil]
RPACKFILE filearg
@@ -447,8 +447,8 @@ compileDocumentation(ctor,libName) ==
initializeLisplib(db,libName) ==
removeFile makeFullFilePath [libName,'ERRORLIB,nil]
resetErrorCount()
- dbOutputStream(db) := writeLib(libName,'ERRORLIB)
- addCompilerOption('FILE,dbOutputStream db)
+ dbLibstream(db) := writeLib(libName,'ERRORLIB)
+ addCompilerOption('FILE,dbLibstream db)
mkCtorDBForm db ==
['constructorDB,quote dbConstructor db]
@@ -456,14 +456,14 @@ mkCtorDBForm db ==
writeInfo(db,info,key,prop) ==
if info ~= nil then
insn := ['%store,[prop,mkCtorDBForm db],quote info]
- LAM_,FILEACTQ(key,expandToVMForm insn)
- lisplibWrite(symbolName key,info,dbOutputStream db)
+ printBackendDecl(key,expandToVMForm insn)
+ lisplibWrite(symbolName key,info,dbLibstream db)
++ Like writeInfo, but only write to the load unit.
writeLoadInfo(db,info,key,prop) ==
info = nil => nil
insn := ['%store,[prop,mkCtorDBForm db],info]
- LAM_,FILEACTQ(key,expandToVMForm insn)
+ printBackendDecl(key,expandToVMForm insn)
writeTemplate db ==
dbConstructorKind db = 'category => nil
@@ -536,8 +536,8 @@ finalizeLisplib(db,libName) ==
-- to the right-hand sides (the definition) for category constructors
if dbConstructorKind db = 'category then
writeCategory db
- lisplibWrite('"sourceFile",dbSourceFile db,dbOutputStream db)
- lisplibWrite('"modemaps",dbModemaps db,dbOutputStream db)
+ lisplibWrite('"sourceFile",dbSourceFile db,dbLibstream db)
+ lisplibWrite('"modemaps",dbModemaps db,dbLibstream db)
opsAndAtts :=
dbConstructorKind db = 'category => getCategoryOpsAndAtts db
getFunctorOpsAndAtts db
@@ -554,7 +554,7 @@ finalizeLisplib(db,libName) ==
writeAncestors db
if not $bootStrapMode then
lisplibWrite('"documentation",
- finalizeDocumentation dbConstructor db,dbOutputStream db)
+ finalizeDocumentation dbConstructor db,dbLibstream db)
if $profileCompiler then profileWrite db
leaveIfErrors(libName,dbConstructorKind db)
true
diff --git a/src/interp/profile.boot b/src/interp/profile.boot
index 74aeb9f1..ff6577a9 100644
--- a/src/interp/profile.boot
+++ b/src/interp/profile.boot
@@ -41,7 +41,7 @@ namespace BOOT
$profileAlist := nil
profileWrite db == --called from finalizeLisplib
- outStream := MAKE_-OUTSTREAM strconc(libDirname dbOutputStream db,'"/info")
+ outStream := MAKE_-OUTSTREAM strconc(libDirname dbLibstream db,'"/info")
SETQ(_*PRINT_-PRETTY_*, true)
PRINT_-FULL(profileTran $profileAlist,outStream)
SHUT outStream
diff --git a/src/interp/spad.lisp b/src/interp/spad.lisp
index 56c1cc80..4e8eab08 100644
--- a/src/interp/spad.lisp
+++ b/src/interp/spad.lisp
@@ -67,7 +67,6 @@
(defun spad (ifile
&aux
(*comp370-apply* (function |printBackendDecl|))
- (*fileactq-apply* (function |printBackendDecl|))
($SPAD T)
(|$compilerOptions| nil)
(|$editFile| ifile)
diff --git a/src/interp/sys-utility.boot b/src/interp/sys-utility.boot
index a08d8715..3ad86d9e 100644
--- a/src/interp/sys-utility.boot
+++ b/src/interp/sys-utility.boot
@@ -407,12 +407,12 @@ macro constructorDB ctor ==
--%
structure %Libstream ==
- Record(mode: %IOMode, dir: %Pathname,tbl: %Thing, st: %Stream)
+ Record(mode: %IOMode, dir: %Pathname,tbl: %Thing, idxst: %Stream)
with
libIOMode == (.mode)
libDirname == (.dir)
libIndexTable == (.tbl)
- libIndexStream == (.st)
+ libIndexStream == (.idxst)
makeLibstream(m,p,idx==nil,st==nil) ==
mk%Libstream(m,p,idx,st)
diff --git a/src/interp/vmlisp.lisp b/src/interp/vmlisp.lisp
index 40bd2bd5..0e7b339a 100644
--- a/src/interp/vmlisp.lisp
+++ b/src/interp/vmlisp.lisp
@@ -55,8 +55,6 @@
(defvar *embedded-functions* nil)
-(defvar *fileactq-apply* nil "function to apply in fileactq")
-
(defvar macerrorcount 0 "Put some documentation in here someday")
(defvar *read-place-holder* (make-symbol "%.EOF")
@@ -208,13 +206,6 @@
(defmacro rvecp (v)
`(typep ,v '(vector float)))
-(defmacro setandfileq (id item)
- `(eval-when
- #+:common-lisp (:load-toplevel :execute)
- #-:common-lisp (eval load)
- (setq ,id ,item)
- (lam\,fileactq ',id (list 'setq ',id (list 'quote ,id)))))
-
(defmacro setqp (&whole form pattern exp)
`(,(dcqexp pattern '=) ,exp))
@@ -1152,10 +1143,6 @@
; 99.0 Ancient Stuff We Decided To Keep
-(defun LAM\,FILEACTQ (name form)
- (if *FILEACTQ-APPLY*
- (FUNCALL *FILEACTQ-APPLY* name form)))
-
(defun PLACEP (item) (eq item *read-place-holder*))
(defun VMREAD (&optional (st |$InputStream|) (eofval *read-place-holder*))
(read st nil eofval))