diff options
| author | Gabriel Dos Reis <gdr@axiomatics.org> | 2015-12-24 19:11:45 -0800 |
|---|---|---|
| committer | Gabriel Dos Reis <gdr@axiomatics.org> | 2015-12-24 19:11:45 -0800 |
| commit | b200f025ccb0b684ff63844dbdddb3f4fa8048df (patch) | |
| tree | 219ba3346dc25156ac1740d0bc81aa86c672d65b /src/boot | |
| parent | 4dcf3f97d30a2b892716923ed4e916805ec87436 (diff) | |
| download | open-axiom-b200f025ccb0b684ff63844dbdddb3f4fa8048df.tar.gz | |
Tidy uses of apply.
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/parser.boot | 6 | ||||
| -rw-r--r-- | src/boot/translator.boot | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/boot/parser.boot b/src/boot/parser.boot index e390894b..3864fc13 100644 --- a/src/boot/parser.boot +++ b/src/boot/parser.boot @@ -208,7 +208,7 @@ bpListof(ps,f,str1,g)== parserTrees(ps) := nil while bpEqKey(ps,str1) and bpRequire(ps,f) repeat nil parserTrees(ps) := [reverse! parserTrees ps,:a] - bpPush(ps,FUNCALL(g, [bpPop3 ps,bpPop2 ps,:bpPop1 ps])) + bpPush(ps,apply(g,[[bpPop3 ps,bpPop2 ps,:bpPop1 ps]])) true false @@ -221,7 +221,7 @@ bpListofFun(ps,f,h,g)== parserTrees(ps) := nil while apply(h,[ps]) and bpRequire(ps,f) repeat nil parserTrees(ps) := [reverse! parserTrees ps,:a] - bpPush(ps,FUNCALL(g, [bpPop3 ps,bpPop2 ps,:bpPop1 ps])) + bpPush(ps,apply(g,[[bpPop3 ps,bpPop2 ps,:bpPop1 ps]])) true false @@ -255,7 +255,7 @@ bpAnyNo(ps,s) == -- AndOr(k,p,f)= k p bpAndOr(ps,keyword,p,f)== bpEqKey(ps,keyword) and bpRequire(ps,p) - and bpPush(ps,FUNCALL(f,parserLoadUnit ps,bpPop1 ps)) + and bpPush(ps,apply(f,[parserLoadUnit ps,bpPop1 ps])) bpConditional(ps,f) == bpEqKey(ps,"IF") and bpRequire(ps,function bpWhere) and (bpEqKey(ps,"BACKSET") or true) => diff --git a/src/boot/translator.boot b/src/boot/translator.boot index 17aab40c..b98f3b30 100644 --- a/src/boot/translator.boot +++ b/src/boot/translator.boot @@ -604,8 +604,8 @@ associateRequestWithFileType(Option '"compile", '"boot", ++ Load native dynamically linked module loadNativeModule m == %hasFeature KEYWORD::SBCL => - FUNCALL(bfColonColon("SB-ALIEN","LOAD-SHARED-OBJECT"),m, - KEYWORD::DONT_-SAVE, true) + apply(bfColonColon("SB-ALIEN","LOAD-SHARED-OBJECT"), + [m,KEYWORD::DONT_-SAVE,true]) %hasFeature KEYWORD::CLISP => EVAL [bfColonColon("FFI","DEFAULT-FOREIGN-LIBRARY"), m] %hasFeature KEYWORD::ECL => |