diff options
| author | Eduardo Julian | 2018-07-29 02:30:13 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2018-07-29 02:30:13 -0400 |
| commit | a59fc865aee240afe21b82ffef2681bb9a6ea693 (patch) | |
| tree | b5a2d95ffdec3edd2ecf7615c477ba522779d985 /new-luxc/source/luxc/lang/host/jvm | |
| parent | 3b156dca7b4750e99bdd68b3858521e3fd6b3de5 (diff) | |
Adapted new-luxc to some of the latest changes to Lux.
Diffstat (limited to 'new-luxc/source/luxc/lang/host/jvm')
| -rw-r--r-- | new-luxc/source/luxc/lang/host/jvm/def.lux | 24 | ||||
| -rw-r--r-- | new-luxc/source/luxc/lang/host/jvm/inst.lux | 2 | ||||
| -rw-r--r-- | new-luxc/source/luxc/lang/host/jvm/type.lux | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/new-luxc/source/luxc/lang/host/jvm/def.lux b/new-luxc/source/luxc/lang/host/jvm/def.lux index f70543ff7..33ded893b 100644 --- a/new-luxc/source/luxc/lang/host/jvm/def.lux +++ b/new-luxc/source/luxc/lang/host/jvm/def.lux @@ -92,28 +92,28 @@ #$.Public Opcodes::ACC_PUBLIC #$.Protected Opcodes::ACC_PROTECTED #$.Private Opcodes::ACC_PRIVATE - #$.Default 0)) + #$.Default +0)) (def: (class-flags config) (-> $.Class-Config Int) ($_ i/+ - (if (get@ #$.finalC config) Opcodes::ACC_FINAL 0))) + (if (get@ #$.finalC config) Opcodes::ACC_FINAL +0))) (def: (method-flags config) (-> $.Method-Config Int) ($_ i/+ - (if (get@ #$.staticM config) Opcodes::ACC_STATIC 0) - (if (get@ #$.finalM config) Opcodes::ACC_FINAL 0) - (if (get@ #$.synchronizedM config) Opcodes::ACC_SYNCHRONIZED 0) - (if (get@ #$.strictM config) Opcodes::ACC_STRICT 0))) + (if (get@ #$.staticM config) Opcodes::ACC_STATIC +0) + (if (get@ #$.finalM config) Opcodes::ACC_FINAL +0) + (if (get@ #$.synchronizedM config) Opcodes::ACC_SYNCHRONIZED +0) + (if (get@ #$.strictM config) Opcodes::ACC_STRICT +0))) (def: (field-flags config) (-> $.Field-Config Int) ($_ i/+ - (if (get@ #$.staticF config) Opcodes::ACC_STATIC 0) - (if (get@ #$.finalF config) Opcodes::ACC_FINAL 0) - (if (get@ #$.transientF config) Opcodes::ACC_TRANSIENT 0) - (if (get@ #$.volatileF config) Opcodes::ACC_VOLATILE 0))) + (if (get@ #$.staticF config) Opcodes::ACC_STATIC +0) + (if (get@ #$.finalF config) Opcodes::ACC_FINAL +0) + (if (get@ #$.transientF config) Opcodes::ACC_TRANSIENT +0) + (if (get@ #$.volatileF config) Opcodes::ACC_VOLATILE +0))) (def: class-to-type (-> $.Class $.Type) @@ -176,7 +176,7 @@ _ (ClassWriter::visitEnd [] writer)] (ClassWriter::toByteArray [] writer)))] - [class 0] + [class +0] [abstract Opcodes::ACC_ABSTRACT] ) @@ -217,7 +217,7 @@ writer) _ (MethodVisitor::visitCode [] =method) _ (then =method) - _ (MethodVisitor::visitMaxs [0 0] =method) + _ (MethodVisitor::visitMaxs [+0 +0] =method) _ (MethodVisitor::visitEnd [] =method)] writer))) diff --git a/new-luxc/source/luxc/lang/host/jvm/inst.lux b/new-luxc/source/luxc/lang/host/jvm/inst.lux index d63ca3795..cb8d47960 100644 --- a/new-luxc/source/luxc/lang/host/jvm/inst.lux +++ b/new-luxc/source/luxc/lang/host/jvm/inst.lux @@ -294,7 +294,7 @@ (function (_ visitor) (let [num-labels (list.size labels) labels-array (host.array Label num-labels) - _ (loop [idx +0] + _ (loop [idx 0] (if (n/< num-labels idx) (exec (host.array-write idx (maybe.assume (list.nth idx labels)) diff --git a/new-luxc/source/luxc/lang/host/jvm/type.lux b/new-luxc/source/luxc/lang/host/jvm/type.lux index 866ef1cef..57374337d 100644 --- a/new-luxc/source/luxc/lang/host/jvm/type.lux +++ b/new-luxc/source/luxc/lang/host/jvm/type.lux @@ -36,7 +36,7 @@ (def: #export (array depth elemT) (-> Nat //.Type //.Type) (case depth - +0 elemT + 0 elemT _ (#//.Array (array (dec depth) elemT)))) (def: #export binary-name |