diff options
| author | Eduardo Julian | 2022-10-24 19:28:57 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2022-10-24 19:28:57 -0400 |
| commit | 8d4c256f8b56561869c14df02db695d774c74fa6 (patch) | |
| tree | 3acdc7e92008bbe8a74e84610ea4daebd292678a /stdlib/source/library/lux | |
| parent | 45c599e49ae2659331d13222948f7e755967fdf9 (diff) | |
Minor naming & syntax improvements.
Diffstat (limited to 'stdlib/source/library/lux')
105 files changed, 355 insertions, 327 deletions
diff --git a/stdlib/source/library/lux/control/concurrency/actor.lux b/stdlib/source/library/lux/control/concurrency/actor.lux index 7b430da17..3693401df 100644 --- a/stdlib/source/library/lux/control/concurrency/actor.lux +++ b/stdlib/source/library/lux/control/concurrency/actor.lux @@ -17,7 +17,7 @@ [macro ["[0]" local]] [type (.only sharing) - [primitive (.only primitive representation abstraction)]]]]] + ["[0]" primitive (.only representation abstraction)]]]]] [// ["[0]" atom (.only Atom atom)] ["[0]" async (.only Async Resolver) (.use "[1]#[0]" monad)] @@ -50,7 +50,7 @@ {.#None} (in {.#End})))) - (primitive .public (Actor s) + (primitive.def .public (Actor s) (Record [#obituary [(Async (<Obituary> Actor s)) (Resolver (<Obituary> Actor s))] @@ -167,7 +167,7 @@ (io.run! (resolve {try.#Failure error})) (async.resolved {try.#Failure error})))))])) - (def .public (tell! message actor) + (def .public (request! message actor) (All (_ s o) (-> (Message s o) (Actor s) (Async (Try o)))) (let [[async mail] (..mail message)] (do async.monad diff --git a/stdlib/source/library/lux/control/concurrency/async.lux b/stdlib/source/library/lux/control/concurrency/async.lux index 4285b3b82..6385844ba 100644 --- a/stdlib/source/library/lux/control/concurrency/async.lux +++ b/stdlib/source/library/lux/control/concurrency/async.lux @@ -16,7 +16,7 @@ [macro ["^" pattern]] [type (.only sharing) - [primitive (.except)] + ["[0]" primitive (.except def)] ["[0]" variance (.only Mutable)]]]]] [// ["[0]" thread (.only Delay)] @@ -30,7 +30,7 @@ (template (_ a) [(-> a (IO Any))])) -(primitive (Async'' a) +(primitive.def (Async'' a) (Atom [(Value a) (List (Handler a))]) (type .public (Async' r w) diff --git a/stdlib/source/library/lux/control/concurrency/atom.lux b/stdlib/source/library/lux/control/concurrency/atom.lux index f6229b7f0..79f902288 100644 --- a/stdlib/source/library/lux/control/concurrency/atom.lux +++ b/stdlib/source/library/lux/control/concurrency/atom.lux @@ -15,7 +15,7 @@ [meta ["@" target] [type - [primitive (.except)] + ["[0]" primitive (.except def)] ["[0]" variance (.only Mutable)]]]]]) (with_expansions [<jvm> (these (ffi.import (java/util/concurrent/atomic/AtomicReference a) @@ -27,7 +27,7 @@ @.jvm <jvm> (these))) -(primitive (Atom'' a) +(primitive.def (Atom'' a) (with_expansions [<jvm> (java/util/concurrent/atomic/AtomicReference a)] (for @.old <jvm> @.jvm <jvm> diff --git a/stdlib/source/library/lux/control/concurrency/incremental.lux b/stdlib/source/library/lux/control/concurrency/incremental.lux index 7bbddd8cc..95af6f6c7 100644 --- a/stdlib/source/library/lux/control/concurrency/incremental.lux +++ b/stdlib/source/library/lux/control/concurrency/incremental.lux @@ -13,14 +13,14 @@ ["[0]" list]]] [meta [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] [// ["[0]" atom (.only Atom)]]) (type (Dependency a) (-> a (IO Any))) -(primitive .public (Computation a) +(primitive.def .public (Computation a) (Atom [a (List (Dependency a))]) (def .public value @@ -117,7 +117,7 @@ _ (watch! update! right)] (in output)))) - (primitive .public (Var a) + (primitive.def .public (Var a) (Computation a) (def .public (var value) diff --git a/stdlib/source/library/lux/control/concurrency/semaphore.lux b/stdlib/source/library/lux/control/concurrency/semaphore.lux index 7e2b8c0cd..2de5b8b31 100644 --- a/stdlib/source/library/lux/control/concurrency/semaphore.lux +++ b/stdlib/source/library/lux/control/concurrency/semaphore.lux @@ -19,7 +19,7 @@ ["i" int]]] [meta [type - ["[0]" primitive (.except)] + ["[0]" primitive (.except def)] ["[0]" refinement]]]]] [// ["[0]" atom (.only Atom)] @@ -31,7 +31,7 @@ #open_positions Int #waiting_list (Queue (Resolver Any))])) -(primitive .public Semaphore +(primitive.def .public Semaphore (Atom State) (def most_positions_possible @@ -96,7 +96,7 @@ (in {try.#Success (the #open_positions post)}))))))) ) -(primitive .public Mutex +(primitive.def .public Mutex Semaphore (def .public (mutex _) @@ -126,7 +126,7 @@ (type .public Limit (, (refinement.type limit))) -(primitive .public Barrier +(primitive.def .public Barrier (Record [#limit Limit #count (Atom Nat) diff --git a/stdlib/source/library/lux/control/concurrency/stm.lux b/stdlib/source/library/lux/control/concurrency/stm.lux index 2b6118575..c653b051b 100644 --- a/stdlib/source/library/lux/control/concurrency/stm.lux +++ b/stdlib/source/library/lux/control/concurrency/stm.lux @@ -17,7 +17,7 @@ [macro ["^" pattern]] [type (.only sharing) - [primitive (.except)] + ["[0]" primitive (.except def)] ["[0]" variance (.only Mutable)]]]]] [// ["[0]" atom (.only Atom atom)] @@ -27,7 +27,7 @@ (type (Observer a) (-> a (IO Any))) -(primitive (Var'' a) +(primitive.def (Var'' a) (Atom [a (List (Sink a))]) (type .public (Var' r w) diff --git a/stdlib/source/library/lux/control/concurrency/structured.lux b/stdlib/source/library/lux/control/concurrency/structured.lux index 69e58c9d0..cd7295f4e 100644 --- a/stdlib/source/library/lux/control/concurrency/structured.lux +++ b/stdlib/source/library/lux/control/concurrency/structured.lux @@ -15,13 +15,13 @@ ["[0]" nat]]] [meta [type (.only sharing) - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" // ["[1]" async (.use "[1]#[0]" monad)] ["[0]" thread (.only Delay)] ["[0]" atom (.only Atom)]]) -(primitive .public (Async value) +(primitive.def .public (Async value) (Record [#cancel! (IO Bit) #async (//.Async (Maybe value))]) @@ -205,7 +205,7 @@ (type Pending (Dictionary ID (Ex (_ value) (Async value)))) - (primitive .public (Scope value) + (primitive.def .public (Scope value) (Record [#pending (Atom [ID Pending]) #itself (Async value)]) diff --git a/stdlib/source/library/lux/control/function/polymorphism/context.lux b/stdlib/source/library/lux/control/function/polymorphism/context.lux index ce9d5a149..904cc100c 100644 --- a/stdlib/source/library/lux/control/function/polymorphism/context.lux +++ b/stdlib/source/library/lux/control/function/polymorphism/context.lux @@ -25,7 +25,7 @@ [syntax (.only syntax) ["[0]" export]]] [type - [primitive (.except #name)]]]]] + ["[0]" primitive (.except def #name)]]]]] [/// ["//" mixin]]) @@ -37,7 +37,7 @@ (scope (alteration context)))) (with_expansions [<representation> Symbol] - (primitive .public Layer + (primitive.def .public Layer <representation> (.def .public layer @@ -93,7 +93,11 @@ #export_policy Code #scenarios (List Code)])) -(context.def [stack expression declaration] Polymorphism) +(context.def + [stack] + [expression] + [declaration] + Polymorphism) (type Signature (Record diff --git a/stdlib/source/library/lux/control/function/polymorphism/predicate.lux b/stdlib/source/library/lux/control/function/polymorphism/predicate.lux index d87917fe0..78a238fa4 100644 --- a/stdlib/source/library/lux/control/function/polymorphism/predicate.lux +++ b/stdlib/source/library/lux/control/function/polymorphism/predicate.lux @@ -32,7 +32,11 @@ #export_policy Code #scenarios (List Code)])) -(context.def [stack expression declaration] Polymorphism) +(context.def + [stack] + [expression] + [declaration] + Polymorphism) (type Signature (Record diff --git a/stdlib/source/library/lux/control/function/polymorphism/type.lux b/stdlib/source/library/lux/control/function/polymorphism/type.lux index ed17649db..6dbd0ef42 100644 --- a/stdlib/source/library/lux/control/function/polymorphism/type.lux +++ b/stdlib/source/library/lux/control/function/polymorphism/type.lux @@ -26,7 +26,11 @@ #interface Code #method Code])) -(context.def [stack expression declaration] Polymorphism) +(context.def + [stack] + [expression] + [declaration] + Polymorphism) (.def .public def (syntax (_ [[export_policy name parameters type methods] diff --git a/stdlib/source/library/lux/control/io.lux b/stdlib/source/library/lux/control/io.lux index 11993b0b4..9da4eda3c 100644 --- a/stdlib/source/library/lux/control/io.lux +++ b/stdlib/source/library/lux/control/io.lux @@ -12,9 +12,9 @@ [syntax (.only syntax)] ["[0]" template]] [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) -(primitive .public (IO a) +(primitive.def .public (IO a) (-> Any a) (def .public io' diff --git a/stdlib/source/library/lux/control/lazy.lux b/stdlib/source/library/lux/control/lazy.lux index 2db5daf4a..4a71170a8 100644 --- a/stdlib/source/library/lux/control/lazy.lux +++ b/stdlib/source/library/lux/control/lazy.lux @@ -16,9 +16,9 @@ [macro (.only with_symbols) [syntax (.only syntax)]] [type (.only sharing) - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) -(primitive .public (Lazy a) +(primitive.def .public (Lazy a) (-> [] a) (def .public (lazy' generator) diff --git a/stdlib/source/library/lux/control/security/capability.lux b/stdlib/source/library/lux/control/security/capability.lux index 48323d842..e422ba4ed 100644 --- a/stdlib/source/library/lux/control/security/capability.lux +++ b/stdlib/source/library/lux/control/security/capability.lux @@ -21,9 +21,9 @@ ["|[0]|" export] ["|[0]|" declaration]]] [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) -(primitive .public (Capability brand input output) +(primitive.def .public (Capability brand input output) (-> input output) (def .public (use it input) diff --git a/stdlib/source/library/lux/control/security/policy.lux b/stdlib/source/library/lux/control/security/policy.lux index 58c895a05..8bd2e9a45 100644 --- a/stdlib/source/library/lux/control/security/policy.lux +++ b/stdlib/source/library/lux/control/security/policy.lux @@ -7,9 +7,9 @@ [monad (.only Monad)]] [meta [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) -(primitive .public (Policy brand value label) +(primitive.def .public (Policy brand value label) value (type .public (Can_Upgrade brand label value) @@ -78,7 +78,7 @@ ) (with_template [<brand> <value> <upgrade> <downgrade>] - [(primitive .public <brand> + [(primitive.def .public <brand> Any (type .public <value> diff --git a/stdlib/source/library/lux/control/thread.lux b/stdlib/source/library/lux/control/thread.lux index dd7b6208c..952eabac4 100644 --- a/stdlib/source/library/lux/control/thread.lux +++ b/stdlib/source/library/lux/control/thread.lux @@ -14,13 +14,13 @@ [meta ["@" target] [type - [primitive (.except)] + ["[0]" primitive (.except def)] ["[0]" variance (.only Mutable)]]]]]) (type .public (Thread ! a) (-> ! a)) -(primitive (Box'' t a) +(primitive.def (Box'' t a) (Array a) (type .public (Box' t r w) diff --git a/stdlib/source/library/lux/data/collection/queue/priority.lux b/stdlib/source/library/lux/data/collection/queue/priority.lux index bbd66f362..49f6cc0a4 100644 --- a/stdlib/source/library/lux/data/collection/queue/priority.lux +++ b/stdlib/source/library/lux/data/collection/queue/priority.lux @@ -15,7 +15,7 @@ ["n" nat (.use "[1]#[0]" interval)]]] [meta [type (.only by_example) - [primitive (.only primitive abstraction representation)]]]]]) + ["[0]" primitive (.only abstraction representation)]]]]]) (type .public Priority Nat) @@ -37,7 +37,7 @@ ..builder) @)) -(primitive .public (Queue a) +(primitive.def .public (Queue a) (Maybe (Tree :@: Priority a)) (def .public empty diff --git a/stdlib/source/library/lux/data/collection/set/multi.lux b/stdlib/source/library/lux/data/collection/set/multi.lux index e08756a80..d7087830b 100644 --- a/stdlib/source/library/lux/data/collection/set/multi.lux +++ b/stdlib/source/library/lux/data/collection/set/multi.lux @@ -15,13 +15,13 @@ [macro ["^" pattern]] [type - ["[0]" primitive (.only primitive abstraction representation)]]]]] + ["[0]" primitive (.only abstraction representation)]]]]] ["[0]" // (.only) [// ["[0]" list (.use "[1]#[0]" mix monoid)] ["[0]" dictionary (.only Dictionary)]]]) -(primitive .public (Set a) +(primitive.def .public (Set a) (Dictionary a Nat) (def .public empty diff --git a/stdlib/source/library/lux/data/collection/set/ordered.lux b/stdlib/source/library/lux/data/collection/set/ordered.lux index dc209c092..3ff035d4b 100644 --- a/stdlib/source/library/lux/data/collection/set/ordered.lux +++ b/stdlib/source/library/lux/data/collection/set/ordered.lux @@ -11,9 +11,9 @@ ["/" ordered]]]] [meta [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) -(primitive .public (Set a) +(primitive.def .public (Set a) (/.Dictionary a a) (def .public empty diff --git a/stdlib/source/library/lux/data/collection/stack.lux b/stdlib/source/library/lux/data/collection/stack.lux index c037e1a56..b910f3e21 100644 --- a/stdlib/source/library/lux/data/collection/stack.lux +++ b/stdlib/source/library/lux/data/collection/stack.lux @@ -9,9 +9,9 @@ ["//" list]]] [meta [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) -(primitive .public (Stack a) +(primitive.def .public (Stack a) (List a) (def .public empty diff --git a/stdlib/source/library/lux/data/collection/tree/finger.lux b/stdlib/source/library/lux/data/collection/tree/finger.lux index 68d7e7157..4e0ed56de 100644 --- a/stdlib/source/library/lux/data/collection/tree/finger.lux +++ b/stdlib/source/library/lux/data/collection/tree/finger.lux @@ -11,10 +11,10 @@ ["[0]" list (.use "[1]#[0]" monoid)]]] [meta [type - [primitive (.only primitive abstraction representation)]]]]]) + ["[0]" primitive (.only abstraction representation)]]]]]) ... https://en.wikipedia.org/wiki/Finger_tree -(primitive .public (Tree @ t v) +(primitive.def .public (Tree @ t v) (Record [#monoid (Monoid t) #tag t diff --git a/stdlib/source/library/lux/data/color.lux b/stdlib/source/library/lux/data/color.lux index 61e3d5593..0f6b443be 100644 --- a/stdlib/source/library/lux/data/color.lux +++ b/stdlib/source/library/lux/data/color.lux @@ -17,7 +17,7 @@ ["[0]" i64]]] [meta [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) (def rgb_limit 256) (def top (-- rgb_limit)) @@ -52,7 +52,7 @@ (type .public HSB [Frac Frac Frac]) -(primitive .public Color +(primitive.def .public Color RGB (def .public (of_rgb [red green blue]) diff --git a/stdlib/source/library/lux/data/format/css.lux b/stdlib/source/library/lux/data/format/css.lux index 600068d16..c754a7d6d 100644 --- a/stdlib/source/library/lux/data/format/css.lux +++ b/stdlib/source/library/lux/data/format/css.lux @@ -14,7 +14,7 @@ ["[0]" nat]]] [meta [type - [primitive (.except Frame pattern)]]] + ["[0]" primitive (.except Frame def pattern)]]] [world [net (.only URL)]]]] ["[0]" / @@ -25,10 +25,10 @@ ["[1][0]" style] ["[1][0]" query (.only Query)]]) -(primitive .public Common Any) -(primitive .public Special Any) +(primitive.def .public Common Any) +(primitive.def .public Special Any) -(primitive .public (CSS brand) +(primitive.def .public (CSS brand) Text (def .public css diff --git a/stdlib/source/library/lux/data/format/css/class.lux b/stdlib/source/library/lux/data/format/css/class.lux index c0bdf1dd5..a3def1196 100644 --- a/stdlib/source/library/lux/data/format/css/class.lux +++ b/stdlib/source/library/lux/data/format/css/class.lux @@ -11,9 +11,9 @@ [macro [syntax (.only syntax)]] [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) -(primitive .public Class +(primitive.def .public Class Text (def .public class diff --git a/stdlib/source/library/lux/data/format/css/id.lux b/stdlib/source/library/lux/data/format/css/id.lux index dc8cc80dc..cd6c1c4cf 100644 --- a/stdlib/source/library/lux/data/format/css/id.lux +++ b/stdlib/source/library/lux/data/format/css/id.lux @@ -11,9 +11,9 @@ [macro [syntax (.only syntax)]] [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) -(primitive .public ID +(primitive.def .public ID Text (def .public id diff --git a/stdlib/source/library/lux/data/format/css/property.lux b/stdlib/source/library/lux/data/format/css/property.lux index c537a0a0e..4b4197940 100644 --- a/stdlib/source/library/lux/data/format/css/property.lux +++ b/stdlib/source/library/lux/data/format/css/property.lux @@ -11,7 +11,7 @@ ["[0]" template] ["[0]" code]] [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] [// [value (.only All Number @@ -58,7 +58,7 @@ (syntax (_ [symbol s.text]) (in (list (code.local (text.replaced "-" "_" symbol)))))) -(primitive .public (Property brand) +(primitive.def .public (Property brand) Text (def .public name diff --git a/stdlib/source/library/lux/data/format/css/query.lux b/stdlib/source/library/lux/data/format/css/query.lux index ab8d92644..6f35f5e43 100644 --- a/stdlib/source/library/lux/data/format/css/query.lux +++ b/stdlib/source/library/lux/data/format/css/query.lux @@ -11,7 +11,7 @@ [syntax (.only syntax)] ["[0]" template]] [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" // ["[1][0]" value (.only Value Length Count Resolution Ratio Orientation Scan Boolean Update @@ -24,7 +24,7 @@ (syntax (_ [symbol s.text]) (in (list (code.local (text.replaced "-" "_" symbol)))))) -(primitive .public Media +(primitive.def .public Media Text (def .public media @@ -42,7 +42,7 @@ ["speech"] )) -(primitive .public Feature +(primitive.def .public Feature Text (def .public feature @@ -102,7 +102,7 @@ ) ) -(primitive .public Query +(primitive.def .public Query Text (def .public query diff --git a/stdlib/source/library/lux/data/format/css/selector.lux b/stdlib/source/library/lux/data/format/css/selector.lux index b584c1a4a..df2df8fbf 100644 --- a/stdlib/source/library/lux/data/format/css/selector.lux +++ b/stdlib/source/library/lux/data/format/css/selector.lux @@ -12,7 +12,7 @@ [macro ["[0]" template]] [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" // ["[1][0]" id (.only ID)] ["[1][0]" class (.only Class)]]) @@ -22,21 +22,21 @@ (type .public Tag Label) (type .public Attribute Label) -(primitive .public (Generic brand) Any) +(primitive.def .public (Generic brand) Any) (with_template [<generic> <brand>] - [(primitive <brand> Any) + [(primitive.def <brand> Any) (type .public <generic> (Generic <brand>))] [Can_Chain Can_Chain'] [Cannot_Chain Cannot_Chain'] ) -(primitive .public Unique Any) -(primitive .public Specific Any) -(primitive .public Composite Any) +(primitive.def .public Unique Any) +(primitive.def .public Specific Any) +(primitive.def .public Composite Any) -(primitive .public (Selector kind) +(primitive.def .public (Selector kind) Text (def .public selector @@ -168,7 +168,7 @@ (format ":not") abstraction)) - (primitive .public Index + (primitive.def .public Index Text (def .public index diff --git a/stdlib/source/library/lux/data/format/css/style.lux b/stdlib/source/library/lux/data/format/css/style.lux index 4e459fd17..0d278d714 100644 --- a/stdlib/source/library/lux/data/format/css/style.lux +++ b/stdlib/source/library/lux/data/format/css/style.lux @@ -8,12 +8,12 @@ ["[0]" list (.use "[1]#[0]" mix)]]] [meta [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" // ["[1][0]" value (.only Value)] ["[1][0]" property (.only Property)]]) -(primitive .public Style +(primitive.def .public Style Text (def .public empty diff --git a/stdlib/source/library/lux/data/format/css/value.lux b/stdlib/source/library/lux/data/format/css/value.lux index 4675c0385..4fa9266ae 100644 --- a/stdlib/source/library/lux/data/format/css/value.lux +++ b/stdlib/source/library/lux/data/format/css/value.lux @@ -23,7 +23,7 @@ [syntax (.only syntax)] ["[0]" template]] [type - [primitive (.except)]]] + ["[0]" primitive (.except def)]]] [world [net (.only URL)]]]] [// @@ -35,7 +35,7 @@ (def enumeration (template (_ <abstraction> <representation> <out> <sample>+ <definition>+) - [(primitive .public <abstraction> + [(primitive.def .public <abstraction> <representation> (def .public <out> @@ -57,7 +57,7 @@ raw (|> raw (text.split_at 1) maybe.trusted product.right)))) -(primitive .public (Value brand) +(primitive.def .public (Value brand) Text (def .public value @@ -72,11 +72,11 @@ [unset "unset"] ) - (primitive .public (Numeric kind) Any) + (primitive.def .public (Numeric kind) Any) (with_template [<name>] [(with_expansions [<name>' (template.symbol [<name> "'"])] - (primitive .public <name>' Any) + (primitive.def .public <name>' Any) (type .public <name> (Numeric <name>')))] @@ -87,7 +87,7 @@ ) (with_template [<brand> <alias>+ <value>+] - [(primitive .public <brand> Any) + [(primitive.def .public <brand> Any) (`` (with_template [<name> <value>] [(def .public <name> @@ -889,7 +889,7 @@ (abstraction (format (%.nat horizontal) ..slice_separator (%.nat vertical)))) - (primitive .public Stop + (primitive.def .public Stop Text (def .public stop @@ -909,7 +909,7 @@ (representation Value start) ..stop_separator (representation Value end)))) - (primitive .public Hint + (primitive.def .public Hint Text (def .public hint @@ -928,7 +928,7 @@ (type .public (List/1 a) [a (List a)]) - (primitive .public Angle + (primitive.def .public Angle Text (def .public angle diff --git a/stdlib/source/library/lux/data/format/html.lux b/stdlib/source/library/lux/data/format/html.lux index d01f92b22..e92858dce 100644 --- a/stdlib/source/library/lux/data/format/html.lux +++ b/stdlib/source/library/lux/data/format/html.lux @@ -16,7 +16,7 @@ [target ["[0]" js]] [type - [primitive (.except)]]] + ["[0]" primitive (.except def)]]] [world [net (.only URL)]]]] [// @@ -80,11 +80,11 @@ (-> Tag Text) (text.enclosed ["</" ">"])) -(primitive .public (HTML brand) +(primitive.def .public (HTML brand) Text (.with_template [<name> <brand>] - [(primitive <brand> Any) + [(primitive.def <brand> Any) (type .public <name> (HTML <brand>))] [Meta Meta'] @@ -102,11 +102,11 @@ ) (.with_template [<super> <super_raw> <sub>+] - [(primitive (<super_raw> brand) Any) + [(primitive.def (<super_raw> brand) Any) (type .public <super> (HTML (<super_raw> Any))) (`` (.with_template [<sub> <sub_raw>] - [(primitive <sub_raw> Any) + [(primitive.def <sub_raw> Any) (type .public <sub> (HTML (<super_raw> <sub_raw>)))] (,, (template.spliced <sub>+))))] diff --git a/stdlib/source/library/lux/data/format/markdown.lux b/stdlib/source/library/lux/data/format/markdown.lux index f6faa4820..11c9f6e9f 100644 --- a/stdlib/source/library/lux/data/format/markdown.lux +++ b/stdlib/source/library/lux/data/format/markdown.lux @@ -8,7 +8,7 @@ ["[0]" list (.use "[1]#[0]" functor)]]] [meta [type - [primitive (.except)]]] + ["[0]" primitive (.except def)]]] [world [net (.only URL)]]]]) @@ -32,10 +32,10 @@ (text.replaced "." "\.") (text.replaced "!" "\!"))) -(primitive .public Span Any) -(primitive .public Block Any) +(primitive.def .public Span Any) +(primitive.def .public Block Any) -(primitive .public (Markdown brand) +(primitive.def .public (Markdown brand) Text (def .public empty diff --git a/stdlib/source/library/lux/data/format/tar.lux b/stdlib/source/library/lux/data/format/tar.lux index 9220719da..aaa41f747 100644 --- a/stdlib/source/library/lux/data/format/tar.lux +++ b/stdlib/source/library/lux/data/format/tar.lux @@ -33,7 +33,7 @@ [macro ["^" pattern]] [type - [primitive (.except #name)]]] + ["[0]" primitive (.except def #name)]]] [world ["[0]" file] [time @@ -78,7 +78,7 @@ (list ["Value" (%.nat value)] ["Maximum" (%.nat (-- <limit>))]))) - (primitive .public <type> + (primitive.def .public <type> Nat (def .public (<in> value) @@ -163,7 +163,7 @@ [value (at n.octal decoded digits)] (..big value))))) -(primitive Checksum +(primitive.def Checksum Text (def from_checksum @@ -256,7 +256,7 @@ (binary!.slice 0 (++ end) string)))))))) (with_template [<type> <representation> <size> <exception> <in> <out> <format> <parser> <none>] - [(primitive .public <type> + [(primitive.def .public <type> <representation> (exception.def .public (<exception> value) @@ -314,7 +314,7 @@ (def magic_size Size 7) -(primitive Magic +(primitive.def Magic Text (def ustar @@ -401,7 +401,7 @@ ... devminor (..small_number ..device_size))) -(primitive Link_Flag +(primitive.def Link_Flag Char (def link_flag @@ -450,7 +450,7 @@ (exception.except ..invalid_link_flag [(.nat it)])))))) ) -(primitive .public Mode +(primitive.def .public Mode Nat (def .public mode @@ -539,7 +539,7 @@ (list.repeated ..content_size) (list#mix n.* 1))) -(primitive .public Content +(primitive.def .public Content [Big Binary] (def .public (content content) diff --git a/stdlib/source/library/lux/data/text/buffer.lux b/stdlib/source/library/lux/data/text/buffer.lux index e9c7a0ec3..17b603e3b 100644 --- a/stdlib/source/library/lux/data/text/buffer.lux +++ b/stdlib/source/library/lux/data/text/buffer.lux @@ -17,7 +17,7 @@ [meta ["@" target] [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" //]) (with_expansions [<jvm> (these (import java/lang/CharSequence @@ -49,7 +49,7 @@ ) (these)))) -(`` (primitive .public Buffer +(`` (primitive.def .public Buffer (for @.old [Nat (-> java/lang/StringBuilder java/lang/StringBuilder)] @.jvm [Nat (-> java/lang/StringBuilder java/lang/StringBuilder)] @.js [Nat (-> (JS_Array Text) (JS_Array Text))] diff --git a/stdlib/source/library/lux/data/text/encoding.lux b/stdlib/source/library/lux/data/text/encoding.lux index 5906ebf3b..c4247a851 100644 --- a/stdlib/source/library/lux/data/text/encoding.lux +++ b/stdlib/source/library/lux/data/text/encoding.lux @@ -5,10 +5,10 @@ [macro ["[0]" template]] [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) ... https://en.wikipedia.org/wiki/Character_encoding#Common_character_encodings -(primitive .public Encoding +(primitive.def .public Encoding Text (with_template [<name> <encoding>] diff --git a/stdlib/source/library/lux/data/text/unicode/block.lux b/stdlib/source/library/lux/data/text/unicode/block.lux index 7a97b8803..ea4fe8889 100644 --- a/stdlib/source/library/lux/data/text/unicode/block.lux +++ b/stdlib/source/library/lux/data/text/unicode/block.lux @@ -12,11 +12,11 @@ ["[0]" i64]]] [meta [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] [/// [char (.only Char)]]) -(primitive .public Block +(primitive.def .public Block (Interval Char) (def .public monoid diff --git a/stdlib/source/library/lux/data/text/unicode/set.lux b/stdlib/source/library/lux/data/text/unicode/set.lux index 732a52ddc..19ab0a416 100644 --- a/stdlib/source/library/lux/data/text/unicode/set.lux +++ b/stdlib/source/library/lux/data/text/unicode/set.lux @@ -11,7 +11,7 @@ ["[1]" finger (.only Tree)]]]] [meta [type (.only by_example) - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] [// ["[0]" block (.only Block)] [// @@ -27,7 +27,7 @@ @)) -(primitive .public Set +(primitive.def .public Set (Tree :@: Block []) (def .public (composite left right) diff --git a/stdlib/source/library/lux/debug.lux b/stdlib/source/library/lux/debug.lux index 2dbebbecc..39c2aecd1 100644 --- a/stdlib/source/library/lux/debug.lux +++ b/stdlib/source/library/lux/debug.lux @@ -533,7 +533,7 @@ (def .public log! (-> Text Any) - (|>> .log#)) + (|>> .log!#)) (exception.def .public (type_hole [location type]) (Exception [Location Type]) diff --git a/stdlib/source/library/lux/ffi.jvm.lux b/stdlib/source/library/lux/ffi.jvm.lux index 8db8186a6..551afd5c0 100644 --- a/stdlib/source/library/lux/ffi.jvm.lux +++ b/stdlib/source/library/lux/ffi.jvm.lux @@ -973,7 +973,10 @@ [[External (List (Type Var))] [Member_Declaration MethodDecl]]) -(context.def [super_context super_expression super_declaration] +(context.def + [super_context] + [super_expression] + [super_declaration] Super) (def var^^ @@ -1056,7 +1059,10 @@ [External (List [Member_Declaration FieldDecl])]) -(context.def [get|set_context get|set_expression get|set_declaration] +(context.def + [get|set_context] + [get|set_expression] + [get|set_declaration] Get|Set) (def privacy_modifier^^ @@ -1181,7 +1187,10 @@ [[External (List (Type Var))] (List [Member_Declaration MethodDecl])]) -(context.def [call_context call_expression call_declaration] +(context.def + [call_context] + [call_expression] + [call_declaration] Call) (def .public with_call diff --git a/stdlib/source/library/lux/ffi.lux b/stdlib/source/library/lux/ffi.lux index ce459e663..17b150560 100644 --- a/stdlib/source/library/lux/ffi.lux +++ b/stdlib/source/library/lux/ffi.lux @@ -21,7 +21,7 @@ [syntax (.only syntax)] ["[0]" template]] [type - [primitive (.except)]] + ["[0]" primitive (.except def)]] ["@" target (.only) ["[0]" js]]]]]) @@ -217,7 +217,7 @@ @.python "python function" @.lua "lua function" (these))] - (primitive .public (Object brand) Any) + (primitive.def .public (Object brand) Any) (with_expansions [<un_common> (for @.js (these [Symbol] [Null] @@ -230,7 +230,7 @@ <un_common> <un_common>] (with_template [<name>] [(with_expansions [<brand> (template.symbol [<name> "'"])] - (primitive <brand> + (primitive.def <brand> Any (type .public <name> diff --git a/stdlib/source/library/lux/ffi.php.lux b/stdlib/source/library/lux/ffi.php.lux index 796e8d887..4f31625f0 100644 --- a/stdlib/source/library/lux/ffi.php.lux +++ b/stdlib/source/library/lux/ffi.php.lux @@ -16,18 +16,18 @@ ["[0]" meta (.only) ["@" target] [type - abstract] + ["[0]" primitive (.except def)]] ["[0]" code (.only) ["<[1]>" \\parser (.only Parser)]] [macro (.only with_symbols) [syntax (.only syntax)] ["[0]" template]]]]]) -(primitive .public (Object brand) Any) +(primitive.def .public (Object brand) Any) (with_template [<name>] [(with_expansions [<brand> (template.symbol [<name> "'"])] - (primitive .public <brand> Any) + (primitive.def .public <brand> Any) (type .public <name> (..Object <brand>)))] diff --git a/stdlib/source/library/lux/ffi.scm.lux b/stdlib/source/library/lux/ffi.scm.lux index 4c57af516..b7169f1e4 100644 --- a/stdlib/source/library/lux/ffi.scm.lux +++ b/stdlib/source/library/lux/ffi.scm.lux @@ -16,18 +16,18 @@ ["[0]" meta (.only) ["@" target] [type - abstract] + ["[0]" primitive (.except def)]] ["[0]" code (.only) ["<[1]>" \\parser (.only Parser)]] [macro (.only with_symbols) [syntax (.only syntax)] ["[0]" template]]]]]) -(primitive .public (Object brand) Any) +(primitive.def .public (Object brand) Any) (with_template [<name>] [(with_expansions [<brand> (template.symbol [<name> "'"])] - (primitive .public <brand> Any) + (primitive.def .public <brand> Any) (type .public <name> (..Object <brand>)))] diff --git a/stdlib/source/library/lux/math/modular.lux b/stdlib/source/library/lux/math/modular.lux index e9810f66c..6f66a7e79 100644 --- a/stdlib/source/library/lux/math/modular.lux +++ b/stdlib/source/library/lux/math/modular.lux @@ -22,11 +22,11 @@ ["[0]" code (.only) ["<[1]>" \\parser]] [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" // ["[1]" modulus (.only Modulus)]]) -(primitive .public (Mod m) +(primitive.def .public (Mod m) (Record [#modulus (Modulus m) #value Int]) diff --git a/stdlib/source/library/lux/math/modulus.lux b/stdlib/source/library/lux/math/modulus.lux index 69b29f4dd..ca56d9d74 100644 --- a/stdlib/source/library/lux/math/modulus.lux +++ b/stdlib/source/library/lux/math/modulus.lux @@ -15,11 +15,11 @@ [macro [syntax (.only syntax)]] [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) (exception.def .public zero_cannot_be_a_modulus) -(primitive .public (Modulus %) +(primitive.def .public (Modulus %) Int (def .public (modulus value) diff --git a/stdlib/source/library/lux/math/random.lux b/stdlib/source/library/lux/math/random.lux index 0027d81a9..7c1fbc448 100644 --- a/stdlib/source/library/lux/math/random.lux +++ b/stdlib/source/library/lux/math/random.lux @@ -180,8 +180,8 @@ [alphabetic unicode.alphabetic] [alpha_numeric unicode.alpha_numeric] [numeric unicode.numeric] - [upper_case unicode.upper_case] - [lower_case unicode.lower_case] + [upper_cased unicode.upper_case] + [lower_cased unicode.lower_case] ) (with_template [<name> <type> <ctor> <gen>] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/lux.lux index dee8675be..501ca50ad 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/lux.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/lux.lux @@ -10,6 +10,7 @@ ["[0]" exception (.only Exception)]] [data ["[0]" text (.only) + [char (.only Char)] ["%" \\format (.only format)]] [collection ["[0]" list (.use "[1]#[0]" functor)] @@ -102,7 +103,7 @@ (list ["Text" (%.text text)]))) (def text_char - (Parser text.Char) + (Parser Char) (do <>.monad [raw <code>.text] (when (text.size raw) @@ -119,7 +120,7 @@ <code>.any) (function (_ extension_name phase archive [input conditionals else]) (do [! phase.monad] - [input (<| (typeA.expecting text.Char) + [input (<| (typeA.expecting Char) (phase archive input)) expectedT meta.expected_type conditionals (monad.each ! (function (_ [cases branch]) @@ -215,7 +216,7 @@ (def with_io_extensions (-> Bundle Bundle) - (|>> (install "log#" (unary Text Any)) + (|>> (install "log!#" (unary Text Any)) (install "error#" (unary Text Nothing)))) (def I64* diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/generation/jvm/common.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/generation/jvm/common.lux index a776e83e6..5f17ba7cc 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/generation/jvm/common.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/generation/jvm/common.lux @@ -395,7 +395,7 @@ (def with_io_extensions (-> Bundle Bundle) - (|>> (dictionary.has "log#|generation" (unary ..io::log)) + (|>> (dictionary.has "log!#|generation" (unary ..io::log)) (dictionary.has "error#|generation" (unary ..io::error)))) (def .public bundle diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive.lux b/stdlib/source/library/lux/meta/compiler/meta/archive.lux index fd16fb8f3..ca3dd65b4 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/archive.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/archive.lux @@ -28,7 +28,7 @@ [meta ["[0]" configuration (.only Configuration)] [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] [/ ["[0]" artifact] ["[0]" registry (.only Registry)] @@ -73,7 +73,7 @@ #output Output #registry Registry])) -(primitive .public Archive +(primitive.def .public Archive (Record [#next module.ID #resolver (Dictionary descriptor.Module [module.ID (Maybe (Entry Any))])]) diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/key.lux b/stdlib/source/library/lux/meta/compiler/meta/archive/key.lux index 24db1094f..09a246977 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/archive/key.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/archive/key.lux @@ -3,11 +3,11 @@ [lux (.except) [meta [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] [// [signature (.only Signature)]]) -(primitive .public (Key k) +(primitive.def .public (Key k) Signature (def .public signature diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/module/document.lux b/stdlib/source/library/lux/meta/compiler/meta/archive/module/document.lux index 3c0df9cbc..3068bb35a 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/archive/module/document.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/archive/module/document.lux @@ -15,7 +15,7 @@ ["[1]" \\format (.only Format)]]] [meta [type (.only sharing) - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] [/// ["[0]" signature (.only Signature) (.use "[1]#[0]" equivalence)] ["[0]" key (.only Key)]]) @@ -26,7 +26,7 @@ (list ["Expected" (signature.description expected)] ["Actual" (signature.description actual)]))) -(primitive .public (Document d) +(primitive.def .public (Document d) (Record [#signature Signature #content d]) diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/registry.lux b/stdlib/source/library/lux/meta/compiler/meta/archive/registry.lux index e3d675ec0..2bdb6c8d4 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/archive/registry.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/archive/registry.lux @@ -24,13 +24,13 @@ [macro ["^" pattern]] [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" // ["[0]" unit] ["[1]" artifact (.only Artifact ID) ["[2][0]" category (.only Category)]]]) -(primitive .public Registry +(primitive.def .public Registry (Record [#artifacts (Sequence [Artifact (Set unit.ID)]) #resolver (Dictionary Text [ID (Maybe //category.Definition)])]) diff --git a/stdlib/source/library/lux/meta/macro/context.lux b/stdlib/source/library/lux/meta/macro/context.lux index 55faa9ef0..ed4c54849 100644 --- a/stdlib/source/library/lux/meta/macro/context.lux +++ b/stdlib/source/library/lux/meta/macro/context.lux @@ -230,11 +230,9 @@ (syntax (_ [.let [! ?.monad ?local (at ! each code.local ?code.local)] - [[export_$? $] [export_expression? g!expression] [export_declaration? g!declaration]] - (?code.tuple (all ?.and - (export.parser ?code.local) - (export.parser ?local) - (export.parser ?local))) + [export_$? $] (?code.tuple (export.parser ?code.local)) + [export_expression? g!expression] (?code.tuple (export.parser ?local)) + [export_declaration? g!declaration] (?code.tuple (export.parser ?local)) context_type ?code.any]) (do [! meta.monad] diff --git a/stdlib/source/library/lux/meta/macro/expansion.lux b/stdlib/source/library/lux/meta/macro/expansion.lux index bbdbe267d..83e34afe2 100644 --- a/stdlib/source/library/lux/meta/macro/expansion.lux +++ b/stdlib/source/library/lux/meta/macro/expansion.lux @@ -123,12 +123,12 @@ (do ///.monad [location ///.location output (<func> token) - .let [_ (.log# (all text#composite - (symbol#encoded macro_name) " " (location.format location) - (|> output - (list#each (|>> code.format (all text#composite text.\n text.\t))) - text.together) - text.\n))]] + .let [_ (.log!# (all text#composite + (symbol#encoded macro_name) " " (location.format location) + (|> output + (list#each (|>> code.format (all text#composite text.\n text.\t))) + text.together) + text.\n))]] (in (if omit? (list) output))) diff --git a/stdlib/source/library/lux/meta/macro/pattern.lux b/stdlib/source/library/lux/meta/macro/pattern.lux index e642b1cd3..6ab386dd1 100644 --- a/stdlib/source/library/lux/meta/macro/pattern.lux +++ b/stdlib/source/library/lux/meta/macro/pattern.lux @@ -13,7 +13,7 @@ [collection ["[0]" list (.use "[1]#[0]" monoid monad mix)]]]]] ["[0]" // (.only with_symbols) - [vocabulary (.only vocabulary)] + ["[0]" vocabulary] ["/[1]" // (.use "[1]#[0]" monad)]]) (def locally @@ -232,11 +232,11 @@ {.#Item [init inits']} (.` {.#Item (., init) (., (untemplated_partial_list last inits'))}))) -(vocabulary - [.public Spliced_UnQuote] - [.public spliced_unquote] - [.public spliced_unquote_macro] - [.private named_spliced_unquote]) +(vocabulary.def + [.public Spliced_UnQuote] + [.public spliced_unquote] + [.public spliced_unquote_macro] + [.private named_spliced_unquote]) (def (untemplated_composite <tag> g!meta untemplated_pattern elems) (-> Code Code (-> Code (Meta Code)) @@ -272,11 +272,11 @@ (///.failure (..wrong_syntax_error (symbol ..,*)))} tokens)))) -(vocabulary - [.public UnQuote] - [.public unquote] - [.public unquote_macro] - [.private named_unquote]) +(vocabulary.def + [.public UnQuote] + [.public unquote] + [.public unquote_macro] + [.private named_unquote]) (def (untemplated_pattern pattern) (-> Code (Meta Code)) diff --git a/stdlib/source/library/lux/meta/macro/vocabulary.lux b/stdlib/source/library/lux/meta/macro/vocabulary.lux index ce47d7f96..2e9297eee 100644 --- a/stdlib/source/library/lux/meta/macro/vocabulary.lux +++ b/stdlib/source/library/lux/meta/macro/vocabulary.lux @@ -2,7 +2,7 @@ (.require [library - [lux (.except local) + [lux (.except local def) [abstract [monad (.only do)]] [control @@ -15,7 +15,7 @@ ["[0]" code (.only) ["?[1]" \\parser (.only Parser)]] ["[0]" type (.only) - [primitive (.except)]]]]) + ["[0]" primitive (.except def)]]]]) (exception.def .public (invalid_type [expected actual]) (Exception [Type Type]) @@ -23,28 +23,28 @@ (list ["Expected" (type.format expected)] ["Actual" (type.format actual)]))) -(def local +(.def local (Parser [Code Code]) (?code.tuple (export.parser (?#each code.local ?code.local)))) -(def .public vocabulary +(.def .public def (syntax (_ [[public|private@type type] ..local [public|private@micro micro] ..local [public|private@macro macro] ..local [public|private@by_name by_name] ..local]) (//.with_symbols [g!_ g!type g!value] - (in (list (` (primitive (, public|private@type) (, type) + (in (list (` (primitive.def (, public|private@type) (, type) Macro - (def (, public|private@micro) (, micro) + (.def (, public|private@micro) (, micro) (-> Macro (, type)) (|>> abstraction)) - (def (, public|private@macro) (, macro) + (.def (, public|private@macro) (, macro) (-> (, type) Macro) (|>> representation)))) - (` (def (, public|private@by_name) ((, by_name) (, g!_)) + (` (.def (, public|private@by_name) ((, by_name) (, g!_)) (-> Symbol (Meta Macro)) (do ///.monad [[(, g!_) (, g!type) (, g!value)] (///.export (, g!_))] diff --git a/stdlib/source/library/lux/meta/target/common_lisp.lux b/stdlib/source/library/lux/meta/target/common_lisp.lux index 9d92f4557..64af1340f 100644 --- a/stdlib/source/library/lux/meta/target/common_lisp.lux +++ b/stdlib/source/library/lux/meta/target/common_lisp.lux @@ -15,13 +15,13 @@ [macro ["[0]" template]] [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) (def as_form (-> Text Text) (text.enclosed ["(" ")"])) -(primitive .public (Code brand) +(primitive.def .public (Code brand) Text (def .public manual @@ -34,7 +34,7 @@ (with_template [<type> <super>] [(with_expansions [<brand> (template.symbol [<type> "'"])] - (`` (primitive .public (<brand> brand) Any)) + (`` (primitive.def .public (<brand> brand) Any)) (`` (type .public (<type> brand) (<super> (<brand> brand)))))] @@ -48,7 +48,7 @@ (with_template [<type> <super>] [(with_expansions [<brand> (template.symbol [<type> "'"])] - (`` (primitive .public <brand> Any)) + (`` (primitive.def .public <brand> Any)) (`` (type .public <type> (<super> <brand>))))] [Label Code] diff --git a/stdlib/source/library/lux/meta/target/js.lux b/stdlib/source/library/lux/meta/target/js.lux index 0a56ad62a..4460eb45b 100644 --- a/stdlib/source/library/lux/meta/target/js.lux +++ b/stdlib/source/library/lux/meta/target/js.lux @@ -16,7 +16,7 @@ [macro ["[0]" template]] [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) (def expression (text.enclosed ["(" ")"])) @@ -34,7 +34,7 @@ (|>> (format \n+) (text.replaced text.new_line (format text.new_line text.tab)))) -(primitive .public (Code brand) +(primitive.def .public (Code brand) Text (def .public code @@ -43,7 +43,7 @@ (with_template [<type> <super>+] [(with_expansions [<brand> (template.symbol [<type> "'"])] - (primitive (<brand> brand) Any) + (primitive.def (<brand> brand) Any) (`` (type .public <type> (|> Any <brand> (,, (template.spliced <super>+))))))] [Expression [Code]] @@ -54,7 +54,7 @@ (with_template [<type> <super>+] [(with_expansions [<brand> (template.symbol [<type> "'"])] - (primitive <brand> Any) + (primitive.def <brand> Any) (`` (type .public <type> (|> <brand> (,, (template.spliced <super>+))))))] [Var [Location' Computation' Expression' Code]] diff --git a/stdlib/source/library/lux/meta/target/jvm/bytecode/address.lux b/stdlib/source/library/lux/meta/target/jvm/bytecode/address.lux index 66b50f65a..92dac219f 100644 --- a/stdlib/source/library/lux/meta/target/jvm/bytecode/address.lux +++ b/stdlib/source/library/lux/meta/target/jvm/bytecode/address.lux @@ -16,7 +16,7 @@ ["n" nat]]] [meta [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" // [jump (.only Big_Jump)] ["/[1]" // @@ -24,7 +24,7 @@ ["[1][0]" unsigned (.only U2)] ["[1][0]" signed (.only S4)]]]]) -(primitive .public Address +(primitive.def .public Address U2 (def .public value diff --git a/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/registry.lux b/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/registry.lux index 3f16fa4a2..a4064ce18 100644 --- a/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/registry.lux +++ b/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/registry.lux @@ -15,7 +15,7 @@ ["n" nat]]] [meta [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" ///// [encoding ["[1][0]" unsigned (.only U1 U2)]] @@ -29,7 +29,7 @@ (def normal 1) (def wide 2) -(primitive .public Registry +(primitive.def .public Registry U2 (def .public registry diff --git a/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/stack.lux b/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/stack.lux index 7c7e0472e..5ea838b14 100644 --- a/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/stack.lux +++ b/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/stack.lux @@ -13,12 +13,12 @@ [\\format (.only Format)]]] [meta [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" ///// [encoding ["[1][0]" unsigned (.only U2)]]]) -(primitive .public Stack +(primitive.def .public Stack U2 (with_template [<frames> <name>] diff --git a/stdlib/source/library/lux/meta/target/jvm/bytecode/instruction.lux b/stdlib/source/library/lux/meta/target/jvm/bytecode/instruction.lux index 573424e12..16bc84c5e 100644 --- a/stdlib/source/library/lux/meta/target/jvm/bytecode/instruction.lux +++ b/stdlib/source/library/lux/meta/target/jvm/bytecode/instruction.lux @@ -23,7 +23,7 @@ [macro ["[0]" template]] [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" // ["[1][0]" address (.only Address)] ["[1][0]" jump (.only Jump Big_Jump)] @@ -222,7 +222,7 @@ [(n.+ (///unsigned.value ..size/211) size) (|>> mutation ((trinary/211' opcode input0 input1 input2)))])]) -(primitive .public Primitive_Array_Type +(primitive.def .public Primitive_Array_Type U1 (def code diff --git a/stdlib/source/library/lux/meta/target/jvm/constant.lux b/stdlib/source/library/lux/meta/target/jvm/constant.lux index a24ae8cb8..b3fbb5cef 100644 --- a/stdlib/source/library/lux/meta/target/jvm/constant.lux +++ b/stdlib/source/library/lux/meta/target/jvm/constant.lux @@ -23,7 +23,7 @@ ["^" pattern] ["[0]" template]] [type - [primitive (.except #name)]]]]] + ["[0]" primitive (.except def #name)]]]]] ["[0]" / ["[1][0]" tag] ["/[1]" // @@ -41,7 +41,7 @@ (Format UTF8) binaryF.utf8_16) -(primitive .public Class +(primitive.def .public Class (Index UTF8) (def .public index @@ -82,7 +82,7 @@ "[1]::[0]" ("static" doubleToRawLongBits [double] long)) -(primitive .public (Value kind) +(primitive.def .public (Value kind) kind (def .public value diff --git a/stdlib/source/library/lux/meta/target/jvm/constant/tag.lux b/stdlib/source/library/lux/meta/target/jvm/constant/tag.lux index f6917a5d0..63d5a88f4 100644 --- a/stdlib/source/library/lux/meta/target/jvm/constant/tag.lux +++ b/stdlib/source/library/lux/meta/target/jvm/constant/tag.lux @@ -10,12 +10,12 @@ [\\format (.only Format)]]] [meta [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" /// [encoding ["[1][0]" unsigned (.only U1) (.use "u1//[0]" equivalence)]]]) -(primitive .public Tag +(primitive.def .public Tag U1 (def .public equivalence diff --git a/stdlib/source/library/lux/meta/target/jvm/encoding/name.lux b/stdlib/source/library/lux/meta/target/jvm/encoding/name.lux index 7516cdc46..dfbf8f419 100644 --- a/stdlib/source/library/lux/meta/target/jvm/encoding/name.lux +++ b/stdlib/source/library/lux/meta/target/jvm/encoding/name.lux @@ -6,7 +6,7 @@ ["%" \\format (.only format)]]] [meta [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) (def .public internal_separator "/") (def .public external_separator ".") @@ -14,7 +14,7 @@ (type .public External Text) -(primitive .public Internal +(primitive.def .public Internal Text (def .public internal diff --git a/stdlib/source/library/lux/meta/target/jvm/encoding/signed.lux b/stdlib/source/library/lux/meta/target/jvm/encoding/signed.lux index 11a43668f..7bb8f86fc 100644 --- a/stdlib/source/library/lux/meta/target/jvm/encoding/signed.lux +++ b/stdlib/source/library/lux/meta/target/jvm/encoding/signed.lux @@ -21,9 +21,9 @@ [macro ["[0]" template]] [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) -(primitive .public (Signed brand) +(primitive.def .public (Signed brand) Int (def .public value @@ -51,7 +51,7 @@ (with_template [<bytes> <name> <size> <constructor> <maximum> <minimum> <+> <->] [(with_expansions [<raw> (template.symbol [<name> "'"])] - (primitive <raw> Any) + (primitive.def <raw> Any) (type .public <name> (Signed <raw>))) (def .public <size> <bytes>) diff --git a/stdlib/source/library/lux/meta/target/jvm/encoding/unsigned.lux b/stdlib/source/library/lux/meta/target/jvm/encoding/unsigned.lux index 0c6e7cde3..e34ad104f 100644 --- a/stdlib/source/library/lux/meta/target/jvm/encoding/unsigned.lux +++ b/stdlib/source/library/lux/meta/target/jvm/encoding/unsigned.lux @@ -20,9 +20,9 @@ [macro ["[0]" template]] [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) -(primitive .public (Unsigned brand) +(primitive.def .public (Unsigned brand) Nat (def .public value @@ -60,7 +60,7 @@ (with_template [<bytes> <name> <size> <constructor> <maximum> <+> <-> <max>] [(with_expansions [<raw> (template.symbol [<name> "'"])] - (primitive .public <raw> Any) + (primitive.def .public <raw> Any) (type .public <name> (Unsigned <raw>))) (def .public <size> <bytes>) diff --git a/stdlib/source/library/lux/meta/target/jvm/index.lux b/stdlib/source/library/lux/meta/target/jvm/index.lux index 05489792b..2ac48514b 100644 --- a/stdlib/source/library/lux/meta/target/jvm/index.lux +++ b/stdlib/source/library/lux/meta/target/jvm/index.lux @@ -8,7 +8,7 @@ [\\format (.only Format)]]] [meta [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" // [encoding ["[1][0]" unsigned (.only U2)]]]) @@ -16,7 +16,7 @@ (def .public length //unsigned.bytes/2) -(primitive .public (Index kind) +(primitive.def .public (Index kind) U2 (def .public index diff --git a/stdlib/source/library/lux/meta/target/jvm/modifier.lux b/stdlib/source/library/lux/meta/target/jvm/modifier.lux index 87cbff564..6cac02f5c 100644 --- a/stdlib/source/library/lux/meta/target/jvm/modifier.lux +++ b/stdlib/source/library/lux/meta/target/jvm/modifier.lux @@ -19,12 +19,12 @@ [macro (.only with_symbols) [syntax (.only syntax)]] [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" // [encoding ["[1][0]" unsigned]]]) -(primitive .public (Modifier of) +(primitive.def .public (Modifier of) //unsigned.U2 (def .public code diff --git a/stdlib/source/library/lux/meta/target/jvm/modifier/inner.lux b/stdlib/source/library/lux/meta/target/jvm/modifier/inner.lux index c61569575..5fc4e07ff 100644 --- a/stdlib/source/library/lux/meta/target/jvm/modifier/inner.lux +++ b/stdlib/source/library/lux/meta/target/jvm/modifier/inner.lux @@ -3,10 +3,10 @@ [lux (.except static) [meta [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] [// (.only modifiers)]) -(primitive .public Inner Any) +(primitive.def .public Inner Any) (modifiers Inner diff --git a/stdlib/source/library/lux/meta/target/jvm/type.lux b/stdlib/source/library/lux/meta/target/jvm/type.lux index 3e5f0641f..f55b66ef9 100644 --- a/stdlib/source/library/lux/meta/target/jvm/type.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type.lux @@ -16,7 +16,7 @@ ["n" nat]]] [meta [type - [primitive (.except #name)]]]]] + ["[0]" primitive (.except def #name)]]]]] ["[0]" // [encoding ["[1][0]" name (.only External)]]] @@ -26,7 +26,7 @@ ["[1][0]" descriptor (.only Descriptor)] ["[1][0]" reflection (.only Reflection)]]) -(primitive .public (Type category) +(primitive.def .public (Type category) [(Signature category) (Descriptor category) (Reflection category)] diff --git a/stdlib/source/library/lux/meta/target/jvm/type/category.lux b/stdlib/source/library/lux/meta/target/jvm/type/category.lux index fcd7e7dac..9dfe3344c 100644 --- a/stdlib/source/library/lux/meta/target/jvm/type/category.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type/category.lux @@ -5,26 +5,26 @@ [macro ["[0]" template]] [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) -(primitive Void' Any) -(primitive .public (Value' kind) Any) -(primitive .public (Return' kind) Any) -(primitive .public Method Any) +(primitive.def Void' Any) +(primitive.def .public (Value' kind) Any) +(primitive.def .public (Return' kind) Any) +(primitive.def .public Method Any) (type .public Return (<| Return' Any)) (type .public Value (<| Return' Value' Any)) (type .public Void (<| Return' Void')) -(primitive (Object' brand) Any) +(primitive.def (Object' brand) Any) (type .public Object (<| Return' Value' Object' Any)) -(primitive (Parameter' brand) Any) +(primitive.def (Parameter' brand) Any) (type .public Parameter (<| Return' Value' Object' Parameter' Any)) (with_template [<parents> <child>] [(with_expansions [<raw> (template.symbol [<child> "'"])] - (primitive <raw> Any) + (primitive.def <raw> Any) (type .public <child> (`` (<| Return' Value' (,, (template.spliced <parents>)) <raw>))))] @@ -34,5 +34,5 @@ [[Object' Parameter'] Array] ) -(primitive .public Declaration Any) -(primitive .public Inheritance Any) +(primitive.def .public Declaration Any) +(primitive.def .public Inheritance Any) diff --git a/stdlib/source/library/lux/meta/target/jvm/type/descriptor.lux b/stdlib/source/library/lux/meta/target/jvm/type/descriptor.lux index 593c33e40..c9d50b9da 100644 --- a/stdlib/source/library/lux/meta/target/jvm/type/descriptor.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type/descriptor.lux @@ -15,14 +15,14 @@ ["n" nat]]] [meta [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" // [category (.only Void Value Return Method Primitive Object Class Array Var Parameter Declaration)] ["/[1]" // [encoding ["[1][0]" name (.only Internal External)]]]]) -(primitive .public (Descriptor category) +(primitive.def .public (Descriptor category) Text (def .public descriptor diff --git a/stdlib/source/library/lux/meta/target/jvm/type/lux.lux b/stdlib/source/library/lux/meta/target/jvm/type/lux.lux index 89639ce4d..306f88580 100644 --- a/stdlib/source/library/lux/meta/target/jvm/type/lux.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type/lux.lux @@ -31,7 +31,7 @@ ["[1][0]" name]]]]) (with_template [<name>] - [(:.primitive .public (<name> class) Any)] + [(:.def .public (<name> class) Any)] [Lower] [Upper] diff --git a/stdlib/source/library/lux/meta/target/jvm/type/reflection.lux b/stdlib/source/library/lux/meta/target/jvm/type/reflection.lux index ae1e6c5cf..0cb424d28 100644 --- a/stdlib/source/library/lux/meta/target/jvm/type/reflection.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type/reflection.lux @@ -8,7 +8,7 @@ ["%" \\format (.only format)]]] [meta [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" // [category (.only Void Value Return Method Primitive Object Class Array Var Parameter Declaration)] ["[1][0]" descriptor] @@ -16,7 +16,7 @@ [encoding ["[1][0]" name (.only External)]]]]) -(primitive .public (Reflection category) +(primitive.def .public (Reflection category) Text (def .public reflection diff --git a/stdlib/source/library/lux/meta/target/jvm/type/signature.lux b/stdlib/source/library/lux/meta/target/jvm/type/signature.lux index c24f1057d..8a0cbc5f5 100644 --- a/stdlib/source/library/lux/meta/target/jvm/type/signature.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type/signature.lux @@ -13,7 +13,7 @@ ["[0]" list (.use "[1]#[0]" functor)]]] [meta [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" // [category (.only Void Value Return Method Primitive Object Class Array Var Parameter Declaration Inheritance)] ["[1][0]" descriptor] @@ -21,7 +21,7 @@ [encoding ["[1][0]" name (.only External)]]]]) -(primitive .public (Signature category) +(primitive.def .public (Signature category) Text (def .public signature diff --git a/stdlib/source/library/lux/meta/target/lua.lux b/stdlib/source/library/lux/meta/target/lua.lux index 8168b065b..063c0fc4d 100644 --- a/stdlib/source/library/lux/meta/target/lua.lux +++ b/stdlib/source/library/lux/meta/target/lua.lux @@ -25,7 +25,7 @@ [syntax (.only syntax)] ["[0]" template]] [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) ... Added the carriage return for better Windows compatibility. (def \n+ @@ -40,7 +40,7 @@ (def input_separator ", ") -(primitive .public (Code brand) +(primitive.def .public (Code brand) Text (def .public equivalence @@ -65,7 +65,7 @@ (with_template [<type> <super>+] [(with_expansions [<brand> (template.symbol [<type> "'"])] - (primitive (<brand> brand) Any) + (primitive.def (<brand> brand) Any) (`` (type .public <type> (|> Any <brand> (,, (template.spliced <super>+))))))] [Expression [Code]] @@ -76,7 +76,7 @@ (with_template [<type> <super>+] [(with_expansions [<brand> (template.symbol [<type> "'"])] - (primitive <brand> Any) + (primitive.def <brand> Any) (`` (type .public <type> (|> <brand> (,, (template.spliced <super>+))))))] [Literal [Computation' Expression' Code]] diff --git a/stdlib/source/library/lux/meta/target/php.lux b/stdlib/source/library/lux/meta/target/php.lux index 748d852c2..e68d9cc37 100644 --- a/stdlib/source/library/lux/meta/target/php.lux +++ b/stdlib/source/library/lux/meta/target/php.lux @@ -24,7 +24,7 @@ [syntax (.only syntax)] ["[0]" template]] [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) (def input_separator ", ") (def statement_suffix ";") @@ -48,7 +48,7 @@ (-> Text Text) (text.enclosed ["(" ")"])) -(primitive .public (Code brand) +(primitive.def .public (Code brand) Text (def .public equivalence @@ -73,7 +73,7 @@ (with_template [<type> <super>+] [(with_expansions [<brand> (template.symbol [<type> "'"])] - (primitive (<brand> brand) Any) + (primitive.def (<brand> brand) Any) (`` (type .public <type> (|> Any <brand> (,, (template.spliced <super>+))))))] [Expression [Code]] @@ -84,7 +84,7 @@ (with_template [<type> <super>+] [(with_expansions [<brand> (template.symbol [<type> "'"])] - (primitive .public <brand> Any) + (primitive.def .public <brand> Any) (`` (type .public <type> (|> <brand> (,, (template.spliced <super>+))))))] [Literal [Computation' Expression' Code]] diff --git a/stdlib/source/library/lux/meta/target/python.lux b/stdlib/source/library/lux/meta/target/python.lux index 93014c3e4..9ff10bbe0 100644 --- a/stdlib/source/library/lux/meta/target/python.lux +++ b/stdlib/source/library/lux/meta/target/python.lux @@ -25,7 +25,7 @@ [syntax (.only syntax)] ["[0]" template]] [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) (.def input_separator ", ") @@ -57,7 +57,7 @@ (|>> (format \n+) (text.replaced text.new_line nested_new_line))))) -(primitive .public (Code brand) +(primitive.def .public (Code brand) Text (.def .public equivalence @@ -82,7 +82,7 @@ (with_template [<type> <super>] [(with_expansions [<brand> (template.symbol [<type> "'"])] - (`` (primitive (<brand> brand) Any)) + (`` (primitive.def (<brand> brand) Any)) (`` (type .public (<type> brand) (<super> (<brand> brand)))))] @@ -95,7 +95,7 @@ (with_template [<type> <super>] [(with_expansions [<brand> (template.symbol [<type> "'"])] - (`` (primitive <brand> Any)) + (`` (primitive.def <brand> Any)) (`` (type .public <type> (<super> <brand>))))] [Literal Computation] @@ -104,7 +104,7 @@ ) (with_template [<var> <brand>] - [(primitive .public <brand> Any) + [(primitive.def .public <brand> Any) (type .public <var> (Var <brand>))] diff --git a/stdlib/source/library/lux/meta/target/r.lux b/stdlib/source/library/lux/meta/target/r.lux index 7da2c28bd..ae57971a3 100644 --- a/stdlib/source/library/lux/meta/target/r.lux +++ b/stdlib/source/library/lux/meta/target/r.lux @@ -20,14 +20,14 @@ [syntax (.only syntax)] ["[0]" template]] [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) -(primitive .public (Code kind) +(primitive.def .public (Code kind) Text (with_template [<type> <super>+] [(with_expansions [<kind> (template.symbol [<type> "'"])] - (primitive .public (<kind> kind) Any) + (primitive.def .public (<kind> kind) Any) (`` (type .public <type> (|> Any <kind> (,, (template.spliced <super>+))))))] [Expression [Code]] @@ -35,14 +35,14 @@ (with_template [<type> <super>+] [(with_expansions [<kind> (template.symbol [<type> "'"])] - (primitive .public (<kind> kind) Any) + (primitive.def .public (<kind> kind) Any) (`` (type .public (<type> <brand>) (|> <brand> <kind> (,, (template.spliced <super>+))))))] [Var [Expression' Code]] ) (with_template [<var> <kind>] - [(primitive .public <kind> Any) + [(primitive.def .public <kind> Any) (type .public <var> (Var <kind>))] [SVar Single] diff --git a/stdlib/source/library/lux/meta/target/ruby.lux b/stdlib/source/library/lux/meta/target/ruby.lux index 628c02eb3..2bef96112 100644 --- a/stdlib/source/library/lux/meta/target/ruby.lux +++ b/stdlib/source/library/lux/meta/target/ruby.lux @@ -24,7 +24,7 @@ [syntax (.only syntax)] ["[0]" template]] [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) (def input_separator ", ") (def statement_suffix ";") @@ -40,7 +40,7 @@ (|>> (format \n+) (text.replaced text.new_line nested_new_line)))) -(primitive .public (Code brand) +(primitive.def .public (Code brand) Text (def .public equivalence @@ -59,7 +59,7 @@ (with_template [<type> <super>+] [(with_expansions [<brand> (template.symbol [<type> "'"])] - (primitive (<brand> brand) Any) + (primitive.def (<brand> brand) Any) (`` (type .public <type> (|> Any <brand> (,, (template.spliced <super>+))))))] [Expression [Code]] @@ -72,7 +72,7 @@ (with_template [<type> <super>+] [(with_expansions [<brand> (template.symbol [<type> "'"])] - (primitive <brand> Any) + (primitive.def <brand> Any) (`` (type .public <type> (|> <brand> (,, (template.spliced <super>+))))))] [Literal [Computation' Expression' Code]] diff --git a/stdlib/source/library/lux/meta/target/scheme.lux b/stdlib/source/library/lux/meta/target/scheme.lux index 51a712a6f..af3fd8b00 100644 --- a/stdlib/source/library/lux/meta/target/scheme.lux +++ b/stdlib/source/library/lux/meta/target/scheme.lux @@ -20,7 +20,7 @@ [macro ["[0]" template]] [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) ... Added the carriage return for better Windows compatibility. (def \n+ @@ -32,7 +32,7 @@ (.let [nested_new_line (format text.new_line text.tab)] (text.replaced text.new_line nested_new_line))) -(primitive .public (Code k) +(primitive.def .public (Code k) Text (def .public equivalence @@ -48,14 +48,14 @@ (def hash (|>> representation (at text.hash hash))))) (with_template [<type> <brand> <super>+] - [(primitive .public (<brand> brand) Any) + [(primitive.def .public (<brand> brand) Any) (`` (type .public <type> (|> Any <brand> (,, (template.spliced <super>+)))))] [Expression Expression' [Code]] ) (with_template [<type> <brand> <super>+] - [(primitive .public <brand> Any) + [(primitive.def .public <brand> Any) (`` (type .public <type> (|> <brand> (,, (template.spliced <super>+)))))] [Var Var' [Expression' Code]] diff --git a/stdlib/source/library/lux/meta/type.lux b/stdlib/source/library/lux/meta/type.lux index badf98388..a024a45bc 100644 --- a/stdlib/source/library/lux/meta/type.lux +++ b/stdlib/source/library/lux/meta/type.lux @@ -428,16 +428,16 @@ (do meta.monad [location meta.location valueT (meta.type valueN) - .let [_ (.log# (all text#composite - (symbol#encoded (symbol ..log!)) " " (location.format location) text.new_line - "Expression: " (when valueC - {.#Some valueC} - (code.format valueC) - - {.#None} - (symbol#encoded valueN)) - text.new_line - " Type: " (..format valueT)))]] + .let [_ (.log!# (all text#composite + (symbol#encoded (symbol ..log!)) " " (location.format location) text.new_line + "Expression: " (when valueC + {.#Some valueC} + (code.format valueC) + + {.#None} + (symbol#encoded valueN)) + text.new_line + " Type: " (..format valueT)))]] (in (list (code.symbol valueN)))) {.#Right valueC} diff --git a/stdlib/source/library/lux/meta/type/dynamic.lux b/stdlib/source/library/lux/meta/type/dynamic.lux index 6c69e7417..ef7605ad2 100644 --- a/stdlib/source/library/lux/meta/type/dynamic.lux +++ b/stdlib/source/library/lux/meta/type/dynamic.lux @@ -14,7 +14,7 @@ [macro (.only with_symbols) ["[0]" syntax (.only syntax)]]]]] ["[0]" // (.only) - ["[0]" primitive (.only primitive)]]) + ["[0]" primitive (.only)]]) (exception.def .public (wrong_type [expected actual]) (Exception [Type Type]) @@ -23,7 +23,7 @@ ["Actual" (%.type actual)]))) (with_expansions [<representation> [Type Any]] - (primitive .public Dynamic + (primitive.def .public Dynamic <representation> (def .public dynamic diff --git a/stdlib/source/library/lux/meta/type/primitive.lux b/stdlib/source/library/lux/meta/type/primitive.lux index 5f7269bca..db066d253 100644 --- a/stdlib/source/library/lux/meta/type/primitive.lux +++ b/stdlib/source/library/lux/meta/type/primitive.lux @@ -1,6 +1,6 @@ (.require [library - [lux (.except) + [lux (.except def) ["[0]" meta] [abstract [monad (.only do)]] @@ -27,7 +27,11 @@ #abstraction Code #representation Code])) -(context.def [frames expression declaration] Frame) +(context.def + [frames] + [expression] + [declaration] + Frame) (.def .public current (Meta Frame) @@ -37,13 +41,13 @@ (-> Text (Meta Frame)) (context.search (|>> (the #name) (text#= name)) ..frames)) -(def cast +(.def cast (Parser [(Maybe Text) Code]) (<>.either (<>.and (<>.maybe <code>.local) <code>.any) (<>.and (<>#in {.#None}) <code>.any))) (with_template [<name> <from> <to>] - [(def .public <name> + [(.def .public <name> (syntax (_ [[frame value] ..cast]) (do meta.monad [[name type_vars abstraction representation] (when frame @@ -59,12 +63,12 @@ [representation abstraction representation] ) -(def declarationP +(.def declarationP (Parser [Text (List Text)]) (<>.either (<code>.form (<>.and <code>.local (<>.some <code>.local))) (<>.and <code>.local (at <>.monad in (list))))) -(def abstract +(.def abstract (Parser [Code [Text (List Text)] Code (List Code)]) (|export|.parser (all <>.and @@ -75,7 +79,7 @@ ... TODO: Make sure the generated code always gets optimized away. ... (This applies to uses of "abstraction" and "representation") -(def .public primitive +(.def .public def (syntax (_ [[export_policy [name type_vars] representation_type primitives] ..abstract]) (do meta.monad @@ -92,12 +96,12 @@ (, representation_type)) (,* primitives))))))) -(def selection +(.def selection (Parser [(List Code) Code]) (<>.either (<>.and (<>#each (|>> list) <code>.any) <code>.any) (<>.and (<>#in (list)) <code>.any))) -(def .public transmutation +(.def .public transmutation (syntax (_ [[specific value] ..selection]) (in (list (` (.|> (, value) (..representation (,* specific)) diff --git a/stdlib/source/library/lux/meta/type/quotient.lux b/stdlib/source/library/lux/meta/type/quotient.lux index 04058c1e1..99a63d400 100644 --- a/stdlib/source/library/lux/meta/type/quotient.lux +++ b/stdlib/source/library/lux/meta/type/quotient.lux @@ -9,9 +9,9 @@ [macro (.only with_symbols) [syntax (.only syntax)]]]]] ["[0]" // (.only) - [primitive (.except)]]) + ["[0]" primitive (.except def)]]) -(primitive .public (Class t c %) +(primitive.def .public (Class t c %) (-> t c) (def .public class @@ -20,7 +20,7 @@ (-> (-> t c) (Class t c %)))) (|>> abstraction)) - (primitive .public (Quotient t c %) + (primitive.def .public (Quotient t c %) (Record [#value t #label c]) diff --git a/stdlib/source/library/lux/meta/type/refinement.lux b/stdlib/source/library/lux/meta/type/refinement.lux index fb7553897..3ccaf066d 100644 --- a/stdlib/source/library/lux/meta/type/refinement.lux +++ b/stdlib/source/library/lux/meta/type/refinement.lux @@ -10,9 +10,9 @@ ["[0]" macro (.only) [syntax (.only syntax)]]]]] ["[0]" // (.only) - [primitive (.except)]]) + ["[0]" primitive (.except def)]]) -(primitive .public (Refined t %) +(primitive.def .public (Refined t %) (Record [#value t #predicate (Predicate t)]) diff --git a/stdlib/source/library/lux/meta/type/resource.lux b/stdlib/source/library/lux/meta/type/resource.lux index acf620981..25b8a52fe 100644 --- a/stdlib/source/library/lux/meta/type/resource.lux +++ b/stdlib/source/library/lux/meta/type/resource.lux @@ -24,7 +24,7 @@ ["[0]" macro (.only) [syntax (.only syntax)]]]]] [// - [primitive (.except)]]) + ["[0]" primitive (.except def)]]) (type .public (Procedure ! input output value) (-> input (! [output value]))) @@ -67,10 +67,10 @@ [output procedure] (in [keys output])))) -(primitive .public Ordered Any) -(primitive .public Commutative Any) +(primitive.def .public Ordered Any) +(primitive.def .public Commutative Any) -(primitive .public (Key mode key) +(primitive.def .public (Key mode key) Any (with_template [<name> <mode>] @@ -82,7 +82,7 @@ [commutative_key Commutative] )) -(primitive .public (Res key value) +(primitive.def .public (Res key value) value (with_template [<name> <mode> <key>] diff --git a/stdlib/source/library/lux/meta/type/row.lux b/stdlib/source/library/lux/meta/type/row.lux index a51add3cd..c4c8b9b1f 100644 --- a/stdlib/source/library/lux/meta/type/row.lux +++ b/stdlib/source/library/lux/meta/type/row.lux @@ -25,14 +25,15 @@ ["[0]" code (.only) ["?[1]" \\parser (.only Parser)]] ["[0]" macro (.only with_symbols) - [vocabulary (.only vocabulary)] + ["[0]" vocabulary] [syntax (.only syntax) ["[0]" export]]]]]]) -(vocabulary [.public Slot] - [.public slot] - [.private macro] - [.private by_name]) +(vocabulary.def + [.public Slot] + [.public slot] + [.private macro] + [.private by_name]) (.type .public (Row content extra) (Record diff --git a/stdlib/source/library/lux/meta/type/unit.lux b/stdlib/source/library/lux/meta/type/unit.lux index 823e300cd..4aa27fbfd 100644 --- a/stdlib/source/library/lux/meta/type/unit.lux +++ b/stdlib/source/library/lux/meta/type/unit.lux @@ -15,9 +15,9 @@ ["[0]" macro (.only) [syntax (.only syntax)]]]]] ["[0]" // (.only) - [primitive (.except)]]) + ["[0]" primitive (.except def)]]) -(primitive .public (Measure scale unit) +(primitive.def .public (Measure scale unit) Int (def .public measure diff --git a/stdlib/source/library/lux/world/db/sql.lux b/stdlib/source/library/lux/world/db/sql.lux index 698c862bc..9a2e04dc8 100644 --- a/stdlib/source/library/lux/world/db/sql.lux +++ b/stdlib/source/library/lux/world/db/sql.lux @@ -14,7 +14,7 @@ [macro ["[0]" template]]] [type - [primitive (.except)]]]]) + ["[0]" primitive (.except def)]]]]) (def parenthesize (-> Text Text) @@ -22,7 +22,7 @@ ... Kind (with_template [<declaration>] - [(primitive .public <declaration> Any)] + [(primitive.def .public <declaration> Any)] [Literal'] [Column'] @@ -63,7 +63,7 @@ (def .public no_alias Alias "") -(primitive .public (SQL kind) +(primitive.def .public (SQL kind) Text ... SQL diff --git a/stdlib/source/library/lux/world/environment.lux b/stdlib/source/library/lux/world/environment.lux index 31dafca6d..f391ea67c 100644 --- a/stdlib/source/library/lux/world/environment.lux +++ b/stdlib/source/library/lux/world/environment.lux @@ -274,8 +274,8 @@ ... @.scheme ... (these (ffi.import (exit [Int] "io" Nothing)) ... ... https://srfi.schemers.org/srfi-98/srfi-98.html - ... (primitive Pair Any) - ... (primitive PList Any) + ... (primitive.def Pair Any) + ... (primitive.def PList Any) ... (ffi.import (get-environment-variables [] "io" PList)) ... (ffi.import (car [Pair] Text)) ... (ffi.import (cdr [Pair] Text)) diff --git a/stdlib/source/library/lux/world/file/watch.lux b/stdlib/source/library/lux/world/file/watch.lux index f5f64dcf5..b8d07c7fc 100644 --- a/stdlib/source/library/lux/world/file/watch.lux +++ b/stdlib/source/library/lux/world/file/watch.lux @@ -29,13 +29,13 @@ [meta ["@" target] [type - [primitive (.only primitive representation abstraction)]]] + ["[0]" primitive (.only representation abstraction)]]] [world [time ["[0]" instant (.only Instant) (.use "[1]#[0]" equivalence)]]]]] ["[0]" //]) -(primitive .public Concern +(primitive.def .public Concern (Record [#creation Bit #modification Bit diff --git a/stdlib/source/library/lux/world/locale.lux b/stdlib/source/library/lux/world/locale.lux index 6cd384586..f42c19e20 100644 --- a/stdlib/source/library/lux/world/locale.lux +++ b/stdlib/source/library/lux/world/locale.lux @@ -12,12 +12,12 @@ ["[0]" encoding (.only Encoding)]]] [meta [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] [/ ["[0]" language (.only Language)] ["[0]" territory (.only Territory)]]) -(primitive .public Locale +(primitive.def .public Locale Text (def territory_separator "_") diff --git a/stdlib/source/library/lux/world/locale/language.lux b/stdlib/source/library/lux/world/locale/language.lux index f5ceb4852..31fa44455 100644 --- a/stdlib/source/library/lux/world/locale/language.lux +++ b/stdlib/source/library/lux/world/locale/language.lux @@ -10,10 +10,10 @@ [macro ["[0]" template]] [type - [primitive (.except #name)]]]]]) + ["[0]" primitive (.except def #name)]]]]]) ... https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes -(primitive .public Language +(primitive.def .public Language (Record [#name Text #code Text]) diff --git a/stdlib/source/library/lux/world/locale/territory.lux b/stdlib/source/library/lux/world/locale/territory.lux index 9cd72ae2a..bf33f64b6 100644 --- a/stdlib/source/library/lux/world/locale/territory.lux +++ b/stdlib/source/library/lux/world/locale/territory.lux @@ -10,10 +10,10 @@ [macro ["[0]" template]] [type - [primitive (.except #name)]]]]]) + ["[0]" primitive (.except def #name)]]]]]) ... https://en.wikipedia.org/wiki/ISO_3166-1 -(primitive .public Territory +(primitive.def .public Territory (Record [#name Text #short Text diff --git a/stdlib/source/library/lux/world/net/http/cookie.lux b/stdlib/source/library/lux/world/net/http/cookie.lux index 528da5899..c8acede49 100644 --- a/stdlib/source/library/lux/world/net/http/cookie.lux +++ b/stdlib/source/library/lux/world/net/http/cookie.lux @@ -21,7 +21,7 @@ ["i" int]]] [meta [type - ["[0]" primitive (.only primitive)]]] + ["[0]" primitive (.only)]]] [world ["[0]" time (.only) ["[0]" day] @@ -130,7 +130,7 @@ [http_only "HttpOnly"] ) -(primitive .public CSRF_Policy +(primitive.def .public CSRF_Policy Text (with_template [<name> <value>] diff --git a/stdlib/source/library/lux/world/net/http/header.lux b/stdlib/source/library/lux/world/net/http/header.lux index 662310def..61522e8a7 100644 --- a/stdlib/source/library/lux/world/net/http/header.lux +++ b/stdlib/source/library/lux/world/net/http/header.lux @@ -17,9 +17,9 @@ [number ["[0]" nat]]]]] [// - ["[0]" mime (.only MIME)] ["[0]" cookie] [// (.only URL) + ["[0]" mime (.only MIME)] ["[0]" uri ["[1]" encoding]]]]) diff --git a/stdlib/source/library/lux/world/net/http/version.lux b/stdlib/source/library/lux/world/net/http/version.lux index 1bd888b31..51eab0f59 100644 --- a/stdlib/source/library/lux/world/net/http/version.lux +++ b/stdlib/source/library/lux/world/net/http/version.lux @@ -8,9 +8,9 @@ ["[0]" text (.use "[1]#[0]" hash)]] [meta [type - ["[0]" primitive (.only primitive)]]]]]) + ["[0]" primitive (.only)]]]]]) -(primitive .public Version +(primitive.def .public Version Text (def .public equivalence diff --git a/stdlib/source/library/lux/world/net/http/mime.lux b/stdlib/source/library/lux/world/net/mime.lux index 0ff909b96..8e3919836 100644 --- a/stdlib/source/library/lux/world/net/http/mime.lux +++ b/stdlib/source/library/lux/world/net/mime.lux @@ -10,18 +10,18 @@ ["[0]" encoding (.only Encoding)]]] [meta [type - [primitive (.except)]]]]]) + ["[0]" primitive]]]]]) -(primitive .public MIME +(primitive.def .public MIME Text (def .public mime (-> Text MIME) - (|>> abstraction)) + (|>> primitive.abstraction)) (def .public name (-> MIME Text) - (|>> representation)) + (|>> primitive.representation)) (def .public equivalence (Equivalence MIME) @@ -34,9 +34,11 @@ ... https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Complete_list_of_MIME_types (with_template [<name> <type>] - [(def .public <name> MIME (..mime <type>))] + [(def .public <name> + MIME + (..mime <type>))] - [aac_audio "audio/aac"] + [aac "audio/aac"] [abiword "application/x-abiword"] [avi "video/x-msvideo"] [amazon_kindle_ebook "application/vnd.amazon.ebook"] @@ -96,11 +98,12 @@ [xml "application/xml"] [xul "application/vnd.mozilla.xul+xml"] [zip "application/zip"] - [!3gpp_audio "audio/3gpp"] - [!3gpp "video/3gpp"] - [!3gpp2_audio "audio/3gpp2"] - [!3gpp2 "video/3gpp2"] - [!7z "application/x-7z-compressed"] + + [audio_3gpp "audio/3gpp"] + [video_3gpp "video/3gpp"] + [audio_3gpp2 "audio/3gpp2"] + [video_3gpp2 "video/3gpp2"] + [compressed_7z "application/x-7z-compressed"] ) (def .public (text encoding) diff --git a/stdlib/source/library/lux/world/net/uri/scheme.lux b/stdlib/source/library/lux/world/net/uri/scheme.lux index 7db4b9583..2c5d7b36f 100644 --- a/stdlib/source/library/lux/world/net/uri/scheme.lux +++ b/stdlib/source/library/lux/world/net/uri/scheme.lux @@ -8,10 +8,10 @@ ["[0]" text]] [meta [type - ["[0]" primitive (.only primitive)]]]]]) + ["[0]" primitive (.only)]]]]]) ... https://en.wikipedia.org/wiki/List_of_URI_schemes -(primitive .public Scheme +(primitive.def .public Scheme Text (with_template [<scheme> <name>] diff --git a/stdlib/source/library/lux/world/time.lux b/stdlib/source/library/lux/world/time.lux index b855ea4af..b4147a5cb 100644 --- a/stdlib/source/library/lux/world/time.lux +++ b/stdlib/source/library/lux/world/time.lux @@ -20,7 +20,7 @@ ["n" nat (.use "[1]#[0]" decimal)]]] [meta [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] [/ ["[0]" duration (.only Duration)]]) @@ -79,7 +79,7 @@ [..seconds second_parser invalid_second ..section_parser] ) -(primitive .public Time +(primitive.def .public Time Nat (def .public midnight diff --git a/stdlib/source/library/lux/world/time/date.lux b/stdlib/source/library/lux/world/time/date.lux index 30c182179..123cfb667 100644 --- a/stdlib/source/library/lux/world/time/date.lux +++ b/stdlib/source/library/lux/world/time/date.lux @@ -24,7 +24,7 @@ ["i" int]]] [meta [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" // ["[1][0]" year (.only Year)] ["[1][0]" month (.only Month)]]) @@ -69,7 +69,7 @@ (def separator "-") -(primitive .public Date +(primitive.def .public Date (Record [#year Year #month Month diff --git a/stdlib/source/library/lux/world/time/duration.lux b/stdlib/source/library/lux/world/time/duration.lux index a8850b4fb..3aca1d203 100644 --- a/stdlib/source/library/lux/world/time/duration.lux +++ b/stdlib/source/library/lux/world/time/duration.lux @@ -20,11 +20,11 @@ ["[0]" nat (.use "[1]#[0]" decimal)]]] [meta [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" // ["[1][0]" year]]) -(primitive .public Duration +(primitive.def .public Duration Int (def .public of_millis diff --git a/stdlib/source/library/lux/world/time/instant.lux b/stdlib/source/library/lux/world/time/instant.lux index e5fd7fd34..233c8d511 100644 --- a/stdlib/source/library/lux/world/time/instant.lux +++ b/stdlib/source/library/lux/world/time/instant.lux @@ -23,7 +23,7 @@ [meta ["@" target] [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" // (.only Time) ["[0]" duration (.only Duration)] ["[0]" year (.only Year)] @@ -31,7 +31,7 @@ ["[0]" day (.only Day)] ["[0]" date (.only Date)]]) -(primitive .public Instant +(primitive.def .public Instant Int (def .public of_millis diff --git a/stdlib/source/library/lux/world/time/solar.lux b/stdlib/source/library/lux/world/time/solar.lux index 0eff5ee00..8c4ffa315 100644 --- a/stdlib/source/library/lux/world/time/solar.lux +++ b/stdlib/source/library/lux/world/time/solar.lux @@ -16,7 +16,7 @@ [meta ["@" target] [type - [primitive (.except)]]]]] + ["[0]" primitive (.except def)]]]]] ["[0]" // ["[1]" instant] ["[0]" duration (.only Duration)]]) @@ -24,7 +24,7 @@ (type .public Zone Text) -(primitive .public Instant +(primitive.def .public Instant (Record [#utc //.Instant #zone Zone diff --git a/stdlib/source/library/lux/world/time/year.lux b/stdlib/source/library/lux/world/time/year.lux index 8826f089d..3098270f8 100644 --- a/stdlib/source/library/lux/world/time/year.lux +++ b/stdlib/source/library/lux/world/time/year.lux @@ -19,7 +19,7 @@ ["i" int (.use "[1]#[0]" decimal)]]] [meta [type - [primitive (.except)]]]]]) + ["[0]" primitive (.except def)]]]]]) (def (internal year) (-> Int Int) @@ -36,7 +36,7 @@ (exception.def .public there_is_no_year_0) ... https://en.wikipedia.org/wiki/Gregorian_calendar -(primitive .public Year +(primitive.def .public Year Int (def .public (year value) |