From fc8bebd3b3c5f050ea92e72eecbd9f6df09f28db Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sat, 4 Sep 2021 12:49:52 -0400 Subject: De-taggification | part 2 --- lux-jvm/source/luxc/lang/translation/jvm/case.lux | 20 ++++++------ .../source/luxc/lang/translation/jvm/common.lux | 16 ++++----- .../luxc/lang/translation/jvm/expression.lux | 4 +-- .../source/luxc/lang/translation/jvm/extension.lux | 6 ++-- .../luxc/lang/translation/jvm/extension/common.lux | 18 +++++----- .../luxc/lang/translation/jvm/extension/host.lux | 38 +++++++++++----------- .../source/luxc/lang/translation/jvm/function.lux | 26 +++++++-------- lux-jvm/source/luxc/lang/translation/jvm/loop.lux | 10 +++--- .../source/luxc/lang/translation/jvm/primitive.lux | 6 ++-- .../source/luxc/lang/translation/jvm/program.lux | 8 ++--- .../source/luxc/lang/translation/jvm/reference.lux | 12 +++---- .../source/luxc/lang/translation/jvm/runtime.lux | 22 ++++++------- .../source/luxc/lang/translation/jvm/structure.lux | 24 +++++++------- 13 files changed, 105 insertions(+), 105 deletions(-) (limited to 'lux-jvm/source/luxc/lang/translation/jvm') 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 - ["" synthesis (#+ Parser)]]] + ["" 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]]) -- cgit v1.2.3