diff options
Diffstat (limited to 'stdlib/source/test/lux/target/jvm.lux')
| -rw-r--r-- | stdlib/source/test/lux/target/jvm.lux | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/stdlib/source/test/lux/target/jvm.lux b/stdlib/source/test/lux/target/jvm.lux index 437621fb4..4a5672382 100644 --- a/stdlib/source/test/lux/target/jvm.lux +++ b/stdlib/source/test/lux/target/jvm.lux @@ -319,8 +319,8 @@ @.jvm ("jvm object cast" - (<new-extension> ("jvm object cast" subject) - ("jvm object cast" parameter)))}))))] + (<new-extension> ("jvm object cast" parameter) + ("jvm object cast" subject)))}))))] [int/2 java/lang/Integer] [long/2 java/lang/Long] @@ -328,7 +328,7 @@ [double/2 java/lang/Double] ) -(template: (long+int/2 <old-extension> <new-extension>) +(template: (int+long/2 <old-extension> <new-extension>) (: (-> java/lang/Integer java/lang/Long java/lang/Long) (function (_ parameter subject) (for {@.old @@ -336,8 +336,8 @@ @.jvm ("jvm object cast" - (<new-extension> ("jvm object cast" subject) - ("jvm object cast" parameter)))})))) + (<new-extension> ("jvm object cast" parameter) + ("jvm object cast" subject)))})))) (def: int Test @@ -487,9 +487,9 @@ (_.lift "LAND" (binary (long/2 "jvm land" "jvm long and") /.land)) (_.lift "LOR" (binary (long/2 "jvm lor" "jvm long or") /.lor)) (_.lift "LXOR" (binary (long/2 "jvm lxor" "jvm long xor") /.lxor)) - (_.lift "LSHL" (shift (long+int/2 "jvm lshl" "jvm long shl") /.lshl)) - (_.lift "LSHR" (shift (long+int/2 "jvm lshr" "jvm long shr") /.lshr)) - (_.lift "LUSHR" (shift (long+int/2 "jvm lushr" "jvm long ushr") /.lushr))) + (_.lift "LSHL" (shift (int+long/2 "jvm lshl" "jvm long shl") /.lshl)) + (_.lift "LSHR" (shift (int+long/2 "jvm lshr" "jvm long shr") /.lshr)) + (_.lift "LUSHR" (shift (int+long/2 "jvm lushr" "jvm long ushr") /.lushr))) comparison (_.lift "LCMP" (do random.monad [reference ..$Long::random @@ -600,19 +600,16 @@ _ instruction _ /.i2l] ..$Long::wrap))))) + comparison-standard (: (-> java/lang/Float java/lang/Float Bit) + (function (_ reference subject) + (for {@.old + ("jvm fgt" subject reference) + + @.jvm + ("jvm float <" ("jvm object cast" subject) ("jvm object cast" reference))}))) comparison ($_ _.and - (_.lift "FCMPL" (comparison /.fcmpl (function (_ reference subject) - (for {@.old - ("jvm fgt" subject reference) - - @.jvm - ("jvm float <" ("jvm object cast" reference) ("jvm object cast" subject))})))) - (_.lift "FCMPG" (comparison /.fcmpg (function (_ reference subject) - (for {@.old - ("jvm fgt" subject reference) - - @.jvm - ("jvm float <" ("jvm object cast" subject) ("jvm object cast" reference))})))))] + (_.lift "FCMPL" (comparison /.fcmpl comparison-standard)) + (_.lift "FCMPG" (comparison /.fcmpg comparison-standard)))] ($_ _.and (<| (_.context "literal") literal) |