diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-02-09 21:12:35 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-02-09 21:12:35 +0000 |
| commit | e6d7d0e6a6a710b4a6ebcb0431dc19bbd666ced0 (patch) | |
| tree | 256009958c8e69d2cd02ce2add85cf20a72bf9f5 /src/interp/nrunfast.boot | |
| parent | 5663732162b1010ab0b506c87f576f2b78c27994 (diff) | |
| download | open-axiom-e6d7d0e6a6a710b4a6ebcb0431dc19bbd666ced0.tar.gz | |
Add MappingCategory as a (builtin) category.
* interp/sys-constants.boot ($CategoryNames): Include MappingCategory.
* interp/g-cndata.boot (unabbrevSpecialForms): Handle
MappingCategory, RecordCategory, and UnionCategory.
* interp/buildom.boot (MappingCategory): New.
* interp/compiler.boot: Elaboration MappingCategory forms.
* interp/g-error.boot (needsToSplitMessage): Fix thinko from
type-based dispatch done by the Boot translator.
* interp/nrunfast.boot (builtinConstructor?): New.
(generalizedBuiltinConstructor?): Likewise.
(lazyMatch): Use them.
(newHasTest): Properly recognize all flavours of category forms.
Diffstat (limited to 'src/interp/nrunfast.boot')
| -rw-r--r-- | src/interp/nrunfast.boot | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot index 57afc9a7..2a524414 100644 --- a/src/interp/nrunfast.boot +++ b/src/interp/nrunfast.boot @@ -463,14 +463,24 @@ lazyMatchArg2(s,a,dollar,domain,typeFlag) == lazyMatch(s,a,dollar,domain) --above line is temporarily necessary until system is compiled 8/15/90 --s = a - + +++ Return true if the symbol `s' designates a builtin constructor. +builtinConstructor? s == + s in $BuiltinConstructorNames + +++ Return true if the symbol `s' designates a generalized builtin +++ constructor, that is a builtin constructor or any operator we +++ deem as a constructor from the domain slot-filling machinery perspective. +generalizedBuiltinConstructor? s == + builtinConstructor? s or s is "QUOTE" or s is "[||]" + lazyMatch(source,lazyt,dollar,domain) == lazyt is [op,:argl] and cons? source and op=first source and #(sargl := rest source) = #argl => - op in '(Record Union) and first argl is [":",:.] => + builtinConstructor? op and first argl is [":",:.] => and/[stag = atag and lazyMatchArg(s,a,dollar,domain) for [.,stag,s] in sargl for [.,atag,a] in argl] - op in '(Union Mapping _[_|_|_] QUOTE Enumeration) => + generalizedBuiltinConstructor? op => and/[lazyMatchArg(s,a,dollar,domain) for s in sargl for a in argl] coSig := getDualSignatureFromDB op null coSig => error ["bad Constructor op", op] @@ -644,7 +654,7 @@ newHasTest(domform,catOrAtt) == -- we will refuse to say yes for 'Cat has Cat' --getConstructorKindFromDB opOf domform = "category" => throwKeyedMsg("S2IS0025",NIL) -- on second thoughts we won't! - getConstructorKindFromDB opOf domform = "category" => + categoryForm? domform => domform = catOrAtt => 'T for [aCat,:cond] in [:ancestorsOf(domform,NIL),:SUBLISLIS (rest domform,$FormalMapVariableList,getConstructorAttributesFromDB(opOf domform))] | aCat = catOrAtt repeat return evalCond cond where @@ -658,7 +668,7 @@ newHasTest(domform,catOrAtt) == pred in '(OR or %or) => or/[evalCond i for i in l] pred in '(AND and %and) => and/[evalCond i for i in l] x - not isAtom and constructor? op => + not isAtom and categoryForm? catOrAtt => domain := eval mkEvalable domform newHasCategory(domain,catOrAtt) catOrAtt is [":",op,type] => |