diff options
Diffstat (limited to '')
| -rw-r--r-- | stdlib/source/spec/compositor/generation/common.lux | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/stdlib/source/spec/compositor/generation/common.lux b/stdlib/source/spec/compositor/generation/common.lux index f10f2a2ef..e2e6199d9 100644 --- a/stdlib/source/spec/compositor/generation/common.lux +++ b/stdlib/source/spec/compositor/generation/common.lux @@ -9,7 +9,9 @@ [data ["." bit ("#@." equivalence)] [number - ["." i64]] + ["." i64] + ["." int] + ["f" frac]] ["." text ("#@." equivalence) ["%" format (#+ format)]] [collection @@ -86,7 +88,7 @@ false) (let [subject <subject-expr>])))] - ["lux i64 f64" Frac int-to-frac f/= subject] + ["lux i64 f64" Frac int.frac f.= subject] ["lux i64 char" Text (|>> (:coerce Nat) text.from-code) text@= (|> subject (:coerce Nat) (n/% (i64.left-shift 8 1)) @@ -115,12 +117,12 @@ (def: simple-frac (Random Frac) - (|> r.nat (:: r.monad map (|>> (n/% 1000) .int int-to-frac)))) + (|> r.nat (:: r.monad map (|>> (n/% 1000) .int int.frac)))) (def: (f64 run) (-> Runner Test) (do r.monad - [param (|> ..simple-frac (r.filter (|>> (f/= +0.0) not))) + [param (|> ..simple-frac (r.filter (|>> (f.= +0.0) not))) subject ..simple-frac] (`` ($_ _.and (~~ (template [<extension> <reference> <comp>] @@ -130,11 +132,11 @@ (run (..sanitize <extension>)) (//case.verify (<reference> param subject))))] - ["lux f64 +" f/+ f/=] - ["lux f64 -" f/- f/=] - ["lux f64 *" f/* f/=] - ["lux f64 /" f// f/=] - ["lux f64 %" f/% f/=] + ["lux f64 +" f.+ f.=] + ["lux f64 -" f.- f.=] + ["lux f64 *" f.* f.=] + ["lux f64 /" f./ f.=] + ["lux f64 %" f.% f.=] )) (~~ (template [<extension> <text>] [(_.test <extension> @@ -148,8 +150,8 @@ _ false)))] - ["lux f64 =" f/=] - ["lux f64 <" f/<] + ["lux f64 =" f.=] + ["lux f64 <" f.<] )) (~~ (template [<extension> <reference>] [(_.test <extension> |