aboutsummaryrefslogtreecommitdiff
path: root/src/interp/i-output.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/i-output.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/i-output.boot')
-rw-r--r--src/interp/i-output.boot34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index 15dd641d..e804fb2d 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -1676,7 +1676,7 @@ printBasic x ==
PRIN1(x,$algebraOutputStream)
charybdis(u,start,linelength) ==
- EQ(keyp u,'EQUATNUM) and ^(CDDR u) =>
+ keyp u='EQUATNUM and ^(CDDR u) =>
charybdis(['PAREN,u.1],start,linelength)
charyTop(u,start,linelength)
@@ -1692,7 +1692,7 @@ charyTop(u,start,linelength) ==
(w := WIDTH(b)) > linelength-start => charyTop(a,start,linelength)
charyTop(b,half(linelength-start-w),linelength)
v := charyTopWidth u
- EQ(keyp u,'ELSE) => charyElse(u,v,start,linelength)
+ keyp u='ELSE => charyElse(u,v,start,linelength)
WIDTH(v) > linelength => charyTrouble(u,v,start,linelength)
d := APP(v,start,0,nil)
n := superspan v
@@ -1737,16 +1737,16 @@ charyTrouble1(u,v,start,linelength) ==
atom u => outputString(start,linelength,atom2String u)
EQ(x:= keyp u,'_-) => charyMinus(u,v,start,linelength)
MEMQ(x,'(_+ _* AGGLST)) => charySplit(u,v,start,linelength)
- EQ(x,'EQUATNUM) => charyEquatnum(u,v,start,linelength)
+ x='EQUATNUM => charyEquatnum(u,v,start,linelength)
d := GETL(x,'INFIXOP) => charyBinary(d,u,v,start,linelength)
x = 'OVER =>
charyBinary(GETL("/",'INFIXOP),u,v,start,linelength)
- EQ(3,LENGTH u) and GETL(x,'Led) =>
+ 3=#u and GETL(x,'Led) =>
d:= PNAME first GETL(x,'Led)
charyBinary(d,u,v,start,linelength)
- EQ(x,'CONCAT) =>
+ x='CONCAT =>
concatTrouble(rest v,d,start,linelength,nil)
- EQ(x,'CONCATB) =>
+ x='CONCATB =>
(rest v) is [loop, 'repeat, body] =>
charyTop(['CONCATB,loop,'repeat],start,linelength)
charyTop(body,start+2,linelength-2)
@@ -1756,21 +1756,21 @@ charyTrouble1(u,v,start,linelength) ==
charyTop(body,start+2,linelength-2)
concatTrouble(rest v,d,start,linelength,true)
GETL(x,'INFIXOP) => charySplit(u,v,start,linelength)
- EQ(x,'PAREN) and
+ x='PAREN and
(EQ(keyp u.1,'AGGLST) and (v:= ",") or EQ(keyp u.1,'AGGSET) and
(v:= ";")) => bracketagglist(rest u.1,start,linelength,v,"_(","_)")
- EQ(x,'PAREN) and EQ(keyp u.1,'CONCATB) =>
+ x='PAREN and EQ(keyp u.1,'CONCATB) =>
bracketagglist(rest u.1,start,linelength," ","_(","_)")
- EQ(x,'BRACKET) and (EQ(keyp u.1,'AGGLST) and (v:= ",")) =>
+ x='BRACKET and (EQ(keyp u.1,'AGGLST) and (v:= ",")) =>
bracketagglist(rest u.1,start,linelength,v,
specialChar 'lbrk, specialChar 'rbrk)
- EQ(x,'BRACE) and (EQ(keyp u.1,'AGGLST) and (v:= ",")) =>
+ x='BRACE and (EQ(keyp u.1,'AGGLST) and (v:= ",")) =>
bracketagglist(rest u.1,start,linelength,v,
specialChar 'lbrc, specialChar 'rbrc)
- EQ(x,'EXT) => longext(u,start,linelength)
- EQ(x,'MATRIX) => MATUNWND()
- EQ(x,'ELSE) => charyElse(u,v,start,linelength)
- EQ(x,'SC) => charySemiColon(u,v,start,linelength)
+ x='EXT => longext(u,start,linelength)
+ x='MATRIX => MATUNWND()
+ x='ELSE => charyElse(u,v,start,linelength)
+ x='SC => charySemiColon(u,v,start,linelength)
charybdis(x,start,linelength)
if rest u then charybdis(['ELSE,:rest u],start,linelength)
-- changed from charybdis(...) by JHD 2 Aug 89, since rest u might be null
@@ -1964,7 +1964,7 @@ appext(u,x,y,d) ==
temp := 1 + WIDTH agg(2,u) + WIDTH agg(3,u)
n := MAX(WIDTH CADR u, WIDTH agg(4,u), temp)
if EQCAR(first(z := agg(5,u)), 'EXT) and
- (EQ(n,3) or (n > 3 and ^(atom z)) ) then
+ (n=3 or (n > 3 and ^(atom z)) ) then
n := 1 + n
d := APP(z, x + n, y, d)
@@ -2040,7 +2040,7 @@ extwidth(u) ==
1 + WIDTH agg(2, u) + WIDTH agg(3, u) )
nil or
(EQCAR(first(z := agg(5, u)), 'EXT) and _
- (EQ(n, 3) or ((n > 3) and null atom z) ) =>
+ (n=3 or ((n > 3) and null atom z) ) =>
n := 1 + n)
true => n + WIDTH agg(5, u)
@@ -2332,7 +2332,7 @@ bracketagglist(u, start, linelength, tchr, open, close) ==
((s := s + WIDTH first x + 1) >= linelength) => return(s)
null rest x => return(s := -1)
nil or
- EQ(s, -1) => (nextu := nil)
+ s = -1 => (nextu := nil)
EQ(lastx, u) => ((nextu := rest u); RPLACD(u, nil) )
true => ((nextu := lastx); RPLACD(PREDECESSOR(lastx, u), nil))
for x in tails u repeat