diff options
Diffstat (limited to 'src/interp')
| -rw-r--r-- | src/interp/compiler.boot | 4 | ||||
| -rw-r--r-- | src/interp/functor.boot | 6 | ||||
| -rw-r--r-- | src/interp/g-opt.boot | 2 | ||||
| -rw-r--r-- | src/interp/mark.boot | 10 | ||||
| -rw-r--r-- | src/interp/nrunfast.boot | 2 | ||||
| -rw-r--r-- | src/interp/wi2.boot | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index c2f23769..1957d753 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -237,7 +237,7 @@ applyMapping([op,:argl],m,e,ml) == emitLocalCallInsn(op,argl',e) -- Compiler synthetized operators are inline. u ~= nil and u.expr is ["XLAM",:.] => ["call",u.expr,:argl'] - ['call,['applyFun,op],:argl'] + ["call",['applyFun,op],:argl'] pairlis := pairList($FormalMapVariableList,argl') convert([form,SUBLIS(pairlis,first ml),e],m) @@ -702,7 +702,7 @@ compApplication(op,argl,m,T) == not (MEMQ(op,$formalArgList) or MEMQ(T.expr,$formalArgList)) and null get(T.expr,"value",e) => emitLocalCallInsn(T.expr,[a.expr for a in argTl],e) - ['call, ['applyFun, T.expr], :[a.expr for a in argTl]] + ["call", ['applyFun, T.expr], :[a.expr for a in argTl]] coerce([form, retm, e],resolve(retm,m)) op = 'elt => nil eltForm := ['elt, op, :argl] diff --git a/src/interp/functor.boot b/src/interp/functor.boot index 75ac00e4..41488141 100644 --- a/src/interp/functor.boot +++ b/src/interp/functor.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2009, Gabriel Dos Reis. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -388,7 +388,7 @@ mkTypeForm x == ['LIST,MKQ 'Record,:[mkTypeForm y for y in argl]] x is ['Join,:argl] => ['LIST,MKQ 'Join,:[mkTypeForm y for y in argl]] - x is ['call,:argl] => ['MKQ, optCall x] + x is ["call",:argl] => ['MKQ, optCall x] --The previous line added JHD/BMT 20/3/84 --Necessary for proper compilation of DPOLY SPAD x is [op] => MKQ x @@ -625,7 +625,7 @@ DescendCode(code,flag,viewAssoc,EnvToPass) == code is ['LIST,:.] => nil code is ['devaluate,:.] => nil code is ['MDEF,:.] => nil - code is ['call,:.] => code + code is ["call",:.] => code code is ["setShellEntry",:.] => code -- can be generated by doItIf code is ['SETELT,:.] => systemErrorHere ["DescendCode",code] code is ['QSETREFV,:.] => systemErrorHere ["DescendCode",code] diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot index 3b0e5b28..0a3cad37 100644 --- a/src/interp/g-opt.boot +++ b/src/interp/g-opt.boot @@ -163,7 +163,7 @@ optSPADCALL(form is ['SPADCALL,:argl]) == null $InteractiveMode => form -- last arg is function/env, but may be a form argl is [:argl,fun] and fun is ["ELT",dom,slot] => - optCall ['call,['ELT,dom,slot],:argl] + optCall ["call",['ELT,dom,slot],:argl] form optCall (x is ["call",:u]) == diff --git a/src/interp/mark.boot b/src/interp/mark.boot index 803def69..c031d8ae 100644 --- a/src/interp/mark.boot +++ b/src/interp/mark.boot @@ -263,14 +263,14 @@ markRepeat(form, T) == [mkWi("repeat", 'WI,form,first T), :rest T] markTran(form,form',[dc,:sig],env) == --from compElt/compFormWithModemap - dc ~= 'Rep or not ('_$ in sig) => mkWi('markTran,'WI,form,['call,:form']) + dc ~= 'Rep or not ('_$ in sig) => mkWi('markTran,'WI,form,["call",:form']) argl := [u for t in rest sig for arg in rest form'] where u() == t='_$ => argSource := getSourceWI arg IDENTP argSource and getmode(argSource,env) = 'Rep => arg markRepper('rep,arg) arg - form' := ['call,first form',:argl] + form' := ["call",first form',:argl] wi := mkWi('markTran,'WI,form,form') first sig = '_$ => markRepper('per,wi) wi @@ -681,7 +681,7 @@ markPaths(x,y,s) == --x < y; find location s of x in y (initially s=nil) nil)) => markCons(p,s) -- x is ['exit,a,b] and y is ['exit,a,c] and (p := mymy markPathsEqual(b,c)) => -- markCons(p,s) - y is ['call,:r] => markPaths(x,r,s) --for loops + y is ["call",:r] => markPaths(x,r,s) --for loops y is [fn,m,y1] and fn in '(PART CATCH THROW) => markPaths(x,y1,s) or "APPEND"/[markPaths(x,u,markCons(i,s)) for u in y1 for i in 0..] "APPEND"/[markPaths(x,u,markCons(i,s)) for u in y for i in 0..] @@ -697,7 +697,7 @@ markPathsEqual(x,y) == y is [fn,.,z] and fn in '(PART CATCH THROW) and markPathsEqual(x,z) => true y is ["%LET",a,b] and GENSYMP a and markPathsEqual(x,b) => true y is ['IF,a,b,:.] and GENSYMP a => markPathsEqual(x,b) -------> ??? - y is ['call,:r] => markPathsEqual(IFCDR x,r) + y is ["call",:r] => markPathsEqual(IFCDR x,r) x is ['REDUCE,.,.,c,:.] and c is ['COLLECT,:u] and y is ['PROGN,.,repeet,:.] and repeet is ['REPEAT,:v] => markPathsEqual(u,v) atom y or atom x => @@ -1389,7 +1389,7 @@ mkPaths(x,y) == --x < y; find location s of x in y (initially s=nil) x is [op, :u] and op in '(LIST VECTOR) and y is ['construct,:v] and markPathsEqual(['construct,:u],y) => [y] (y is ["%LET",a,b] or y is ['IF,a,b,:.]) and GENSYMP a and markPathsEqual(x,b) => [y] - y is ['call,:r] => + y is ["call",:r] => -- markPathsEqual(x,y1) => [y] mkPaths(x,r) => [y] y is ['PART,.,y1] => mkPaths(x,y1) diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot index 7f9e5266..baf3c218 100644 --- a/src/interp/nrunfast.boot +++ b/src/interp/nrunfast.boot @@ -478,7 +478,7 @@ lazyMatch(source,lazyt,dollar,domain) == STRINGP source and lazyt is ['QUOTE,=source] => true NUMBERP source => lazyt is ['_#, slotNum] => source = #(domain.slotNum) - lazyt is ['call,'LENGTH, slotNum] => source = #(domain.slotNum) + lazyt is ["call",'LENGTH, slotNum] => source = #(domain.slotNum) nil -- A hideous hack on the same lines as the previous four lines JHD/MCD diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot index 31983811..0e54854f 100644 --- a/src/interp/wi2.boot +++ b/src/interp/wi2.boot @@ -437,7 +437,7 @@ applyMapping([op,:argl],m,e,ml) == getAbbreviation($op,#rest $form) [op',:argl',"$"] where op':= INTERN STRCONC(encodeItem nprefix,";",encodeItem op) - ['call,['applyFun,op],:argl'] + ["call",['applyFun,op],:argl'] pairlis := pairList(argl',$FormalMapVariableList) convert([form,SUBLIS(pairlis,first ml),e],m) |