Extracted "phase" from under "lux/platform/compiler/default".

14 files changed, 42 insertions, 53 deletions

diff --git a/new-luxc/source/luxc/lang/host/jvm.lux b/new-luxc/source/luxc/lang/host/jvm.lux
index 49f02c0f0..656d07d21 100644
--- a/new-luxc/source/luxc/lang/host/jvm.lux
+++ b/new-luxc/source/luxc/lang/host/jvm.lux
@@ -12,8 +12,8 @@
    [host (#+ import:)]
    [world
     [binary (#+ Binary)]]
-   [compiler
-    [default
+   [platform
+    [compiler
      [reference (#+ Register)]
      [phase
       ["." translation]]]]])
diff --git a/new-luxc/source/luxc/lang/host/jvm/inst.lux b/new-luxc/source/luxc/lang/host/jvm/inst.lux
index 44ce0839a..9a26f8df0 100644
--- a/new-luxc/source/luxc/lang/host/jvm/inst.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/inst.lux
@@ -15,8 +15,8 @@
     ["." code]
     ["s" syntax (#+ syntax:)]]
    ["." function]
-   [compiler
-    [default
+   [platform
+    [compiler
      [phase (#+ Operation)]]]]
   ["." // (#+ Primitive Inst)
    ["." type]])
diff --git a/new-luxc/source/luxc/lang/translation/jvm.lux b/new-luxc/source/luxc/lang/translation/jvm.lux
index 3f9189f4f..47fbbefcf 100644
--- a/new-luxc/source/luxc/lang/translation/jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm.lux
@@ -20,10 +20,9 @@
     [binary (#+ Binary)]]
    [platform
     [compiler
-     [default
-      ["." name]
-      [phase
-       ["." translation]]]]]]
+     ["." name]
+     [phase
+      ["." translation]]]]]
   [///
    [host
     ["." jvm (#+ Inst Definition Host State)
diff --git a/new-luxc/source/luxc/lang/translation/jvm/case.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/case.jvm.lux
index 4b9feebb4..78ef508e8 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/case.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/case.jvm.lux
@@ -8,9 +8,8 @@
      format]]
    [platform
     [compiler
-     [default
-      ["." phase ("operation/." Monad<Operation>)
-       ["." synthesis (#+ Path Synthesis)]]]]]]
+     ["." phase ("operation/." Monad<Operation>)
+      ["." synthesis (#+ Path Synthesis)]]]]]
   [luxc
    [lang
     [host
diff --git a/new-luxc/source/luxc/lang/translation/jvm/common.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/common.jvm.lux
index 67721c736..f0b73ac23 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/common.jvm.lux
@@ -16,10 +16,9 @@
     [binary (#+ Binary)]]
    [platform
     [compiler
-     [default
-      ["." name]
-      [reference (#+ Register)]
-      ["." phase]]]]]
+     ["." name]
+     [reference (#+ Register)]
+     ["." phase]]]]
   ## [luxc
   ##  [lang
   ##   [host
diff --git a/new-luxc/source/luxc/lang/translation/jvm/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/expression.jvm.lux
index 60e873323..7af459900 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/expression.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/expression.jvm.lux
@@ -2,10 +2,9 @@
   [lux #*
    [platform
     [compiler
-     [default
-      [phase
-       ["." synthesis]
-       ["." extension]]]]]]
+     [phase
+      ["." synthesis]
+      ["." extension]]]]]
   [luxc
    [lang
     [host
diff --git a/new-luxc/source/luxc/lang/translation/jvm/function.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/function.jvm.lux
index 730d45641..8e5fe30b3 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/function.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/function.jvm.lux
@@ -9,12 +9,11 @@
      ["." list ("list/." Functor<List> Monoid<List>)]]]
    [platform
     [compiler
-     [default
-      ["_." reference (#+ Register Variable)]
-      ["." phase
-       [analysis (#+ Arity)]
-       [synthesis (#+ Synthesis Abstraction Apply)]
-       ["." translation]]]]]]
+     ["_." reference (#+ Register Variable)]
+     ["." phase
+      [analysis (#+ Arity)]
+      [synthesis (#+ Synthesis Abstraction Apply)]
+      ["." translation]]]]]
   [luxc
    [lang
     [host
diff --git a/new-luxc/source/luxc/lang/translation/jvm/loop.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/loop.jvm.lux
index ed40d498f..40f4decd9 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/loop.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/loop.jvm.lux
@@ -9,11 +9,10 @@
      ["." list ("list/." Functor<List> Monoid<List>)]]]
    [platform
     [compiler
-     [default
-      [reference (#+ Register)]
-      ["." phase
-       ["." synthesis (#+ Synthesis)]
-       ["." translation]]]]]]
+     [reference (#+ Register)]
+     ["." phase
+      ["." synthesis (#+ Synthesis)]
+      ["." translation]]]]]
   [luxc
    [lang
     [host
diff --git a/new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux
index 392de6354..7129a3887 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux
@@ -7,8 +7,7 @@
      format]]
    [platform
     [compiler
-     [default
-      [phase ("operation/." Monad<Operation>)]]]]]
+     [phase ("operation/." Monad<Operation>)]]]]
   [luxc
    [lang
     [host
diff --git a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux
index c1d8792d0..154dcbdcf 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux
@@ -15,11 +15,10 @@
     ["s" syntax (#+ syntax:)]]
    [platform
     [compiler
-     [default
-      ["." phase
-       [synthesis (#+ Synthesis)]
-       ["." extension
-        ["." bundle]]]]]]
+     ["." phase
+      [synthesis (#+ Synthesis)]
+      ["." extension
+       ["." bundle]]]]]
    [host (#+ import:)]]
   [luxc
    [lang
diff --git a/new-luxc/source/luxc/lang/translation/jvm/reference.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/reference.jvm.lux
index ec9facd2c..175338ba4 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/reference.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/reference.jvm.lux
@@ -7,11 +7,10 @@
      format]]
    [platform
     [compiler
-     [default
-      ["." name]
-      ["." reference (#+ Register Variable)]
-      ["." phase ("operation/." Monad<Operation>)
-       ["." translation]]]]]]
+     ["." name]
+     ["." reference (#+ Register Variable)]
+     ["." phase ("operation/." Monad<Operation>)
+      ["." translation]]]]]
   [luxc
    [lang
     [host
diff --git a/new-luxc/source/luxc/lang/translation/jvm/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/runtime.jvm.lux
index eaad9cced..a22ed2b07 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/runtime.jvm.lux
@@ -10,10 +10,9 @@
    ["." math]
    [platform
     [compiler
-     [default
-      ["." phase
-       [analysis (#+ Arity)]
-       ["." translation]]]]]]
+     ["." phase
+      [analysis (#+ Arity)]
+      ["." translation]]]]]
   [luxc
    [lang
     [host
diff --git a/new-luxc/source/luxc/lang/translation/jvm/structure.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/structure.jvm.lux
index f50788c58..9f69b1edd 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/structure.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/structure.jvm.lux
@@ -10,9 +10,8 @@
      ["." list]]]
    [platform
     [compiler
-     [default
-      ["." phase
-       [synthesis (#+ Synthesis)]]]]]]
+     ["." phase
+      [synthesis (#+ Synthesis)]]]]]
   [luxc
    [lang
     [host
diff --git a/new-luxc/source/program.lux b/new-luxc/source/program.lux
index f119d9174..4fa032f7f 100644
--- a/new-luxc/source/program.lux
+++ b/new-luxc/source/program.lux
@@ -20,13 +20,13 @@
       ["." archive]
       [io
        ["." context]]]
+     ["." phase
+      ["." translation]
+      ["." statement]]
      [default
       ["." platform (#+ Platform)]
       ["." init]
-      ["." syntax]
-      ["." phase
-       ["." translation]
-       ["." statement]]]]]
+      ["." syntax]]]]
    ## ["." interpreter]
    ]
   [luxc