diff options
Diffstat (limited to 'stdlib/source/library/lux/target/jvm')
26 files changed, 56 insertions, 56 deletions
diff --git a/stdlib/source/library/lux/target/jvm/attribute.lux b/stdlib/source/library/lux/target/jvm/attribute.lux index a1796629b..61e9401f5 100644 --- a/stdlib/source/library/lux/target/jvm/attribute.lux +++ b/stdlib/source/library/lux/target/jvm/attribute.lux @@ -29,7 +29,7 @@ ["[1][0]" constant (.only Constant)] ["[1][0]" code]]) -(type: .public (Info about) +(type .public (Info about) (Record [#name (Index UTF8) #length U4 @@ -56,14 +56,14 @@ (|>> nameT lengthT infoT)]))) (with_expansions [<Code> (these (/code.Code Attribute))] - (type: .public Attribute + (type .public Attribute (Rec Attribute (Variant {#Constant (Info (Constant Any))} {#Code (Info <Code>)} {#Signature (Info (Index UTF8))}))) - (type: .public Code + (type .public Code <Code>) ) diff --git a/stdlib/source/library/lux/target/jvm/attribute/code.lux b/stdlib/source/library/lux/target/jvm/attribute/code.lux index 24bb2bdd1..face35c64 100644 --- a/stdlib/source/library/lux/target/jvm/attribute/code.lux +++ b/stdlib/source/library/lux/target/jvm/attribute/code.lux @@ -22,7 +22,7 @@ ["[0]" / ["[1][0]" exception (.only Exception)]]) -(type: .public (Code Attribute) +(type .public (Code Attribute) (Record [#limit Limit #code Binary diff --git a/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux b/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux index ee7d960cb..a125c1282 100644 --- a/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux +++ b/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux @@ -19,7 +19,7 @@ [encoding ["[1][0]" unsigned (.only U2)]]]]) -(type: .public Exception +(type .public Exception (Record [#start Address #end Address diff --git a/stdlib/source/library/lux/target/jvm/attribute/constant.lux b/stdlib/source/library/lux/target/jvm/attribute/constant.lux index 799124c9a..3a31f2c70 100644 --- a/stdlib/source/library/lux/target/jvm/attribute/constant.lux +++ b/stdlib/source/library/lux/target/jvm/attribute/constant.lux @@ -12,7 +12,7 @@ [encoding ["[1][0]" unsigned (.only U2 U4)]]]) -(type: .public (Constant a) +(type .public (Constant a) (Index (Value a))) (def .public equivalence diff --git a/stdlib/source/library/lux/target/jvm/bytecode.lux b/stdlib/source/library/lux/target/jvm/bytecode.lux index 5d74511b8..9f71fd570 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode.lux @@ -52,13 +52,13 @@ ["[0]" reflection] ["[0]" parser]]]]) -(type: .public Label +(type .public Label Nat) -(type: .public Resolver +(type .public Resolver (Dictionary Label [Stack (Maybe Address)])) -(type: .public Tracker +(type .public Tracker (Record [#program_counter Address #next Label @@ -70,7 +70,7 @@ #next 0 #known (dictionary.empty n.hash)]) -(type: .public Relative +(type .public Relative (-> Resolver (Try [(Sequence Exception) Instruction]))) (def no_exceptions @@ -116,7 +116,7 @@ (def identity ..relative#identity) (def composite ..relative#composite))) -(type: .public (Bytecode a) +(type .public (Bytecode a) (+State Try [Pool Environment Tracker] (Writer Relative a))) (def .public new_label @@ -792,7 +792,7 @@ "Start" (|> @from /address.value //unsigned.value %.nat) "Target" (|> jump //signed.value %.int))) -(type: Any_Jump +(type Any_Jump (Either Big_Jump Jump)) diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment.lux index b3f322519..a0c93c974 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/environment.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/environment.lux @@ -17,7 +17,7 @@ [type (.only Type) [category (.only Method)]]]]) -(type: .public Environment +(type .public Environment (Record [#limit Limit #stack (Maybe Stack)])) @@ -34,7 +34,7 @@ [virtual /limit.virtual] ) -(type: .public Condition +(type .public Condition (-> Environment (Try Environment))) (def .public monoid diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux index 3cda1e1f1..ce98e3228 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux @@ -20,7 +20,7 @@ [type (.only Type) [category (.only Method)]]]]) -(type: .public Limit +(type .public Limit (Record [#stack Stack #registry Registry])) diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux index 88b3e4dec..cc989ed02 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux @@ -22,7 +22,7 @@ [category (.only Method)] ["[1]/[0]" parser]]]) -(type: .public Register +(type .public Register U1) (def normal 1) diff --git a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux index 060e751a5..fa61fa2fc 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux @@ -38,17 +38,17 @@ [type [category (.only Value Method)]]]]) -(type: .public Size +(type .public Size U2) -(type: .public Estimator +(type .public Estimator (-> Address Size)) (def fixed (-> Size Estimator) function.constant) -(type: .public Instruction +(type .public Instruction (-> Specification Specification)) (def .public empty @@ -59,7 +59,7 @@ (-> Instruction Specification) (function.on \\format.no_op)) -(type: Opcode +(type Opcode Nat) (with_template [<size> <name>] diff --git a/stdlib/source/library/lux/target/jvm/bytecode/jump.lux b/stdlib/source/library/lux/target/jvm/bytecode/jump.lux index d2931b2c8..8274d3855 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/jump.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/jump.lux @@ -10,7 +10,7 @@ [encoding ["[1][0]" signed (.only S2 S4)]]]) -(type: .public Jump +(type .public Jump S2) (def .public equivalence @@ -21,7 +21,7 @@ (Writer Jump) ///signed.writer/2) -(type: .public Big_Jump +(type .public Big_Jump S4) (def .public lifted diff --git a/stdlib/source/library/lux/target/jvm/class.lux b/stdlib/source/library/lux/target/jvm/class.lux index 8bb2ea186..08ef0790a 100644 --- a/stdlib/source/library/lux/target/jvm/class.lux +++ b/stdlib/source/library/lux/target/jvm/class.lux @@ -30,7 +30,7 @@ ["[1][0]" constant (.only Constant) ["[2][0]" pool (.only Pool Resource)]]]) -(type: .public Class +(type .public Class (Rec Class (Record [#magic Magic diff --git a/stdlib/source/library/lux/target/jvm/constant.lux b/stdlib/source/library/lux/target/jvm/constant.lux index 54b1d15d5..f404694ea 100644 --- a/stdlib/source/library/lux/target/jvm/constant.lux +++ b/stdlib/source/library/lux/target/jvm/constant.lux @@ -33,7 +33,7 @@ [encoding ["[1][0]" unsigned]]]]) -(type: .public UTF8 +(type .public UTF8 Text) (def utf8_writer @@ -98,7 +98,7 @@ Equivalence<kind>)) (with_template [<constructor> <type> <marker>] - [(type: .public <type> + [(type .public <type> (Value <marker>)) (def .public <constructor> @@ -127,12 +127,12 @@ ) ) -(type: .public (Name_And_Type of) +(type .public (Name_And_Type of) (Record [#name (Index UTF8) #descriptor (Index (Descriptor of))])) -(type: .public (Reference of) +(type .public (Reference of) (Record [#class (Index Class) #name_and_type (Index (Name_And_Type of))])) @@ -154,7 +154,7 @@ [Reference reference_equivalence reference_writer] ) -(type: .public Constant +(type .public Constant (Variant {#UTF8 UTF8} {#Integer Integer} diff --git a/stdlib/source/library/lux/target/jvm/constant/pool.lux b/stdlib/source/library/lux/target/jvm/constant/pool.lux index bbfc2be17..ad82d4686 100644 --- a/stdlib/source/library/lux/target/jvm/constant/pool.lux +++ b/stdlib/source/library/lux/target/jvm/constant/pool.lux @@ -32,7 +32,7 @@ [category (.only Value Method)] ["[1][0]" descriptor (.only Descriptor)]]]]) -(type: .public Pool +(type .public Pool [Index (Sequence [Index Constant])]) (def .public equivalence @@ -41,7 +41,7 @@ (sequence.equivalence (product.equivalence //index.equivalence //.equivalence)))) -(type: .public (Resource a) +(type .public (Resource a) (+State Try Pool a)) (def .public functor @@ -135,7 +135,7 @@ failure (as_expected failure))])) -(type: (Adder of) +(type (Adder of) (-> of (Resource (Index of)))) (with_template [<name> <type> <tag> <equivalence>] @@ -173,7 +173,7 @@ (/|do %) (!add % //.#UTF8 text.equivalence value))) -(type: .public (Member of) +(type .public (Member of) (Record [#name UTF8 #descriptor (Descriptor of)])) diff --git a/stdlib/source/library/lux/target/jvm/encoding/name.lux b/stdlib/source/library/lux/target/jvm/encoding/name.lux index 558dfcad5..246bb0575 100644 --- a/stdlib/source/library/lux/target/jvm/encoding/name.lux +++ b/stdlib/source/library/lux/target/jvm/encoding/name.lux @@ -10,7 +10,7 @@ (def .public internal_separator "/") (def .public external_separator ".") -(type: .public External +(type .public External Text) (primitive .public Internal diff --git a/stdlib/source/library/lux/target/jvm/encoding/signed.lux b/stdlib/source/library/lux/target/jvm/encoding/signed.lux index b25fc4412..83d6bc4d8 100644 --- a/stdlib/source/library/lux/target/jvm/encoding/signed.lux +++ b/stdlib/source/library/lux/target/jvm/encoding/signed.lux @@ -51,7 +51,7 @@ (with_template [<bytes> <name> <size> <constructor> <maximum> <minimum> <+> <->] [(with_expansions [<raw> (template.symbol [<name> "'"])] (primitive <raw> Any) - (type: .public <name> (Signed <raw>))) + (type .public <name> (Signed <raw>))) (def .public <size> <bytes>) diff --git a/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux b/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux index 33477f551..b31a67dcb 100644 --- a/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux +++ b/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux @@ -63,7 +63,7 @@ (with_template [<bytes> <name> <size> <constructor> <maximum> <+> <-> <max>] [(with_expansions [<raw> (template.symbol [<name> "'"])] (primitive .public <raw> Any) - (type: .public <name> (Unsigned <raw>))) + (type .public <name> (Unsigned <raw>))) (def .public <size> <bytes>) diff --git a/stdlib/source/library/lux/target/jvm/field.lux b/stdlib/source/library/lux/target/jvm/field.lux index d8d6ab791..ab9f3ea6e 100644 --- a/stdlib/source/library/lux/target/jvm/field.lux +++ b/stdlib/source/library/lux/target/jvm/field.lux @@ -20,7 +20,7 @@ [category (.only Value)] [descriptor (.only Descriptor)]]]) -(type: .public Field +(type .public Field (Rec Field (Record [#modifier (Modifier Field) diff --git a/stdlib/source/library/lux/target/jvm/loader.lux b/stdlib/source/library/lux/target/jvm/loader.lux index 0ce3ffe3f..04ea3f433 100644 --- a/stdlib/source/library/lux/target/jvm/loader.lux +++ b/stdlib/source/library/lux/target/jvm/loader.lux @@ -19,7 +19,7 @@ ["[0]" array] ["[0]" dictionary (.only Dictionary)]]]]]) -(type: .public Library +(type .public Library (Atom (Dictionary Text Binary))) (exception: .public (already_stored [class Text]) diff --git a/stdlib/source/library/lux/target/jvm/magic.lux b/stdlib/source/library/lux/target/jvm/magic.lux index b59147f41..3aab60bec 100644 --- a/stdlib/source/library/lux/target/jvm/magic.lux +++ b/stdlib/source/library/lux/target/jvm/magic.lux @@ -9,7 +9,7 @@ [encoding ["[1][0]" unsigned (.only U4)]]]) -(type: .public Magic +(type .public Magic U4) (def .public code diff --git a/stdlib/source/library/lux/target/jvm/method.lux b/stdlib/source/library/lux/target/jvm/method.lux index 9632c28a0..4468f152d 100644 --- a/stdlib/source/library/lux/target/jvm/method.lux +++ b/stdlib/source/library/lux/target/jvm/method.lux @@ -28,7 +28,7 @@ ["[2][0]" category] ["[2][0]" signature (.only Signature)]]]) -(type: .public Method +(type .public Method (Rec Method (Record [#modifier (Modifier Method) diff --git a/stdlib/source/library/lux/target/jvm/reflection.lux b/stdlib/source/library/lux/target/jvm/reflection.lux index 262ad8145..1076bfff2 100644 --- a/stdlib/source/library/lux/target/jvm/reflection.lux +++ b/stdlib/source/library/lux/target/jvm/reflection.lux @@ -1,6 +1,6 @@ (.require [library - [lux (.except Primitive type parameter) + [lux (.except Primitive parameter) ["[0]" ffi (.only import)] ["[0]" type] [abstract diff --git a/stdlib/source/library/lux/target/jvm/type.lux b/stdlib/source/library/lux/target/jvm/type.lux index f2ae2d59d..3bb1f6411 100644 --- a/stdlib/source/library/lux/target/jvm/type.lux +++ b/stdlib/source/library/lux/target/jvm/type.lux @@ -30,13 +30,13 @@ (Descriptor category) (Reflection category)] - (type: .public Argument + (type .public Argument [Text (Type Value)]) - (type: .public (Typed a) + (type .public (Typed a) [(Type Value) a]) - (type: .public Constraint + (type .public Constraint (Record [#name Text #super_class (Type Class) diff --git a/stdlib/source/library/lux/target/jvm/type/alias.lux b/stdlib/source/library/lux/target/jvm/type/alias.lux index 9eb7986d2..5db726862 100644 --- a/stdlib/source/library/lux/target/jvm/type/alias.lux +++ b/stdlib/source/library/lux/target/jvm/type/alias.lux @@ -1,6 +1,6 @@ (.require [library - [lux (.except Type Primitive int char type parameter) + [lux (.except Type Primitive int char parameter) [abstract ["[0]" monad (.only do)]] [control @@ -24,7 +24,7 @@ [encoding ["[1][0]" name]]]]) -(type: .public Aliasing +(type .public Aliasing (Dictionary Text Text)) (def .public fresh diff --git a/stdlib/source/library/lux/target/jvm/type/category.lux b/stdlib/source/library/lux/target/jvm/type/category.lux index 772503318..62a0a3a45 100644 --- a/stdlib/source/library/lux/target/jvm/type/category.lux +++ b/stdlib/source/library/lux/target/jvm/type/category.lux @@ -11,20 +11,20 @@ (primitive .public (Return' kind) Any) (primitive .public Method Any) -(type: .public Return (<| Return' Any)) -(type: .public Value (<| Return' Value' Any)) -(type: .public Void (<| Return' Void')) +(type .public Return (<| Return' Any)) +(type .public Value (<| Return' Value' Any)) +(type .public Void (<| Return' Void')) (primitive (Object' brand) Any) -(type: .public Object (<| Return' Value' Object' Any)) +(type .public Object (<| Return' Value' Object' Any)) (primitive (Parameter' brand) Any) -(type: .public Parameter (<| Return' Value' Object' Parameter' Any)) +(type .public Parameter (<| Return' Value' Object' Parameter' Any)) (with_template [<parents> <child>] [(with_expansions [<raw> (template.symbol [<child> "'"])] (primitive <raw> Any) - (type: .public <child> + (type .public <child> (`` (<| Return' Value' (~~ (template.spliced <parents>)) <raw>))))] [[] Primitive] diff --git a/stdlib/source/library/lux/target/jvm/type/lux.lux b/stdlib/source/library/lux/target/jvm/type/lux.lux index 8ae726f26..3e3b02271 100644 --- a/stdlib/source/library/lux/target/jvm/type/lux.lux +++ b/stdlib/source/library/lux/target/jvm/type/lux.lux @@ -1,6 +1,6 @@ (.require [library - [lux (.except Primitive int char type parameter) + [lux (.except Primitive int char parameter) [abstract ["[0]" monad (.only do)]] [control @@ -35,7 +35,7 @@ [Lower] [Upper] ) -(type: .public Mapping +(type .public Mapping (Dictionary Text Type)) (def .public fresh diff --git a/stdlib/source/library/lux/target/jvm/version.lux b/stdlib/source/library/lux/target/jvm/version.lux index 5d23d62c1..9e50f90bf 100644 --- a/stdlib/source/library/lux/target/jvm/version.lux +++ b/stdlib/source/library/lux/target/jvm/version.lux @@ -7,9 +7,9 @@ [encoding ["[1][0]" unsigned (.only U2)]]]) -(type: .public Version U2) -(type: .public Minor Version) -(type: .public Major Version) +(type .public Version U2) +(type .public Minor Version) +(type .public Major Version) (def .public default_minor Minor |