From 7f1e696f0ec12616045ac9f698b10640771ca51c Mon Sep 17 00:00:00 2001 From: dos-reis Date: Thu, 11 Oct 2007 06:02:32 +0000 Subject: * Makefile.pamphlet (<>): Remove. * lisplib.boot.pamphlet: Push into package "BOOT". (findConstructorSlotNumber): Tidy. (sigsMatch): Likewise. --- src/interp/lisplib.boot.pamphlet | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/interp/lisplib.boot.pamphlet') 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 @@ <<*>>= <> +)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" -- cgit v1.2.3