diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-01-03 10:26:16 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-01-03 10:26:16 +0000 |
| commit | ad0d6445de436a1c7c04cfe14316d620cb9202b3 (patch) | |
| tree | 2165a9a2446cc52a27bd6545359607e7dc376599 /src/algebra/strap | |
| parent | 844be40b5b876fffd816f285f87711cca6ef3121 (diff) | |
| download | open-axiom-ad0d6445de436a1c7c04cfe14316d620cb9202b3.tar.gz | |
2009-01-03 Gabriel Dos Reis <gdr@cs.tamu.edu>
* Makefile.pamphlet (AXIOM_SRC_TARGETS): Add all-databases.
src/ChangeLog
2009-01-03 Gabriel Dos Reis <gdr@cs.tamu.edu>
* lisp/core.lisp.in (|%algebraSystemIsComplete|): New.
(|%basicSystemIsComplete|): Use it.
* interp/wi1.boot (setqSingle): Use maximalSuperType.
(coerceSubset): Simplify.
(compCoerce1): Tidy.
* interp/i-resolv.boot (resolveTCat): Use superType.
* interp/lisplib.boot (findConstructorSlotNumber): Use isSubset.
(sigsMatch): Likewise.
(findDomainSlotNumber): Likewise.
* interp/define.boot (compSubDomain1): Reject for complex subdomain
predicate. Support paramterized subdomains.
* interp/daase.lisp (interpOpen): Read superdomain slot.
(getdatabase): Remove adhoc hardcoded superdomain info.
Return superdomain info stored in database.
(localnrlib): Read superdomain info.
(write-interpdb): Write superdomain info.
(database): Add superdomain slot.
* interp/g-util.boot (superType): New.
(maximalSuperType): Rework. Support parameterized subdomains.
(noteSubDomainInfo): New.
(isSubDomain): Rework.
* interp/c-util.boot (isSubset): Rework.
* interp/g-opt.boot (optEQ): Remove.
* interp/g-cndata.boot (getImmediateSuperDomain): Remove.
(maximalSuperType): Move to g-util.boot.
* interp/types.boot (%Constructor): New type specifier.
(%Instantiation): Likewise.
* interp/compiler.boot (primitiveType): Don't return $NegativeInteger.
(maxSuperType): Remove.
(hasType): Use maximalSuperType.
(satisfies): New.
(coerceSubset): Use it. Simplify.
* interp/wi2.boot (smallIntegerStep): Use maximalSuperType.
* interp/sys-constants.boot ($AtVariables): New.
($NegativeInteger): Remove.
($NonPositiveInteger): Likewise.
($CategoryNames): Category is not a category.
* interp/property.lisp: Remove Subsets property settings.
* interp/i-coerce.boot (coerceSubDomain): Simplify.
(coerceImmediateSubDomain): Remove.
(getSubDomainPredicate): Simplify.
* interp/category.boot (SourceLevelSubset): Use isSubDomain.
(MachineLevelSubset): Likewise.
* interp/modemap.boot (mergeModemap): Likewise.
(isSuperDomain): Remove.
(augModemapsFromDomain): Support parameterized subdomains.
* interp/i-util.boot (isSubDomain): Move to g-util.boot.
* Makefile.pamphlet (all-databases): New target.
* interp/Makefile.pamphlet ($(AXIOMSYS)): Push
:open-axiom-algebra-system onto *FEATURES*.
* etc/Makefile.in (all-databases): New target.
Diffstat (limited to 'src/algebra/strap')
| -rw-r--r-- | src/algebra/strap/NNI.lsp | 11 | ||||
| -rw-r--r-- | src/algebra/strap/PI.lsp | 11 | ||||
| -rw-r--r-- | src/algebra/strap/SINT.lsp | 9 |
3 files changed, 5 insertions, 26 deletions
diff --git a/src/algebra/strap/NNI.lsp b/src/algebra/strap/NNI.lsp index a6017162..9d034bca 100644 --- a/src/algebra/strap/NNI.lsp +++ b/src/algebra/strap/NNI.lsp @@ -1,15 +1,8 @@ (/VERSIONCHECK 2) -(SETQ |$CategoryFrame| - (|put| #0='|NonNegativeInteger| '|SuperDomain| #1='(|Integer|) - (|put| #1# '|SubDomain| - (CONS '(|NonNegativeInteger| COND ((< |#1| 0) 'NIL) - ('T 'T)) - (DELASC #0# - (|get| #1# '|SubDomain| - |$CategoryFrame|))) - |$CategoryFrame|))) +(|noteSubDomainInfo| '|NonNegativeInteger| '(|Integer|) + '(COND ((< |#1| 0) 'NIL) ('T 'T))) (DECLAIM (FTYPE (FUNCTION ((|%IntegerSection| 0) (|%IntegerSection| 0) diff --git a/src/algebra/strap/PI.lsp b/src/algebra/strap/PI.lsp index 2cf0e75e..72a7e508 100644 --- a/src/algebra/strap/PI.lsp +++ b/src/algebra/strap/PI.lsp @@ -1,15 +1,8 @@ (/VERSIONCHECK 2) -(SETQ |$CategoryFrame| - (|put| #0='|PositiveInteger| '|SuperDomain| - #1='(|NonNegativeInteger|) - (|put| #1# '|SubDomain| - (CONS '(|PositiveInteger| < 0 |#1|) - (DELASC #0# - (|get| #1# '|SubDomain| - |$CategoryFrame|))) - |$CategoryFrame|))) +(|noteSubDomainInfo| '|PositiveInteger| '(|NonNegativeInteger|) + '(< 0 |#1|)) (DEFUN |PositiveInteger| () (PROG () diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp index 7db8a6cd..90441a90 100644 --- a/src/algebra/strap/SINT.lsp +++ b/src/algebra/strap/SINT.lsp @@ -1,14 +1,7 @@ (/VERSIONCHECK 2) -(SETQ |$CategoryFrame| - (|put| #0='|SingleInteger| '|SuperDomain| #1='(|Integer|) - (|put| #1# '|SubDomain| - (CONS '(|SingleInteger| SMINTP |#1|) - (DELASC #0# - (|get| #1# '|SubDomain| - |$CategoryFrame|))) - |$CategoryFrame|))) +(|noteSubDomainInfo| '|SingleInteger| '(|Integer|) '(SMINTP |#1|)) (DECLAIM (FTYPE (FUNCTION (|%Thing| |%Short| |%Shell|) |%Void|) |SINT;writeOMSingleInt|)) |