diff options
Diffstat (limited to 'new-luxc/source/luxc/lang/translation/jvm.lux')
| -rw-r--r-- | new-luxc/source/luxc/lang/translation/jvm.lux | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/new-luxc/source/luxc/lang/translation/jvm.lux b/new-luxc/source/luxc/lang/translation/jvm.lux index 7388e8c30..86d7f9b9a 100644 --- a/new-luxc/source/luxc/lang/translation/jvm.lux +++ b/new-luxc/source/luxc/lang/translation/jvm.lux @@ -21,7 +21,7 @@ [target [jvm ["." loader (#+ Library)] - [type + ["." type ["." descriptor]]]] [tool [compiler @@ -49,7 +49,7 @@ (type: #export ByteCode Binary) (def: #export value-field Text "_value") -(def: #export $Value (descriptor.class "java.lang.Object")) +(def: #export $Value (type.class "java.lang.Object" (list))) (exception: #export (cannot-load {class Text} {error Text}) (exception.report @@ -93,15 +93,15 @@ bytecode (def.class #jvm.V1_6 #jvm.Public jvm.noneC bytecode-name - (list) ["java.lang.Object" (list)] + (list) $Value (list) (|>> (def.field #jvm.Public ($_ jvm.++F jvm.finalF jvm.staticF) ..value-field ..$Value) (def.method #jvm.Public ($_ jvm.++M jvm.staticM jvm.strictM) "<clinit>" - (descriptor.method [(list) descriptor.void]) + (type.method [(list) type.void (list)]) (|>> valueI - (inst.PUTSTATIC (descriptor.class bytecode-name) ..value-field ..$Value) + (inst.PUTSTATIC (type.class bytecode-name (list)) ..value-field ..$Value) inst.RETURN))))] (io.run (do (try.with io.monad) [_ (loader.store eval-class bytecode library) @@ -151,6 +151,6 @@ (def: #export runtime-class "LuxRuntime") (def: #export function-class "LuxFunction") -(def: #export $Variant (descriptor.array ..$Value)) -(def: #export $Tuple (descriptor.array ..$Value)) -(def: #export $Function (descriptor.class ..function-class)) +(def: #export $Variant (type.array ..$Value)) +(def: #export $Tuple (type.array ..$Value)) +(def: #export $Function (type.class ..function-class (list))) |