diff options
| author | Eduardo Julian | 2021-08-16 01:12:01 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2021-08-16 01:12:01 -0400 |
| commit | 3289b9dcf9d5d1c1e5c380e3185065c8fd32535f (patch) | |
| tree | fc2f67581dd7b1d72c20217a95e031187a375bc5 /lux-jvm/source/luxc/lang/host/jvm | |
| parent | 6fd22846f21b8b70b7867e989109d14a366c0a3e (diff) | |
Made extension-definition macros specify their bindings the same way as syntax:.
Diffstat (limited to 'lux-jvm/source/luxc/lang/host/jvm')
| -rw-r--r-- | lux-jvm/source/luxc/lang/host/jvm/def.lux | 8 | ||||
| -rw-r--r-- | lux-jvm/source/luxc/lang/host/jvm/inst.lux | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lux-jvm/source/luxc/lang/host/jvm/def.lux b/lux-jvm/source/luxc/lang/host/jvm/def.lux index 064224c6e..f8233222d 100644 --- a/lux-jvm/source/luxc/lang/host/jvm/def.lux +++ b/lux-jvm/source/luxc/lang/host/jvm/def.lux @@ -138,7 +138,7 @@ (param_signature super) (|> interfaces (list@map param_signature) - (text.join_with "")))) + (text.interposed "")))) (def: (constraints_signature constraints super interfaces) (-> (List Constraint) (Type Class) (List (Type Class)) @@ -148,13 +148,13 @@ (format "<" (|> constraints (list@map formal_param) - (text.join_with "")) + (text.interposed "")) ">"))] (format formal_params (..signature super) (|> interfaces (list@map ..signature) - (text.join_with ""))))) + (text.interposed ""))))) (def: class_computes Int @@ -300,4 +300,4 @@ singleton (#.Item head tail) - (function.compose (fuse tail) head))) + (function.composite (fuse tail) head))) diff --git a/lux-jvm/source/luxc/lang/host/jvm/inst.lux b/lux-jvm/source/luxc/lang/host/jvm/inst.lux index 90732578e..0c724ca87 100644 --- a/lux-jvm/source/luxc/lang/host/jvm/inst.lux +++ b/lux-jvm/source/luxc/lang/host/jvm/inst.lux @@ -375,7 +375,7 @@ labels_array (ffi.array org/objectweb/asm/Label array_size) _ (loop [idx 0] (if (n.< array_size idx) - (let [[key label] (maybe.assume (list.item idx keys+labels))] + (let [[key label] (maybe.trusted (list.item idx keys+labels))] (exec (ffi.array_write idx (ffi.long_to_int key) keys_array) (ffi.array_write idx label labels_array) @@ -392,7 +392,7 @@ _ (loop [idx 0] (if (n.< num_labels idx) (exec (ffi.array_write idx - (maybe.assume (list.item idx labels)) + (maybe.trusted (list.item idx labels)) labels_array) (recur (inc idx))) []))] @@ -466,4 +466,4 @@ singleton (#.Item head tail) - (function.compose (fuse tail) head))) + (function.composite (fuse tail) head))) |