diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-12-28 04:03:36 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-12-28 04:03:36 +0000 |
| commit | 1fd6a63bbce9234ba3b8efa12c9a91643f0a87a1 (patch) | |
| tree | 49569695e13334db4bf2c15f769c6761173f7db3 /src/interp/br-data.boot | |
| parent | 8165b0668e5116e9ed43b9de15bf961792598d72 (diff) | |
| download | open-axiom-1fd6a63bbce9234ba3b8efa12c9a91643f0a87a1.tar.gz | |
* boot/tokens.boot: Do not rewrite drop and take.
* boot/utility.boot (drop): Define and export.
(take): Likewise.
* interp/br-con.boot: Use take, not TAKE; use drop, not DROP.
* interp/br-data.boot: Likewise.
* interp/br-op1.boot: Likewise.
* interp/br-saturn.boot: Likewise.
* interp/c-doc.boot: Likewise.
* interp/c-util.boot: Likewise.
* interp/cattable.boot: Likewise.
* interp/clammed.boot: Likewise.
* interp/compiler.boot: Likewise.
* interp/database.boot: Likewise.
* interp/define.boot: Likewise.
* interp/guess.boot: Likewise.
* interp/htsetvar.boot: Likewise.
* interp/i-analy.boot: Likewise.
* interp/i-eval.boot: Likewise.
* interp/i-funsel.boot: Likewise.
* interp/i-map.boot: Likewise.
* interp/i-output.boot: Likewise.
* interp/i-special.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/i-toplev.boot: Likewise.
* interp/i-util.boot: Likewise.
* interp/nruncomp.boot: Likewise.
* interp/parse.boot: Likewise.
* interp/record.boot: Likewise.
* interp/setvars.boot: Likewise.
* interp/slam.boot: Likewise.
* interp/trace.boot: Likewise.
* interp/word.boot: Likewise.
* interp/macros.lisp (DROP): Remove.
(TAKE): Likewise.
Diffstat (limited to 'src/interp/br-data.boot')
| -rw-r--r-- | src/interp/br-data.boot | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot index dbc7eb16..54a8021e 100644 --- a/src/interp/br-data.boot +++ b/src/interp/br-data.boot @@ -127,7 +127,7 @@ buildLibdbString [x,:u] == libConstructorSig [conname,:argl] == [[.,:sig],:.] := getConstructorModemap conname - formals := TAKE(#argl,$FormalMapVariableList) + formals := take(#argl,$FormalMapVariableList) sig := applySubst(pairList($TriangleVariableList,formals),sig) keys := [g(f,sig,i) for f in formals for i in 1..] where g(x,u,i) == --does x appear in any but i-th element of u? @@ -496,7 +496,7 @@ getImports conname == --called by mkUsersHashTable getParentsFor(db,formalParams) == --called by compDefineFunctor1 acc := nil - formals := TAKE(#formalParams,$TriangleVariableList) + formals := take(#formalParams,$TriangleVariableList) constructorForm := dbConstructorForm db for x in folks dbCategory db repeat x := applySubst(pairList(formals,formalParams),x) @@ -653,7 +653,7 @@ domainsOf(conform,domname,:options) == | key is [anc,: =conname]] --u is list of pairs (a . b) where b() = conname --we sort u then replace each b by the predicate for which this is true - s := listSort(function GLESSEQP,COPY u) + s := listSort(function GLESSEQP,copyTree u) s := [[first pair,:constructorHasCategoryFromDB pair] for pair in s] transKCatAlist(conform,domname,listSort(function GLESSEQP,s)) @@ -696,7 +696,7 @@ transKCatAlist(conform,domname,s) == main where --no domname, so look for special argument combinations acc := nil KDR conform => - farglist := TAKE(#rest conform,$FormalMapVariableList) + farglist := take(#rest conform,$FormalMapVariableList) for pair in s repeat --pair has form [con,[conargs,:pred],...]] leftForm := getConstructorForm first pair for (ap := [args,:pred]) in rest pair repeat |