aboutsummaryrefslogtreecommitdiff
path: root/src/interp/cparse.boot
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2009-01-03 10:26:16 +0000
committerdos-reis <gdr@axiomatics.org>2009-01-03 10:26:16 +0000
commitad0d6445de436a1c7c04cfe14316d620cb9202b3 (patch)
tree2165a9a2446cc52a27bd6545359607e7dc376599 /src/interp/cparse.boot
parent844be40b5b876fffd816f285f87711cca6ef3121 (diff)
downloadopen-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/interp/cparse.boot')
-rw-r--r--src/interp/cparse.boot12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/interp/cparse.boot b/src/interp/cparse.boot
index 7f2c2971..c3b11c5b 100644
--- a/src/interp/cparse.boot
+++ b/src/interp/cparse.boot
@@ -264,7 +264,7 @@ npLeftAssoc(operations,parser)==
else false
npInfixOp()==
- EQ(CAAR $stok,"key") and
+ CAAR $stok = "key" and
GETL($ttok,"INFGENERIC") and npPushId()
npInfixOperator()== npInfixOp() or
@@ -279,7 +279,7 @@ npInfixOperator()== npInfixOp() or
npRestore a
false
-npInfKey s== EQ(CAAR $stok,"key") and MEMQ($ttok,s) and npPushId()
+npInfKey s== CAAR $stok="key" and MEMQ($ttok,s) and npPushId()
npDDInfKey s==
npInfKey s or
@@ -334,20 +334,20 @@ npWConditional f==
-- peek for keyword s, no advance of token stream
-npEqPeek s == EQ(CAAR $stok,"key") and EQ(s,$ttok)
+npEqPeek s == CAAR $stok="key" and EQ(s,$ttok)
-- test for keyword s, if found advance token stream
npEqKey s ==
- EQ(CAAR $stok,"key") and EQ(s,$ttok) and npNext()
+ CAAR $stok="key" and EQ(s,$ttok) and npNext()
$npTokToNames:= ["~","#","[]","{}", "[||]","{||}"]
npId() ==
- EQ(CAAR $stok,"id") =>
+ CAAR $stok="id" =>
npPush $stok
npNext()
- EQ(CAAR $stok,"key") and MEMQ($ttok,$npTokToNames)=>
+ CAAR $stok="key" and MEMQ($ttok,$npTokToNames)=>
npPush tokConstruct("id",$ttok,tokPosn $stok)
npNext()
false