From f621a133e6e0a516c0586270fea8eaffb4829d82 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sun, 8 Aug 2021 17:56:15 -0400 Subject: No more #export magic syntax. --- lux-jvm/source/luxc/lang/directive/jvm.lux | 48 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'lux-jvm/source/luxc/lang/directive/jvm.lux') diff --git a/lux-jvm/source/luxc/lang/directive/jvm.lux b/lux-jvm/source/luxc/lang/directive/jvm.lux index 93a356c0e..000a5808f 100644 --- a/lux-jvm/source/luxc/lang/directive/jvm.lux +++ b/lux-jvm/source/luxc/lang/directive/jvm.lux @@ -531,7 +531,7 @@ ..relabel_bytecode product.right (row\map ..instruction) - row.to_list + row.list _.fuse)) (with_expansions [ (as_is jvm.Anchor) @@ -580,7 +580,7 @@ _ (phase.except extension.invalid_syntax [extension_name %.code inputsC+])))) -(def: #export (custom [parser handler]) +(def: .public (custom [parser handler]) (All [i] (-> [(Parser i) (-> Text ..Phase Archive i (..Operation Requirements))] @@ -1008,7 +1008,7 @@ (def: (constructor_method_analysis archive [class_name class_tvars] method) (-> Archive Declaration (Constructor Code) (Operation (Constructor Analysis))) (do {! phase.monad} - [#let [[privacy strict_floating_point? annotations method_tvars exceptions + [.let [[privacy strict_floating_point? annotations method_tvars exceptions self arguments constructor_argumentsC bodyC] method] analyse directive.analysis] @@ -1043,14 +1043,14 @@ (def: (override_method_analysis archive [class_name class_tvars] supers method) (-> Archive Declaration (List (Type Class)) (Override Code) (Operation (Override Analysis))) (do {! phase.monad} - [#let [[[super_name super_tvars] method_name strict_floating_point? annotations + [.let [[[super_name super_tvars] method_name strict_floating_point? annotations method_tvars self arguments returnJ exceptionsJ bodyC] method] analyse directive.analysis] (directive.lift_analysis (do ! [mapping (//A.with_fresh_type_vars class_tvars luxT.fresh) - #let [parent_type (/type.class super_name super_tvars)] + .let [parent_type (/type.class super_name super_tvars)] mapping (//A.with_override_mapping supers parent_type mapping) mapping (//A.with_fresh_type_vars method_tvars mapping) selfT (//A.reflection_type mapping (/type.class class_name class_tvars)) @@ -1073,7 +1073,7 @@ (def: (virtual_method_analysis archive [class_name class_tvars] method) (-> Archive Declaration (Virtual Code) (Operation (Virtual Analysis))) (do {! phase.monad} - [#let [[name privacy final? strict_floating_point? annotations method_tvars + [.let [[name privacy final? strict_floating_point? annotations method_tvars self arguments returnJ exceptionsJ bodyC] method] analyse directive.analysis] @@ -1101,7 +1101,7 @@ (def: (static_method_analysis archive method) (-> Archive (Static Code) (Operation (Static Analysis))) (do {! phase.monad} - [#let [[name privacy strict_floating_point? annotations method_tvars + [.let [[name privacy strict_floating_point? annotations method_tvars arguments returnJ exceptionsJ bodyC] method] analyse directive.analysis] @@ -1156,7 +1156,7 @@ (def: (constructor_method_synthesis archive method) (-> Archive (Constructor Analysis) (Operation (Constructor Synthesis))) (do {! phase.monad} - [#let [[privacy strict_floating_point? annotations method_tvars exceptions + [.let [[privacy strict_floating_point? annotations method_tvars exceptions self arguments constructor_argumentsA bodyA] method] synthesise directive.synthesis] @@ -1179,7 +1179,7 @@ (def: (override_method_synthesis archive method) (-> Archive (Override Analysis) (Operation (Override Synthesis))) (do {! phase.monad} - [#let [[[super_name super_tvars] method_name strict_floating_point? annotations + [.let [[[super_name super_tvars] method_name strict_floating_point? annotations method_tvars self arguments returnJ exceptionsJ bodyA] method] synthesise directive.synthesis] @@ -1198,7 +1198,7 @@ (def: (virtual_method_synthesis archive method) (-> Archive (Virtual Analysis) (Operation (Virtual Synthesis))) (do {! phase.monad} - [#let [[name privacy final? strict_floating_point? annotations method_tvars + [.let [[name privacy final? strict_floating_point? annotations method_tvars self arguments returnJ exceptionsJ bodyA] method] synthesise directive.synthesis] @@ -1217,7 +1217,7 @@ (def: (static_method_synthesis archive method) (-> Archive (Static Analysis) (Operation (Static Synthesis))) (do {! phase.monad} - [#let [[name privacy strict_floating_point? annotations method_tvars + [.let [[name privacy strict_floating_point? annotations method_tvars arguments returnJ exceptionsJ bodyA] method] synthesise directive.synthesis] @@ -1259,7 +1259,7 @@ (def: (constructor_method_generation archive super_class method) (-> Archive (Type Class) (Constructor Synthesis) (Operation jvm.Def)) (do {! phase.monad} - [#let [[privacy strict_floating_point? annotations method_tvars exceptions + [.let [[privacy strict_floating_point? annotations method_tvars exceptions self arguments constructor_argumentsS bodyS] method] generate directive.generation] @@ -1268,7 +1268,7 @@ [constructor_argumentsG (monad.map ! (|>> product.right (generate archive)) constructor_argumentsS) bodyG (generate archive (//G.hidden_method_body (list.size arguments) bodyS)) - #let [[super_name super_vars] (parser.read_class super_class) + .let [[super_name super_vars] (parser.read_class super_class) super_constructor_argument_values (_.fuse constructor_argumentsG) super_constructorT (/type.method [(list) (list\map product.left constructor_argumentsS) @@ -1293,14 +1293,14 @@ (def: (override_method_generation archive method) (-> Archive (Override Synthesis) (Operation jvm.Def)) (do {! phase.monad} - [#let [[[super_name super_tvars] method_name strict_floating_point? annotations + [.let [[[super_name super_tvars] method_name strict_floating_point? annotations method_tvars self arguments returnJ exceptionsJ bodyS] method] generate directive.generation] (directive.lift_generation (do ! [bodyG (generate archive (//G.hidden_method_body (list.size arguments) bodyS)) - #let [argumentsT (list\map product.right arguments)]] + .let [argumentsT (list\map product.right arguments)]] (in (def.method #jvm.Public (if strict_floating_point? jvm.strictM @@ -1314,14 +1314,14 @@ (def: (virtual_method_generation archive method) (-> Archive (Virtual Synthesis) (Operation jvm.Def)) (do {! phase.monad} - [#let [[method_name privacy final? strict_floating_point? annotations method_tvars + [.let [[method_name privacy final? strict_floating_point? annotations method_tvars self arguments returnJ exceptionsJ bodyS] method] generate directive.generation] (directive.lift_generation (do ! [bodyG (generate archive (//G.hidden_method_body (list.size arguments) bodyS)) - #let [argumentsT (list\map product.right arguments)]] + .let [argumentsT (list\map product.right arguments)]] (in (def.method (..visibility privacy) (|> jvm.noneM (jvm.++M (if strict_floating_point? @@ -1339,14 +1339,14 @@ (def: (static_method_generation archive method) (-> Archive (Static Synthesis) (Operation jvm.Def)) (do {! phase.monad} - [#let [[method_name privacy strict_floating_point? annotations method_tvars + [.let [[method_name privacy strict_floating_point? annotations method_tvars arguments returnJ exceptionsJ bodyS] method] generate directive.generation] (directive.lift_generation (do ! [bodyG (generate archive (//G.hidden_method_body (list.size arguments) bodyS)) - #let [argumentsT (list\map product.right arguments)]] + .let [argumentsT (list\map product.right arguments)]] (in (def.method (..visibility privacy) (|> jvm.staticM (jvm.++M (if strict_floating_point? @@ -1413,7 +1413,7 @@ fields methodsC]) (do {! phase.monad} - [#let [[class_name type_variables] declaration + [.let [[class_name type_variables] declaration header (..header [class_name type_variables] super_class super_interfaces @@ -1423,7 +1423,7 @@ ## Necessary for reflection to work properly during analysis. _ (directive.lift_generation (generation.execute! header)) - #let [supers (: (List (Type Class)) + .let [supers (: (List (Type Class)) (list& super_class super_interfaces))] _ (|> methodsC (list.all ..convert_overriden_method) @@ -1432,7 +1432,7 @@ methodsA (monad.map ! (method_analysis archive declaration supers) methodsC) methodsS (monad.map ! (method_synthesis archive) methodsA) methodsG (monad.map ! (method_generation archive super_class) methodsS) - #let [directive [class_name + .let [directive [class_name (def.class #jvm.V1_6 #jvm.Public jvm.noneC class_name (list\map ..constraint type_variables) super_class @@ -1457,7 +1457,7 @@ (<>.some ..method_declaration)) (function (_ extension_name phase archive [[class_name type_variables] supers annotations method_declarations]) (do {! phase.monad} - [#let [directive [class_name + [.let [directive [class_name (def.interface #jvm.V1_6 #jvm.Public jvm.noneC class_name (list\map ..constraint type_variables) supers @@ -1474,7 +1474,7 @@ _ (generation.log! (format "JVM Interface " (%.text class_name)))] (in directive.no_requirements)))))])) -(def: #export (bundle class_loader extender) +(def: .public (bundle class_loader extender) (-> java/lang/ClassLoader jvm.Extender (directive.Bundle jvm.Anchor jvm.Inst jvm.Definition)) (|> bundle.empty (dictionary.put "lux def generation" (..def::generation extender)) -- cgit v1.2.3