aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2012-05-06 15:13:16 +0000
committerdos-reis <gdr@axiomatics.org>2012-05-06 15:13:16 +0000
commit03c3da037eca3d7d557784db3d3a9872ba2a2cb5 (patch)
treeb7ebac6bf164dc2b15dfe8430c66593524e51fb0 /src
parent1dbbbe925423f63ad24be607081ced422eed5181 (diff)
downloadopen-axiom-03c3da037eca3d7d557784db3d3a9872ba2a2cb5.tar.gz
misc cleanup
Diffstat (limited to 'src')
-rw-r--r--src/interp/debug.lisp2
-rw-r--r--src/interp/i-syscmd.boot42
-rw-r--r--src/interp/spad-parser.boot4
-rw-r--r--src/interp/vmlisp.lisp3
4 files changed, 3 insertions, 48 deletions
diff --git a/src/interp/debug.lisp b/src/interp/debug.lisp
index 5c4abac9..bb51443d 100644
--- a/src/interp/debug.lisp
+++ b/src/interp/debug.lisp
@@ -562,7 +562,7 @@ EXAMINE (SETQ RECNO (NOTE |$InputStream|))
(if (AND (INTEGERP X)
(> X 0)
(< X 9))
- (LIST (FETCHCHAR (STRINGIMAGE X) 0))))
+ (LIST (ELT (STRINGIMAGE X) 0))))
onlys)))
(if (NOT (OR A V C NL))
(if Caller (return "119") (return "019")))
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index db0e0ffb..8e3d5867 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -1932,40 +1932,6 @@ load args == loadSpad2Cmd args
loadSpad2Cmd args ==
sayKeyedMsg("S2IU0003", nil)
nil
--- load1(args,$forceDatabaseUpdate)
-
---load1(args,$forceDatabaseUpdate) == -- $ var is now local
--- null args => helpSpad2Cmd '(load)
--- loadfun := 'loadLib
--- justWondering := nil
--- compiler := 'old
--- doExpose := true
--- $forceDatabaseUpdate := true -- BMT request, 5/14/90
--- for [opt,:.] in $options repeat
--- fullopt := selectOptionLC(opt,
--- '(cond update query new noexpose noupdate),
--- 'optionError)
--- fullopt is 'cond => loadfun := 'loadLibIfNotLoaded
--- fullopt is 'query => justWondering := true
--- fullopt is 'update => $forceDatabaseUpdate := true
--- fullopt is 'noexpose => doExpose := false
--- fullopt is 'noupdate => $forceDatabaseUpdate := false
--- if $forceDatabaseUpdate then clearClams()
--- for lib in args repeat
--- lib := object2Identifier lib
--- justWondering =>
--- dbLoaded? constructorDB lib => sayKeyedMsg("S2IZ0028",[lib])
--- sayKeyedMsg("S2IZ0029",[lib])
--- null getConstructorModuleFromDB lib and
--- null (lib := getConstructorFullNameFromDB lib) =>
--- sayKeyedMsg("S2IL0020", [namestring [lib,$spadLibFT,"*"]])
--- null FUNCALL(loadfun,lib) =>
--- sayKeyedMsg("S2IZ0029",[lib])
--- sayKeyedMsg("S2IZ0028",[lib])
--- if doExpose and
--- not isExposedConstructor(lib) then
--- setExposeAddConstr([lib])
--- 'EndOfLoad
reportCount () ==
centerAndHighlight(" Current Count Settings ",$LINELENGTH,specialChar 'hbar)
@@ -2785,14 +2751,6 @@ processSynonyms() ==
-- functions for interfacing to system commands from algebra code
-- common lisp dependent
-tabsToBlanks s ==
- k := charPosition($charTab,s,0)
- n := #s
- k < n =>
- k = 0 => tabsToBlanks subString(s,1)
- strconc(subString(s,0,k),$charBlank, tabsToBlanks subString(s,k + 1))
- s
-
doSystemCommand string ==
string := strconc('")", EXPAND_-TABS string)
LINE: local := string
diff --git a/src/interp/spad-parser.boot b/src/interp/spad-parser.boot
index edf0cac0..50d05c5c 100644
--- a/src/interp/spad-parser.boot
+++ b/src/interp/spad-parser.boot
@@ -49,14 +49,14 @@ namespace BOOT
--%
addClose(line,ch) ==
- FETCHCHAR(line,maxIndex line) = char ";" =>
+ line.(maxIndex line) = char ";" =>
ch = char ";" => line
line.(maxIndex line) := ch
SUFFIX(char ";",line)
SUFFIX(ch,line)
escaped?(s,n) ==
- n > 0 and FETCHCHAR(s,n-1) = char "__"
+ n > 0 and s.(n-1) = char "__"
infixToken? s ==
STRING2ID_-N(s,1) in '(_then _else)
diff --git a/src/interp/vmlisp.lisp b/src/interp/vmlisp.lisp
index 03ab0277..2f57c6ac 100644
--- a/src/interp/vmlisp.lisp
+++ b/src/interp/vmlisp.lisp
@@ -115,9 +115,6 @@
(defmacro exit (&rest value)
`(return-from seq ,@value))
-(defmacro fetchchar (x i)
- `(char ,x ,i))
-
(defmacro greaterp (&rest args)
`(> ,@args))