From a75f032ff219fdd639580455a6d3e83fd05d5592 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 6 Apr 2019 21:14:27 -0400
Subject: Created the "lux/abstract" branch and moved some modules into it.

---
 .../lux/tool/compiler/phase/generation/scheme/case.jvm.lux       | 9 +++++----
 .../compiler/phase/generation/scheme/extension/common.jvm.lux    | 3 ++-
 .../lux/tool/compiler/phase/generation/scheme/function.jvm.lux   | 3 ++-
 .../lux/tool/compiler/phase/generation/scheme/loop.jvm.lux       | 2 +-
 .../lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux    | 5 +++--
 .../lux/tool/compiler/phase/generation/scheme/structure.jvm.lux  | 2 +-
 6 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'stdlib/source/lux/tool/compiler/phase/generation/scheme')

diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.jvm.lux
index 49733e6f3..d68abbdd7 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.jvm.lux
@@ -1,7 +1,8 @@
 (.module:
   [lux (#- case let if)
+   [abstract
+    [monad (#+ do)]]
    [control
-    [monad (#+ do)]
     ["ex" exception (#+ exception:)]]
    [data
     ["." number]
@@ -97,9 +98,9 @@
 (def: (pm-catch handler)
   (-> Expression Computation)
   (_.lambda [(list @alt-error) #.None]
-       (_.if (|> @alt-error (_.eqv?/2 pm-error))
-         handler
-         (_.raise/1 @alt-error))))
+            (_.if (|> @alt-error (_.eqv?/2 pm-error))
+              handler
+              (_.raise/1 @alt-error))))
 
 (def: (pattern-matching' generate pathP)
   (-> Phase Path (Operation Expression))
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.jvm.lux
index 0de327e23..cb96a5718 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.jvm.lux
@@ -1,7 +1,8 @@
 (.module:
   [lux #*
+   [abstract
+    ["." monad (#+ do)]]
    [control
-    ["." monad (#+ do)]
     ["ex" exception (#+ exception:)]]
    [data
     ["e" error]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.jvm.lux
index 2cbb89825..28bfd36ba 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.jvm.lux
@@ -1,7 +1,8 @@
 (.module:
   [lux (#- function)
+   [abstract
+    ["." monad (#+ do)]]
    [control
-    ["." monad (#+ do)]
     pipe]
    [data
     ["." product]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.jvm.lux
index 7064c8301..6922806e2 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.jvm.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux (#- Scope)
-   [control
+   [abstract
     ["." monad (#+ do)]]
    [data
     ["." product]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux
index d3c949df1..1e891c006 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux
@@ -1,9 +1,10 @@
 (.module:
   [lux #*
    ["." function]
-   [control
-    ["p" parser ("#;." monad)]
+   [abstract
     [monad (#+ do)]]
+   [control
+    ["p" parser ("#;." monad)]]
    [data
     [number (#+ hex)]
     [text
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.jvm.lux
index 7419ad239..e44ab508b 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.jvm.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #*
-   [control
+   [abstract
     ["." monad (#+ do)]]
    [host
     ["_" scheme (#+ Expression)]]]
-- 
cgit v1.2.3