From 832a9361b632331e82a64c07baa560487ca8abde Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Tue, 29 Dec 2020 00:38:21 -0400 Subject: Moved "lux/data/number" to "lux/math/number". --- stdlib/source/poly/lux/abstract/equivalence.lux | 21 +++++++++++---------- stdlib/source/poly/lux/abstract/functor.lux | 7 ++++--- stdlib/source/poly/lux/data/format/json.lux | 19 ++++++++++--------- 3 files changed, 25 insertions(+), 22 deletions(-) (limited to 'stdlib/source/poly') diff --git a/stdlib/source/poly/lux/abstract/equivalence.lux b/stdlib/source/poly/lux/abstract/equivalence.lux index b6cfa2c2c..fabd4b335 100644 --- a/stdlib/source/poly/lux/abstract/equivalence.lux +++ b/stdlib/source/poly/lux/abstract/equivalence.lux @@ -10,11 +10,6 @@ ["." product] ["." bit] ["." maybe] - [number - ["." nat ("#\." decimal)] - ["." int] - ["." rev] - ["." frac]] ["." text ("#\." monoid) ["%" format (#+ format)]] [collection @@ -25,17 +20,23 @@ ["." set] ["." dictionary (#+ Dictionary)] ["." tree]]] + [macro + ["." code] + ["." poly (#+ poly:)] + [syntax (#+ syntax:) + ["." common]]] + [math + [number + ["." nat ("#\." decimal)] + ["." int] + ["." rev] + ["." frac]]] [time ["." duration] ["." date] ["." instant] ["." day] ["." month]] - [macro - ["." code] - ["." poly (#+ poly:)] - [syntax (#+ syntax:) - ["." common]]] ["." type ["." unit]]] {1 diff --git a/stdlib/source/poly/lux/abstract/functor.lux b/stdlib/source/poly/lux/abstract/functor.lux index 70f4f9b64..741a1b851 100644 --- a/stdlib/source/poly/lux/abstract/functor.lux +++ b/stdlib/source/poly/lux/abstract/functor.lux @@ -1,5 +1,6 @@ (.module: [lux #* + ["." type] [abstract [monad (#+ Monad do)]] [control @@ -8,8 +9,6 @@ ["s" code (#+ Parser)]]] [data ["." product] - [number - ["n" nat]] ["." text ["%" format (#+ format)]] [collection @@ -19,7 +18,9 @@ [syntax (#+ syntax:) ["." common]] ["." poly (#+ poly:)]] - ["." type]] + [math + [number + ["n" nat]]]] {1 ["." /]}) diff --git a/stdlib/source/poly/lux/data/format/json.lux b/stdlib/source/poly/lux/data/format/json.lux index 58784dccd..b6c14eb14 100644 --- a/stdlib/source/poly/lux/data/format/json.lux +++ b/stdlib/source/poly/lux/data/format/json.lux @@ -14,27 +14,28 @@ maybe ["." sum] ["." product] - [number - ["." i64] - ["n" nat ("#\." decimal)] - ["." int] - ["." frac ("#\." decimal)]] ["." text ("#\." equivalence) ["%" format (#+ format)]] [collection ["." list ("#\." fold monad)] ["." row (#+ Row row) ("#\." monad)] ["d" dictionary]]] + [macro + [syntax (#+ syntax:)] + ["." code] + ["." poly (#+ poly:)]] + [math + [number + ["." i64] + ["n" nat ("#\." decimal)] + ["." int] + ["." frac ("#\." decimal)]]] [time ## ["." instant] ## ["." duration] ["." date] ["." day] ["." month]] - [macro - [syntax (#+ syntax:)] - ["." code] - ["." poly (#+ poly:)]] ["." type ["." unit]]] {1 -- cgit v1.2.3