From c0acd75d41ed0e927ec318d4b12c0ec4f5f2e1d3 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 2 Jul 2017 15:52:36 -0400
Subject: - Adjusted compiler to the new lack of Char type. - WIP: PM/case
 synthesis.

---
 new-luxc/source/luxc/generator/expr.jvm.lux      | 1 -
 new-luxc/source/luxc/generator/host/jvm/def.lux  | 2 +-
 new-luxc/source/luxc/generator/host/jvm/inst.lux | 4 ++--
 new-luxc/source/luxc/generator/host/jvm/type.lux | 2 +-
 new-luxc/source/luxc/generator/primitive.jvm.lux | 1 -
 5 files changed, 4 insertions(+), 6 deletions(-)

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

diff --git a/new-luxc/source/luxc/generator/expr.jvm.lux b/new-luxc/source/luxc/generator/expr.jvm.lux
index 32291317f..32f8bde31 100644
--- a/new-luxc/source/luxc/generator/expr.jvm.lux
+++ b/new-luxc/source/luxc/generator/expr.jvm.lux
@@ -27,7 +27,6 @@
      [#ls;Int  &primitive;generate-int]
      [#ls;Deg  &primitive;generate-deg]
      [#ls;Real &primitive;generate-real]
-     [#ls;Char &primitive;generate-char]
      [#ls;Text &primitive;generate-text])
 
     (#ls;Variant tag tail? member)
diff --git a/new-luxc/source/luxc/generator/host/jvm/def.lux b/new-luxc/source/luxc/generator/host/jvm/def.lux
index 39fab2f2a..6f0f97d9b 100644
--- a/new-luxc/source/luxc/generator/host/jvm/def.lux
+++ b/new-luxc/source/luxc/generator/host/jvm/def.lux
@@ -255,7 +255,7 @@
   [long-field    Int  $t;long    id]
   [float-field   Real $t;float   host;d2f]
   [double-field  Real $t;double  id]
-  [char-field    Char $t;char    id]
+  [char-field    Nat  $t;char    (|>. nat-to-int host;l2i host;i2c)]
   [string-field  Text ($t;class "java.lang.String" (list)) id]
   )
 
diff --git a/new-luxc/source/luxc/generator/host/jvm/inst.lux b/new-luxc/source/luxc/generator/host/jvm/inst.lux
index 82b360883..824598ab8 100644
--- a/new-luxc/source/luxc/generator/host/jvm/inst.lux
+++ b/new-luxc/source/luxc/generator/host/jvm/inst.lux
@@ -1,5 +1,5 @@
 (;module:
-  lux
+  [lux #- char]
   (lux [host #+ jvm-import do-to])
   ["$" ..]
   (.. ["$t" type]))
@@ -122,7 +122,7 @@
   [int     Int  host;l2i]
   [long    Int  id]
   [double  Real id]
-  [char    Char id]
+  [char    Nat  (|>. nat-to-int host;l2i host;i2c)]
   [string  Text id]
   )
 
diff --git a/new-luxc/source/luxc/generator/host/jvm/type.lux b/new-luxc/source/luxc/generator/host/jvm/type.lux
index b457ac636..3825d443b 100644
--- a/new-luxc/source/luxc/generator/host/jvm/type.lux
+++ b/new-luxc/source/luxc/generator/host/jvm/type.lux
@@ -1,5 +1,5 @@
 (;module:
-  lux
+  [lux #- char]
   (lux (data [text]
              text/format
              (coll [list "L/" Functor<List>])))
diff --git a/new-luxc/source/luxc/generator/primitive.jvm.lux b/new-luxc/source/luxc/generator/primitive.jvm.lux
index c444f791d..2cb01a6aa 100644
--- a/new-luxc/source/luxc/generator/primitive.jvm.lux
+++ b/new-luxc/source/luxc/generator/primitive.jvm.lux
@@ -33,6 +33,5 @@
   [generate-int  Int  $i;long $i;wrap-long]
   [generate-deg  Deg  (|>. (:! Int) $i;long) $i;wrap-long]
   [generate-real Real $i;double $i;wrap-double]
-  [generate-char Char $i;char $i;wrap-char]
   [generate-text Text $i;string id]
   )
-- 
cgit v1.2.3