diff options
Diffstat (limited to 'new-luxc/source/luxc/lang/translation')
| -rw-r--r-- | new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux index b073aa3b7..1b784ee76 100644 --- a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux @@ -119,7 +119,7 @@ ### Bits (do-template [<name> <op>] - [(def: (<name> [inputI maskI]) + [(def: (<name> [maskI inputI]) Binary (|>> inputI (_.unwrap #$.Long) maskI (_.unwrap #$.Long) @@ -131,7 +131,7 @@ ) (do-template [<name> <op>] - [(def: (<name> [inputI shiftI]) + [(def: (<name> [shiftI inputI]) Binary (|>> inputI (_.unwrap #$.Long) shiftI jvm-intI @@ -162,11 +162,11 @@ <op> (_.wrap <type>)))] - [i64::+ #$.Long _.LADD] - [i64::- #$.Long _.LSUB] - [i64::* #$.Long _.LMUL] - [i64::/ #$.Long _.LDIV] - [i64::% #$.Long _.LREM] + [i64::+ #$.Long _.LADD] + [i64::- #$.Long _.LSUB] + [int::* #$.Long _.LMUL] + [int::/ #$.Long _.LDIV] + [int::% #$.Long _.LREM] [frac::+ #$.Double _.DADD] [frac::- #$.Double _.DSUB] @@ -188,7 +188,7 @@ [<eq> +0] [<lt> -1])] - [i64::= i64::< (_.unwrap #$.Long) _.LCMP] + [i64::= int::< (_.unwrap #$.Long) _.LCMP] [frac::= frac::< (_.unwrap #$.Double) _.DCMPG] ) @@ -197,11 +197,11 @@ Unary (|>> inputI <prepare> <transform>))] - [i64::to-frac (_.unwrap #$.Long) (<| (_.wrap #$.Double) _.L2D)] - [i64::char (_.unwrap #$.Long) + [int::frac (_.unwrap #$.Long) (<| (_.wrap #$.Double) _.L2D)] + [int::char (_.unwrap #$.Long) ((|>> _.L2I _.I2C (_.INVOKESTATIC "java.lang.Character" "toString" (_t.method (list _t.char) (#.Some $String) (list)) #0)))] - [frac::to-i64 (_.unwrap #$.Double) (<| (_.wrap #$.Long) _.D2L)] + [frac::int (_.unwrap #$.Double) (<| (_.wrap #$.Long) _.D2L)] [frac::encode (_.unwrap #$.Double) (_.INVOKESTATIC "java.lang.Double" "toString" (_t.method (list _t.double) (#.Some $String) (list)) #0)] [frac::decode ..check-stringI @@ -325,12 +325,12 @@ Bundle (<| (bundle.prefix "int") (|> (: Bundle bundle.empty) - (bundle.install "*" (binary i64::*)) - (bundle.install "/" (binary i64::/)) - (bundle.install "%" (binary i64::%)) - (bundle.install "<" (binary i64::<)) - (bundle.install "to-frac" (unary i64::to-frac)) - (bundle.install "char" (unary i64::char))))) + (bundle.install "*" (binary int::*)) + (bundle.install "/" (binary int::/)) + (bundle.install "%" (binary int::%)) + (bundle.install "<" (binary int::<)) + (bundle.install "frac" (unary int::frac)) + (bundle.install "char" (unary int::char))))) (def: bundle::frac Bundle @@ -346,7 +346,7 @@ (bundle.install "smallest" (nullary frac::smallest)) (bundle.install "min" (nullary frac::min)) (bundle.install "max" (nullary frac::max)) - (bundle.install "to-i64" (unary frac::to-i64)) + (bundle.install "int" (unary frac::int)) (bundle.install "encode" (unary frac::encode)) (bundle.install "decode" (unary frac::decode))))) |