diff options
| author | dos-reis <gdr@axiomatics.org> | 2012-05-30 19:40:36 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2012-05-30 19:40:36 +0000 |
| commit | 96a0d6b9d7002c6ced564c398eb9b576f1c85119 (patch) | |
| tree | 8c33fb608e2b2e78da65ac09a65ff7858009e19a | |
| parent | b6ff648a69b67216b55b58c4ae8374fcfea7bce2 (diff) | |
| download | open-axiom-96a0d6b9d7002c6ced564c398eb9b576f1c85119.tar.gz | |
misc cleanup
| -rw-r--r-- | src/boot/ast.boot | 6 | ||||
| -rw-r--r-- | src/boot/parser.boot | 10 | ||||
| -rw-r--r-- | src/boot/translator.boot | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/boot/ast.boot b/src/boot/ast.boot index 4a84bf87..8cee6417 100644 --- a/src/boot/ast.boot +++ b/src/boot/ast.boot @@ -364,7 +364,7 @@ bfSep(iters)== iters = nil => [[],[],[],[],[],[]] f := first iters r := bfSep rest iters - [append(i,j) for i in f for j in r] + [[:i,:j] for i in f for j in r] bfReduce(op,y)== a := @@ -597,7 +597,7 @@ defSheepAndGoatsList(x)== x = nil => [[],[],[]] [opassoc,defs,nondefs] := defSheepAndGoats first x [opassoc1,defs1,nondefs1] := defSheepAndGoatsList rest x - [append(opassoc,opassoc1),append(defs,defs1), append(nondefs,nondefs1)] + [[:opassoc,:opassoc1],[:defs,:defs1],[:nondefs,:nondefs1]] --% LET @@ -1236,7 +1236,7 @@ bfWhere (context,expr)== [opassoc,defs,nondefs] := defSheepAndGoats context a:=[[first d,second d,bfSUBLIS(opassoc,third d)] for d in defs] - $wheredefs:=append(a,$wheredefs) + $wheredefs := [:a,:$wheredefs] bfMKPROGN bfSUBLIS(opassoc,append!(nondefs,[expr])) --shoeReadLispString(s,n)== diff --git a/src/boot/parser.boot b/src/boot/parser.boot index a6c349c1..e67705bd 100644 --- a/src/boot/parser.boot +++ b/src/boot/parser.boot @@ -170,7 +170,7 @@ bpIndentParenthesized(ps,f) == parserNesting(ps) := parserNesting ps - 1 bpNextToken ps parserScope ps = 0 => true - parserTokens(ps) := append(bpAddTokens(ps,parserScope ps),parserTokens ps) + parserTokens(ps) := [:bpAddTokens(ps,parserScope ps),:parserTokens ps] bpFirstToken ps parserNesting ps = 0 => bpCancel ps @@ -1146,16 +1146,16 @@ bpPatternList ps == bpRegularPatternItemL ps => while (bpEqKey(ps,"COMMA") and (bpRegularPatternItemL ps or (bpPatternTail ps - and bpPush(ps,append(bpPop2 ps,bpPop1 ps)) + and bpPush(ps,[:bpPop2 ps,:bpPop1 ps]) or bpTrap ps;false) )) repeat - bpPush(ps,append(bpPop2 ps,bpPop1 ps)) + bpPush(ps,[:bpPop2 ps,:bpPop1 ps]) true bpPatternTail ps bpPatternTail ps == bpPatternColon ps and (bpEqKey(ps,"COMMA") and bpRequire(ps,function bpRegularList) - and bpPush(ps,append(bpPop2 ps,bpPop1 ps)) or true) + and bpPush(ps,[:bpPop2 ps,:bpPop1 ps]) or true) -- BOUND VARIABLE @@ -1199,7 +1199,7 @@ bpBoundVariablelist ps == (bpColonName ps and bpPush(ps,bfColonAppend(bpPop2 ps,bpPop1 ps)) or bpTrap ps;false) )) repeat - bpPush(ps,append(bpPop2 ps,bpPop1 ps)) + bpPush(ps,[:bpPop2 ps,:bpPop1 ps]) true bpColonName ps and bpPush(ps,bfColonAppend(nil,bpPop1 ps)) diff --git a/src/boot/translator.boot b/src/boot/translator.boot index e0de5ef5..c350bd7c 100644 --- a/src/boot/translator.boot +++ b/src/boot/translator.boot @@ -578,12 +578,12 @@ defuse1(e,y)== defusebuiltin y =>$used UNION([y],$used) [] - y is ["LAMBDA",a,:b]=> defuse1 (append(unfluidlist a,e),b) + y is ["LAMBDA",a,:b] => defuse1([:unfluidlist a,:e],b) y is ["PROG",a,:b]=> [dol,ndol]:=defSeparate a for i in dol repeat tableValue($bootDefined,i) := true - defuse1 (append(ndol,e),b) + defuse1([:ndol,:e],b) y is ['QUOTE,:a] => [] y is ["+LINE",:a] => [] for i in y repeat defuse1(e,i) |