diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/algebra/strap/ILIST.lsp | 14 | ||||
| -rw-r--r-- | src/algebra/strap/ISTRING.lsp | 12 | ||||
| -rw-r--r-- | src/algebra/strap/LIST.lsp | 6 | ||||
| -rw-r--r-- | src/algebra/strap/PRIMARR.lsp | 12 | ||||
| -rw-r--r-- | src/algebra/strap/VECTOR.lsp | 6 | ||||
| -rw-r--r-- | src/interp/define.boot | 8 |
7 files changed, 34 insertions, 30 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2d8bb7b5..9bd01f6a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2008-11-30 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/define.boot (disallowNiAttribute): Remove. + (compDefineFunctor1): Don't use it anymore. + (compCategoryItem): Filter out nil attributes here. + 2008-11-29 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/nruncomp.boot (deltaTran): Don't check for $NRTaddForm diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp index 39658b69..872490b2 100644 --- a/src/algebra/strap/ILIST.lsp +++ b/src/algebra/strap/ILIST.lsp @@ -555,19 +555,19 @@ (|HasCategory| |#1| '(|OrderedSet|)) (|HasCategory| (|Integer|) '(|OrderedSet|)) (|HasCategory| |#1| '(|SetCategory|)) + (|HasCategory| |#1| + '(|CoercibleTo| (|OutputForm|))) (AND (|HasCategory| |#1| '(|SetCategory|)) (|HasCategory| |#1| (LIST '|Evalable| - (|devaluate| |#1|)))) - (|HasCategory| |#1| - '(|CoercibleTo| (|OutputForm|))))) . #0#)) + (|devaluate| |#1|)))))) . #0#)) (|haddProp| |$ConstructorCache| '|IndexedList| (LIST |dv$1| |dv$2|) (CONS 1 $)) (|stuffDomainSlots| $) (|setShellEntry| $ 6 |#1|) (|setShellEntry| $ 7 |#2|) (COND - ((|testBitVector| |pv$| 9) + ((|testBitVector| |pv$| 8) (|setShellEntry| $ 46 (CONS (|dispatchFunction| |ILIST;coerce;$Of;21|) $)))) (COND @@ -698,8 +698,8 @@ 0 0 0 30 1 3 0 0 6 0 30 1 1 0 71 0 1 2 0 11 30 0 1 1 7 70 0 1 2 0 0 0 8 1 1 0 6 0 13 2 0 72 63 0 1 2 0 0 0 6 1 - 1 0 11 0 1 2 0 11 63 0 1 3 8 0 0 6 6 - 1 3 8 0 0 25 25 1 2 8 0 0 61 1 2 8 0 + 1 0 11 0 1 2 0 11 63 0 1 3 9 0 0 6 6 + 1 3 9 0 0 25 25 1 2 9 0 0 61 1 2 9 0 0 62 1 2 0 11 0 0 12 2 7 11 6 0 1 1 0 25 0 1 1 0 11 0 17 0 0 0 16 2 0 6 0 30 1 3 0 6 0 30 6 1 2 0 0 0 65 1 2 0 @@ -711,7 +711,7 @@ 8 63 0 1 3 0 0 0 0 30 1 1 0 0 0 35 1 3 69 0 1 1 0 0 25 26 2 0 0 0 0 54 2 0 0 0 6 1 1 0 0 39 1 2 0 0 0 6 1 2 0 0 - 6 0 10 2 0 0 0 0 1 1 9 37 0 46 1 0 39 + 6 0 10 2 0 0 0 0 1 1 8 37 0 46 1 0 39 0 1 2 7 11 0 0 1 2 0 11 63 0 1 2 5 11 0 0 1 2 5 11 0 0 1 2 7 11 0 0 48 2 5 11 0 0 1 2 5 11 0 0 1 1 0 8 0 9))))) diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp index 20b18b16..d3c63504 100644 --- a/src/algebra/strap/ISTRING.lsp +++ b/src/algebra/strap/ISTRING.lsp @@ -909,12 +909,12 @@ (|HasCategory| (|Integer|) '(|OrderedSet|)) (|HasCategory| (|Character|) '(|SetCategory|)) + (|HasCategory| (|Character|) + '(|CoercibleTo| (|OutputForm|))) (AND (|HasCategory| (|Character|) '(|SetCategory|)) (|HasCategory| (|Character|) - '(|Evalable| (|Character|)))) - (|HasCategory| (|Character|) - '(|CoercibleTo| (|OutputForm|))))) . #0#)) + '(|Evalable| (|Character|)))))) . #0#)) (|haddProp| |$ConstructorCache| '|IndexedString| (LIST |dv$1|) (CONS 1 $)) (|stuffDomainSlots| $) @@ -1027,8 +1027,8 @@ 0 38 3 0 0 8 0 18 1 3 0 0 0 0 18 23 1 0 84 0 1 2 0 11 18 0 1 1 7 79 0 1 1 0 18 0 69 1 6 8 0 1 2 0 83 80 0 1 2 0 0 - 0 8 1 2 0 11 80 0 1 3 8 0 0 74 74 1 3 - 8 0 0 8 8 1 2 8 0 0 76 1 2 8 0 0 75 1 + 0 8 1 2 0 11 80 0 1 3 9 0 0 74 74 1 3 + 9 0 0 8 8 1 2 9 0 0 76 1 2 9 0 0 75 1 2 0 11 0 0 1 2 7 11 8 0 1 1 0 74 0 1 1 0 11 0 12 0 0 0 10 2 0 0 0 0 1 2 0 0 0 19 21 2 0 8 0 18 52 3 0 8 0 18 8 @@ -1036,7 +1036,7 @@ 1 2 0 7 80 0 1 3 0 0 0 0 18 66 1 0 0 0 17 1 3 78 0 1 1 0 0 74 1 1 0 0 59 67 2 0 0 0 0 16 2 0 0 0 8 1 2 0 0 8 0 - 1 1 9 25 0 27 1 0 0 8 1 2 0 11 80 0 1 + 1 1 8 25 0 27 1 0 0 8 1 2 0 11 80 0 1 2 5 11 0 0 1 2 5 11 0 0 1 2 7 11 0 0 14 2 5 11 0 0 1 2 5 11 0 0 15 1 0 7 0 13))))) diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp index 949f0960..c97fecf3 100644 --- a/src/algebra/strap/LIST.lsp +++ b/src/algebra/strap/LIST.lsp @@ -244,12 +244,12 @@ (|HasCategory| |#1| '(|OpenMath|)) (|HasCategory| (|Integer|) '(|OrderedSet|)) (|HasCategory| |#1| '(|SetCategory|)) + (|HasCategory| |#1| + '(|CoercibleTo| (|OutputForm|))) (AND (|HasCategory| |#1| '(|SetCategory|)) (|HasCategory| |#1| (LIST '|Evalable| - (|devaluate| |#1|)))) - (|HasCategory| |#1| - '(|CoercibleTo| (|OutputForm|))))) . #0#)) + (|devaluate| |#1|)))))) . #0#)) (|haddProp| |$ConstructorCache| '|List| (LIST |dv$1|) (CONS 1 $)) (|stuffDomainSlots| $) diff --git a/src/algebra/strap/PRIMARR.lsp b/src/algebra/strap/PRIMARR.lsp index b9f73fa8..c2c29828 100644 --- a/src/algebra/strap/PRIMARR.lsp +++ b/src/algebra/strap/PRIMARR.lsp @@ -144,12 +144,12 @@ (|HasCategory| |#1| '(|OrderedSet|)) (|HasCategory| (|Integer|) '(|OrderedSet|)) (|HasCategory| |#1| '(|SetCategory|)) + (|HasCategory| |#1| + '(|CoercibleTo| (|OutputForm|))) (AND (|HasCategory| |#1| '(|SetCategory|)) (|HasCategory| |#1| (LIST '|Evalable| - (|devaluate| |#1|)))) - (|HasCategory| |#1| - '(|CoercibleTo| (|OutputForm|))))) . #0#)) + (|devaluate| |#1|)))))) . #0#)) (|haddProp| |$ConstructorCache| '|PrimitiveArray| (LIST |dv$1|) (CONS 1 $)) (|stuffDomainSlots| $) @@ -220,15 +220,15 @@ 7 30 0 1 3 0 0 0 0 9 1 3 0 0 6 0 9 1 1 0 34 0 1 2 0 19 9 0 1 1 7 31 0 1 1 6 6 0 1 2 0 33 23 0 1 2 0 0 0 6 17 2 - 0 19 23 0 1 3 8 0 0 20 20 1 2 8 0 0 - 21 1 3 8 0 0 6 6 1 2 8 0 0 22 1 2 0 + 0 19 23 0 1 3 9 0 0 20 20 1 2 9 0 0 + 21 1 3 9 0 0 6 6 1 2 9 0 0 22 1 2 0 19 0 0 1 2 7 19 6 0 1 1 0 20 0 1 1 0 19 0 1 0 0 0 11 2 0 0 0 25 1 2 0 6 0 9 14 3 0 6 0 9 6 1 2 0 0 0 9 1 2 0 0 0 25 1 2 7 7 6 0 1 2 0 7 23 0 1 3 0 0 0 0 9 1 1 0 0 0 1 1 3 29 0 1 1 0 0 20 1 1 0 0 32 1 2 0 0 6 0 1 2 0 0 0 0 1 - 2 0 0 0 6 1 1 9 28 0 1 2 0 19 23 0 1 + 2 0 0 0 6 1 1 8 28 0 1 2 0 19 23 0 1 2 5 19 0 0 1 2 5 19 0 0 1 2 7 19 0 0 1 2 5 19 0 0 1 2 5 19 0 0 1 1 0 7 0 8))))) diff --git a/src/algebra/strap/VECTOR.lsp b/src/algebra/strap/VECTOR.lsp index 61c9ca51..d9513c35 100644 --- a/src/algebra/strap/VECTOR.lsp +++ b/src/algebra/strap/VECTOR.lsp @@ -78,12 +78,12 @@ (AND (|HasCategory| |#1| '(|RadicalCategory|)) (|HasCategory| |#1| '(|Ring|))) + (|HasCategory| |#1| + '(|CoercibleTo| (|OutputForm|))) (AND (|HasCategory| |#1| '(|SetCategory|)) (|HasCategory| |#1| (LIST '|Evalable| - (|devaluate| |#1|)))) - (|HasCategory| |#1| - '(|CoercibleTo| (|OutputForm|))))) . #0#)) + (|devaluate| |#1|)))))) . #0#)) (|haddProp| |$ConstructorCache| '|Vector| (LIST |dv$1|) (CONS 1 $)) (|stuffDomainSlots| $) diff --git a/src/interp/define.boot b/src/interp/define.boot index d68d3316..8e684640 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -593,7 +593,7 @@ compDefineFunctor1(df is ['DEF,form,signature,$functorSpecialCases,body], $compileExportsOnly => compDefineExports(form, ds.1, signature',$e) $domainShell:= COPY_-SEQ ds --+ copy needed since slot1 is reset; compMake.. can return a cached vector - attributeList := disallowNilAttribute ds.2 --see below under "loadTimeAlist" + attributeList := ds.2 --see below under "loadTimeAlist" --+ 7 lines for $NRT follow -->--these globals used by NRTmakeCategoryAlist, set by NRTsetVector4Part1 $condAlist: local := nil @@ -718,10 +718,6 @@ compDefineFunctor1(df is ['DEF,form,signature,$functorSpecialCases,body], ['MAKEPROP, ['QUOTE,op'], ['QUOTE,'NILADIC], true]) [fun,['Mapping,:signature'],originale] -disallowNilAttribute x == - res := [y for y in x | car y and car y ^= "nil"] ---HACK to get rid of nil attibutes ---NOTE: nil is RENAMED to NIL - compFunctorBody(body,m,e,parForm) == $bootStrapMode = true => [bootStrapError($functorForm, _/EDITFILE),m,e] @@ -1731,6 +1727,8 @@ compCategoryItem(x,predl,env) == --2. if attribute, push it and return x is ["ATTRIBUTE",y] => + -- Attribute 'nil' carries no semantics. + y = "nil" => nil noteExport(y,pred) PUSH(MKQ [y,pred],$atList) |