diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-07-06 18:58:35 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-07-06 18:58:35 +0000 |
| commit | 2cb102a281332ac6410c1ae3b14ceeb56d778aae (patch) | |
| tree | c1a95ce8cc7d01c6a08fb4b127b6157c47996723 /src/interp/define.boot | |
| parent | b0f950ab3726cf4facbe2b94f97ffbb598963165 (diff) | |
| download | open-axiom-2cb102a281332ac6410c1ae3b14ceeb56d778aae.tar.gz | |
* interp/parse.boot ($normalizeTree): New.
(parseNotEqual): Likewise.
* interp/compiler.boot (compCompilerPredicate): New.
(compileNot): Use it.
* interp/define.boot (compSubDomain1): Likewise.
(doItIf): Likewise.
* interp/bootlex.lisp (boot): Set $nornamizeTree.
* algebra/Makefile.pamphlet (axiom_algebra_layer_9): Move from
layer 4 to here.
Diffstat (limited to 'src/interp/define.boot')
| -rw-r--r-- | src/interp/define.boot | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/interp/define.boot b/src/interp/define.boot index 55ea350a..e92ca4d1 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -1276,7 +1276,7 @@ compSubDomain1(domainForm,predicate,m,e) == [.,.,e]:= compMakeDeclaration([":","#1",domainForm],$EmptyMode,addDomain(domainForm,e)) u:= - compOrCroak(predicate,$Boolean,e) or + compCompilerPredicate(predicate,e) or stackSemanticError(["predicate: ",predicate, " cannot be interpreted with #1: ",domainForm],nil) prefixPredicate:= lispize u.expr @@ -1403,7 +1403,7 @@ isMacro(x,e) == doItIf(item is [.,p,x,y],$predl,$e) == olde:= $e - [p',.,$e]:= comp(p,$Boolean,$e) or userError ['"not a Boolean:",p] + [p',.,$e]:= compCompilerPredicate(p,$e) or userError ['"not a Boolean:",p] oldFLP:=$functorLocalParameters if x^="%noBranch" then compSingleCapsuleItem(x,$predl,getSuccessEnvironment(p,$e)) |