diff options
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/algebra/strap/DFLOAT.lsp | 7 | ||||
| -rw-r--r-- | src/algebra/strap/INT.lsp | 4 | ||||
| -rw-r--r-- | src/algebra/strap/OUTFORM.lsp | 2 | ||||
| -rw-r--r-- | src/algebra/strap/SINT.lsp | 6 | ||||
| -rw-r--r-- | src/interp/define.boot | 8 |
6 files changed, 20 insertions, 13 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d4334bd9..86ae0c33 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2008-11-29 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/define.boot (mustInstantiate): Fix thinko introduced by + earlier tweaks. + (mkExplicitCategoryFunction): Likewise. + +2008-11-29 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/nruncomp.boot (genDeltaSpecialSig): Remove, as unused. 2008-11-29 Gabriel Dos Reis <gdr@cs.tamu.edu> diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp index c696356e..822d20da 100644 --- a/src/algebra/strap/DFLOAT.lsp +++ b/src/algebra/strap/DFLOAT.lsp @@ -1074,11 +1074,12 @@ (|ArcTrigonometricFunctionCategory|) (|TrigonometricFunctionCategory|) (|OpenMath|) (|ConvertibleTo| 129) - (|RadicalCategory|) (|CoercibleFrom| 24) + (|RadicalCategory|) (|ConvertibleTo| 101) (|ConvertibleTo| 13) (|CoercibleFrom| 104) - (|CoercibleFrom| $$) (|BasicType|) + (|CoercibleFrom| $$) + (|CoercibleFrom| 24) (|BasicType|) (|CoercibleTo| 38)) (|makeByteWordVec2| 139 '(0 6 0 7 2 9 0 8 6 10 1 9 11 0 12 2 9 @@ -1118,7 +1119,7 @@ 0 0 64 1 0 0 0 74 1 0 0 0 62 1 0 41 0 43 1 0 129 0 1 1 0 101 0 103 1 0 13 0 100 1 0 0 104 1 1 0 0 24 58 1 0 0 104 - 1 1 0 0 24 58 1 0 0 0 1 1 0 38 0 40 0 + 1 1 0 0 0 1 1 0 0 24 58 1 0 38 0 40 0 0 105 1 1 0 0 0 1 0 0 22 30 0 0 22 23 1 0 0 0 81 2 0 0 0 0 108 1 0 0 0 69 2 0 18 0 0 1 1 0 0 0 79 1 0 0 0 67 1 0 diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp index ee770745..6548543c 100644 --- a/src/algebra/strap/INT.lsp +++ b/src/algebra/strap/INT.lsp @@ -669,9 +669,9 @@ (|CombinatorialFunctionCategory|) (|ConvertibleTo| 123) (|ConvertibleTo| 50) - (|CoercibleFrom| 11) (|ConvertibleTo| 11) - (|CoercibleFrom| $$) (|BasicType|) + (|CoercibleFrom| $$) + (|CoercibleFrom| 11) (|BasicType|) (|CoercibleTo| 36)) (|makeByteWordVec2| 131 '(1 7 6 0 8 3 7 6 0 9 9 10 2 7 6 0 11 diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp index 97591c7a..d89865c0 100644 --- a/src/algebra/strap/OUTFORM.lsp +++ b/src/algebra/strap/OUTFORM.lsp @@ -359,7 +359,7 @@ (RETURN (SEQ (LETT |ss| (|getShellEntry| $ 6) |OUTFORM;doubleFloatFormat;2S;1|) - (SETELT $ 6 |s|) (EXIT |ss|))))) + (|setShellEntry| $ 6 |s|) (EXIT |ss|))))) (DEFUN |OUTFORM;sform| (|s| $) (DECLARE (IGNORE $)) |s|) diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp index cce89b66..70537d38 100644 --- a/src/algebra/strap/SINT.lsp +++ b/src/algebra/strap/SINT.lsp @@ -448,9 +448,9 @@ (EXIT (|error| "integer too large to represent in a machine word")))) (DEFUN |SINT;random;$;52| ($) - (SEQ (SETELT $ 6 - (REMAINDER (TIMES 314159269 (|getShellEntry| $ 6)) - 2147483647)) + (SEQ (|setShellEntry| $ 6 + (REMAINDER (TIMES 314159269 (|getShellEntry| $ 6)) + 2147483647)) (EXIT (REMAINDER (|getShellEntry| $ 6) 67108864)))) (DEFUN |SINT;random;2$;53| (|n| $) (DECLARE (IGNORE $)) (RANDOM |n|)) diff --git a/src/interp/define.boot b/src/interp/define.boot index 5da7a327..d68d3316 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -1642,8 +1642,8 @@ makeCategoryForm(c,e) == mustInstantiate: %Form -> %Thing mustInstantiate D == - D is [fn,:.] and (not (fn in $DummyFunctorNames) - or GET(fn,"makeFunctionList")) + D is [fn,:.] and + not (MEMQ(fn,$DummyFunctorNames) or GET(fn,"makeFunctionList")) wrapDomainSub: (%List, %Form) -> %Form wrapDomainSub(parameters,x) == @@ -1651,8 +1651,8 @@ wrapDomainSub(parameters,x) == mkExplicitCategoryFunction(domainOrPackage,sigList,atList) == body:= - ["mkCategory",MKQ domainOrPackage,['LIST,:nreverse sigList], - ['LIST,:nreverse atList],MKQ domList,nil] where + ["mkCategory",MKQ domainOrPackage,['LIST,:reverse sigList], + ['LIST,:reverse atList],MKQ domList,nil] where domList() == ("union"/[fn sig for ["QUOTE",[[.,sig,:.],:.]] in sigList]) where fn sig == [D for D in sig | mustInstantiate D] |