diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-10-22 17:15:56 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-10-22 17:15:56 +0000 |
| commit | eaa1adc1cb6ed9ec07ff56614700fe713ba6667c (patch) | |
| tree | c37aeb6ed1ebfe0adbe0ced27a1402aa4dad043a /src/interp/i-funsel.boot | |
| parent | 5da95c1b34152d06c776e1c446a51c6703b46cc6 (diff) | |
| download | open-axiom-eaa1adc1cb6ed9ec07ff56614700fe713ba6667c.tar.gz | |
* interp/br-op2.boot (htSayExplicitExports): Don't forget possible
constant marker in exported signatures.
* interp/cattable.boot (simpHas): Likewise.
* interp/format.boot (form2String1): Likewise.
* interp/i-eval.boot (evaluateSignature): Likewise.
* interp/i-funsel.boot (hasCaty): Likewise.
(hasAttSig): Likewise.
* interp/define.boot (extendsCategory): Likewise.
(extendsCategoryBasic): Likewise.
(catExtendsCat?): Likewise.
(mkExportFromDescription): New.
(mkCategoryPackage): Use it.
* boot/tokens.boot: Add new selectors: mapOpsig, mapOperation,
mapPredicate, and mapImpl.
Diffstat (limited to 'src/interp/i-funsel.boot')
| -rw-r--r-- | src/interp/i-funsel.boot | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot index 513d3a9a..87aa5bb8 100644 --- a/src/interp/i-funsel.boot +++ b/src/interp/i-funsel.boot @@ -1472,7 +1472,7 @@ hasCaty(d,cat,SL) == -- 2. a list of pairs (argument to cat,condition) otherwise -- then the substitution SL is augmented, or the result is 'failed cat is ['CATEGORY,.,:y] => hasAttSig(d,subCopy(y,constructSubst d),SL) - cat is ['SIGNATURE,foo,sig] => + cat is ['SIGNATURE,foo,sig,:.] => hasSig(d,foo,subCopy(sig,constructSubst d),SL) cat is ['ATTRIBUTE,a] => hasAtt(d,subCopy(a,constructSubst d),SL) cat is ["Join",:.] => @@ -1546,7 +1546,7 @@ hasAttSig(d,x,SL) == -- the result is an augmented SL, if d has x, 'failed otherwise for y in x until SL is 'failed repeat SL:= y is ['ATTRIBUTE,a] => hasAtt(d,a,SL) - y is ['SIGNATURE,foo,s] => hasSig(d,foo,s,SL) + y is ['SIGNATURE,foo,s,:.] => hasSig(d,foo,s,SL) keyedSystemError("S2GE0016", ['"hasAttSig",'"unexpected form of unnamed category"]) SL |