diff options
Diffstat (limited to '')
-rw-r--r-- | stdlib/source/lux/data/number/ratio.lux | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/stdlib/source/lux/data/number/ratio.lux b/stdlib/source/lux/data/number/ratio.lux index 9d241fe89..6d241064a 100644 --- a/stdlib/source/lux/data/number/ratio.lux +++ b/stdlib/source/lux/data/number/ratio.lux @@ -27,21 +27,21 @@ {#numerator (n// common numerator) #denominator (n// common denominator)})) -(def: #export (r/* param input) +(def: #export (* param input) (-> Ratio Ratio Ratio) (normalize [(n/* (get@ #numerator param) (get@ #numerator input)) (n/* (get@ #denominator param) (get@ #denominator input))])) -(def: #export (r// param input) +(def: #export (/ param input) (-> Ratio Ratio Ratio) (normalize [(n/* (get@ #denominator param) (get@ #numerator input)) (n/* (get@ #numerator param) (get@ #denominator input))])) -(def: #export (r/+ param input) +(def: #export (+ param input) (-> Ratio Ratio Ratio) (normalize [(n/+ (n/* (get@ #denominator input) (get@ #numerator param)) @@ -50,7 +50,7 @@ (n/* (get@ #denominator param) (get@ #denominator input))])) -(def: #export (r/- param input) +(def: #export (- param input) (-> Ratio Ratio Ratio) (normalize [(n/- (n/* (get@ #denominator input) (get@ #numerator param)) @@ -59,16 +59,16 @@ (n/* (get@ #denominator param) (get@ #denominator input))])) -(def: #export (r/% param input) +(def: #export (% param input) (-> Ratio Ratio Ratio) (let [quot (n// (n/* (get@ #denominator input) (get@ #numerator param)) (n/* (get@ #denominator param) (get@ #numerator input)))] - (r/- (update@ #numerator (n/* quot) param) - input))) + (- (update@ #numerator (n/* quot) param) + input))) -(def: #export (r/= param input) +(def: #export (= param input) (-> Ratio Ratio Bool) (and (n/= (get@ #numerator param) (get@ #numerator input)) @@ -83,10 +83,10 @@ (n/* (get@ #denominator param) (get@ #numerator input)))))] - [r/< n/<] - [r/<= n/<=] - [r/> n/>] - [r/>= n/>=] + [< n/<] + [<= n/<=] + [> n/>] + [>= n/>=] ) (do-template [<name> <comp>] @@ -96,26 +96,26 @@ right left))] - [r/min r/<] - [r/max r/>] + [min <] + [max >] ) (struct: #export _ (Eq Ratio) - (def: = r/=)) + (def: = ..=)) (struct: #export _ (order.Order Ratio) (def: eq Eq<Ratio>) - (def: < r/<) - (def: <= r/<=) - (def: > r/>) - (def: >= r/>=)) + (def: < ..<) + (def: <= ..<=) + (def: > ..>) + (def: >= ..>=)) (struct: #export _ (Number Ratio) - (def: + r/+) - (def: - r/-) - (def: * r/*) - (def: / r//) - (def: % r/%) + (def: + ..+) + (def: - ..-) + (def: * ..*) + (def: / ../) + (def: % ..%) (def: (negate (^slots [#numerator #denominator])) {#numerator denominator #denominator numerator}) |