diff options
author | Eduardo Julian | 2019-08-20 22:00:59 -0400 |
---|---|---|
committer | Eduardo Julian | 2019-08-20 22:00:59 -0400 |
commit | 59ededb795732e04ac8e1eaceb2b1509a1c1cc23 (patch) | |
tree | c0498fbae7cd18fa9434c972a6f7e35d0e02b456 /stdlib/source/test | |
parent | cdfda2f80b2abd8ec7d8021aab910ccc82271ade (diff) |
WIP: Make new-luxc instructions rely on the Descriptor type.
Diffstat (limited to 'stdlib/source/test')
-rw-r--r-- | stdlib/source/test/lux/target/jvm.lux | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/stdlib/source/test/lux/target/jvm.lux b/stdlib/source/test/lux/target/jvm.lux index 4dd3ee4b3..9437fb38a 100644 --- a/stdlib/source/test/lux/target/jvm.lux +++ b/stdlib/source/test/lux/target/jvm.lux @@ -75,7 +75,7 @@ (#static TYPE (java/lang/Class java/lang/Long))) (def: descriptor - (Random (Descriptor (Value Any))) + (Random (Descriptor Value)) (random.rec (function (_ descriptor) ($_ random.either @@ -87,13 +87,13 @@ (random@wrap /descriptor.float) (random@wrap /descriptor.double) (random@wrap /descriptor.char) - (random@map (|>> (text.join-with /name.external-separator) /descriptor.object) + (random@map (|>> (text.join-with /name.external-separator) /descriptor.class) (random.list 3 (random.ascii/upper-alpha 10))) (random@map /descriptor.array descriptor) )))) (def: field - (Random [Text (Descriptor (Value Any))]) + (Random [Text (Descriptor Value)]) ($_ random.and (random.ascii/lower-alpha 10) ..descriptor @@ -120,7 +120,7 @@ method-name (random.ascii/upper-alpha 10) expected random.int #let [inputsJT (list) - outputJT (/descriptor.object "java.lang.Object")]] + outputJT (/descriptor.class "java.lang.Object")]] (_.test "Can compile a method." (let [bytecode (|> (/class.class /version.v6_0 /class.public (/name.internal class-name) @@ -137,7 +137,7 @@ [_ (/instruction.ldc/long (/constant.long expected)) _ (/instruction.invokestatic "java.lang.Long" "valueOf" [(list /descriptor.long) - (/descriptor.object "java.lang.Long")])] + (/descriptor.class "java.lang.Long")])] /instruction.areturn))) (row.row)) (binaryF.run /class.writer)) |