From 5de8734377870637a7757f5aedd13d19cc3c82bb Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Mon, 29 Oct 2018 21:15:30 -0400
Subject: Nested the compiler and the interpreter under the lux/platform/*
 path.

---
 new-luxc/source/luxc/lang/translation/jvm.lux      | 11 +++++----
 .../source/luxc/lang/translation/jvm/case.jvm.lux  |  9 ++++----
 .../luxc/lang/translation/jvm/common.jvm.lux       | 11 +++++----
 .../luxc/lang/translation/jvm/expression.jvm.lux   | 11 +++++----
 .../luxc/lang/translation/jvm/function.jvm.lux     | 15 ++++++------
 .../source/luxc/lang/translation/jvm/loop.jvm.lux  | 13 ++++++-----
 .../luxc/lang/translation/jvm/primitive.jvm.lux    |  7 +++---
 .../lang/translation/jvm/procedure/common.jvm.lux  | 13 ++++++-----
 .../luxc/lang/translation/jvm/reference.jvm.lux    | 13 ++++++-----
 .../luxc/lang/translation/jvm/runtime.jvm.lux      | 11 +++++----
 .../luxc/lang/translation/jvm/structure.jvm.lux    |  9 ++++----
 new-luxc/source/program.lux                        | 27 +++++++++++-----------
 12 files changed, 81 insertions(+), 69 deletions(-)

(limited to 'new-luxc')

diff --git a/new-luxc/source/luxc/lang/translation/jvm.lux b/new-luxc/source/luxc/lang/translation/jvm.lux
index 560994256..3f9189f4f 100644
--- a/new-luxc/source/luxc/lang/translation/jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm.lux
@@ -18,11 +18,12 @@
    ["." io (#+ IO io)]
    [world
     [binary (#+ Binary)]]
-   [compiler
-    [default
-     ["." name]
-     [phase
-      ["." translation]]]]]
+   [platform
+    [compiler
+     [default
+      ["." 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 ac7ab3b83..4b9feebb4 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/case.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/case.jvm.lux
@@ -6,10 +6,11 @@
    [data
     [text
      format]]
-   [compiler
-    [default
-     ["." phase ("operation/." Monad<Operation>)
-      ["." synthesis (#+ Path Synthesis)]]]]]
+   [platform
+    [compiler
+     [default
+      ["." 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 34e7f02c8..67721c736 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/common.jvm.lux
@@ -14,11 +14,12 @@
    [host (#+ import:)]
    [world
     [binary (#+ Binary)]]
-   [compiler
-    [default
-     ["." name]
-     [reference (#+ Register)]
-     ["." phase]]]]
+   [platform
+    [compiler
+     [default
+      ["." 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 9579acaa3..60e873323 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/expression.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/expression.jvm.lux
@@ -1,10 +1,11 @@
 (.module:
   [lux #*
-   [compiler
-    [default
-     [phase
-      ["." synthesis]
-      ["." extension]]]]]
+   [platform
+    [compiler
+     [default
+      [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 4e2b71f39..730d45641 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/function.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/function.jvm.lux
@@ -7,13 +7,14 @@
      format]
     [collection
      ["." list ("list/." Functor<List> Monoid<List>)]]]
-   [compiler
-    [default
-     ["_." reference (#+ Register Variable)]
-     ["." phase
-      [analysis (#+ Arity)]
-      [synthesis (#+ Synthesis Abstraction Apply)]
-      ["." translation]]]]]
+   [platform
+    [compiler
+     [default
+      ["_." 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 20be62066..ed40d498f 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/loop.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/loop.jvm.lux
@@ -7,12 +7,13 @@
      format]
     [collection
      ["." list ("list/." Functor<List> Monoid<List>)]]]
-   [compiler
-    [default
-     [reference (#+ Register)]
-     ["." phase
-      ["." synthesis (#+ Synthesis)]
-      ["." translation]]]]]
+   [platform
+    [compiler
+     [default
+      [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 c46d4d495..392de6354 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux
@@ -5,9 +5,10 @@
    [data
     [text
      format]]
-   [compiler
-    [default
-     [phase ("operation/." Monad<Operation>)]]]]
+   [platform
+    [compiler
+     [default
+      [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 e439ecdd6..c1d8792d0 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
@@ -13,12 +13,13 @@
    ["." macro (#+ with-gensyms)
     ["." code]
     ["s" syntax (#+ syntax:)]]
-   [compiler
-    [default
-     ["." phase
-      [synthesis (#+ Synthesis)]
-      ["." extension
-       ["." bundle]]]]]
+   [platform
+    [compiler
+     [default
+      ["." 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 9d1d8134f..ec9facd2c 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/reference.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/reference.jvm.lux
@@ -5,12 +5,13 @@
    [data
     [text
      format]]
-   [compiler
-    [default
-     ["." name]
-     ["." reference (#+ Register Variable)]
-     ["." phase ("operation/." Monad<Operation>)
-      ["." translation]]]]]
+   [platform
+    [compiler
+     [default
+      ["." 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 05641fe22..eaad9cced 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/runtime.jvm.lux
@@ -8,11 +8,12 @@
     [collection
      ["." list ("list/." Functor<List>)]]]
    ["." math]
-   [compiler
-    [default
-     ["." phase
-      [analysis (#+ Arity)]
-      ["." translation]]]]]
+   [platform
+    [compiler
+     [default
+      ["." 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 f937d5bdb..f50788c58 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/structure.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/structure.jvm.lux
@@ -8,10 +8,11 @@
      format]
     [collection
      ["." list]]]
-   [compiler
-    [default
-     ["." phase
-      [synthesis (#+ Synthesis)]]]]]
+   [platform
+    [compiler
+     [default
+      ["." phase
+       [synthesis (#+ Synthesis)]]]]]]
   [luxc
    [lang
     [host
diff --git a/new-luxc/source/program.lux b/new-luxc/source/program.lux
index 0362d14b0..f119d9174 100644
--- a/new-luxc/source/program.lux
+++ b/new-luxc/source/program.lux
@@ -13,19 +13,20 @@
    [world
     ["." file (#+ File)]
     ["." console]]
-   ["." compiler
-    ["." cli (#+ Configuration)]
-    [meta
-     ["." archive]
-     [io
-      ["." context]]]
-    [default
-     ["." platform (#+ Platform)]
-     ["." init]
-     ["." syntax]
-     ["." phase
-      ["." translation]
-      ["." statement]]]]
+   [platform
+    ["." compiler
+     ["." cli (#+ Configuration)]
+     [meta
+      ["." archive]
+      [io
+       ["." context]]]
+     [default
+      ["." platform (#+ Platform)]
+      ["." init]
+      ["." syntax]
+      ["." phase
+       ["." translation]
+       ["." statement]]]]]
    ## ["." interpreter]
    ]
   [luxc
-- 
cgit v1.2.3