From ad0d6445de436a1c7c04cfe14316d620cb9202b3 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sat, 3 Jan 2009 10:26:16 +0000 Subject: 2009-01-03 Gabriel Dos Reis * Makefile.pamphlet (AXIOM_SRC_TARGETS): Add all-databases. src/ChangeLog 2009-01-03 Gabriel Dos Reis * 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. --- src/interp/interop.boot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/interp/interop.boot') diff --git a/src/interp/interop.boot b/src/interp/interop.boot index 58b46b42..fde42557 100644 --- a/src/interp/interop.boot +++ b/src/interp/interop.boot @@ -360,7 +360,7 @@ basicLookupCheckDefaults(op,sig,domain,dollar) == $hasCatOpHash := hashString '"%%" opIsHasCat op == hashCode? op => EQL(op, $hasCatOpHash) - EQ(op, "%%") + op = "%%" -- has cat questions lookup up twice if false -- replace with following ? @@ -439,7 +439,7 @@ hashNewLookupInTable(op,sig,dollar,[domain,opvec],flag) == nil slot := domain.loc null atom slot => - EQ(QCAR slot,'newGoGet) => someMatch:=true + QCAR slot = 'newGoGet => someMatch:=true --treat as if operation were not there --if EQ(QCAR slot,'newGoGet) then -- UNWIND_-PROTECT --break infinite recursion @@ -561,7 +561,7 @@ newHasAttribute(domain,attrib) == or/[x for x in domain.2 | attrib = hashType(first x, hashPercent)] LASSOC(attrib,domain.2) predIndex => - EQ(predIndex,0) => true + predIndex = 0 => true predvec := domain.3 testBitVector(predvec,predIndex) false @@ -575,7 +575,7 @@ newHasCategory(domain,catform) == #catvec > 0 and INTEGERP KDR catvec.0 => --old style predIndex := lazyMatchAssocV1(catform,catvec,domain) null predIndex => false - EQ(predIndex,0) => true + predIndex = 0 => true predvec := QVELT(domain,3) testBitVector(predvec,predIndex) lazyMatchAssocV(catform,auxvec,catvec,domain) --new style -- cgit v1.2.3