diff options
| author | dos-reis <gdr@axiomatics.org> | 2007-10-11 06:02:32 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2007-10-11 06:02:32 +0000 |
| commit | 7f1e696f0ec12616045ac9f698b10640771ca51c (patch) | |
| tree | 9951ff2874c5d62306a3b6413d77615e53551c93 /src | |
| parent | e662e66b323f896bc662d1ff326cb14cc5a4950a (diff) | |
| download | open-axiom-7f1e696f0ec12616045ac9f698b10640771ca51c.tar.gz | |
* Makefile.pamphlet (<<lisplib.clisp>>): Remove.
* lisplib.boot.pamphlet: Push into package "BOOT".
(findConstructorSlotNumber): Tidy.
(sigsMatch): Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/interp/ChangeLog | 7 | ||||
| -rw-r--r-- | src/interp/Makefile.in | 4 | ||||
| -rw-r--r-- | src/interp/Makefile.pamphlet | 10 | ||||
| -rw-r--r-- | src/interp/lisplib.boot.pamphlet | 6 |
4 files changed, 11 insertions, 16 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog index 0611d6a8..9d5369ef 100644 --- a/src/interp/ChangeLog +++ b/src/interp/ChangeLog @@ -1,3 +1,10 @@ +2007-10-11 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * Makefile.pamphlet (<<lisplib.clisp>>): Remove. + * lisplib.boot.pamphlet: Push into package "BOOT". + (findConstructorSlotNumber): Tidy. + (sigsMatch): Likewise. + 2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu> * br-search.boot.pamphlet: Replace uses of $SPAROOT with diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in index 709c2768..0b9eab63 100644 --- a/src/interp/Makefile.in +++ b/src/interp/Makefile.in @@ -787,10 +787,6 @@ i-util.clisp: i-util.boot @ echo 325 making $@ from $< @ echo '(old-boot::boot "i-util.boot")' | ${DEPSYS} -lisplib.clisp: lisplib.boot - @ echo 336 making $@ from $< - @ echo '(old-boot::boot "lisplib.boot")' | ${DEPSYS} - match.clisp: match.boot @ echo 339 making $@ from $< @ echo '(old-boot::boot "match.boot")' | ${DEPSYS} diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index fd929778..e3dd2a29 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -1560,14 +1560,6 @@ iterator.clisp: iterator.boot @ echo '(old-boot::boot "iterator.boot")' | ${DEPSYS} @ -\subsection{lisplib.boot} - -<<lisplib.clisp>>= -lisplib.clisp: lisplib.boot - @ echo 336 making $@ from $< - @ echo '(old-boot::boot "lisplib.boot")' | ${DEPSYS} -@ - \subsection{match.boot} <<match.clisp>>= @@ -2153,8 +2145,6 @@ boot-pkg.$(FASLEXT): boot-pkg.lisp <<i-util.clisp>> -<<lisplib.clisp>> - <<match.clisp>> <<modemap.clisp>> diff --git a/src/interp/lisplib.boot.pamphlet b/src/interp/lisplib.boot.pamphlet index bffb777e..8028e449 100644 --- a/src/interp/lisplib.boot.pamphlet +++ b/src/interp/lisplib.boot.pamphlet @@ -50,6 +50,8 @@ <<*>>= <<license>> +)package "BOOT" + --% Standard Library Creation Functions readLib(fn,ft) == readLib1(fn,ft,"*") @@ -577,7 +579,7 @@ findConstructorSlotNumber(domainForm,domain,op,sig) == constructorArglist:= rest domainForm nsig:=#sig tail:= or/[r for [[op1,sig1],:r] in domain.1 | op=op1 and nsig=#sig1 and - and/[compare for a in sig for b in sig1]] where compare == + "and"/[compare for a in sig for b in sig1]] where compare() == a=b => true FIXP b => a=constructorArglist.b isSuperDomain(bustUnion b,bustUnion a,$CategoryFrame) @@ -615,7 +617,7 @@ sigsMatch(sig,sig1,domainForm) == findDomainSlotNumber(domain,op,sig) == --using slot 1 of the domain nsig:=#sig tail:= or/[r for [[op1,sig1],:r] in domain.1 | op=op1 and nsig=#sig1 and - and/[a=b or isSuperDomain(bustUnion b,bustUnion a,$CategoryFrame) + "and"/[a=b or isSuperDomain(bustUnion b,bustUnion a,$CategoryFrame) for a in sig for b in sig1]] tail is [.,["ELT",.,n]] => n systemErrorHere '"findDomainSlotNumber" |