From 7e4c9ba2e02f06fa621ffe24bc0ca046536429ef Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sat, 2 Jul 2022 16:32:00 -0400 Subject: Moved "lux/macro" to "lux/meta/macro". --- stdlib/source/polytypic/lux/abstract/equivalence.lux | 14 +++++++------- stdlib/source/polytypic/lux/data/format/json.lux | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'stdlib/source/polytypic') diff --git a/stdlib/source/polytypic/lux/abstract/equivalence.lux b/stdlib/source/polytypic/lux/abstract/equivalence.lux index bc044fe6b..50d04c8e0 100644 --- a/stdlib/source/polytypic/lux/abstract/equivalence.lux +++ b/stdlib/source/polytypic/lux/abstract/equivalence.lux @@ -25,18 +25,18 @@ ["[0]" int] ["[0]" rev] ["[0]" frac]]] - [time - ["[0]" duration] - ["[0]" date] - ["[0]" instant] - ["[0]" day] - ["[0]" month]] [meta ["[0]" code] ["[0]" type (.only) ["<[1]>" \\parser] ["[0]" poly (.only polytypic)] - ["[0]" unit]]]]] + ["[0]" unit]]] + [time + ["[0]" duration] + ["[0]" date] + ["[0]" instant] + ["[0]" day] + ["[0]" month]]]] [\\library ["[0]" /]]) diff --git a/stdlib/source/polytypic/lux/data/format/json.lux b/stdlib/source/polytypic/lux/data/format/json.lux index 5f79d7fe4..cae0194d4 100644 --- a/stdlib/source/polytypic/lux/data/format/json.lux +++ b/stdlib/source/polytypic/lux/data/format/json.lux @@ -17,27 +17,27 @@ ["[0]" list (.use "[1]#[0]" monad)] ["[0]" sequence (.only sequence)] ["[0]" dictionary]]] - [macro - [syntax (.only syntax)]] [math [number ["n" nat (.use "[1]#[0]" decimal)] ["[0]" i64] ["[0]" int] ["[0]" frac]]] - [time - ... ["[0]" instant] - ... ["[0]" duration] - ["[0]" date] - ["[0]" day] - ["[0]" month]] [meta ["[0]" code (.only) ["<[1]>" \\parser]] + [macro + [syntax (.only syntax)]] ["[0]" type (.only) ["<[1]>" \\parser] ["[0]" unit] - ["[0]" poly (.only polytypic)]]]]] + ["[0]" poly (.only polytypic)]]] + [time + ... ["[0]" instant] + ... ["[0]" duration] + ["[0]" date] + ["[0]" day] + ["[0]" month]]]] [\\library ["[0]" / (.only JSON)]]) -- cgit v1.2.3