From 78fd01f7e6688448bbd710336d4d7b1c35ae058a Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Thu, 25 Jul 2019 00:45:51 -0400 Subject: No more "i/"-prefixed functions. --- stdlib/source/spec/compositor/generation/common.lux | 20 ++++++++++---------- .../source/spec/compositor/generation/structure.lux | 6 ++++-- 2 files changed, 14 insertions(+), 12 deletions(-) (limited to 'stdlib/source/spec/compositor') diff --git a/stdlib/source/spec/compositor/generation/common.lux b/stdlib/source/spec/compositor/generation/common.lux index e2e6199d9..b7a114893 100644 --- a/stdlib/source/spec/compositor/generation/common.lux +++ b/stdlib/source/spec/compositor/generation/common.lux @@ -10,7 +10,7 @@ ["." bit ("#@." equivalence)] [number ["." i64] - ["." int] + ["i" int] ["f" frac]] ["." text ("#@." equivalence) ["%" format (#+ format)]] @@ -88,7 +88,7 @@ false) (let [subject ])))] - ["lux i64 f64" Frac int.frac f.= subject] + ["lux i64 f64" Frac i.frac f.= subject] ["lux i64 char" Text (|>> (:coerce Nat) text.from-code) text@= (|> subject (:coerce Nat) (n/% (i64.left-shift 8 1)) @@ -105,19 +105,19 @@ (#try.Failure _) false)))] - ["lux i64 +" i/+ Int i/=] - ["lux i64 -" i/- Int i/=] - ["lux i64 *" i/* Int i/=] - ["lux i64 /" i// Int i/=] - ["lux i64 %" i/% Int i/=] - ["lux i64 =" i/= Bit bit@=] - ["lux i64 <" i/< Bit bit@=] + ["lux i64 +" i.+ Int i.=] + ["lux i64 -" i.- Int i.=] + ["lux i64 *" i.* Int i.=] + ["lux i64 /" i./ Int i.=] + ["lux i64 %" i.% Int i.=] + ["lux i64 =" i.= Bit bit@=] + ["lux i64 <" i.< Bit bit@=] )) )))) (def: simple-frac (Random Frac) - (|> r.nat (:: r.monad map (|>> (n/% 1000) .int int.frac)))) + (|> r.nat (:: r.monad map (|>> (n/% 1000) .int i.frac)))) (def: (f64 run) (-> Runner Test) diff --git a/stdlib/source/spec/compositor/generation/structure.lux b/stdlib/source/spec/compositor/generation/structure.lux index 619f3921f..a93b27086 100644 --- a/stdlib/source/spec/compositor/generation/structure.lux +++ b/stdlib/source/spec/compositor/generation/structure.lux @@ -8,6 +8,8 @@ ["." try]] [data ["." maybe] + [number + ["i" int]] ["." text ("#@." equivalence) ["%" format (#+ format)]] [collection @@ -52,7 +54,7 @@ #.None (not last?-in)) - same-value? (|> value-out (:coerce Int) (i/= value-in))] + same-value? (|> value-out (:coerce Int) (i.= value-in))] (and same-tag? same-flag? same-value?)))) @@ -72,7 +74,7 @@ (let [tuple-out (:coerce (Array Any) tuple-out)] (and (n/= size (array.size tuple-out)) (list.every? (function (_ [left right]) - (i/= left (:coerce Int right))) + (i.= left (:coerce Int right))) (list.zip2 tuple-in (array.to-list tuple-out))))) (#try.Failure _) -- cgit v1.2.3