aboutsummaryrefslogtreecommitdiff
path: root/lux-jvm
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--lux-jvm/source/luxc/lang/directive/jvm.lux40
-rw-r--r--lux-jvm/source/luxc/lang/host/jvm.lux16
-rw-r--r--lux-jvm/source/luxc/lang/host/jvm/def.lux12
-rw-r--r--lux-jvm/source/luxc/lang/host/jvm/inst.lux18
-rw-r--r--lux-jvm/source/luxc/lang/synthesis/variable.lux2
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm.lux28
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/case.lux20
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/common.lux16
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/expression.lux4
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/extension.lux6
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux18
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux38
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/function.lux26
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/loop.lux10
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/primitive.lux6
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/program.lux8
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/reference.lux12
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/runtime.lux22
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/structure.lux24
-rw-r--r--lux-jvm/source/program.lux48
-rw-r--r--lux-jvm/source/test/program.lux6
-rw-r--r--lux-jvm/test/test/luxc/lang/analysis/host.jvm.lux6
-rw-r--r--lux-jvm/test/test/luxc/lang/synthesis/loop.lux2
-rw-r--r--lux-jvm/test/test/luxc/lang/synthesis/procedure.lux2
-rw-r--r--lux-jvm/test/test/luxc/lang/translation/js.lux6
-rw-r--r--lux-jvm/test/test/luxc/lang/translation/jvm.lux2
26 files changed, 199 insertions, 199 deletions
diff --git a/lux-jvm/source/luxc/lang/directive/jvm.lux b/lux-jvm/source/luxc/lang/directive/jvm.lux
index 8be0777a8..cce373dfc 100644
--- a/lux-jvm/source/luxc/lang/directive/jvm.lux
+++ b/lux-jvm/source/luxc/lang/directive/jvm.lux
@@ -1,35 +1,35 @@
(.module:
[library
- [lux (#- Type static local)
- ["." ffi (#+ Inheritance Privacy State import:)]
+ [lux {"-" [Type static local]}
+ ["." ffi {"+" [Inheritance Privacy State import:]}]
[abstract
- ["." monad (#+ do)]]
+ ["." monad {"+" [do]}]]
[control
- [pipe (#+ case>)]
- ["." try (#+ Try)]
+ [pipe {"+" [case>]}]
+ ["." try {"+" [Try]}]
["<>" parser
- ["<.>" code (#+ Parser)]
+ ["<.>" code {"+" [Parser]}]
["<.>" text]]]
[data
- [identity (#+ Identity)]
- [binary (#+ Binary)]
+ [identity {"+" [Identity]}]
+ [binary {"+" [Binary]}]
["." product]
[text
- ["%" format (#+ format)]]
+ ["%" format {"+" [format]}]]
[collection
- [array (#+ Array)]
+ [array {"+" [Array]}]
["." list ("#\." mix functor monoid)]
- ["." dictionary (#+ Dictionary)]
- ["." row (#+ Row) ("#\." functor mix)]]]
+ ["." dictionary {"+" [Dictionary]}]
+ ["." row {"+" [Row]} ("#\." functor mix)]]]
[math
[number
["." nat]]]
[target
["/" jvm
[encoding
- ["." name (#+ External)]]
- ["#." type (#+ Type Constraint)
- [category (#+ Void Value Return Primitive Object Class Var Parameter)]
+ ["." name {"+" [External]}]]
+ ["#." type {"+" [Type Constraint]}
+ [category {"+" [Void Value Return Primitive Object Class Var Parameter]}]
["." parser]
[".T" lux]
["#/." signature]
@@ -39,10 +39,10 @@
["." phase]
[language
[lux
- ["." analysis (#+ Analysis)]
- ["." synthesis (#+ Synthesis)]
+ ["." analysis {"+" [Analysis]}]
+ ["." synthesis {"+" [Synthesis]}]
["." generation]
- ["." directive (#+ Requirements)]
+ ["." directive {"+" [Requirements]}]
[phase
[analysis
[".A" scope]
@@ -54,10 +54,10 @@
[directive
["./" lux]]]]]]
[meta
- [archive (#+ Archive)]]]]]]
+ [archive {"+" [Archive]}]]]]]]
[///
[host
- ["." jvm (#+ Inst)
+ ["." jvm {"+" [Inst]}
["_" inst]
["." def]]]
[translation
diff --git a/lux-jvm/source/luxc/lang/host/jvm.lux b/lux-jvm/source/luxc/lang/host/jvm.lux
index 44cc680eb..206408ce0 100644
--- a/lux-jvm/source/luxc/lang/host/jvm.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm.lux
@@ -1,32 +1,32 @@
(.module:
[library
- [lux (#- Definition Type Label)
- [ffi (#+ import:)]
+ [lux {"-" [Definition Type Label]}
+ [ffi {"+" [import:]}]
[abstract
monad]
[control
["<>" parser
["<.>" code]]]
[data
- [binary (#+ Binary)]
+ [binary {"+" [Binary]}]
[collection
["." list ("#\." monad)]]]
[macro
["." code]
- [syntax (#+ syntax:)]]
+ [syntax {"+" [syntax:]}]]
[target
[jvm
- ["." type (#+ Type)
- [category (#+ Class)]]]]
+ ["." type {"+" [Type]}
+ [category {"+" [Class]}]]]]
[tool
[compiler
[reference
- [variable (#+ Register)]]
+ [variable {"+" [Register]}]]
[language
[lux
["." generation]]]
[meta
- [archive (#+ Archive)]]]]]])
+ [archive {"+" [Archive]}]]]]]])
(import: org/objectweb/asm/MethodVisitor)
diff --git a/lux-jvm/source/luxc/lang/host/jvm/def.lux b/lux-jvm/source/luxc/lang/host/jvm/def.lux
index 6b31137ac..3260e954c 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/def.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/def.lux
@@ -1,15 +1,15 @@
(.module:
[library
- [lux (#- Type)
- ["." ffi (#+ import: do_to)]
+ [lux {"-" [Type]}
+ ["." ffi {"+" [import: do_to]}]
[control
["." function]]
[data
["." product]
["." text
- ["%" format (#+ format)]]
+ ["%" format {"+" [format]}]]
[collection
- ["." array (#+ Array)]
+ ["." array {"+" [Array]}]
["." list ("#@." functor)]]]
[math
[number
@@ -18,8 +18,8 @@
[jvm
[encoding
["." name]]
- ["." type (#+ Type Constraint)
- [category (#+ Class Value Method)]
+ ["." type {"+" [Type Constraint]}
+ [category {"+" [Class Value Method]}]
["." signature]
["." descriptor]]]]]]
["." //])
diff --git a/lux-jvm/source/luxc/lang/host/jvm/inst.lux b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
index ba381d5d2..9a622da03 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/inst.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
@@ -1,9 +1,9 @@
(.module:
[library
- [lux (#- Type int char try)
- ["." ffi (#+ import: do_to)]
+ [lux {"-" [Type int char try]}
+ ["." ffi {"+" [import: do_to]}]
[abstract
- [monad (#+ do)]]
+ [monad {"+" [do]}]]
[control
["." function]
["." maybe]
@@ -15,7 +15,7 @@
[collection
["." list ("#@." functor)]]]
[macro
- [syntax (#+ syntax:)]
+ [syntax {"+" [syntax:]}]
["." code]
["." template]]
[math
@@ -25,16 +25,16 @@
[target
[jvm
[encoding
- ["." name (#+ External)]]
- ["." type (#+ Type) ("#@." equivalence)
- [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter)]
+ ["." name {"+" [External]}]]
+ ["." type {"+" [Type]} ("#@." equivalence)
+ [category {"+" [Void Value Return Method Primitive Object Class Array Var Parameter]}]
["." box]
["." descriptor]
["." reflection]]]]
[tool
[compiler
- [phase (#+ Operation)]]]]]
- ["." // (#+ Inst)])
+ [phase {"+" [Operation]}]]]]]
+ ["." // {"+" [Inst]}])
(def: class_name (|>> type.descriptor descriptor.class_name name.read))
(def: descriptor (|>> type.descriptor descriptor.descriptor))
diff --git a/lux-jvm/source/luxc/lang/synthesis/variable.lux b/lux-jvm/source/luxc/lang/synthesis/variable.lux
index 1fa63446e..73f1e031d 100644
--- a/lux-jvm/source/luxc/lang/synthesis/variable.lux
+++ b/lux-jvm/source/luxc/lang/synthesis/variable.lux
@@ -6,7 +6,7 @@
["s" set])))
(luxc (lang ["la" analysis]
["ls" synthesis]
- [".L" variable #+ Variable])))
+ [".L" variable {"+" [Variable]}])))
(def: (bound-vars path)
(-> ls.Path (List Variable))
diff --git a/lux-jvm/source/luxc/lang/translation/jvm.lux b/lux-jvm/source/luxc/lang/translation/jvm.lux
index 41a10f32a..3a2c38718 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm.lux
@@ -1,28 +1,28 @@
(.module:
[library
- [lux (#- Module Definition)
- ["." ffi (#+ import: do_to object)]
+ [lux {"-" [Module Definition]}
+ ["." ffi {"+" [import: do_to object]}]
[abstract
- [monad (#+ do)]]
+ [monad {"+" [do]}]]
[control
pipe
["." maybe]
- ["." try (#+ Try)]
- ["." exception (#+ exception:)]
- ["." io (#+ IO io)]
+ ["." try {"+" [Try]}]
+ ["." exception {"+" [exception:]}]
+ ["." io {"+" [IO io]}]
[concurrency
- ["." atom (#+ Atom atom)]]]
+ ["." atom {"+" [Atom atom]}]]]
[data
- [binary (#+ Binary)]
+ [binary {"+" [Binary]}]
["." product]
["." text ("#@." hash)
- ["%" format (#+ format)]]
+ ["%" format {"+" [format]}]]
[collection
["." array]
- ["." dictionary (#+ Dictionary)]]]
+ ["." dictionary {"+" [Dictionary]}]]]
[target
[jvm
- ["." loader (#+ Library)]
+ ["." loader {"+" [Library]}]
["." type
["." descriptor]]]]
[tool
@@ -32,13 +32,13 @@
["." version]
["." generation]]]
[meta
- [io (#+ lux_context)]
+ [io {"+" [lux_context]}]
[archive
- [descriptor (#+ Module)]
+ [descriptor {"+" [Module]}]
["." artifact]]]]]]]
[///
[host
- ["." jvm (#+ Inst Definition Host State)
+ ["." jvm {"+" [Inst Definition Host State]}
["." def]
["." inst]]]]
)
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/case.lux b/lux-jvm/source/luxc/lang/translation/jvm/case.lux
index 4c385c0e4..41511f300 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/case.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/case.lux
@@ -1,11 +1,11 @@
(.module:
[library
- [lux (#- Type Label if let case)
+ [lux {"-" [Type Label if let case]}
[abstract
- ["." monad (#+ do)]]
+ ["." monad {"+" [do]}]]
[control
["." function]
- ["ex" exception (#+ exception:)]]
+ ["ex" exception {"+" [exception:]}]]
[data
[collection
["." list ("#@." mix)]]]
@@ -14,22 +14,22 @@
["n" nat]]]
[target
[jvm
- ["." type (#+ Type)
- ["." category (#+ Void Value Return Primitive Object Class Array Var Parameter Method)]
- ["." descriptor (#+ Descriptor)]
- ["." signature (#+ Signature)]]]]
+ ["." type {"+" [Type]}
+ ["." category {"+" [Void Value Return Primitive Object Class Array Var Parameter Method]}]
+ ["." descriptor {"+" [Descriptor]}]
+ ["." signature {"+" [Signature]}]]]]
[tool
[compiler
["." phase ("operation@." monad)]
[meta
- [archive (#+ Archive)]]
+ [archive {"+" [Archive]}]]
[language
[lux
- ["." synthesis (#+ Path Synthesis)]]]]]]]
+ ["." synthesis {"+" [Path Synthesis]}]]]]]]]
[luxc
[lang
[host
- ["$" jvm (#+ Label Inst Operation Phase Generator)
+ ["$" jvm {"+" [Label Inst Operation Phase Generator]}
["_" inst]]]]]
["." //
["." runtime]
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/common.lux b/lux-jvm/source/luxc/lang/translation/jvm/common.lux
index f1dc4ae24..1430a3ea4 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/common.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/common.lux
@@ -1,23 +1,23 @@
(.module:
[library
- [lux #*
+ [lux "*"
... [abstract
- ... [monad (#+ do)]]
+ ... [monad {"+" [do]}]]
... [control
- ... ["." try (#+ Try)]
- ... ["ex" exception (#+ exception:)]
+ ... ["." try {"+" [Try]}]
+ ... ["ex" exception {"+" [exception:]}]
... ["." io]]
... [data
- ... [binary (#+ Binary)]
+ ... [binary {"+" [Binary]}]
... ["." text ("#/." hash)
... format]
... [collection
- ... ["." dictionary (#+ Dictionary)]]]
+ ... ["." dictionary {"+" [Dictionary]}]]]
... ["." macro]
- ... [host (#+ import:)]
+ ... [host {"+" [import:]}]
... [tool
... [compiler
- ... [reference (#+ Register)]
+ ... [reference {"+" [Register]}]
... ["." name]
... ["." phase]]]
]]
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/expression.lux b/lux-jvm/source/luxc/lang/translation/jvm/expression.lux
index 41f795adc..0586646da 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/expression.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/expression.lux
@@ -1,6 +1,6 @@
(.module:
[library
- [lux #*
+ [lux "*"
[tool
[compiler
[language
@@ -11,7 +11,7 @@
[luxc
[lang
[host
- [jvm (#+ Phase)]]]]
+ [jvm {"+" [Phase]}]]]]
[//
["." common]
["." primitive]
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension.lux
index 69f29376c..ce0a3991b 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension.lux
@@ -1,13 +1,13 @@
(.module:
[library
- [lux #*
+ [lux "*"
[data
[collection
["." dictionary]]]]]
[////
[host
- [jvm (#+ Bundle)]]]
- ["." / #_
+ [jvm {"+" [Bundle]}]]]
+ ["." / "_"
["#." common]
["#." host]])
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
index 99c702b81..2d33970db 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
@@ -1,13 +1,13 @@
(.module:
[library
- [lux (#- Type Label)
- [ffi (#+ import:)]
+ [lux {"-" [Type Label]}
+ [ffi {"+" [import:]}]
[abstract
- ["." monad (#+ do)]]
+ ["." monad {"+" [do]}]]
[control
["." try]
["<>" parser
- ["<s>" synthesis (#+ Parser)]]]
+ ["<s>" synthesis {"+" [Parser]}]]]
[data
["." product]
[collection
@@ -23,20 +23,20 @@
[compiler
["." phase]
[meta
- [archive (#+ Archive)]]
+ [archive {"+" [Archive]}]]
[language
[lux
- ["." synthesis (#+ Synthesis %synthesis)]
+ ["." synthesis {"+" [Synthesis %synthesis]}]
[phase
[generation
- [extension (#+ Nullary Unary Binary Trinary Variadic
- nullary unary binary trinary variadic)]]
+ [extension {"+" [Nullary Unary Binary Trinary Variadic
+ nullary unary binary trinary variadic]}]]
["." extension
["." bundle]]]]]]]]]
[luxc
[lang
[host
- ["$" jvm (#+ Label Inst Def Handler Bundle Operation Phase)
+ ["$" jvm {"+" [Label Inst Def Handler Bundle Operation Phase]}
["_" inst]]]]]
["." ///
["." runtime]])
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
index 0b3a0f9fd..16ef783f2 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
@@ -1,23 +1,23 @@
(.module:
[library
- [lux (#- Type Label primitive int char type)
- [ffi (#+ import:)]
+ [lux {"-" [Type Label primitive int char type]}
+ [ffi {"+" [import:]}]
[abstract
- ["." monad (#+ do)]]
+ ["." monad {"+" [do]}]]
[control
["." maybe ("#\." functor)]
- ["." exception (#+ exception:)]
+ ["." exception {"+" [exception:]}]
["." function]
["<>" parser ("#\." monad)
["<.>" text]
- ["<.>" synthesis (#+ Parser)]]]
+ ["<.>" synthesis {"+" [Parser]}]]]
[data
["." product]
["." text ("#\." equivalence)
- ["%" format (#+ format)]]
+ ["%" format {"+" [format]}]]
[collection
["." list ("#\." monad mix)]
- ["." dictionary (#+ Dictionary)]
+ ["." dictionary {"+" [Dictionary]}]
["." set]]]
[macro
["." template]]
@@ -26,8 +26,8 @@
["n" nat]]]
[target
[jvm
- ["." type (#+ Type Typed Argument)
- ["." category (#+ Void Value Return Primitive Object Class Array Var Parameter Method)]
+ ["." type {"+" [Type Typed Argument]}
+ ["." category {"+" [Void Value Return Primitive Object Class Array Var Parameter Method]}]
["." box]
["." reflection]
["." signature]
@@ -36,19 +36,19 @@
[tool
[compiler
["." phase ("#\." monad)]
- [reference (#+)
- ["." variable (#+ Variable Register)]]
+ [reference {"+" []}
+ ["." variable {"+" [Variable Register]}]]
[meta
- [archive (#+ Archive)]]
+ [archive {"+" [Archive]}]]
[language
[lux
- [analysis (#+ Environment)]
- ["." synthesis (#+ Synthesis Path %synthesis)]
+ [analysis {"+" [Environment]}]
+ ["." synthesis {"+" [Synthesis Path %synthesis]}]
["." generation]
[phase
[generation
- [extension (#+ Nullary Unary Binary
- nullary unary binary)]]
+ [extension {"+" [Nullary Unary Binary
+ nullary unary binary]}]]
[analysis
[".A" reference]]
["." extension
@@ -58,11 +58,11 @@
[luxc
[lang
[host
- ["$" jvm (#+ Label Inst Def Handler Bundle Operation Phase)
+ ["$" jvm {"+" [Label Inst Def Handler Bundle Operation Phase]}
["_" inst]
["_." def]]]]]
- ["." // #_
- [common (#+ custom)]
+ ["." // "_"
+ [common {"+" [custom]}]
["/#" //
["#." reference]
["#." function]]])
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/function.lux b/lux-jvm/source/luxc/lang/translation/jvm/function.lux
index 877194de1..69605bb8a 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/function.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/function.lux
@@ -1,16 +1,16 @@
(.module:
[library
- [lux (#- Type Label function)
+ [lux {"-" [Type Label function]}
[abstract
- ["." monad (#+ do)]
+ ["." monad {"+" [do]}]
["." enum]]
[control
- [pipe (#+ when> new>)]
+ [pipe {"+" [when> new>]}]
["." function]]
[data
["." product]
[text
- ["%" format (#+ format)]]
+ ["%" format {"+" [format]}]]
[collection
["." list ("#@." functor monoid)]]]
[math
@@ -19,25 +19,25 @@
["i" int]]]
[target
[jvm
- ["." type (#+ Type)
- ["." category (#+ Void Value Return Primitive Object Class Array Var Parameter Method)]]]]
+ ["." type {"+" [Type]}
+ ["." category {"+" [Void Value Return Primitive Object Class Array Var Parameter Method]}]]]]
[tool
[compiler
- [arity (#+ Arity)]
+ [arity {"+" [Arity]}]
["." phase]
[reference
- [variable (#+ Register)]]
+ [variable {"+" [Register]}]]
[language
[lux
- [analysis (#+ Environment)]
- [synthesis (#+ Synthesis Abstraction Apply)]
- ["." generation (#+ Context)]]]
+ [analysis {"+" [Environment]}]
+ [synthesis {"+" [Synthesis Abstraction Apply]}]
+ ["." generation {"+" [Context]}]]]
[meta
- [archive (#+ Archive)]]]]]]
+ [archive {"+" [Archive]}]]]]]]
[luxc
[lang
[host
- ["$" jvm (#+ Label Inst Def Operation Phase Generator)
+ ["$" jvm {"+" [Label Inst Def Operation Phase Generator]}
["." def]
["_" inst]]]]]
["." //
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/loop.lux b/lux-jvm/source/luxc/lang/translation/jvm/loop.lux
index ae1300cf9..260d14ca8 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/loop.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/loop.lux
@@ -1,8 +1,8 @@
(.module:
[library
- [lux #*
+ [lux "*"
[abstract
- ["." monad (#+ do)]]
+ ["." monad {"+" [do]}]]
[control
["." function]]
[data
@@ -15,15 +15,15 @@
[compiler
["." phase]
[reference
- [variable (#+ Register)]]
+ [variable {"+" [Register]}]]
[language
[lux
- ["." synthesis (#+ Synthesis)]
+ ["." synthesis {"+" [Synthesis]}]
["." generation]]]]]]]
[luxc
[lang
[host
- [jvm (#+ Inst Operation Phase Generator)
+ [jvm {"+" [Inst Operation Phase Generator]}
["_" inst]]]]]
["." //])
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux b/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux
index 95d6c95bf..1b1c0dd3b 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux
@@ -1,7 +1,7 @@
(.module:
[library
- [lux (#- i64)
- ["." ffi (#+ import:)]
+ [lux {"-" [i64]}
+ ["." ffi {"+" [import:]}]
[math
[number
["i" int]]]
@@ -14,7 +14,7 @@
[luxc
[lang
[host
- ["." jvm (#+ Inst Operation)
+ ["." jvm {"+" [Inst Operation]}
["_" inst]]]]])
(def: .public bit
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/program.lux b/lux-jvm/source/luxc/lang/translation/jvm/program.lux
index ab36835da..ebce2d74a 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/program.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/program.lux
@@ -1,9 +1,9 @@
(.module:
[library
- [lux #*
+ [lux "*"
[data
[text
- ["%" format (#+ format)]]]
+ ["%" format {"+" [format]}]]]
[target
[jvm
["$t" type]]]
@@ -11,8 +11,8 @@
[compiler
[language
[lux
- [generation (#+ Context)]
- [program (#+ Program)]]]]]]]
+ [generation {"+" [Context]}]
+ [program {"+" [Program]}]]]]]]]
[luxc
[lang
[host
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/reference.lux b/lux-jvm/source/luxc/lang/translation/jvm/reference.lux
index 2c37cf101..1adc46589 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/reference.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/reference.lux
@@ -1,28 +1,28 @@
(.module:
[library
- [lux (#- local)
+ [lux {"-" [local]}
[abstract
- [monad (#+ do)]]
+ [monad {"+" [do]}]]
[data
[text
- ["%" format (#+ format)]]]
+ ["%" format {"+" [format]}]]]
[target
[jvm
["." type]]]
[tool
[compiler
[reference
- ["." variable (#+ Register Variable)]]
+ ["." variable {"+" [Register Variable]}]]
["." phase ("operation@." monad)]
[meta
- [archive (#+ Archive)]]
+ [archive {"+" [Archive]}]]
[language
[lux
["." generation]]]]]]]
[luxc
[lang
[host
- [jvm (#+ Inst Operation)
+ [jvm {"+" [Inst Operation]}
["_" inst]]]]]
["." //
["#." runtime]])
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux b/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux
index a9f58e932..a3552e3ba 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux
@@ -1,14 +1,14 @@
(.module:
[library
- [lux (#- Type Label try)
+ [lux {"-" [Type Label try]}
[abstract
- [monad (#+ do)]
+ [monad {"+" [do]}]
["." enum]]
[data
- [binary (#+ Binary)]
+ [binary {"+" [Binary]}]
["." product]
[text
- ["%" format (#+ format)]]
+ ["%" format {"+" [format]}]]
[collection
["." list ("#@." functor)]
["." row]]]
@@ -17,27 +17,27 @@
["n" nat]]]
[target
[jvm
- ["." type (#+ Type)
- ["." category (#+ Void Value' Value Return' Return Primitive Object Class Array Var Parameter Method)]
+ ["." type {"+" [Type]}
+ ["." category {"+" [Void Value' Value Return' Return Primitive Object Class Array Var Parameter Method]}]
["." reflection]]]]
[tool
[compiler
- [arity (#+ Arity)]
+ [arity {"+" [Arity]}]
["." phase]
[language
[lux
["." synthesis]
["." generation]]]
[meta
- [archive (#+ Output)
- ["." artifact (#+ Registry)]]]]]]]
+ [archive {"+" [Output]}
+ ["." artifact {"+" [Registry]}]]]]]]]
[luxc
[lang
[host
- ["$" jvm (#+ Label Inst Def Operation)
+ ["$" jvm {"+" [Label Inst Def Operation]}
["$d" def]
["_" inst]]]]]
- ["." // (#+ ByteCode)])
+ ["." // {"+" [ByteCode]}])
(def: $Text (type.class "java.lang.String" (list)))
(def: .public $Tag type.int)
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
index 76948ca72..109c44b22 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
@@ -1,14 +1,14 @@
(.module:
[library
- [lux (#- Type)
- ["." ffi (#+ import:)]
+ [lux {"-" [Type]}
+ ["." ffi {"+" [import:]}]
[abstract
- ["." monad (#+ do)]]
+ ["." monad {"+" [do]}]]
[control
- ["." exception (#+ exception:)]]
+ ["." exception {"+" [exception:]}]]
[data
[text
- ["%" format (#+ format)]]
+ ["%" format {"+" [format]}]]
[collection
["." list]]]
[math
@@ -17,22 +17,22 @@
["i" int]]]
[target
[jvm
- ["." type (#+ Type)
- ["." category (#+ Void Value Return Primitive Object Class Array Var Parameter Method)]
- ["." descriptor (#+ Descriptor)]
- ["." signature (#+ Signature)]]]]
+ ["." type {"+" [Type]}
+ ["." category {"+" [Void Value Return Primitive Object Class Array Var Parameter Method]}]
+ ["." descriptor {"+" [Descriptor]}]
+ ["." signature {"+" [Signature]}]]]]
[tool
[compiler
["." phase]
[meta
- [archive (#+ Archive)]]
+ [archive {"+" [Archive]}]]
[language
[lux
- [synthesis (#+ Synthesis)]]]]]]]
+ [synthesis {"+" [Synthesis]}]]]]]]]
[luxc
[lang
[host
- [jvm (#+ Inst Operation Phase Generator)
+ [jvm {"+" [Inst Operation Phase Generator]}
["_" inst]]]]]
["." //
["#." runtime]])
diff --git a/lux-jvm/source/program.lux b/lux-jvm/source/program.lux
index 304e2195f..6a908d1b1 100644
--- a/lux-jvm/source/program.lux
+++ b/lux-jvm/source/program.lux
@@ -1,58 +1,58 @@
(.module:
[library
- [lux (#- Definition)
- [program (#+ program:)]
+ [lux {"-" [Definition]}
+ [program {"+" [program:]}]
["@" target]
- ["." ffi (#+ import:)]
+ ["." ffi {"+" [import:]}]
[abstract
- [monad (#+ do)]]
+ [monad {"+" [do]}]]
[control
- ["." io (#+ IO)]
- ["." try (#+ Try)]
+ ["." io {"+" [IO]}]
+ ["." try {"+" [Try]}]
[concurrency
- ["." async (#+ Async)]]]
+ ["." async {"+" [Async]}]]]
[data
["." product]
[text
- ["%" format (#+ format)]]
+ ["%" format {"+" [format]}]]
[collection
- [array (#+ Array)]
+ [array {"+" [Array]}]
["." dictionary]]]
- ["." world #_
+ ["." world "_"
["." file]
["#/." program]]
[target
- ["." jvm #_
- [bytecode (#+ Bytecode)]
+ ["." jvm "_"
+ [bytecode {"+" [Bytecode]}]
["#/." type
["#/." box]]]]
[tool
[compiler
- [reference (#+)]
+ [reference {"+" []}]
["." phase]
[default
- ["." platform (#+ Platform)]]
+ ["." platform {"+" [Platform]}]]
[meta
- [archive (#+ Archive)]
- ["." packager #_
+ [archive {"+" [Archive]}]
+ ["." packager "_"
["#" jvm]]]
[language
[lux
- ["$" synthesis (#+ Synthesis)]
+ ["$" synthesis {"+" [Synthesis]}]
["." generation]
[analysis
- [macro (#+ Expander)]]
+ [macro {"+" [Expander]}]]
[phase
- [extension (#+ Phase Bundle Operation Handler Extender)
- ["." analysis #_
+ [extension {"+" [Phase Bundle Operation Handler Extender]}
+ ["." analysis "_"
["#" jvm]]
- ... ["." generation #_
+ ... ["." generation "_"
... ["#" jvm]]
- ... ["." directive #_
+ ... ["." directive "_"
... ["#" jvm]]
]
[generation
- ["." jvm #_
+ ["." jvm "_"
["#/." runtime]
... ["#/." host]
]]]]]]]]]
@@ -64,7 +64,7 @@
[lang
[host
["_" jvm]]
- ["." directive #_
+ ["." directive "_"
["#" jvm]]
[translation
["." jvm
diff --git a/lux-jvm/source/test/program.lux b/lux-jvm/source/test/program.lux
index 46e2a2b71..e8cf0df53 100644
--- a/lux-jvm/source/test/program.lux
+++ b/lux-jvm/source/test/program.lux
@@ -1,10 +1,10 @@
(.module:
- [lux #*
- ["_" test (#+ Test)]
+ [lux "*"
+ ["_" test {"+" [Test]}]
[control
["." io]
[parser
- [cli (#+ program:)]]]]
+ [cli {"+" [program:]}]]]]
[spec
["." compositor]]
{1
diff --git a/lux-jvm/test/test/luxc/lang/analysis/host.jvm.lux b/lux-jvm/test/test/luxc/lang/analysis/host.jvm.lux
index 4858d9359..e8a585408 100644
--- a/lux-jvm/test/test/luxc/lang/analysis/host.jvm.lux
+++ b/lux-jvm/test/test/luxc/lang/analysis/host.jvm.lux
@@ -1,8 +1,8 @@
(.module:
- [lux #*
+ [lux "*"
[control
pipe
- [monad (#+ do)]
+ [monad {"+" [do]}]
["." maybe]]
[data
["e" error]
@@ -16,7 +16,7 @@
[math
["r" random "r/" Monad<Random>]]
["." type]
- [macro (#+ Monad<Meta>)
+ [macro {"+" [Monad<Meta>]}
["." code]]
[compiler
["." default
diff --git a/lux-jvm/test/test/luxc/lang/synthesis/loop.lux b/lux-jvm/test/test/luxc/lang/synthesis/loop.lux
index 48efb99c9..7c059ac2e 100644
--- a/lux-jvm/test/test/luxc/lang/synthesis/loop.lux
+++ b/lux-jvm/test/test/luxc/lang/synthesis/loop.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do])
+ (control [monad {"+" [do]}])
(data [bit "bit/" Eq<Bit>]
[number]
(coll [list "list/" Functor<List>]
diff --git a/lux-jvm/test/test/luxc/lang/synthesis/procedure.lux b/lux-jvm/test/test/luxc/lang/synthesis/procedure.lux
index c2cf5ace9..ccbb28320 100644
--- a/lux-jvm/test/test/luxc/lang/synthesis/procedure.lux
+++ b/lux-jvm/test/test/luxc/lang/synthesis/procedure.lux
@@ -1,7 +1,7 @@
(.module:
lux
(lux [io]
- (control [monad #+ do]
+ (control [monad {"+" [do]}]
pipe)
(data [text "text/" Eq<Text>]
[product]
diff --git a/lux-jvm/test/test/luxc/lang/translation/js.lux b/lux-jvm/test/test/luxc/lang/translation/js.lux
index db4d5a205..effad7726 100644
--- a/lux-jvm/test/test/luxc/lang/translation/js.lux
+++ b/lux-jvm/test/test/luxc/lang/translation/js.lux
@@ -1,7 +1,7 @@
(.module:
lux
- (lux [io #+ IO]
- (control [monad #+ do]
+ (lux [io {"+" [IO]}]
+ (control [monad {"+" [do]}]
pipe)
(data ["e" error]
text/format
@@ -12,7 +12,7 @@
["r" math/random]
(macro [code])
test)
- (luxc (lang [synthesis #+ Synthesis]))
+ (luxc (lang [synthesis {"+" [Synthesis]}]))
(test/luxc common))
(def: upper-alpha-ascii
diff --git a/lux-jvm/test/test/luxc/lang/translation/jvm.lux b/lux-jvm/test/test/luxc/lang/translation/jvm.lux
index 82d5470c4..060081e13 100644
--- a/lux-jvm/test/test/luxc/lang/translation/jvm.lux
+++ b/lux-jvm/test/test/luxc/lang/translation/jvm.lux
@@ -2,7 +2,7 @@
lux
(lux [io]
(control pipe
- [monad #+ do]
+ [monad {"+" [do]}]
[maybe])
(data ["e" error]
[bit]