urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-12 18:48:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes to Fl Points.

Browse Source 
Printing/parsing still pretty broken.
This commit is contained in:
Jared Hance 2014-06-04 10:20:15 -04:00
parent 5358a25a13
commit 5f979c9346
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
arvo/hoon.hoon
View File

@ -1163,7 +1163,7 @@
:: ::
++ rlyd |= red=@rd ^- [s=? h=@ f=@] !: ++ rlyd |= red=@rd ^- [s=? h=@ f=@] !:
~& [%rlyd `@ux`red] ~& [%rlyd `@ux`red]
[s=(sig:rd red) h=(exp:rd red) f=(fac:rd red)] [s=(sig:rd red) h=(hol:rd red) f=0]
++ rlyh |=(reh=@rh ~|(%real-nyet ^-([s=? h=@ f=@] !!))) ++ rlyh |=(reh=@rh ~|(%real-nyet ^-([s=? h=@ f=@] !!)))
++ rlyq |=(req=@rq ~|(%real-nyet ^-([s=? h=@ f=@] !!))) ++ rlyq |=(req=@rq ~|(%real-nyet ^-([s=? h=@ f=@] !!)))
++ rlys |=(res=@rs ~|(%real-nyet ^-([s=? h=@ f=@] !!))) ++ rlys |=(res=@rs ~|(%real-nyet ^-([s=? h=@ f=@] !!)))
@ -1217,6 +1217,12 @@
::=+ (^mul ari (bex e)) ::=+ (^mul ari (bex e))
!! !!
:: Decimal length of number, for use in ++den
++ dcl |= [f=@u] ^- @u
?: =(f 0)
0
(^add 1 $(f (^div f 10)))
:: Denominator of fraction, f is base 10 :: Denominator of fraction, f is base 10
++ den |= f=@u ^- @u ++ den |= f=@u ^- @u
(bey 10 (dcl f) 0 1) (bey 10 (dcl f) 0 1)
@ -1231,11 +1237,12 @@
=+ d=(bex (^sub (met 0 a) 1)) =+ d=(bex (^sub (met 0 a) 1))
(^div (^mul a (bey 10 q 0 1)) d) (^div (^mul a (bey 10 q 0 1)) d)
:: Decimal length of number, for use in ++den ++ hol |= [p=@u n=[s=? e=@s a=@u]] ^- @u
++ dcl |= [f=@u] ^- @u ?: =((mod `@`e.n 2) 0)
?: =(f 0) ?: (^gte (abs:si e.n) p)
0 (lsh 0 (^sub (abs:si e.n) p) a.n)
(^add 1 $(f (^div f 10))) (rsh 0 (^sub p (abs:si e.n)) a.n)
0
:: reverse ari, ari -> mantissa :: reverse ari, ari -> mantissa
++ ira |= a=@u ^- @u ++ ira |= a=@u ^- @u
@ -1342,7 +1349,7 @@
++ bit |= a=[s=? e=@s a=@u] ++ bit |= a=[s=? e=@s a=@u]
=+ a2=(lia:fl 52 a.a) =+ a2=(lia:fl 52 a.a)
=+ b=(ira:fl a2) =+ b=(ira:fl a2)
=+ c=(lsh 0 (^sub 52 (dec (met 0 a2))) b) =+ c=(lsh 0 (^sub 52 (met 0 b)) b)
(can 0 [[52 c] [[11 (abs:si (sum:si (sun:si 1.023) e.a))] [[1 `@`s.a] ~]]]) (can 0 [[52 c] [[11 (abs:si (sum:si (sun:si 1.023) e.a))] [[1 `@`s.a] ~]]])
:: Sign of an @rd :: Sign of an @rd
++ sig |= [a=@rd] ^- ? ++ sig |= [a=@rd] ^- ?
@ -1352,10 +1359,13 @@
(dif:si (sun:si (rsh 0 52 (end 0 63 a))) (sun:si 1.023)) (dif:si (sun:si (rsh 0 52 (end 0 63 a))) (sun:si 1.023))
:: Fraction of an @rd (binary) :: Fraction of an @rd (binary)
++ fac |= [a=@rd] ^- @u ++ fac |= [a=@rd] ^- @u
(end 0 52 a) (fre:fl 14 (ari:fl 52 (end 0 52 a)))
:: Whole
++ hol |= [a=@rd] ^- @u
(hol:fl 52 (sea a))
:: Convert to sign/exp/ari form :: Convert to sign/exp/ari form
++ sea |= a=@rd ^- [s=? e=@s a=@u] ++ sea |= a=@rd ^- [s=? e=@s a=@u]
[s=(sig a) e=(exp a) a=(ari:fl 52 (fac a))] [s=(sig a) e=(exp a) a=(ari:fl 52 (end 0 52 a))]
:::::::::::: ::::::::::::
++ add ~/ %add ++ add ~/ %add
@ -1389,6 +1399,19 @@
++ gth ~/ %gth ++ gth ~/ %gth
|= [a=@rd b=@rd] ^- ? |= [a=@rd b=@rd] ^- ?
(gth:fl (sea a) (sea b)) (gth:fl (sea a) (sea b))
++ max |= [a=@rd b=@rd] ^- @rd
?: (gth a b)
a
b
++ min |= [a=@rd b=@rd] ^- @rd
?: (lth a b)
a
b
++ bex |= a=@s ^- @rd
(bit [s=%.y e=a a=(ari:fl 52 0)])
-- --
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: section 2cH, urbit time :: :: section 2cH, urbit time ::