diff options
Diffstat (limited to 'new-luxc/source/luxc/lang/translation/jvm')
8 files changed, 19 insertions, 15 deletions
diff --git a/new-luxc/source/luxc/lang/translation/jvm/case.lux b/new-luxc/source/luxc/lang/translation/jvm/case.lux index 1f3129cd2..f57671f36 100644 --- a/new-luxc/source/luxc/lang/translation/jvm/case.lux +++ b/new-luxc/source/luxc/lang/translation/jvm/case.lux @@ -10,7 +10,8 @@ ["n" nat]]] [target [jvm - ["." descriptor]]] + [type + ["." descriptor]]]] [tool [compiler ["." synthesis (#+ Path Synthesis)] diff --git a/new-luxc/source/luxc/lang/translation/jvm/function.lux b/new-luxc/source/luxc/lang/translation/jvm/function.lux index 5da2839cd..dca622efa 100644 --- a/new-luxc/source/luxc/lang/translation/jvm/function.lux +++ b/new-luxc/source/luxc/lang/translation/jvm/function.lux @@ -13,7 +13,8 @@ ["." list ("#@." functor monoid)]]] [target [jvm - ["." descriptor (#+ Descriptor Class Method Value)]]] + [type + ["." descriptor (#+ Descriptor Class Method Value)]]]] [tool [compiler [arity (#+ Arity)] diff --git a/new-luxc/source/luxc/lang/translation/jvm/primitive.lux b/new-luxc/source/luxc/lang/translation/jvm/primitive.lux index 6903b065d..d5f8d56cb 100644 --- a/new-luxc/source/luxc/lang/translation/jvm/primitive.lux +++ b/new-luxc/source/luxc/lang/translation/jvm/primitive.lux @@ -2,8 +2,8 @@ [lux (#- i64) [target [jvm - ["." descriptor] - ["$t" type]]] + [type + ["." descriptor]]]] [tool [compiler [phase ("operation@." monad)]]]] diff --git a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.lux b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.lux index dbf3a13be..6e7891460 100644 --- a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.lux +++ b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.lux @@ -16,7 +16,8 @@ ["." dictionary]]] [target [jvm - ["." descriptor]]] + [type + ["." descriptor]]]] [tool [compiler ["." synthesis (#+ Synthesis %synthesis)] diff --git a/new-luxc/source/luxc/lang/translation/jvm/procedure/host.lux b/new-luxc/source/luxc/lang/translation/jvm/procedure/host.lux index 62fd37fdb..a51d1715b 100644 --- a/new-luxc/source/luxc/lang/translation/jvm/procedure/host.lux +++ b/new-luxc/source/luxc/lang/translation/jvm/procedure/host.lux @@ -20,10 +20,10 @@ ["." set]]] [target ["." jvm #_ - ["." descriptor (#+ Descriptor Value Primitive Object Method)] ["#" type (#+ Bound Generic Class Var Typed Argument Return) ["." box] - ["." reflection]]]] + ["." reflection] + ["." descriptor (#+ Descriptor Value Primitive Object Method)]]]] [tool [compiler [analysis (#+ Environment)] diff --git a/new-luxc/source/luxc/lang/translation/jvm/reference.lux b/new-luxc/source/luxc/lang/translation/jvm/reference.lux index 8352c7d6f..1995fcd74 100644 --- a/new-luxc/source/luxc/lang/translation/jvm/reference.lux +++ b/new-luxc/source/luxc/lang/translation/jvm/reference.lux @@ -7,7 +7,8 @@ ["%" format (#+ format)]]] [target [jvm - ["." descriptor]]] + [type + ["." descriptor]]]] [tool [compiler ["." name] diff --git a/new-luxc/source/luxc/lang/translation/jvm/runtime.lux b/new-luxc/source/luxc/lang/translation/jvm/runtime.lux index 755ae7a3b..0f3a89faf 100644 --- a/new-luxc/source/luxc/lang/translation/jvm/runtime.lux +++ b/new-luxc/source/luxc/lang/translation/jvm/runtime.lux @@ -4,12 +4,12 @@ [monad (#+ do)]] [data [collection - ["." list ("#/." functor)]]] + ["." list ("#@." functor)]]] ["." math] [target [jvm - ["." descriptor (#+ Descriptor)] - ["$t" type]]] + [type + ["." descriptor (#+ Descriptor)]]]] [tool [compiler [arity (#+ Arity)] @@ -329,10 +329,10 @@ (def: translate-function (Operation ByteCode) (let [applyI (|> (list.n/range 2 num-apply-variants) - (list/map (function (_ arity) + (list@map (function (_ arity) ($d.method #$.Public $.noneM apply-method (apply-signature arity) (let [preI (|> (list.n/range 0 (dec arity)) - (list/map _.ALOAD) + (list@map _.ALOAD) _.fuse)] (|>> preI (_.INVOKEVIRTUAL //.$Function apply-method (apply-signature (dec arity)) #0) diff --git a/new-luxc/source/luxc/lang/translation/jvm/structure.lux b/new-luxc/source/luxc/lang/translation/jvm/structure.lux index 92bf41256..e224f1f2f 100644 --- a/new-luxc/source/luxc/lang/translation/jvm/structure.lux +++ b/new-luxc/source/luxc/lang/translation/jvm/structure.lux @@ -13,8 +13,8 @@ ["." list]]] [target [jvm - ["." descriptor] - ["$t" type (#+ Type)]]] + [type + ["." descriptor]]]] [tool [compiler [synthesis (#+ Synthesis)] |