diff options
author | dos-reis <gdr@axiomatics.org> | 2010-05-15 19:30:34 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2010-05-15 19:30:34 +0000 |
commit | 0d8fcdd4995bba86701b8184b288dd549a5336fa (patch) | |
tree | 81e8f7491effa5959cd43ffdd9d9b94cef9d3f81 | |
parent | 8f2bad3b8cea97189a9e842ed0f78559aa4be795 (diff) | |
download | open-axiom-0d8fcdd4995bba86701b8184b288dd549a5336fa.tar.gz |
* interp/vmlisp.lisp (SETELT): Remove.
* interp/br-data.boot: Remove use of SETELT.
* interp/br-saturn.boot: Likewise.
* interp/br-util.boot: Likewise.
* interp/functor.boot: Likewise.
* interp/ht-util.boot: Likewise.
* interp/interop.boot: Likewise.
* interp/nruncomp.boot: Likewise.
-rw-r--r-- | src/ChangeLog | 11 | ||||
-rw-r--r-- | src/interp/br-data.boot | 2 | ||||
-rw-r--r-- | src/interp/br-saturn.boot | 4 | ||||
-rw-r--r-- | src/interp/br-search.boot | 3 | ||||
-rw-r--r-- | src/interp/br-util.boot | 2 | ||||
-rw-r--r-- | src/interp/functor.boot | 4 | ||||
-rw-r--r-- | src/interp/ht-util.boot | 24 | ||||
-rw-r--r-- | src/interp/interop.boot | 2 | ||||
-rw-r--r-- | src/interp/nruncomp.boot | 2 | ||||
-rw-r--r-- | src/interp/vmlisp.lisp | 15 |
10 files changed, 33 insertions, 36 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0b125d03..d2ade349 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2010-05-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/vmlisp.lisp (SETELT): Remove. + * interp/br-data.boot: Remove use of SETELT. + * interp/br-saturn.boot: Likewise. + * interp/br-util.boot: Likewise. + * interp/functor.boot: Likewise. + * interp/ht-util.boot: Likewise. + * interp/interop.boot: Likewise. + * interp/nruncomp.boot: Likewise. + 2010-05-13 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/sys-utility.boot (hashTable): Define. diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot index e5fcc1ca..ba28aa18 100644 --- a/src/interp/br-data.boot +++ b/src/interp/br-data.boot @@ -190,7 +190,7 @@ libdbTrim s == k := MAXINDEX s k < 0 => s for i in 0..k repeat - s.i = $Newline => SETELT(s,i,char '_ ) + s.i = $Newline => s.i := char " " trimString s checkCommentsForBraces(kind,sop,sigpart,comments) == diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot index 7a968bfb..8112eb99 100644 --- a/src/interp/br-saturn.boot +++ b/src/interp/br-saturn.boot @@ -550,7 +550,7 @@ htpAddToPageDescription(htPage, pageDescrip) == newDescript := string? pageDescrip => [pageDescrip, :htPage.7] nconc(nreverse COPY_-LIST pageDescrip, htPage.7) - SETELT(htPage, 7, newDescript) + htPage.7 := newDescript htProcessBcStrings strings == @@ -1426,7 +1426,7 @@ htEndTabular() == htPopSaturn s == pageDescription := $saturnPage.7 - pageDescription is [=s,:b] => SETELT($saturnPage, 7, rest pageDescription) + pageDescription is [=s,:b] => $saturnPage.7 := rest pageDescription nil htBeginTable() == diff --git a/src/interp/br-search.boot b/src/interp/br-search.boot index 6056dd7a..9f094a3c 100644 --- a/src/interp/br-search.boot +++ b/src/interp/br-search.boot @@ -603,7 +603,8 @@ stripOffSegments(s,n) == replaceTicksBySpaces s == n := -1 max := MAXINDEX s - while (n := charPosition(char '_`,s,n + 1)) <= max repeat SETELT(s,n,char '_ ) + while (n := charPosition(char '_`,s,n + 1)) <= max repeat + s.n := char " " s checkFilter filter == diff --git a/src/interp/br-util.boot b/src/interp/br-util.boot index 41f4f392..1312170c 100644 --- a/src/interp/br-util.boot +++ b/src/interp/br-util.boot @@ -106,7 +106,7 @@ capitalize s == ("default package" . "Default Package"))) or res := COPY_-SEQ s - SETELT(res,0,UPCASE res.0) + res.0 := UPCASE res.0 res escapeSpecialIds u == --very expensive function diff --git a/src/interp/functor.boot b/src/interp/functor.boot index 9968e291..940c0959 100644 --- a/src/interp/functor.boot +++ b/src/interp/functor.boot @@ -532,7 +532,7 @@ DescendCodeAdd1(base,flag,target,formalArgs,formalArgModes) == QCAR code in '(getShellEntry ELT QREFELT) => copyvec.(third code):=union(copyvec.(third code), sofar) true - code is [x,name,number,u'] and x in '(setShellEntry SETELT QSETREFV) => + code is [x,name,number,u'] and x in '(setShellEntry QSETREFV) => update(u',copyvec,[[name,:number],:sofar]) for i in 6..n repeat for u in copyvec.i repeat @@ -634,7 +634,7 @@ DescendCode(code,flag,viewAssoc,EnvToPass) == ConstantCreator u == null u => false - u is [q,.,.,u'] and (q in '(setShellEntry SETELT QSETREFV)) => + u is [q,.,.,u'] and (q in '(setShellEntry QSETREFV)) => ConstantCreator u' u is ['CONS,:.] => false true diff --git a/src/interp/ht-util.boot b/src/interp/ht-util.boot index 440fbddf..35b44baf 100644 --- a/src/interp/ht-util.boot +++ b/src/interp/ht-util.boot @@ -60,28 +60,28 @@ htpName htPage == htPage.0 htpSetName(htPage, val) == - SETELT(htPage, 0, val) + htPage.0 := val htpDomainConditions htPage == -- List of Domain conditions htPage.1 htpSetDomainConditions(htPage, val) == - SETELT(htPage, 1, val) + htPage.1 := val htpDomainVariableAlist htPage == -- alist of pattern variables and conditions htPage.2 htpSetDomainVariableAlist(htPage, val) == - SETELT(htPage, 2, val) + htPage.2 := val htpDomainPvarSubstList htPage == -- alist of user pattern variables to system vars htPage.3 htpSetDomainPvarSubstList(htPage, val) == - SETELT(htPage, 3, val) + htPage.3 := val htpRadioButtonAlist htPage == -- alist of radio button group names and labels @@ -93,17 +93,17 @@ htpButtonValue(htPage, groupName) == return buttonName htpSetRadioButtonAlist(htPage, val) == - SETELT(htPage, 4, val) + htPage.4 := val htpInputAreaAlist htPage == -- Alist of input-area labels, and default values htPage.5 htpSetInputAreaAlist(htPage, val) == - SETELT(htPage, 5, val) + htPage.5 := val htpAddInputAreaProp(htPage, label, prop) == - SETELT(htPage, 5, [[label, nil, nil, nil, :prop], :htPage.5]) + htPage.5 := [[label, nil, nil, nil, :prop], :htPage.5] htpPropertyList htPage == -- Association list of user-defined properties @@ -115,7 +115,7 @@ htpProperty(htPage, propName) == htpSetProperty(htPage, propName, val) == pair := assoc(propName, htPage.6) pair => pair.rest := val - SETELT(htPage, 6, [[propName, :val], :htPage.6]) + htPage.6 := [[propName, :val], :htPage.6] htpLabelInputString(htPage, label) == -- value user typed as input string on page @@ -143,7 +143,7 @@ replacePercentByDollar s == fn(s,0,MAXINDEX s) where htpSetLabelInputString(htPage, label, val) == -- value user typed as input string on page props := LASSOC(label, htpInputAreaAlist htPage) - props => SETELT(props, 0, STRINGIMAGE val) + props => props.0 := STRINGIMAGE val nil htpLabelSpadValue(htPage, label) == @@ -155,7 +155,7 @@ htpLabelSpadValue(htPage, label) == htpSetLabelSpadValue(htPage, label, val) == -- value user typed as input string on page props := LASSOC(label, htpInputAreaAlist htPage) - props => SETELT(props, 1, val) + props => props.1 := val nil htpLabelErrorMsg(htPage, label) == @@ -167,7 +167,7 @@ htpLabelErrorMsg(htPage, label) == htpSetLabelErrorMsg(htPage, label, val) == -- error message associated with input area props := LASSOC(label, htpInputAreaAlist htPage) - props => SETELT(props, 2, val) + props => props.2 := val nil htpLabelType(htPage, label) == @@ -205,7 +205,7 @@ htpPageDescription htPage == htPage.7 htpSetPageDescription(htPage, pageDescription) == - SETELT(htPage, 7, pageDescription) + htPage.7 := pageDescription iht line == -- issue a single hyperteTeX line, or a group of lines diff --git a/src/interp/interop.boot b/src/interp/interop.boot index c1ae917c..5ecd28f0 100644 --- a/src/interp/interop.boot +++ b/src/interp/interop.boot @@ -213,7 +213,7 @@ oldAxiomCategoryNthParent([.,.,.,parvec,dom], n, env) == catform := parvec.(n-1) VECTORP KAR catform => catform newcat := oldAxiomPreCategoryBuild(catform,dom,nil) - SETELT(parvec, n-1, newcat) + parvec.(n-1) := newcat newcat oldAxiomCategoryBuild([catform,:.], dom, env) == diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot index 014e757f..b21ecb6e 100644 --- a/src/interp/nruncomp.boot +++ b/src/interp/nruncomp.boot @@ -363,7 +363,7 @@ consDomainForm(x,dc) == NRTdescendCodeTran(u,condList) == null u => nil u is ['LIST] => nil - u is [op,.,i,a] and op in '(setShellEntry SETELT QSETREFV) => + u is [op,.,i,a] and op in '(setShellEntry QSETREFV) => null condList and a is ['CONS,fn,:.] => u.first := 'LIST u.rest := nil diff --git a/src/interp/vmlisp.lisp b/src/interp/vmlisp.lisp index ae8b1df3..f14d4898 100644 --- a/src/interp/vmlisp.lisp +++ b/src/interp/vmlisp.lisp @@ -446,9 +446,6 @@ (setq ,id ,item) (lam\,fileactq ',id (list 'setq ',id (list 'quote ,id))))) -(defmacro setelt (vec ind val) - `(setf (elt ,vec ,ind) ,val)) - (defmacro setqp (&whole form pattern exp) `(,(dcqexp pattern '=) ,exp)) @@ -786,10 +783,6 @@ (defun QSREMAINDER (a b) (the fixnum (rem (the fixnum a) (the fixnum b)))) -;(defun IFCAR (x) (if (consp x) (car (the cons x)))) - -;(defun IFCDR (x) (if (consp x) (cdr (the cons x)))) - ; 13.3 Updating @@ -971,14 +964,6 @@ ; 17.3 Searching -;;- (defun strpos (what in start dontcare) -;;- (setq what (string what) in (string in)) -;;- (if dontcare (progn (setq dontcare (character dontcare)) -;;- (search what in :start2 start -;;- :test #'(lambda (x y) (or (eql x dontcare) -;;- (eql x y))))) -;;- (search what in :start2 start))) - (defun strpos (what in start dontcare) (setq what (string what) in (string in)) (if dontcare (progn (setq dontcare (character dontcare)) |