diff options
Diffstat (limited to '')
17 files changed, 45 insertions, 45 deletions
diff --git a/stdlib/source/library/lux/target/jvm/bytecode/address.lux b/stdlib/source/library/lux/target/jvm/bytecode/address.lux index 94f53c258..7edce6747 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/address.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/address.lux @@ -15,7 +15,7 @@ [number ["n" nat]]] [type - [abstract "*"]]]] + [primitive "*"]]]] ["[0]" // "_" [jump {"+" Big_Jump}] ["/[1]" // "_" @@ -23,7 +23,7 @@ ["[1][0]" unsigned {"+" U2}] ["[1][0]" signed {"+" S4}]]]]) -(abstract: .public Address +(primitive: .public Address U2 (def: .public value 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 cc99cdaed..334a2cb15 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 @@ -14,7 +14,7 @@ [number ["n" nat]]] [type - [abstract "*"]]]] + [primitive "*"]]]] ["[0]" ///// "_" [encoding ["[1][0]" unsigned {"+" U1 U2}]] @@ -28,7 +28,7 @@ (def: normal 1) (def: wide 2) -(abstract: .public Registry +(primitive: .public Registry U2 (def: .public registry diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux index 4722fde9e..414a74ddd 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux @@ -12,12 +12,12 @@ [format [binary {"+" Writer}]]] [type - [abstract "*"]]]] + [primitive "*"]]]] ["[0]" ///// "_" [encoding ["[1][0]" unsigned {"+" U2}]]]) -(abstract: .public Stack +(primitive: .public Stack U2 (template [<frames> <name>] diff --git a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux index b899cd83d..90569a287 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux @@ -23,7 +23,7 @@ [number {"+" hex} ["n" nat]]] [type - [abstract "*"]]]] + [primitive "*"]]]] ["[0]" // "_" ["[1][0]" address {"+" Address}] ["[1][0]" jump {"+" Jump Big_Jump}] @@ -222,7 +222,7 @@ [(n.+ (///unsigned.value ..size/211) size) (|>> mutation ((trinary/211' opcode input0 input1 input2)))])]) -(abstract: .public Primitive_Array_Type +(primitive: .public Primitive_Array_Type U1 (def: code diff --git a/stdlib/source/library/lux/target/jvm/constant.lux b/stdlib/source/library/lux/target/jvm/constant.lux index e1fc0337e..b0dfc7cda 100644 --- a/stdlib/source/library/lux/target/jvm/constant.lux +++ b/stdlib/source/library/lux/target/jvm/constant.lux @@ -22,7 +22,7 @@ ["[0]" int] ["[0]" frac]]] [type - [abstract "*"]]]] + [primitive "*"]]]] ["[0]" / "_" ["[1][0]" tag] ["/[1]" // "_" @@ -40,7 +40,7 @@ (Writer UTF8) binaryF.utf8_16) -(abstract: .public Class +(primitive: .public Class (Index UTF8) (def: .public index @@ -82,7 +82,7 @@ "[1]::[0]" ("static" doubleToRawLongBits [double] long)) -(abstract: .public (Value kind) +(primitive: .public (Value kind) kind (def: .public value diff --git a/stdlib/source/library/lux/target/jvm/constant/tag.lux b/stdlib/source/library/lux/target/jvm/constant/tag.lux index 21a53ae56..440dbc581 100644 --- a/stdlib/source/library/lux/target/jvm/constant/tag.lux +++ b/stdlib/source/library/lux/target/jvm/constant/tag.lux @@ -9,12 +9,12 @@ [format [binary {"+" Writer}]]] [type - [abstract "*"]]]] + [primitive "*"]]]] ["[0]" /// "_" [encoding ["[1][0]" unsigned {"+" U1} ("u1//[0]" equivalence)]]]) -(abstract: .public Tag +(primitive: .public Tag U1 (implementation: .public equivalence diff --git a/stdlib/source/library/lux/target/jvm/encoding/name.lux b/stdlib/source/library/lux/target/jvm/encoding/name.lux index 666251728..1479e35dd 100644 --- a/stdlib/source/library/lux/target/jvm/encoding/name.lux +++ b/stdlib/source/library/lux/target/jvm/encoding/name.lux @@ -5,7 +5,7 @@ ["[0]" text ["%" format {"+" format}]]] [type - [abstract "*"]]]]) + [primitive "*"]]]]) (def: .public internal_separator "/") (def: .public external_separator ".") @@ -13,7 +13,7 @@ (type: .public External Text) -(abstract: .public Internal +(primitive: .public Internal Text (def: .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 c56ada38f..be0f564e3 100644 --- a/stdlib/source/library/lux/target/jvm/encoding/signed.lux +++ b/stdlib/source/library/lux/target/jvm/encoding/signed.lux @@ -20,9 +20,9 @@ ["n" nat] ["i" int]]] [type - [abstract "*"]]]]) + [primitive "*"]]]]) -(abstract: .public (Signed brand) +(primitive: .public (Signed brand) Int (def: .public value @@ -49,7 +49,7 @@ (template [<bytes> <name> <size> <constructor> <maximum> <minimum> <+> <->] [(with_expansions [<raw> (template.symbol [<name> "'"])] - (abstract: <raw> Any) + (primitive: <raw> Any) (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 ec8b7b068..66506f3b0 100644 --- a/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux +++ b/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux @@ -19,9 +19,9 @@ ["n" nat] ["[0]" i64]]] [type - [abstract "*"]]]]) + [primitive "*"]]]]) -(abstract: .public (Unsigned brand) +(primitive: .public (Unsigned brand) Nat (def: .public value @@ -61,7 +61,7 @@ (template [<bytes> <name> <size> <constructor> <maximum> <+> <-> <max>] [(with_expansions [<raw> (template.symbol [<name> "'"])] - (abstract: .public <raw> Any) + (primitive: .public <raw> Any) (type: .public <name> (Unsigned <raw>))) (def: .public <size> <bytes>) diff --git a/stdlib/source/library/lux/target/jvm/index.lux b/stdlib/source/library/lux/target/jvm/index.lux index 9afae818a..42c0e4c15 100644 --- a/stdlib/source/library/lux/target/jvm/index.lux +++ b/stdlib/source/library/lux/target/jvm/index.lux @@ -7,7 +7,7 @@ [format [binary {"+" Writer}]]] [type - [abstract "*"]]]] + [primitive "*"]]]] ["[0]" // "_" [encoding ["[1][0]" unsigned {"+" U2}]]]) @@ -15,7 +15,7 @@ (def: .public length //unsigned.bytes/2) -(abstract: .public (Index kind) +(primitive: .public (Index kind) U2 (def: .public index diff --git a/stdlib/source/library/lux/target/jvm/modifier.lux b/stdlib/source/library/lux/target/jvm/modifier.lux index 0e4097cb0..d573f0aeb 100644 --- a/stdlib/source/library/lux/target/jvm/modifier.lux +++ b/stdlib/source/library/lux/target/jvm/modifier.lux @@ -18,12 +18,12 @@ ["[0]" number {"+" hex} ["[0]" i64]]] [type - [abstract "*"]]]] + [primitive "*"]]]] ["[0]" // "_" [encoding ["[1][0]" unsigned]]]) -(abstract: .public (Modifier of) +(primitive: .public (Modifier of) //unsigned.U2 (def: .public code diff --git a/stdlib/source/library/lux/target/jvm/type.lux b/stdlib/source/library/lux/target/jvm/type.lux index 06191a89f..c2f40a5a5 100644 --- a/stdlib/source/library/lux/target/jvm/type.lux +++ b/stdlib/source/library/lux/target/jvm/type.lux @@ -15,7 +15,7 @@ [number ["n" nat]]] [type - [abstract "*"]]]] + [primitive "*"]]]] ["[0]" // "_" [encoding ["[1][0]" name {"+" External}]]] @@ -25,7 +25,7 @@ ["[1][0]" descriptor {"+" Descriptor}] ["[1][0]" reflection {"+" Reflection}]]) -(abstract: .public (Type category) +(primitive: .public (Type category) [(Signature category) (Descriptor category) (Reflection category)] diff --git a/stdlib/source/library/lux/target/jvm/type/category.lux b/stdlib/source/library/lux/target/jvm/type/category.lux index 82080666d..f10e42ebd 100644 --- a/stdlib/source/library/lux/target/jvm/type/category.lux +++ b/stdlib/source/library/lux/target/jvm/type/category.lux @@ -4,26 +4,26 @@ [macro ["[0]" template]] [type - [abstract "*"]]]]) + [primitive "*"]]]]) -(abstract: Void' Any) -(abstract: .public (Value' kind) Any) -(abstract: .public (Return' kind) Any) -(abstract: .public Method Any) +(primitive: Void' Any) +(primitive: .public (Value' kind) Any) +(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')) -(abstract: (Object' brand) Any) +(primitive: (Object' brand) Any) (type: .public Object (<| Return' Value' Object' Any)) -(abstract: (Parameter' brand) Any) +(primitive: (Parameter' brand) Any) (type: .public Parameter (<| Return' Value' Object' Parameter' Any)) (template [<parents> <child>] [(with_expansions [<raw> (template.symbol [<child> "'"])] - (abstract: <raw> Any) + (primitive: <raw> Any) (type: .public <child> (`` (<| Return' Value' (~~ (template.spliced <parents>)) <raw>))))] @@ -33,5 +33,5 @@ [[Object' Parameter'] Array] ) -(abstract: .public Declaration Any) -(abstract: .public Inheritance Any) +(primitive: .public Declaration Any) +(primitive: .public Inheritance Any) diff --git a/stdlib/source/library/lux/target/jvm/type/descriptor.lux b/stdlib/source/library/lux/target/jvm/type/descriptor.lux index cfc674edc..a58c9098f 100644 --- a/stdlib/source/library/lux/target/jvm/type/descriptor.lux +++ b/stdlib/source/library/lux/target/jvm/type/descriptor.lux @@ -14,14 +14,14 @@ [number ["n" nat]]] [type - [abstract "*"]]]] + [primitive "*"]]]] ["[0]" // "_" [category {"+" Void Value Return Method Primitive Object Class Array Var Parameter Declaration}] ["/[1]" // "_" [encoding ["[1][0]" name {"+" Internal External}]]]]) -(abstract: .public (Descriptor category) +(primitive: .public (Descriptor category) Text (def: .public descriptor diff --git a/stdlib/source/library/lux/target/jvm/type/lux.lux b/stdlib/source/library/lux/target/jvm/type/lux.lux index a1b8328bf..8fa73b5f9 100644 --- a/stdlib/source/library/lux/target/jvm/type/lux.lux +++ b/stdlib/source/library/lux/target/jvm/type/lux.lux @@ -16,7 +16,7 @@ ["[0]" array] ["[0]" dictionary {"+" Dictionary}]]] [type - [abstract "*"] + [primitive "*"] ["[0]" check {"+" Check} ("[1]#[0]" monad)]]]] ["[0]" // [category {"+" Void Value Return Method Primitive Object Class Array Var Parameter}] @@ -30,7 +30,7 @@ ["[1][0]" name]]]]) (template [<name>] - [(abstract: .public (<name> class) Any)] + [(primitive: .public (<name> class) Any)] [Lower] [Upper] ) diff --git a/stdlib/source/library/lux/target/jvm/type/reflection.lux b/stdlib/source/library/lux/target/jvm/type/reflection.lux index ae364efa0..7e7ad7a1a 100644 --- a/stdlib/source/library/lux/target/jvm/type/reflection.lux +++ b/stdlib/source/library/lux/target/jvm/type/reflection.lux @@ -7,7 +7,7 @@ ["[0]" text ("[1]#[0]" equivalence) ["%" format {"+" format}]]] [type - [abstract "*"]]]] + [primitive "*"]]]] ["[0]" // "_" [category {"+" Void Value Return Method Primitive Object Class Array Var Parameter Declaration}] ["[1][0]" descriptor] @@ -15,7 +15,7 @@ [encoding ["[1][0]" name {"+" External}]]]]) -(abstract: .public (Reflection category) +(primitive: .public (Reflection category) Text (def: .public reflection diff --git a/stdlib/source/library/lux/target/jvm/type/signature.lux b/stdlib/source/library/lux/target/jvm/type/signature.lux index 46a4c1066..e9dffe710 100644 --- a/stdlib/source/library/lux/target/jvm/type/signature.lux +++ b/stdlib/source/library/lux/target/jvm/type/signature.lux @@ -12,7 +12,7 @@ [collection ["[0]" list ("[1]#[0]" functor)]]] [type - [abstract "*"]]]] + [primitive "*"]]]] ["[0]" // "_" [category {"+" Void Value Return Method Primitive Object Class Array Var Parameter Declaration Inheritance}] ["[1][0]" descriptor] @@ -20,7 +20,7 @@ [encoding ["[1][0]" name {"+" External}]]]]) -(abstract: .public (Signature category) +(primitive: .public (Signature category) Text (def: .public signature |