47 files changed, 31 insertions, 29 deletions
diff --git a/stdlib/source/lux/platform/compiler/default/evaluation.lux b/stdlib/source/lux/platform/compiler/default/evaluation.lux
index ea76624df..157596e84 100644
--- a/stdlib/source/lux/platform/compiler/default/evaluation.lux
+++ b/stdlib/source/lux/platform/compiler/default/evaluation.lux
@@ -6,7 +6,7 @@
     ["." error]
     [text
      format]]]
-  [//
+  [///
    ["." phase
     [analysis (#+ Operation)
      [".A" expression]
diff --git a/stdlib/source/lux/platform/compiler/default/init.lux b/stdlib/source/lux/platform/compiler/default/init.lux
index c50d37705..699ddfb54 100644
--- a/stdlib/source/lux/platform/compiler/default/init.lux
+++ b/stdlib/source/lux/platform/compiler/default/init.lux
@@ -15,21 +15,21 @@
   ["." //
    ["." syntax (#+ Aliases)]
    ["." evaluation]
-   ["." phase
-    ["." analysis
-     ["." module]
-     [".A" expression]]
-    ["." synthesis
-     [".S" expression]]
-    ["." translation]
-    ["." statement
-     [".S" total]]
-    ["." extension
-     [".E" analysis]
-     [".E" synthesis]
-     [".E" statement]]]
    ["/." // (#+ Compiler)
     ["." host]
+    ["." phase
+     ["." analysis
+      ["." module]
+      [".A" expression]]
+     ["." synthesis
+      [".S" expression]]
+     ["." translation]
+     ["." statement
+      [".S" total]]
+     ["." extension
+      [".E" analysis]
+      [".E" synthesis]
+      [".E" statement]]]
     [meta
      [archive
       ["." signature]
diff --git a/stdlib/source/lux/platform/compiler/default/platform.lux b/stdlib/source/lux/platform/compiler/default/platform.lux
index e5d881833..9a169fb15 100644
--- a/stdlib/source/lux/platform/compiler/default/platform.lux
+++ b/stdlib/source/lux/platform/compiler/default/platform.lux
@@ -10,10 +10,10 @@
   [//
    ["." init]
    ["." syntax]
-   ["." phase
-    ["." translation]
-    ["." statement]]
    ["/." //
+    ["." phase
+     ["." translation]
+     ["." statement]]
     ["." cli (#+ Configuration)]
     [meta
      ["." archive]
diff --git a/stdlib/source/lux/platform/compiler/default/name.lux b/stdlib/source/lux/platform/compiler/name.lux
index 184b2cab5..184b2cab5 100644
--- a/stdlib/source/lux/platform/compiler/default/name.lux
+++ b/stdlib/source/lux/platform/compiler/name.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase.lux b/stdlib/source/lux/platform/compiler/phase.lux
index a81d5dfa7..a81d5dfa7 100644
--- a/stdlib/source/lux/platform/compiler/default/phase.lux
+++ b/stdlib/source/lux/platform/compiler/phase.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/analysis.lux b/stdlib/source/lux/platform/compiler/phase/analysis.lux
index c69ff8eb2..c69ff8eb2 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/analysis.lux
+++ b/stdlib/source/lux/platform/compiler/phase/analysis.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/analysis/case.lux b/stdlib/source/lux/platform/compiler/phase/analysis/case.lux
index 5044aed92..5044aed92 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/analysis/case.lux
+++ b/stdlib/source/lux/platform/compiler/phase/analysis/case.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/analysis/case/coverage.lux b/stdlib/source/lux/platform/compiler/phase/analysis/case/coverage.lux
index aff981e09..aff981e09 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/analysis/case/coverage.lux
+++ b/stdlib/source/lux/platform/compiler/phase/analysis/case/coverage.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/analysis/expression.lux b/stdlib/source/lux/platform/compiler/phase/analysis/expression.lux
index 1da6520a5..1da6520a5 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/analysis/expression.lux
+++ b/stdlib/source/lux/platform/compiler/phase/analysis/expression.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/analysis/function.lux b/stdlib/source/lux/platform/compiler/phase/analysis/function.lux
index a996457d9..a996457d9 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/analysis/function.lux
+++ b/stdlib/source/lux/platform/compiler/phase/analysis/function.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/analysis/inference.lux b/stdlib/source/lux/platform/compiler/phase/analysis/inference.lux
index 010bdc437..010bdc437 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/analysis/inference.lux
+++ b/stdlib/source/lux/platform/compiler/phase/analysis/inference.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/analysis/macro.lux b/stdlib/source/lux/platform/compiler/phase/analysis/macro.lux
index af12c747d..af12c747d 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/analysis/macro.lux
+++ b/stdlib/source/lux/platform/compiler/phase/analysis/macro.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/analysis/module.lux b/stdlib/source/lux/platform/compiler/phase/analysis/module.lux
index a8f6bda03..a8f6bda03 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/analysis/module.lux
+++ b/stdlib/source/lux/platform/compiler/phase/analysis/module.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/analysis/primitive.lux b/stdlib/source/lux/platform/compiler/phase/analysis/primitive.lux
index bd42825d3..bd42825d3 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/analysis/primitive.lux
+++ b/stdlib/source/lux/platform/compiler/phase/analysis/primitive.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/analysis/reference.lux b/stdlib/source/lux/platform/compiler/phase/analysis/reference.lux
index 30da3e60f..30da3e60f 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/analysis/reference.lux
+++ b/stdlib/source/lux/platform/compiler/phase/analysis/reference.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/analysis/scope.lux b/stdlib/source/lux/platform/compiler/phase/analysis/scope.lux
index 2849e059d..2849e059d 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/analysis/scope.lux
+++ b/stdlib/source/lux/platform/compiler/phase/analysis/scope.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/analysis/structure.lux b/stdlib/source/lux/platform/compiler/phase/analysis/structure.lux
index 43cb8e0d2..43cb8e0d2 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/analysis/structure.lux
+++ b/stdlib/source/lux/platform/compiler/phase/analysis/structure.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/analysis/type.lux b/stdlib/source/lux/platform/compiler/phase/analysis/type.lux
index 36fee29f8..36fee29f8 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/analysis/type.lux
+++ b/stdlib/source/lux/platform/compiler/phase/analysis/type.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/extension.lux b/stdlib/source/lux/platform/compiler/phase/extension.lux
index 75814ad24..75814ad24 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/extension.lux
+++ b/stdlib/source/lux/platform/compiler/phase/extension.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/extension/analysis.lux b/stdlib/source/lux/platform/compiler/phase/extension/analysis.lux
index cc4736ac0..3b31f3d46 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/extension/analysis.lux
+++ b/stdlib/source/lux/platform/compiler/phase/extension/analysis.lux
@@ -6,7 +6,8 @@
   [///
    [analysis (#+ Bundle)]
    [//
-    [evaluation (#+ Eval)]]]
+    [default
+     [evaluation (#+ Eval)]]]]
   [/
    ["." common]
    ["." host]])
diff --git a/stdlib/source/lux/platform/compiler/default/phase/extension/analysis/common.lux b/stdlib/source/lux/platform/compiler/phase/extension/analysis/common.lux
index d599af130..73f0d6c9d 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/extension/analysis/common.lux
+++ b/stdlib/source/lux/platform/compiler/phase/extension/analysis/common.lux
@@ -20,7 +20,8 @@
      [".A" case]
      [".A" function]]
     [//
-     [evaluation (#+ Eval)]]]])
+     [default
+      [evaluation (#+ Eval)]]]]])
 
 ## [Utils]
 (def: (simple inputsT+ outputT)
diff --git a/stdlib/source/lux/platform/compiler/default/phase/extension/analysis/host.jvm.lux b/stdlib/source/lux/platform/compiler/phase/extension/analysis/host.jvm.lux
index a494b0e44..a494b0e44 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/extension/analysis/host.jvm.lux
+++ b/stdlib/source/lux/platform/compiler/phase/extension/analysis/host.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/extension/bundle.lux b/stdlib/source/lux/platform/compiler/phase/extension/bundle.lux
index 582526694..582526694 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/extension/bundle.lux
+++ b/stdlib/source/lux/platform/compiler/phase/extension/bundle.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/extension/statement.lux b/stdlib/source/lux/platform/compiler/phase/extension/statement.lux
index e5963e96c..e5963e96c 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/extension/statement.lux
+++ b/stdlib/source/lux/platform/compiler/phase/extension/statement.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/extension/synthesis.lux b/stdlib/source/lux/platform/compiler/phase/extension/synthesis.lux
index 1a2e44f6f..1a2e44f6f 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/extension/synthesis.lux
+++ b/stdlib/source/lux/platform/compiler/phase/extension/synthesis.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/extension/translation.lux b/stdlib/source/lux/platform/compiler/phase/extension/translation.lux
index 232c8c168..232c8c168 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/extension/translation.lux
+++ b/stdlib/source/lux/platform/compiler/phase/extension/translation.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/statement.lux b/stdlib/source/lux/platform/compiler/phase/statement.lux
index c7ff3719f..c7ff3719f 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/statement.lux
+++ b/stdlib/source/lux/platform/compiler/phase/statement.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/statement/total.lux b/stdlib/source/lux/platform/compiler/phase/statement/total.lux
index 15f116aa1..15f116aa1 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/statement/total.lux
+++ b/stdlib/source/lux/platform/compiler/phase/statement/total.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/synthesis.lux b/stdlib/source/lux/platform/compiler/phase/synthesis.lux
index cf29ad74b..cf29ad74b 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/synthesis.lux
+++ b/stdlib/source/lux/platform/compiler/phase/synthesis.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/synthesis/case.lux b/stdlib/source/lux/platform/compiler/phase/synthesis/case.lux
index e9e941a30..e9e941a30 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/synthesis/case.lux
+++ b/stdlib/source/lux/platform/compiler/phase/synthesis/case.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/synthesis/expression.lux b/stdlib/source/lux/platform/compiler/phase/synthesis/expression.lux
index 0d15ae463..0d15ae463 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/synthesis/expression.lux
+++ b/stdlib/source/lux/platform/compiler/phase/synthesis/expression.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/synthesis/function.lux b/stdlib/source/lux/platform/compiler/phase/synthesis/function.lux
index 267d941fc..267d941fc 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/synthesis/function.lux
+++ b/stdlib/source/lux/platform/compiler/phase/synthesis/function.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/synthesis/loop.lux b/stdlib/source/lux/platform/compiler/phase/synthesis/loop.lux
index cd57c1d29..cd57c1d29 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/synthesis/loop.lux
+++ b/stdlib/source/lux/platform/compiler/phase/synthesis/loop.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/translation.lux b/stdlib/source/lux/platform/compiler/phase/translation.lux
index fb40f4652..fb40f4652 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/translation.lux
+++ b/stdlib/source/lux/platform/compiler/phase/translation.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/case.jvm.lux b/stdlib/source/lux/platform/compiler/phase/translation/scheme/case.jvm.lux
index 4a963d507..4a963d507 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/case.jvm.lux
+++ b/stdlib/source/lux/platform/compiler/phase/translation/scheme/case.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/expression.jvm.lux b/stdlib/source/lux/platform/compiler/phase/translation/scheme/expression.jvm.lux
index 53d7bbbcb..53d7bbbcb 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/expression.jvm.lux
+++ b/stdlib/source/lux/platform/compiler/phase/translation/scheme/expression.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/extension.jvm.lux b/stdlib/source/lux/platform/compiler/phase/translation/scheme/extension.jvm.lux
index a40b4953f..a40b4953f 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/extension.jvm.lux
+++ b/stdlib/source/lux/platform/compiler/phase/translation/scheme/extension.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/extension/common.jvm.lux b/stdlib/source/lux/platform/compiler/phase/translation/scheme/extension/common.jvm.lux
index a503949dd..a503949dd 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/extension/common.jvm.lux
+++ b/stdlib/source/lux/platform/compiler/phase/translation/scheme/extension/common.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/extension/host.jvm.lux b/stdlib/source/lux/platform/compiler/phase/translation/scheme/extension/host.jvm.lux
index b8b2b7612..b8b2b7612 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/extension/host.jvm.lux
+++ b/stdlib/source/lux/platform/compiler/phase/translation/scheme/extension/host.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/function.jvm.lux b/stdlib/source/lux/platform/compiler/phase/translation/scheme/function.jvm.lux
index 7eeb5a8ed..7eeb5a8ed 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/function.jvm.lux
+++ b/stdlib/source/lux/platform/compiler/phase/translation/scheme/function.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/loop.jvm.lux b/stdlib/source/lux/platform/compiler/phase/translation/scheme/loop.jvm.lux
index 91757d291..91757d291 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/loop.jvm.lux
+++ b/stdlib/source/lux/platform/compiler/phase/translation/scheme/loop.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/primitive.jvm.lux b/stdlib/source/lux/platform/compiler/phase/translation/scheme/primitive.jvm.lux
index c16c696c4..c16c696c4 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/primitive.jvm.lux
+++ b/stdlib/source/lux/platform/compiler/phase/translation/scheme/primitive.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/reference.jvm.lux b/stdlib/source/lux/platform/compiler/phase/translation/scheme/reference.jvm.lux
index 6d4088189..6d4088189 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/reference.jvm.lux
+++ b/stdlib/source/lux/platform/compiler/phase/translation/scheme/reference.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/runtime.jvm.lux b/stdlib/source/lux/platform/compiler/phase/translation/scheme/runtime.jvm.lux
index 43748c3b1..43748c3b1 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/runtime.jvm.lux
+++ b/stdlib/source/lux/platform/compiler/phase/translation/scheme/runtime.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/structure.jvm.lux b/stdlib/source/lux/platform/compiler/phase/translation/scheme/structure.jvm.lux
index 3991ea281..3991ea281 100644
--- a/stdlib/source/lux/platform/compiler/default/phase/translation/scheme/structure.jvm.lux
+++ b/stdlib/source/lux/platform/compiler/phase/translation/scheme/structure.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/default/reference.lux b/stdlib/source/lux/platform/compiler/reference.lux
index b945c1327..b945c1327 100644
--- a/stdlib/source/lux/platform/compiler/default/reference.lux
+++ b/stdlib/source/lux/platform/compiler/reference.lux
diff --git a/stdlib/source/lux/platform/interpreter.lux b/stdlib/source/lux/platform/interpreter.lux
index 8a6d00578..b73f72bc6 100644
--- a/stdlib/source/lux/platform/interpreter.lux
+++ b/stdlib/source/lux/platform/interpreter.lux
@@ -10,19 +10,19 @@
    [type (#+ :share)
     ["." check]]
    [compiler
-    ["." cli (#+ Configuration)]
+    ["." phase
+     ["." analysis
+      ["." module]
+      ["." type]]
+     ["." translation]
+     ["." statement (#+ State+ Operation)
+      ["." total]]
+     ["." extension]]
     ["." default
      ["." syntax]
      ["." platform (#+ Platform)]
-     ["." init]
-     ["." phase
-      ["." analysis
-       ["." module]
-       ["." type]]
-      ["." translation]
-      ["." statement (#+ State+ Operation)
-       ["." total]]
-      ["." extension]]]]
+     ["." init]]
+    ["." cli (#+ Configuration)]]
    [world
     ["." file (#+ File)]
     ["." console (#+ Console)]]]