diff options
Diffstat (limited to 'src/algebra/draw.spad.pamphlet')
| -rw-r--r-- | src/algebra/draw.spad.pamphlet | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/algebra/draw.spad.pamphlet b/src/algebra/draw.spad.pamphlet index b5e7bae8..f145330d 100644 --- a/src/algebra/draw.spad.pamphlet +++ b/src/algebra/draw.spad.pamphlet @@ -318,10 +318,10 @@ TopLevelDrawFunctionsForCompiledFunctions(): myTrap1: (SF-> SF, SF) -> SF myTrap1(ff:SF-> SF, f:SF):SF == - s := trapNumericErrors(ff(f))$Lisp :: Union(SF, "failed") - s case "failed" => quietDoubleNaN()$Foreign(Builtin) - r:=s::SF - r >max()$SF or r < min()$SF => quietDoubleNaN()$Foreign(Builtin) + s: Maybe SF := trapNumericErrors(ff(f))$Lisp + s case nothing => quietDoubleNaN()$Foreign(Builtin) + r := s@SF + r > max()$SF or r < min()$SF => quietDoubleNaN()$Foreign(Builtin) r makePt2: (SF,SF) -> Point SF @@ -493,10 +493,10 @@ TopLevelDrawFunctionsForCompiledFunctions(): myTrap2: ((SF, SF) -> SF, SF, SF) -> SF myTrap2(ff:(SF, SF) -> SF, u:SF, v:SF):SF == - s := trapNumericErrors(ff(u, v))$Lisp :: Union(SF, "failed") - s case "failed" => quietDoubleNaN()$Foreign(Builtin) - r:SF := s::SF - r >max()$SF or r < min()$SF => quietDoubleNaN()$Foreign(Builtin) + s: Maybe SF := trapNumericErrors(ff(u, v))$Lisp + s case nothing => quietDoubleNaN()$Foreign(Builtin) + r := s@SF + r > max()$SF or r < min()$SF => quietDoubleNaN()$Foreign(Builtin) r recolor(ptFunc,colFunc) == |