diff options
| author | Eduardo Julian | 2017-10-26 14:48:05 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2017-10-26 14:48:05 -0400 |
| commit | 1fabe19f7eacb668ef26cccde681dce5e2f98072 (patch) | |
| tree | ad2ead4ae5d7f997353e7b8223aa29725df40111 /new-luxc/source/luxc/generator/host | |
| parent | 40e9eae7468af9b03f6c684171d83a521dd90e82 (diff) | |
- WIP: Wiring everything to get the compiler to work fully.
- Fixed a bug when combining field/method/class modifiers.
Diffstat (limited to '')
| -rw-r--r-- | new-luxc/source/luxc/generator/host/jvm.lux | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/new-luxc/source/luxc/generator/host/jvm.lux b/new-luxc/source/luxc/generator/host/jvm.lux index c985efc9a..24d4a9ea9 100644 --- a/new-luxc/source/luxc/generator/host/jvm.lux +++ b/new-luxc/source/luxc/generator/host/jvm.lux @@ -109,8 +109,8 @@ (` (def: (~' #export) ((~ (code;local-symbol ++)) (~ g!_left) (~ g!_right)) (-> (~ g!type) (~ g!type) (~ g!type)) (~ (code;record (list/map (function [tag] - [tag (` (and (get@ (~ tag) (~ g!_left)) - (get@ (~ tag) (~ g!_right))))]) + [tag (` (or (get@ (~ tag) (~ g!_left)) + (get@ (~ tag) (~ g!_right))))]) g!tags+))))) g!options+)))) |