diff options
author | dos-reis <gdr@axiomatics.org> | 2010-07-03 23:17:46 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2010-07-03 23:17:46 +0000 |
commit | 704439cfc3b15316702dabe92419b9cd2f2fe9d7 (patch) | |
tree | 5d0a3ae67abed87e874be3ce9790468b284dd839 /src/interp/wi2.boot | |
parent | 9f34933f2f76a2a59e70e458ba529c99ae7e64d8 (diff) | |
download | open-axiom-704439cfc3b15316702dabe92419b9cd2f2fe9d7.tar.gz |
* interp/category.boot (isCategoryForm): Tidy.
* interp/compiler.boot (compMacro): Handle parameterized definition.
* interp/define.boot (macroExpand): Likewise.
(macroExpandList): Move case for niladic macros to macroExpand.
* interp/g-util.boot (putMacro): New utility function.
Diffstat (limited to 'src/interp/wi2.boot')
-rw-r--r-- | src/interp/wi2.boot | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot index 1bd25e3b..ce36da65 100644 --- a/src/interp/wi2.boot +++ b/src/interp/wi2.boot @@ -400,7 +400,7 @@ compMakeCategoryObject(c,$e) == nil macroExpand(x,e) == --not worked out yet - atom x => (u:= get(x,"macro",e) => macroExpand(u,e); x) + atom x => (u:= get(x,'macro,e) => macroExpand(u,e); x) x is ['DEF,lhs,sig,spCases,rhs] => ['DEF,macroExpand(lhs,e), macroExpandList(sig,e),macroExpandList(spCases,e), macroExpand(rhs,e)] @@ -1074,7 +1074,7 @@ rhsOfLetIsDomainForm code == doItDef item == ['DEF,[op,:.],:.] := item - body:= isMacro(item,$e) => $e:= put(op,"macro",body,$e) + body:= isMacro(item,$e) => $e := putMacro(op,body,$e) [.,.,$e]:= t:= compOrCroak(item,$EmptyMode,$e) chk(item,3) item.first := "CodeDefine" |