Unified repository abstraction for Aedifex.

16 files changed, 71 insertions, 58 deletions

diff --git a/stdlib/source/lux/tool/compiler/language/lux/analysis/evaluation.lux b/stdlib/source/lux/tool/compiler/language/lux/analysis/evaluation.lux
index 19dada86b..521c88a23 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/analysis/evaluation.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/analysis/evaluation.lux
@@ -1,15 +1,13 @@
 (.module:
   [lux (#- Module)
+   ["." meta]
    [abstract
     [monad (#+ do)]]
    [control
     ["." try]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]
+   [math
     [number
-     ["n" nat]]]
-   ["." meta]]
+     ["n" nat]]]]
   [// (#+ Operation)
    [macro (#+ Expander)]
    [//
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case.lux
index dec7625fa..f48155088 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case.lux
@@ -1,5 +1,6 @@
 (.module:
   [lux (#- case)
+   ["." meta]
    [abstract
     ["." monad (#+ do)]]
    [control
@@ -8,17 +9,17 @@
    [data
     ["." product]
     ["." maybe]
-    [number
-     ["n" nat]]
     [text
      ["%" format (#+ format)]]
     [collection
      ["." list ("#\." fold monoid functor)]]]
-   ["." type
-    ["." check]]
-   ["." meta]
+   [math
+    [number
+     ["n" nat]]]
    [macro
-    ["." code]]]
+    ["." code]]
+   ["." type
+    ["." check]]]
   ["." / #_
    ["#." coverage (#+ Coverage)]
    ["/#" // #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux
index 82f23b0f6..af5a12c37 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux
@@ -9,13 +9,14 @@
    [data
     ["." bit ("#\." equivalence)]
     ["." maybe]
-    [number
-     ["n" nat]]
     ["." text
      ["%" format (#+ Format format)]]
     [collection
      ["." list ("#\." functor fold)]
-     ["." dictionary (#+ Dictionary)]]]]
+     ["." dictionary (#+ Dictionary)]]]
+   [math
+    [number
+     ["n" nat]]]]
   ["." //// #_
    [//
     ["/" analysis (#+ Pattern Variant Operation)]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/inference.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/inference.lux
index 552216119..31a5cb912 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/inference.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/inference.lux
@@ -6,12 +6,13 @@
     ["." exception (#+ exception:)]]
    [data
     ["." maybe]
-    [number
-     ["n" nat]]
     ["." text
      ["%" format (#+ format)]]
     [collection
      ["." list ("#\." functor)]]]
+   [math
+    [number
+     ["n" nat]]]
    ["." type
     ["." check]]
    ["." meta]]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/structure.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/structure.lux
index fb5df2084..dadc61c2d 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/structure.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/structure.lux
@@ -1,5 +1,6 @@
 (.module:
   [lux #*
+   ["." meta]
    [abstract
     ["." monad (#+ do)]]
    [control
@@ -9,18 +10,18 @@
     ["." name]
     ["." product]
     ["." maybe]
-    [number
-     ["n" nat]]
     [text
      ["%" format (#+ format)]]
     [collection
      ["." list ("#\." functor)]
      ["." dictionary (#+ Dictionary)]]]
-   ["." type
-    ["." check]]
-   ["." meta]
    [macro
-    ["." code]]]
+    ["." code]]
+   [math
+    [number
+     ["n" nat]]]
+   ["." type
+    ["." check]]]
   ["." // #_
    ["#." type]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
index 8a4ef09d5..fe753e2cc 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
@@ -14,16 +14,15 @@
    [data
     ["." maybe]
     ["." product]
-    [number
-     ["n" nat]]
     ["." text ("#\." equivalence)
      ["%" format (#+ format)]]
     [collection
      ["." list ("#\." fold monad monoid)]
      ["." array]
      ["." dictionary (#+ Dictionary)]]]
-   ["." type
-    ["." check (#+ Check) ("#\." monad)]]
+   [math
+    [number
+     ["n" nat]]]
    [target
     ["." jvm #_
      [".!" reflection]
@@ -37,7 +36,9 @@
       ["." signature]
       ["#_." parser]
       ["#_." alias (#+ Aliasing)]
-      [".T" lux (#+ Mapping)]]]]]
+      [".T" lux (#+ Mapping)]]]]
+   ["." type
+    ["." check (#+ Check) ("#\." monad)]]]
   ["." // #_
    ["#." lux (#+ custom)]
    ["/#" //
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
index a76bfcc60..0d18884cb 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
@@ -10,13 +10,14 @@
      ["<c>" code (#+ Parser)]]]
    [data
     ["." maybe]
-    [number
-     ["n" nat]]
     ["." text
      ["%" format (#+ format)]]
     [collection
      ["." list ("#\." functor)]
      ["." dictionary (#+ Dictionary)]]]
+   [math
+    [number
+     ["n" nat]]]
    [type
     ["." check]]
    ["." meta]]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux
index 2837d6620..a00fe5273 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux
@@ -10,18 +10,17 @@
      ["<t>" text]]]
    [data
     ["." product]
-    [number
-     ["." i32]]
     [text
      ["%" format (#+ format)]]
     [collection
      ["." list ("#\." functor fold)]
      ["." dictionary]
      ["." row]]]
-   [type
-    ["." check (#+ Check)]]
    [macro
     ["." template]]
+   [math
+    [number
+     ["." i32]]]
    [target
     [jvm
      ["_" bytecode (#+ Bytecode)]
@@ -57,7 +56,9 @@
        [analysis
         ["." jvm]]
        [directive
-        ["/" lux]]]]]]])
+        ["/" lux]]]]]]
+   [type
+    ["." check (#+ Check)]]])
 
 (type: Operation
   (directive.Operation Anchor (Bytecode Any) Definition))
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
index 76c9554b7..4b84727aa 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
@@ -1,5 +1,6 @@
 (.module:
   [lux #*
+   ["." meta]
    [abstract
     ["." monad (#+ do)]]
    [control
@@ -14,12 +15,12 @@
     ["." text
      ["%" format (#+ format)]]
     [collection
-     ["." dictionary]]
-    [number
-     ["n" nat]]]
-   ["." meta]
+     ["." dictionary]]]
    [macro
     ["." code]]
+   [math
+    [number
+     ["n" nat]]]
    ["." type (#+ :share)
     ["." check]]]
   ["." /// (#+ Extender)
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux
index 51f647d94..cc86b7df2 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux
@@ -7,10 +7,6 @@
     ["." try]]
    [data
     [binary (#+ Binary)]
-    [number
-     ["." i32]
-     ["." i64]
-     ["n" nat]]
     [collection
      ["." list ("#\." functor)]
      ["." row]]
@@ -18,6 +14,11 @@
      ["#" binary]]
     [text
      ["%" format (#+ format)]]]
+   [math
+    [number
+     ["n" nat]
+     ["." i32]
+     ["." i64]]]
    [target
     ["." jvm #_
      ["_" bytecode (#+ Label Bytecode)]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/case.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/case.lux
index 057302ef7..f0bd340b1 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/case.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/case.lux
@@ -9,13 +9,14 @@
     ["." product]
     ["." bit ("#\." equivalence)]
     ["." text ("#\." equivalence)]
+    [collection
+     ["." list ("#\." functor fold monoid)]
+     ["." set (#+ Set)]]]
+   [math
     [number
      ["." i64]
      ["n" nat]
-     ["." frac ("#\." equivalence)]]
-    [collection
-     ["." list ("#\." functor fold monoid)]
-     ["." set (#+ Set)]]]]
+     ["." frac ("#\." equivalence)]]]]
   ["." /// #_
    [//
     ["#." analysis (#+ Pattern Match Analysis)]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/function.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/function.lux
index bc6aee080..d3558e9c4 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/function.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/function.lux
@@ -10,10 +10,11 @@
     ["." maybe ("#\." functor)]
     ["." text
      ["%" format (#+ format)]]
-    [number
-     ["n" nat]]
     [collection
-     ["." list ("#\." functor monoid fold)]]]]
+     ["." list ("#\." functor monoid fold)]]]
+   [math
+    [number
+     ["n" nat]]]]
   ["." // #_
    ["#." loop (#+ Transform)]
    ["//#" /// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/loop.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/loop.lux
index 0cd95f100..e0fbf816c 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/loop.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/loop.lux
@@ -4,10 +4,11 @@
     ["." monad (#+ do)]]
    [data
     ["." maybe ("#\." monad)]
-    [number
-     ["n" nat]]
     [collection
-     ["." list]]]]
+     ["." list]]]
+   [math
+    [number
+     ["n" nat]]]]
   [////
    ["." analysis (#+ Environment)]
    ["/" synthesis (#+ Path Abstraction Synthesis)]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/variable.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
index 31693f4a0..68e12745d 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
@@ -8,14 +8,15 @@
    [data
     ["." product]
     ["." maybe ("#\." functor)]
-    [number
-     ["n" nat]]
     ["." text
      ["%" format]]
     [collection
      ["." dictionary (#+ Dictionary)]
      ["." list ("#\." functor fold)]
-     ["." set]]]]
+     ["." set]]]
+   [math
+    [number
+     ["n" nat]]]]
   [////
    ["/" synthesis (#+ Path Synthesis)]
    ["." analysis]
diff --git a/stdlib/source/lux/tool/compiler/meta/io/archive.lux b/stdlib/source/lux/tool/compiler/meta/io/archive.lux
index 0b2db4346..a755d2bec 100644
--- a/stdlib/source/lux/tool/compiler/meta/io/archive.lux
+++ b/stdlib/source/lux/tool/compiler/meta/io/archive.lux
@@ -22,7 +22,8 @@
      ["." list ("#\." functor fold)]
      ["." dictionary (#+ Dictionary)]
      ["." row (#+ Row)]
-     ["." set]]
+     ["." set]]]
+   [math
     [number
      ["n" nat]]]
    [world
diff --git a/stdlib/source/lux/tool/compiler/meta/packager/jvm.lux b/stdlib/source/lux/tool/compiler/meta/packager/jvm.lux
index 61fb97ddf..d92d1e686 100644
--- a/stdlib/source/lux/tool/compiler/meta/packager/jvm.lux
+++ b/stdlib/source/lux/tool/compiler/meta/packager/jvm.lux
@@ -14,11 +14,12 @@
     ["." binary (#+ Binary)]
     ["." text
      ["%" format (#+ format)]]
-    [number
-     ["n" nat]]
     [collection
      ["." row (#+ Row)]
      ["." list ("#\." functor)]]]
+   [math
+    [number
+     ["n" nat]]]
    [target
     [jvm
      [encoding