diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-04-13 06:22:18 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-04-13 06:22:18 +0000 |
| commit | c5659a8580de5b531891c6703465c84add9fbb1b (patch) | |
| tree | 60966651b64626e365cd158a89cd41a9028ea8a9 /src/interp/g-cndata.boot | |
| parent | 3c748c0ab1f5119528ae3ae41cc144371b1b375c (diff) | |
| download | open-axiom-c5659a8580de5b531891c6703465c84add9fbb1b.tar.gz | |
Various cleanups.
Diffstat (limited to 'src/interp/g-cndata.boot')
| -rw-r--r-- | src/interp/g-cndata.boot | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/interp/g-cndata.boot b/src/interp/g-cndata.boot index 2b1a05c3..d6ad6b1c 100644 --- a/src/interp/g-cndata.boot +++ b/src/interp/g-cndata.boot @@ -79,17 +79,20 @@ constructor? name == -- if it is a constructor name, return the abbreviation GETDATABASE(name,'ABBREVIATION) +domainForm?: %Form -> %Boolean domainForm? d == - GETDATABASE(opOf d,'CONSTRUCTORKIND) = 'domain + getConstructorKindFromDB opOf d = "domain" +packageForm?: %Form -> %Boolean packageForm? d == - GETDATABASE(opOf d,'CONSTRUCTORKIND) = 'package + getConstructorKindFromDB opOf d = "package" +categoryFrom?: %Form -> %Boolean categoryForm? c == op := opOf c MEMQ(op, $CategoryNames) => true - GETDATABASE(op,'CONSTRUCTORKIND) = 'category => true - nil + getConstructorKindFromDB op = "category" => true + false getImmediateSuperDomain(d) == IFCAR GETDATABASE(opOf d, 'SUPERDOMAIN) @@ -117,7 +120,7 @@ mkUserConstructorAbbreviation(c,a,type) == abbQuery(x) == abb := GETDATABASE(x,'ABBREVIATION) => - sayKeyedMsg("S2IZ0001",[abb,GETDATABASE(x,'CONSTRUCTORKIND),x]) + sayKeyedMsg("S2IZ0001",[abb,getConstructorKindFromDB x,x]) sayKeyedMsg("S2IZ0003",[x]) installConstructor(cname,type) == @@ -140,7 +143,7 @@ constructorAbbreviationErrorCheck(c,a,typ,errmess) == if s ^= UPCASE s then throwKeyedMsg("S2IL0006",NIL) abb := GETDATABASE(c,'ABBREVIATION) name:= GETDATABASE(a,'CONSTRUCTOR) - type := GETDATABASE(c,'CONSTRUCTORKIND) + type := getConstructorKindFromDB c a=abb and c^=name => lisplibError(c,a,typ,abb,name,type,'duplicateAbb) a=name and c^=name => lisplibError(c,a,typ,abb,name,type,'abbIsName) c=name and typ^=type => lisplibError(c,a,typ,abb,name,type,'wrongType) |