From 1fabe19f7eacb668ef26cccde681dce5e2f98072 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Thu, 26 Oct 2017 14:48:05 -0400
Subject: - WIP: Wiring everything to get the compiler to work fully. - Fixed a
 bug when combining field/method/class modifiers.

---
 new-luxc/source/luxc/generator/host/jvm.lux | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'new-luxc/source/luxc/generator/host')

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+))))
-- 
cgit v1.2.3