diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-04-30 18:55:21 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-04-30 18:55:21 +0000 |
| commit | 42cf0984b569e49060252e536c0c7e7aee469873 (patch) | |
| tree | c2cb31c68df04f75bfd9a490ae10b9c6cf795102 /src/interp/nrunfast.boot | |
| parent | 5770442f576aa0c1e389344a636f1e4edca1b136 (diff) | |
| download | open-axiom-42cf0984b569e49060252e536c0c7e7aee469873.tar.gz | |
* More cleanup
Diffstat (limited to 'src/interp/nrunfast.boot')
| -rw-r--r-- | src/interp/nrunfast.boot | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot index 3b6952f8..e5dff431 100644 --- a/src/interp/nrunfast.boot +++ b/src/interp/nrunfast.boot @@ -670,22 +670,22 @@ newHasTest(domform,catOrAtt) == -- atom (infovec := getInfovec opOf domform) => fn(domform,catOrAtt) where fn(a,b) == categoryForm?(a) => assoc(b, ancestorsOf(a, nil)) - isPartialMode a => throwKeyedMsg("S2IS0025",NIL) + isPartialMode a => throwKeyedMsg("S2IS0025",nil) b is ["SIGNATURE",:opSig] => HasSignature(evalDomain a,opSig) b is ["ATTRIBUTE",attr] => HasAttribute(evalDomain a,attr) - hasCaty(a,b,NIL) isnt 'failed + hasCaty(a,b,nil) isnt 'failed HasCategory(evalDomain a,b) => true -- for asharp domains: must return Boolean op := opOf catOrAtt isAtom := atom catOrAtt not isAtom and op is 'Join => and/[newHasTest(domform,x) for x in rest catOrAtt] -- we will refuse to say yes for 'Cat has Cat' ---getConstructorKindFromDB opOf domform = "category" => throwKeyedMsg("S2IS0025",NIL) +--getConstructorKindFromDB opOf domform = "category" => throwKeyedMsg("S2IS0025",nil) -- on second thoughts we won't! categoryForm? domform => domform = catOrAtt => 'T - for [aCat,:cond] in [:ancestorsOf(domform,NIL),:applySubst(pairList($FormalMapVariableList,rest domform),getConstructorAttributesFromDB(opOf domform))] | aCat = catOrAtt repeat + for [aCat,:cond] in [:ancestorsOf(domform,nil),:applySubst(pairList($FormalMapVariableList,rest domform),getConstructorAttributesFromDB(opOf domform))] | aCat = catOrAtt repeat return evalCond cond where evalCond x == atom x => x |