diff options
Diffstat (limited to '')
24 files changed, 74 insertions, 73 deletions
diff --git a/stdlib/source/library/lux/data/format/json.lux b/stdlib/source/library/lux/data/format/json.lux index 4f95615ed..3a0e69a6c 100644 --- a/stdlib/source/library/lux/data/format/json.lux +++ b/stdlib/source/library/lux/data/format/json.lux @@ -12,12 +12,12 @@ ["[0]" maybe] ["[0]" try (.only Try)] ["<>" parser (.open: "[1]#[0]" monad) - ["<[0]>" text (.only Parser)] ["<[0]>" code]]] [data ["[0]" bit] ["[0]" product] - ["[0]" text (.open: "[1]#[0]" equivalence monoid)] + ["[0]" text (.open: "[1]#[0]" equivalence monoid) + ["<[1]>" \\parser (.only Parser)]] [collection ["[0]" list (.open: "[1]#[0]" mix functor)] ["[0]" sequence (.only Sequence sequence) (.open: "[1]#[0]" monad)] diff --git a/stdlib/source/library/lux/data/format/xml.lux b/stdlib/source/library/lux/data/format/xml.lux index 1fa0a04ac..dfab48227 100644 --- a/stdlib/source/library/lux/data/format/xml.lux +++ b/stdlib/source/library/lux/data/format/xml.lux @@ -7,11 +7,11 @@ [codec (.only Codec)]] [control [try (.only Try)] - ["<>" parser (.open: "[1]#[0]" monad) - ["<[0]>" text (.only Parser Slice)]]] + ["<>" parser (.open: "[1]#[0]" monad)]] [data ["[0]" product] - ["[0]" text (.only \n) (.open: "[1]#[0]" equivalence monoid)] + ["[0]" text (.only \n) (.open: "[1]#[0]" equivalence monoid) + ["<[1]>" \\parser (.only Parser Slice)]] [collection ["[0]" list (.open: "[1]#[0]" functor)] ["[0]" dictionary (.only Dictionary)]]] diff --git a/stdlib/source/library/lux/data/text/regex.lux b/stdlib/source/library/lux/data/text/regex.lux index 8e48c00d4..38908a999 100644 --- a/stdlib/source/library/lux/data/text/regex.lux +++ b/stdlib/source/library/lux/data/text/regex.lux @@ -9,10 +9,11 @@ ["[0]" try] ["[0]" exception (.only exception:)] ["<>" parser (.open: "[1]#[0]" monad) - ["<[0]>" text (.only Parser)] ["<[0]>" code]]] [data ["[0]" product] + ["[0]" text + ["<[1]>" \\parser (.only Parser)]] [collection ["[0]" list (.open: "[1]#[0]" mix monad)]]] [macro (.only with_symbols) diff --git a/stdlib/source/library/lux/extension.lux b/stdlib/source/library/lux/extension.lux index ffe7a4a78..90033a988 100644 --- a/stdlib/source/library/lux/extension.lux +++ b/stdlib/source/library/lux/extension.lux @@ -6,7 +6,6 @@ [control ["<>" parser (.open: "[1]#[0]" monad) ["<c>" code (.only Parser)] - ["<a>" analysis] ["<s>" synthesis]]] [data ["[0]" product] @@ -17,7 +16,11 @@ ["[0]" code]] [tool [compiler - ["[0]" phase]]]]]) + ["[0]" phase] + [language + [lux + [analysis + ["<a>" \\parser]]]]]]]]) (type: Declaration (Record diff --git a/stdlib/source/library/lux/ffi/export.rb.lux b/stdlib/source/library/lux/ffi/export.rb.lux index 46c259fbe..00702d7cf 100644 --- a/stdlib/source/library/lux/ffi/export.rb.lux +++ b/stdlib/source/library/lux/ffi/export.rb.lux @@ -9,11 +9,11 @@ ["[0]" monad (.only do)]] [control ["<>" parser (.only) - ["<[0]>" code] - ["<[0]>" text (.only Parser)]]] + ["<[0]>" code]]] [data - [text - ["%" format]] + ["[0]" text + ["%" format] + ["<[1]>" \\parser (.only Parser)]] [collection ["[0]" list (.open: "[1]#[0]" monad mix)] ["[0]" set]]] diff --git a/stdlib/source/library/lux/math/modular.lux b/stdlib/source/library/lux/math/modular.lux index 09e1b6a31..a46f67418 100644 --- a/stdlib/source/library/lux/math/modular.lux +++ b/stdlib/source/library/lux/math/modular.lux @@ -11,11 +11,11 @@ ["[0]" try (.only Try)] ["[0]" exception (.only exception:)] ["<>" parser (.only) - ["<[0]>" text (.only Parser)] ["<[0]>" code]]] [data ["[0]" product] - ["[0]" text (.open: "[1]#[0]" monoid)]] + ["[0]" text (.open: "[1]#[0]" monoid) + ["<[1]>" \\parser (.only Parser)]]] [macro ["[0]" code]] [math diff --git a/stdlib/source/library/lux/meta/configuration.lux b/stdlib/source/library/lux/meta/configuration.lux index cf6675195..6e6ed68bb 100644 --- a/stdlib/source/library/lux/meta/configuration.lux +++ b/stdlib/source/library/lux/meta/configuration.lux @@ -10,11 +10,11 @@ ["[0]" maybe (.open: "[1]#[0]" functor)] ["[0]" exception (.only exception:)] ["<>" parser (.only) - ["<[0]>" text (.only Parser)] ["<[0]>" code]]] [data ["[0]" text (.open: "[1]#[0]" equivalence) - ["%" format]] + ["%" format] + ["<[1]>" \\parser (.only Parser)]] [collection ["[0]" list (.open: "[1]#[0]" functor mix)] [dictionary diff --git a/stdlib/source/library/lux/target/jvm/reflection.lux b/stdlib/source/library/lux/target/jvm/reflection.lux index 5a76db47d..3548f5c19 100644 --- a/stdlib/source/library/lux/target/jvm/reflection.lux +++ b/stdlib/source/library/lux/target/jvm/reflection.lux @@ -7,12 +7,11 @@ ["[0]" monad (.only do)]] [control ["[0]" try (.only Try) (.open: "[1]#[0]" functor)] - ["[0]" exception (.only exception:)] - [parser - ["<t>" text]]] + ["[0]" exception (.only exception:)]] [data ["[0]" text (.open: "[1]#[0]" equivalence) - ["%" format (.only format)]] + ["%" format (.only format)] + ["<t>" \\parser]] [collection ["[0]" list (.open: "[1]#[0]" mix functor)] ["[0]" array] diff --git a/stdlib/source/library/lux/target/jvm/type/alias.lux b/stdlib/source/library/lux/target/jvm/type/alias.lux index 2d6cb7c49..eb1dc6341 100644 --- a/stdlib/source/library/lux/target/jvm/type/alias.lux +++ b/stdlib/source/library/lux/target/jvm/type/alias.lux @@ -7,11 +7,11 @@ ["[0]" maybe] ["[0]" try] ["[0]" exception (.only exception:)] - ["<>" parser (.only) - ["<[0]>" text (.only Parser)]]] + ["<>" parser (.only)]] [data ["[0]" text (.only) - ["%" format (.only format)]] + ["%" format (.only format)] + ["<[1]>" \\parser (.only Parser)]] [collection ["[0]" dictionary (.only Dictionary)]]]]] ["[0]" // (.only Type) diff --git a/stdlib/source/library/lux/target/jvm/type/lux.lux b/stdlib/source/library/lux/target/jvm/type/lux.lux index 96fa31b11..351d9c490 100644 --- a/stdlib/source/library/lux/target/jvm/type/lux.lux +++ b/stdlib/source/library/lux/target/jvm/type/lux.lux @@ -6,12 +6,12 @@ [control ["[0]" try] ["[0]" exception (.only exception:)] - ["<>" parser (.open: "[1]#[0]" monad) - ["<[0]>" text (.only Parser)]]] + ["<>" parser (.open: "[1]#[0]" monad)]] [data ["[0]" product] ["[0]" text (.open: "[1]#[0]" equivalence) - ["%" format (.only format)]] + ["%" format (.only format)] + ["<[1]>" \\parser (.only Parser)]] [collection ["[0]" array] ["[0]" dictionary (.only Dictionary)]]] diff --git a/stdlib/source/library/lux/target/jvm/type/parser.lux b/stdlib/source/library/lux/target/jvm/type/parser.lux index 166b2d984..53bd29aa0 100644 --- a/stdlib/source/library/lux/target/jvm/type/parser.lux +++ b/stdlib/source/library/lux/target/jvm/type/parser.lux @@ -4,14 +4,14 @@ [abstract [monad (.only do)]] [control + ["<>" parser (.open: "[1]#[0]" monad)] ["[0]" try] - ["[0]" function] - ["<>" parser (.open: "[1]#[0]" monad) - ["<[0]>" text (.only Parser)]]] + ["[0]" function]] [data ["[0]" product] - [text - ["%" format (.only format)]] + ["[0]" text + ["%" format (.only format)] + ["<[1]>" \\parser (.only Parser)]] [collection ["[0]" list]]]]] ["[0]" // (.only Type) diff --git a/stdlib/source/library/lux/time.lux b/stdlib/source/library/lux/time.lux index 532961dcb..07f3dcb94 100644 --- a/stdlib/source/library/lux/time.lux +++ b/stdlib/source/library/lux/time.lux @@ -8,13 +8,13 @@ [codec (.only Codec)] [monad (.only Monad do)]] [control + ["<>" parser (.only)] ["[0]" pipe] ["[0]" try (.only Try)] - ["[0]" exception (.only exception:)] - ["<>" parser (.only) - ["<[0]>" text (.only Parser)]]] + ["[0]" exception (.only exception:)]] [data - ["[0]" text (.open: "[1]#[0]" monoid)]] + ["[0]" text (.open: "[1]#[0]" monoid) + ["<[1]>" \\parser (.only Parser)]]] [math [number ["n" nat (.open: "[1]#[0]" decimal)]]] diff --git a/stdlib/source/library/lux/time/date.lux b/stdlib/source/library/lux/time/date.lux index 54d7a90ff..3419b07ea 100644 --- a/stdlib/source/library/lux/time/date.lux +++ b/stdlib/source/library/lux/time/date.lux @@ -8,13 +8,13 @@ [codec (.only Codec)] [monad (.only do)]] [control + ["<>" parser (.only)] ["[0]" maybe] ["[0]" try (.only Try)] - ["[0]" exception (.only exception:)] - ["<>" parser (.only) - ["<[0]>" text (.only Parser)]]] + ["[0]" exception (.only exception:)]] [data - ["[0]" text (.open: "[1]#[0]" monoid)] + ["[0]" text (.open: "[1]#[0]" monoid) + ["<[1]>" \\parser (.only Parser)]] [collection ["[0]" list (.open: "[1]#[0]" mix)] ["[0]" dictionary (.only Dictionary)]]] diff --git a/stdlib/source/library/lux/time/duration.lux b/stdlib/source/library/lux/time/duration.lux index c9869c08c..e59e4c9f2 100644 --- a/stdlib/source/library/lux/time/duration.lux +++ b/stdlib/source/library/lux/time/duration.lux @@ -9,11 +9,11 @@ [monoid (.only Monoid)] [monad (.only do)]] [control - ["[0]" try] - ["<>" parser (.only) - ["<[0]>" text (.only Parser)]]] + ["<>" parser (.only)] + ["[0]" try]] [data - ["[0]" text (.open: "[1]#[0]" monoid)]] + ["[0]" text (.open: "[1]#[0]" monoid) + ["<[1]>" \\parser (.only Parser)]]] [math [number ["i" int] diff --git a/stdlib/source/library/lux/time/instant.lux b/stdlib/source/library/lux/time/instant.lux index 366bfe020..2f8bbd980 100644 --- a/stdlib/source/library/lux/time/instant.lux +++ b/stdlib/source/library/lux/time/instant.lux @@ -10,13 +10,13 @@ [monad (.only Monad do)]] [control [io (.only IO io)] + ["<>" parser (.only)] ["[0]" maybe] ["[0]" try] - ["[0]" exception (.only exception:)] - ["<>" parser (.only) - ["<[0]>" text (.only Parser)]]] + ["[0]" exception (.only exception:)]] [data - ["[0]" text (.open: "[1]#[0]" monoid)]] + ["[0]" text (.open: "[1]#[0]" monoid) + ["<[1]>" \\parser (.only Parser)]]] [math [number ["i" int] diff --git a/stdlib/source/library/lux/time/year.lux b/stdlib/source/library/lux/time/year.lux index 135607980..a815cbd1c 100644 --- a/stdlib/source/library/lux/time/year.lux +++ b/stdlib/source/library/lux/time/year.lux @@ -7,12 +7,12 @@ [equivalence (.only Equivalence)] [order (.only Order)]] [control + ["<>" parser (.only)] ["[0]" try (.only Try)] - ["[0]" exception (.only exception:)] - ["<>" parser (.only) - ["<[0]>" text (.only Parser)]]] + ["[0]" exception (.only exception:)]] [data - ["[0]" text (.open: "[1]#[0]" monoid)]] + ["[0]" text (.open: "[1]#[0]" monoid) + ["<[1]>" \\parser (.only Parser)]]] [math [number ["n" nat (.open: "[1]#[0]" decimal)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux index c5044dba6..7835a454b 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux @@ -12,13 +12,13 @@ ["[0]" try (.only Try) (.open: "[1]#[0]" monad)] ["[0]" exception (.only exception:)] ["<>" parser (.only) - ["<[0]>" code (.only Parser)] - ["<[0]>" text]]] + ["<[0]>" code (.only Parser)]]] [data [binary (.only Binary)] ["[0]" product] ["[0]" text (.open: "[1]#[0]" equivalence) - ["%" format (.only format)]] + ["%" format (.only format)] + ["<[1]>" \\parser]] [collection ["[0]" list (.open: "[1]#[0]" mix monad monoid)] ["[0]" array] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux index e6c308b21..ff87daec1 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux @@ -10,13 +10,13 @@ ["[0]" exception] ["<>" parser (.open: "[1]#[0]" monad) ["<[0]>" code (.only Parser)] - ["<[0]>" text] ["<[0]>" synthesis]]] [data [binary (.only Binary)] ["[0]" product] - [text - ["%" format (.only format)]] + ["[0]" text + ["%" format (.only format)] + ["<[1]>" \\parser]] [collection ["[0]" list (.open: "[1]#[0]" functor mix)] ["[0]" dictionary] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux index 202f4b5e0..3bb78789c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux @@ -7,12 +7,12 @@ ["[0]" maybe (.open: "[1]#[0]" functor)] ["[0]" exception (.only exception:)] ["<>" parser (.only) - ["<[0]>" text] ["<[0]>" synthesis (.only Parser)]]] [data ["[0]" product] ["[0]" text (.open: "[1]#[0]" equivalence) - ["%" format]] + ["%" format] + ["<[1]>" \\parser]] [collection ["[0]" list (.open: "[1]#[0]" monad mix monoid)] ["[0]" dictionary (.only Dictionary)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux index d0bc4dbdc..6bde519da 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux @@ -34,10 +34,10 @@ ["[0]" maybe] ["[0]" exception (.only exception:)] ["<>" parser (.only) - [text (.only Offset)] ["<[0]>" code]]] [data ["[0]" text (.only) + [\\parser (.only Offset)] ["%" format (.only format)]] [collection ["[0]" list] diff --git a/stdlib/source/library/lux/tool/compiler/meta/cli.lux b/stdlib/source/library/lux/tool/compiler/meta/cli.lux index 40ae2eb84..d8ea47bf1 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cli.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cli.lux @@ -7,12 +7,12 @@ [control ["[0]" pipe] ["<>" parser (.only) - ["<[0]>" cli (.only Parser)] - ["<[0]>" text]]] + ["<[0]>" cli (.only Parser)]]] [data ["[0]" product] ["[0]" text (.only) - ["%" format]] + ["%" format] + ["<[1]>" \\parser]] [collection ["[0]" list (.open: "[1]#[0]" functor)]]] [macro diff --git a/stdlib/source/library/lux/tool/compiler/meta/cli/compiler.lux b/stdlib/source/library/lux/tool/compiler/meta/cli/compiler.lux index 84107e91d..317506075 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cli/compiler.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cli/compiler.lux @@ -5,12 +5,12 @@ [monad (.only do)] [equivalence (.only Equivalence)]] [control - ["<>" parser (.only) - ["<[0]>" text (.only Parser)]]] + ["<>" parser (.only)]] [data ["[0]" product] ["[0]" text (.only) - ["%" format]] + ["%" format] + ["<[1]>" \\parser (.only Parser)]] [collection ["[0]" list (.open: "[1]#[0]" functor)]]] [math diff --git a/stdlib/source/library/lux/control/parser/text.lux b/stdlib/source/parser/lux/data/text.lux index fbe318d12..e02733f77 100644 --- a/stdlib/source/library/lux/control/parser/text.lux +++ b/stdlib/source/parser/lux/data/text.lux @@ -4,6 +4,7 @@ [abstract [monad (.only Monad do)]] [control + ["//" parser] ["[0]" maybe] ["[0]" try (.only Try)] ["[0]" exception (.only exception:)]] @@ -18,8 +19,7 @@ ["[0]" template]] [math [number - ["n" nat (.open: "[1]#[0]" decimal)]]]]] - ["[0]" //]) + ["n" nat (.open: "[1]#[0]" decimal)]]]]]) (type: .public Offset Nat) diff --git a/stdlib/source/library/lux/control/parser/analysis.lux b/stdlib/source/parser/lux/tool/compiler/language/lux/analysis.lux index ebf4f2ec6..159c1c62e 100644 --- a/stdlib/source/library/lux/control/parser/analysis.lux +++ b/stdlib/source/parser/lux/tool/compiler/language/lux/analysis.lux @@ -4,6 +4,7 @@ [abstract [monad (.only do)]] [control + ["//" parser] ["[0]" try (.only Try)] ["[0]" exception (.only exception:)]] [data @@ -27,11 +28,8 @@ [compiler [arity (.only Arity)] [reference (.only) - [variable (.only)]] - [language - [lux - ["/" analysis (.only Environment Analysis)]]]]]]] - ["[0]" //]) + [variable (.only)]]]]]] + ["/" \\library (.only Environment Analysis)]) (def: (remaining_inputs asts) (-> (List Analysis) Text) |