aboutsummaryrefslogtreecommitdiff
path: root/new-luxc/source/luxc/generator/host/jvm
diff options
context:
space:
mode:
authorEduardo Julian2017-07-02 15:52:36 -0400
committerEduardo Julian2017-07-02 15:52:36 -0400
commitc0acd75d41ed0e927ec318d4b12c0ec4f5f2e1d3 (patch)
tree2dce468eaee847cfb6ab51cd21b7bebffb3b2478 /new-luxc/source/luxc/generator/host/jvm
parent38d5f05977c54770195129df5ede2c91be4a32af (diff)
- Adjusted compiler to the new lack of Char type.
- WIP: PM/case synthesis.
Diffstat (limited to 'new-luxc/source/luxc/generator/host/jvm')
-rw-r--r--new-luxc/source/luxc/generator/host/jvm/def.lux2
-rw-r--r--new-luxc/source/luxc/generator/host/jvm/inst.lux4
-rw-r--r--new-luxc/source/luxc/generator/host/jvm/type.lux2
3 files changed, 4 insertions, 4 deletions
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>])))