aboutsummaryrefslogtreecommitdiff
path: root/new-luxc/source/luxc/lang/host
diff options
context:
space:
mode:
authorEduardo Julian2019-04-07 17:49:35 -0400
committerEduardo Julian2019-04-07 17:49:35 -0400
commita4e0eb58480a05e4c23a07d33965022125c539f2 (patch)
tree751b2dd5f6154b5940df39a3cb16c49868cd6551 /new-luxc/source/luxc/lang/host
parenta61c3f2e7bc29c3224264317b14254fe93d503fe (diff)
Updated the JVM compiler to the latest changes.
Diffstat (limited to 'new-luxc/source/luxc/lang/host')
-rw-r--r--new-luxc/source/luxc/lang/host/jvm.lux17
-rw-r--r--new-luxc/source/luxc/lang/host/jvm/def.lux5
-rw-r--r--new-luxc/source/luxc/lang/host/jvm/inst.lux5
3 files changed, 15 insertions, 12 deletions
diff --git a/new-luxc/source/luxc/lang/host/jvm.lux b/new-luxc/source/luxc/lang/host/jvm.lux
index 71e887d4d..da9dcb974 100644
--- a/new-luxc/source/luxc/lang/host/jvm.lux
+++ b/new-luxc/source/luxc/lang/host/jvm.lux
@@ -1,7 +1,8 @@
(.module:
[lux (#- Type Definition)
+ [abstract
+ monad]
[control
- monad
["p" parser]]
[data
[collection
@@ -16,7 +17,7 @@
[compiler
[reference (#+ Register)]
[phase
- ["." translation]]]]])
+ ["." generation]]]]])
## [Host]
(import: org/objectweb/asm/MethodVisitor)
@@ -94,17 +95,17 @@
(type: #export Anchor [Label Register])
(type: #export Host
- (translation.Host Inst Definition))
+ (generation.Host Inst Definition))
(template [<name> <base>]
[(type: #export <name>
(<base> ..Anchor Inst Definition))]
- [State translation.State]
- [Operation translation.Operation]
- [Phase translation.Phase]
- [Handler translation.Handler]
- [Bundle translation.Bundle]
+ [State generation.State]
+ [Operation generation.Operation]
+ [Phase generation.Phase]
+ [Handler generation.Handler]
+ [Bundle generation.Bundle]
)
## [Values]
diff --git a/new-luxc/source/luxc/lang/host/jvm/def.lux b/new-luxc/source/luxc/lang/host/jvm/def.lux
index f9b6e5c2d..012d7ceee 100644
--- a/new-luxc/source/luxc/lang/host/jvm/def.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/def.lux
@@ -1,5 +1,7 @@
(.module:
[lux #*
+ [control
+ ["." function]]
[data
["." text
format]
@@ -7,8 +9,7 @@
[collection
["." array (#+ Array)]
["." list ("#/." functor)]]]
- ["." host (#+ import: do-to)]
- ["." function]]
+ ["." host (#+ import: do-to)]]
["$" //
["$t" type]])
diff --git a/new-luxc/source/luxc/lang/host/jvm/inst.lux b/new-luxc/source/luxc/lang/host/jvm/inst.lux
index 36a020686..f1ae8abd2 100644
--- a/new-luxc/source/luxc/lang/host/jvm/inst.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/inst.lux
@@ -1,7 +1,9 @@
(.module:
[lux (#- int char)
+ [abstract
+ [monad (#+ do)]]
[control
- [monad (#+ do)]
+ ["." function]
["p" parser]]
[data
["." maybe]
@@ -14,7 +16,6 @@
[macro
["." code]
["s" syntax (#+ syntax:)]]
- ["." function]
[tool
[compiler
[phase (#+ Operation)]]]]