diff options
Diffstat (limited to 'stdlib/source/parser')
| -rw-r--r-- | stdlib/source/parser/lux/data/format/json.lux | 6 | ||||
| -rw-r--r-- | stdlib/source/parser/lux/data/text.lux | 5 | ||||
| -rw-r--r-- | stdlib/source/parser/lux/meta/code.lux (renamed from stdlib/source/parser/lux/macro/code.lux) | 5 | ||||
| -rw-r--r-- | stdlib/source/parser/lux/meta/type.lux | 7 |
4 files changed, 12 insertions, 11 deletions
diff --git a/stdlib/source/parser/lux/data/format/json.lux b/stdlib/source/parser/lux/data/format/json.lux index c78f8132c..ddb73da8f 100644 --- a/stdlib/source/parser/lux/data/format/json.lux +++ b/stdlib/source/parser/lux/data/format/json.lux @@ -14,11 +14,11 @@ ["[0]" list (.use "[1]#[0]" functor)] ["[0]" sequence] ["[0]" dictionary (.only Dictionary)]]] - [macro - ["[0]" code]] [math [number - ["[0]" frac]]]]] + ["[0]" frac]]] + [meta + ["[0]" code]]]] [\\library ["[0]" / (.only JSON)]]) diff --git a/stdlib/source/parser/lux/data/text.lux b/stdlib/source/parser/lux/data/text.lux index 3cd4076f5..a85ef474a 100644 --- a/stdlib/source/parser/lux/data/text.lux +++ b/stdlib/source/parser/lux/data/text.lux @@ -15,11 +15,12 @@ ["[0]" list (.use "[1]#[0]" mix)]]] [macro ["^" pattern] - ["[0]" code] ["[0]" template]] [math [number - ["n" nat (.use "[1]#[0]" decimal)]]]]]) + ["n" nat (.use "[1]#[0]" decimal)]]] + [meta + ["[0]" code]]]]) (type .public Offset Nat) diff --git a/stdlib/source/parser/lux/macro/code.lux b/stdlib/source/parser/lux/meta/code.lux index 85490e2d0..844c0e1c2 100644 --- a/stdlib/source/parser/lux/macro/code.lux +++ b/stdlib/source/parser/lux/meta/code.lux @@ -11,8 +11,6 @@ ["[0]" text (.use "[1]#[0]" monoid)] [collection ["[0]" list (.use "[1]#[0]" functor)]]] - [macro - ["[0]" code (.use "[1]#[0]" equivalence)]] [math [number ["[0]" nat] @@ -20,7 +18,8 @@ ["[0]" rev] ["[0]" frac]]] [meta - ["[0]" symbol]]]]) + ["[0]" symbol] + ["[0]" code (.use "[1]#[0]" equivalence)]]]]) (def (un_paired pairs) (All (_ a) (-> (List [a a]) (List a))) diff --git a/stdlib/source/parser/lux/meta/type.lux b/stdlib/source/parser/lux/meta/type.lux index 7c7090474..46f89fec7 100644 --- a/stdlib/source/parser/lux/meta/type.lux +++ b/stdlib/source/parser/lux/meta/type.lux @@ -15,11 +15,12 @@ ["[0]" list (.use "[1]#[0]" functor)] ["[0]" dictionary (.only Dictionary)]]] [macro - ["^" pattern] - ["[0]" code]] + ["^" pattern]] [math [number - ["n" nat (.use "[1]#[0]" decimal)]]]]] + ["n" nat (.use "[1]#[0]" decimal)]]] + [meta + ["[0]" code]]]] [\\library ["[0]" / (.use "[1]#[0]" equivalence) ["[0]" check]]]) |