steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix obscure corner case; -include='compiler math'

db4
Slava Pestov 2008-07-06 18:21:34 -05:00
parent 3358e399d7
commit 0bb85a1ef9
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/math/intervals/intervals.factor
View File

@ -2,7 +2,7 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
! Based on Slate's src/unfinished/interval.slate by Brian Rice. ! Based on Slate's src/unfinished/interval.slate by Brian Rice.
USING: accessors kernel sequences arrays math math.order USING: accessors kernel sequences arrays math math.order
combinators ; combinators generic ;
IN: math.intervals IN: math.intervals
TUPLE: interval { from read-only } { to read-only } ; TUPLE: interval { from read-only } { to read-only } ;
@ -177,6 +177,11 @@ C: <interval> interval
: interval/ ( i1 i2 -- i3 ) : interval/ ( i1 i2 -- i3 )
[ [ / ] interval-op ] interval-division-op ; [ [ / ] interval-op ] interval-division-op ;
: interval/-safe ( i1 i2 -- i3 )
#! Just a hack to make the compiler work if bootstrap.math
#! is not loaded.
\ integer \ / method [ interval/ ] [ 2drop f ] if ;
: interval/i ( i1 i2 -- i3 ) : interval/i ( i1 i2 -- i3 )
[ [
[ [ /i ] interval-op ] interval-integer-op [ [ /i ] interval-op ] interval-integer-op

2
core/optimizer/math/math.factor
View File

@ -158,7 +158,7 @@ optimizer.math.partial generic.standard system accessors ;
{ + { { fixnum integer } } interval+ } { + { { fixnum integer } } interval+ }
{ - { { fixnum integer } } interval- } { - { { fixnum integer } } interval- }
{ * { { fixnum integer } } interval* } { * { { fixnum integer } } interval* }
{ / { { fixnum rational } { integer rational } } interval/ } { / { { fixnum rational } { integer rational } } interval/-safe }
{ /i { { fixnum integer } } interval/i } { /i { { fixnum integer } } interval/i }
{ shift { { fixnum integer } } interval-shift-safe } { shift { { fixnum integer } } interval-shift-safe }
} [ } [