Removed several unnecessary imports.

15 files changed, 8 insertions, 21 deletions

diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/function.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/function.lux
index b4c9ec016..2f362685d 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/function.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/function.lux
@@ -22,9 +22,7 @@
     [//
      ["/" analysis (#+ Analysis Operation Phase)]
      [///
-      ["#" phase]
-      [reference (#+)
-       [variable (#+)]]]]]])
+      ["#" phase]]]]])
 
 (exception: #export (cannot-analyse {expected Type} {function Text} {argument Text} {body Code})
   (ex.report ["Type" (%.type expected)]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/directive.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/directive.lux
index 7bcb4a39b..d06acc314 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/directive.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/directive.lux
@@ -19,7 +19,6 @@
     ["#." analysis
      ["#/." macro (#+ Expander)]]
     [///
-     [reference (#+)]
      ["//" phase]]]])
 
 (exception: #export (not-a-directive {code Code})
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 19cb9b946..78a128fe5 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
@@ -51,7 +51,6 @@
       ["#." analysis (#+ Analysis Operation Phase Handler Bundle)]
       ["#." synthesis]
       [///
-       [reference (#+)]
        ["." phase ("#\." monad)]
        [meta
         [archive (#+ Archive)
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
index c1418b2ce..03ec04853 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
@@ -63,7 +63,7 @@
      ["#." generation]
      [///
       ["#" phase]
-      [reference (#+)
+      [reference
        ["#." variable (#+ Variable)]]
       [meta
        ["." archive (#+ Archive)]]]]]])
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common-lisp.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common-lisp.lux
index 43d449402..f3afe14a6 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common-lisp.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common-lisp.lux
@@ -13,7 +13,6 @@
    ["." ///
     ["." extension]
     [//
-     [analysis (#+)]
      ["." synthesis]]]])
 
 (def: #export (generate synthesis)
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js.lux
index 8477134a0..b2ede6b94 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js.lux
@@ -19,7 +19,6 @@
     ["/#" // #_
      ["." extension]
      ["/#" // #_
-      [analysis (#+)]
       ["." synthesis]
       ["//#" /// #_
        ["#." phase ("#\." monad)]]]]]])
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm.lux
index 47ad3ca78..bb908e4c9 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm.lux
@@ -13,7 +13,6 @@
    ["//#" /// #_
     ["#." extension]
     [//
-     [analysis (#+)]
      ["." synthesis]
      [///
       ["." reference]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua.lux
index f28998159..31ede85d1 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua.lux
@@ -13,7 +13,6 @@
    ["//#" /// #_
     ["#." extension]
     ["/#" // #_
-     [analysis (#+)]
      ["." synthesis]
      ["//#" /// #_
       ["#." phase ("#\." monad)]]]]])
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php.lux
index 43d449402..f3afe14a6 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php.lux
@@ -13,7 +13,6 @@
    ["." ///
     ["." extension]
     [//
-     [analysis (#+)]
      ["." synthesis]]]])
 
 (def: #export (generate synthesis)
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python.lux
index defe15b33..d7e02b980 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python.lux
@@ -13,7 +13,6 @@
    ["//#" /// #_
     ["#." extension]
     ["/#" // #_
-     [analysis (#+)]
      ["#." synthesis]
      ["//#" /// #_
       ["#." phase ("#\." monad)]]]]])
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby.lux
index defe15b33..d7e02b980 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby.lux
@@ -13,7 +13,6 @@
    ["//#" /// #_
     ["#." extension]
     ["/#" // #_
-     [analysis (#+)]
      ["#." synthesis]
      ["//#" /// #_
       ["#." phase ("#\." monad)]]]]])
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme.lux
index e7f50ee82..a6e03cfd4 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme.lux
@@ -13,7 +13,6 @@
    ["." ///
     ["." extension]
     [//
-     [analysis (#+)]
      ["." synthesis]]]])
 
 (def: #export (generate synthesis)
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis.lux
index e4d72cb92..278f819ce 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis.lux
@@ -20,8 +20,6 @@
      ["#." analysis (#+ Analysis)]
      ["/" synthesis (#+ Synthesis Phase)]
      [///
-      [reference (#+)
-       [variable (#+)]]
       ["." phase ("#\." monad)]]]]])
 
 (def: (primitive analysis)
diff --git a/stdlib/source/lux/tool/compiler/language/lux/synthesis.lux b/stdlib/source/lux/tool/compiler/language/lux/synthesis.lux
index 5b631ab1b..36dd33b23 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/synthesis.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/synthesis.lux
@@ -2,8 +2,8 @@
   [lux (#- i64 Scope)
    [abstract
     [monad (#+ do)]
-    [hash (#+ Hash)]
-    ["." equivalence (#+ Equivalence)]]
+    [equivalence (#+ Equivalence)]
+    [hash (#+ Hash)]]
    [control
     [pipe (#+ case>)]
     ["." exception (#+ exception:)]]
@@ -500,7 +500,7 @@
       (^template [<tag> <equivalence>]
         [[(<tag> reference-cons)
           (<tag> sample-cons)]
-         (\ (list.equivalence (equivalence.product <equivalence> =)) =
+         (\ (list.equivalence (product.equivalence <equivalence> =)) =
             (#.Cons reference-cons)
             (#.Cons sample-cons))])
       ([#I64-Fork i64.equivalence]
diff --git a/stdlib/source/lux/tool/compiler/meta/archive/signature.lux b/stdlib/source/lux/tool/compiler/meta/archive/signature.lux
index 95bfc166b..e4e1be377 100644
--- a/stdlib/source/lux/tool/compiler/meta/archive/signature.lux
+++ b/stdlib/source/lux/tool/compiler/meta/archive/signature.lux
@@ -1,11 +1,12 @@
 (.module:
   [lux #*
    [abstract
-    ["." equivalence (#+ Equivalence)]]
+    [equivalence (#+ Equivalence)]]
    [control
     ["<>" parser
      ["<b>" binary (#+ Parser)]]]
    [data
+    ["." product]
     ["." name]
     ["." text
      ["%" format (#+ format)]]
@@ -22,7 +23,7 @@
 
 (def: #export equivalence
   (Equivalence Signature)
-  (equivalence.product name.equivalence nat.equivalence))
+  (product.equivalence name.equivalence nat.equivalence))
 
 (def: #export (description signature)
   (-> Signature Text)