aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog12
-rw-r--r--src/boot/strap/tokens.clisp12
-rw-r--r--src/boot/tokens.boot2
-rw-r--r--src/interp/br-util.boot2
-rw-r--r--src/interp/category.boot5
-rw-r--r--src/interp/define.boot2
-rw-r--r--src/interp/functor.boot8
-rw-r--r--src/interp/i-coerfn.boot2
-rw-r--r--src/interp/i-syscmd.boot6
-rw-r--r--src/interp/newfort.boot2
10 files changed, 35 insertions, 18 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7f311c42..ada5a090 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,17 @@
2011-07-13 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * boot/tokens.boot: copyString, copyTree, and copyVector are now
+ builtin library functions.
+ * interp/br-util.boot: Use copyVector instead of COPY-SEQ.
+ * interp/category.boot: Likewise.
+ * interp/define.boot: Likewise.
+ * interp/functor.boot: Likewise.
+ * interp/i-coerfn.boot: Likewise.
+ * interp/i-syscmd.boot: Likewise.
+ * interp/newfort.boot: Likewise.
+
+2011-07-13 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* interp/category.boot: Remove dead codes.
* interp/define.boot (hasFullSignature): Tidy.
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp
index 703b4263..49017e4f 100644
--- a/src/boot/strap/tokens.clisp
+++ b/src/boot/strap/tokens.clisp
@@ -211,11 +211,12 @@
(LIST '|charString| 'STRING)
(LIST '|char?| 'CHARACTERP)
(LIST '|codePoint| 'CHAR-CODE) (LIST '|cons?| 'CONSP)
- (LIST '|copy| 'COPY) (LIST '|copyTree| 'COPY-TREE)
- (LIST '|croak| 'CROAK) (LIST '|digit?| 'DIGIT-CHAR-P)
- (LIST '|drop| 'DROP) (LIST '|exit| 'EXIT)
- (LIST '|false| 'NIL) (LIST '|first| 'CAR)
- (LIST '|float?| 'FLOATP)
+ (LIST '|copy| 'COPY) (LIST '|copyString| 'COPY-SEQ)
+ (LIST '|copyTree| 'COPY-TREE)
+ (LIST '|copyVector| 'COPY-SEQ) (LIST '|croak| 'CROAK)
+ (LIST '|digit?| 'DIGIT-CHAR-P) (LIST '|drop| 'DROP)
+ (LIST '|exit| 'EXIT) (LIST '|false| 'NIL)
+ (LIST '|first| 'CAR) (LIST '|float?| 'FLOATP)
(LIST '|flushOutput| 'FORCE-OUTPUT)
(LIST '|fourth| 'CADDDR) (LIST '|function| 'FUNCTION)
(LIST '|function?| 'FUNCTIONP) (LIST '|gensym| 'GENSYM)
@@ -257,6 +258,7 @@
(LIST '|vectorRef| 'SVREF)
(LIST '|writeByte| 'WRITE-BYTE)
(LIST '|writeChar| 'WRITE-CHAR)
+ (LIST '|writeInteger| 'PRINC)
(LIST '|writeLine| 'WRITE-LINE)
(LIST '|writeNewline| 'TERPRI)
(LIST '|writeString| 'WRITE-STRING) (LIST 'PLUS '+)
diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot
index 925d8689..bc66db93 100644
--- a/src/boot/tokens.boot
+++ b/src/boot/tokens.boot
@@ -262,7 +262,9 @@ for i in [ _
["codePoint", "CHAR-CODE"], _
["cons?", "CONSP"] , _
["copy", "COPY"] , _
+ ["copyString", "COPY-SEQ"] , _
["copyTree", "COPY-TREE"] , _
+ ["copyVector", "COPY-SEQ"] , _
["croak", "CROAK"] , _
["digit?", "DIGIT-CHAR-P"] , _
["drop", "DROP"] , _
diff --git a/src/interp/br-util.boot b/src/interp/br-util.boot
index bc22ab8d..e82f2042 100644
--- a/src/interp/br-util.boot
+++ b/src/interp/br-util.boot
@@ -102,7 +102,7 @@ capitalize s ==
("package" . "Package")
("default package" . "Default Package")))
or
- res := COPY_-SEQ s
+ res := copyString s
stringChar(res,0) := charUpcase stringChar(res,0)
res
diff --git a/src/interp/category.boot b/src/interp/category.boot
index 9ce65944..23d5a042 100644
--- a/src/interp/category.boot
+++ b/src/interp/category.boot
@@ -469,7 +469,7 @@ JoinInner(l,$e) ==
FundamentalAncestors:= [newentry,:FundamentalAncestors]
else ancindex:= nil
if not copied then
- $NewCatVec:= COPY_-SEQ $NewCatVec
+ $NewCatVec:= copyVector $NewCatVec
copied:= true
if ancindex
then ($NewCatVec.ancindex:= bname; reallynew:= nil)
@@ -516,7 +516,8 @@ JoinInner(l,$e) ==
copied:= false
originalvector:= false
$NewCatVec.n:= b.0
- if not copied then $NewCatVec:= COPY_-SEQ $NewCatVec
+ if not copied then
+ $NewCatVec:= copyVector $NewCatVec
-- It is important to copy the vector now,
-- in case SigListUnion alters it while
-- performing Operator Subsumption
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 50911353..8d249ab5 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -933,7 +933,7 @@ compDefineFunctor1(df is ['DEF,form,signature,nils,body],
stackAndThrow('" cannot produce category object: %1pb",[target])
$compileExportsOnly =>
compDefineExports(form, categoryExports ds, signature',$e)
- $domainShell: local := COPY_-SEQ ds
+ $domainShell: local := copyVector ds
attributeList := vectorRef(ds,2) --see below under "loadTimeAlist"
$condAlist: local := nil
$uncondAlist: local := nil
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index 8b21eba9..eed8a982 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -78,13 +78,13 @@ DomainPrint1(D,brief,$e) ==
for u in D for i in 1..],:$Sublis]
for u in D for i in 1.. repeat
brief and i>1 => nil
- uu:= COPY_-SEQ rest u
- uu.4:= '"This domain"
+ uu := copyVector rest u
+ uu.4 := '"This domain"
if not brief then
SAY ['"View number ",i,'" corresponding to categories:"]
PRETTYPRINT first u
if i=1 and vector? uu.5 then
- vv:= COPY_-SEQ uu.5
+ vv := copyVector uu.5
uu.5:= vv
for j in 0..maxIndex vv repeat
if vector? vv.j then
@@ -121,7 +121,7 @@ DPname() ==
name
PacPrint v ==
- vv:= COPY_-SEQ v
+ vv := copyVector v
for j in 0..maxIndex vv repeat
if vector? vv.j then
l:= ASSQ(keyItem vv.j,Sublis)
diff --git a/src/interp/i-coerfn.boot b/src/interp/i-coerfn.boot
index 9631505f..93a7afd1 100644
--- a/src/interp/i-coerfn.boot
+++ b/src/interp/i-coerfn.boot
@@ -414,7 +414,7 @@ Expr2Dmp1(summands, vec, c, source, index, varList, T) ==
univ := objValUnwrap univ
for [e,:c] in univ repeat
- vec := COPY_-SEQ vec
+ vec := copyVector vec
vec.index := e
summands := Expr2Dmp1(summands, vec, c, T, index+1, rest varList, T)
summands
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index e9c11444..a0c288c8 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -88,7 +88,7 @@ $localExposureDataDefault :=
VECTOR(["basic", "categories"], [], [])
$localExposureData :=
- COPY_-SEQ $localExposureDataDefault
+ copyVector $localExposureDataDefault
--% Top level system command
@@ -295,7 +295,7 @@ clearCmdSortedCaches() ==
clearCmdCompletely() ==
clearCmdAll()
- $localExposureData := COPY_-SEQ $localExposureDataDefault
+ $localExposureData := copyVector $localExposureDataDefault
-- $functionTable := nil
sayKeyedMsg("S2IZ0013",nil)
clearClams()
@@ -1127,7 +1127,7 @@ emptyInterpreterFrame(name) ==
$HistListAct, -- $HistListAct
$HistRecord, -- $HistRecord
nil, -- $internalHistoryTable
- COPY_-SEQ $localExposureDataDefault -- $localExposureData
+ copyVector $localExposureDataDefault -- $localExposureData
]
closeInterpreterFrame(name) ==
diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot
index cc137f0a..b4064de1 100644
--- a/src/interp/newfort.boot
+++ b/src/interp/newfort.boot
@@ -198,7 +198,7 @@ beenHere(e,n) ==
if exprStk then
-- using COPY-TREE : RPLAC does not smash $fortCsList
-- which led to inconsistencies in assignment of temp. vars.
- $fortCsList := COPY_-TREE [['"=",var,e],:$fortCsList]
+ $fortCsList := copyTree [['"=",var,e],:$fortCsList]
loc := first exprStk
fun := first n.3
fun = 'CAR =>