diff options
author | dos-reis <gdr@axiomatics.org> | 2011-05-19 21:38:54 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2011-05-19 21:38:54 +0000 |
commit | 09469d002d15b88c105731142bce403a1aa5a21b (patch) | |
tree | c91273f9d8a7b5ae5bd3efb0f67734db0fb49dee /src/algebra/draw.spad.pamphlet | |
parent | 0d25890bd7bc8bd697294a3288396c23a2438879 (diff) | |
download | open-axiom-09469d002d15b88c105731142bce403a1aa5a21b.tar.gz |
* algebra/aggcat.spad.pamphlet (Aggregate) [more?,less?,size?]:
Move to StreamAggregate.
* algebra/array2.spad.pamphlet (TwoDimensionalArrayCategory):
Don't implement them.
* algebra/tree.spad.pamphlet (Tree): Likewise.
Diffstat (limited to 'src/algebra/draw.spad.pamphlet')
-rw-r--r-- | src/algebra/draw.spad.pamphlet | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/algebra/draw.spad.pamphlet b/src/algebra/draw.spad.pamphlet index ca2c76a7..fe9ddefe 100644 --- a/src/algebra/draw.spad.pamphlet +++ b/src/algebra/draw.spad.pamphlet @@ -273,7 +273,7 @@ TopLevelDrawFunctionsForCompiledFunctions(): segList := retract(cl :: Any)$ANY1(L SEG) empty? segList => error "draw: you may specify at least 1 segment for 2D clipping" - more?(segList,2) => + #segList > 2 => error "draw: you may specify at most 2 segments for 2D clipping" xLo : SF := 0; xHi : SF := 0; yLo : SF := 0; yHi : SF := 0 if empty? rest segList then @@ -1039,14 +1039,14 @@ TopLevelDrawFunctionsForAlgebraicCurves(R,Ex): Exports == Implementation where yRangeFloat : SEG F := segment(0,0) -- dummy value if not ratRange case "failed" then ranges := retract(ratRange :: Any)$ANY1(L SEG RN) - not size?(ranges,2) => error "draw: you must specify two ranges" + #ranges ~= 2 => error "draw: you must specify two ranges" xRange := first ranges; yRange := second ranges xRangeFloat := map(convert(#1)@Float,xRange)@(SEG F) yRangeFloat := map(convert(#1)@Float,yRange)@(SEG F) floatRanges := [xRangeFloat,yRangeFloat] else floatRanges := retract(floatRange :: Any)$ANY1(L SEG F) - not size?(floatRanges,2) => + #floatRanges ~= 2 => error "draw: you must specify two ranges" xRangeFloat := first floatRanges yRangeFloat := second floatRanges |