From 132ffdae1add622c8a3c6065d7730a8fe8ea5e78 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 5 Sep 2021 22:52:26 -0400
Subject: Changed the syntax of do/be's (co)monad bindings.

---
 lux-jvm/source/luxc/lang/directive/jvm.lux | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'lux-jvm/source/luxc/lang/directive')

diff --git a/lux-jvm/source/luxc/lang/directive/jvm.lux b/lux-jvm/source/luxc/lang/directive/jvm.lux
index cce373dfc..246e49761 100644
--- a/lux-jvm/source/luxc/lang/directive/jvm.lux
+++ b/lux-jvm/source/luxc/lang/directive/jvm.lux
@@ -599,7 +599,7 @@
 (template [<name> <type> <parser>]
   [(def: <name>
      (Parser <type>)
-     (do {! <>.monad}
+     (do [! <>.monad]
        [raw <code>.text]
        (<>.lifted (<text>.result <parser> raw))))]
 
@@ -1009,7 +1009,7 @@
 
 (def: (constructor_method_analysis archive [class_name class_tvars] method)
   (-> Archive Declaration (Constructor Code) (Operation (Constructor Analysis)))
-  (do {! phase.monad}
+  (do [! phase.monad]
     [.let [[privacy strict_floating_point? annotations method_tvars exceptions
             self arguments constructor_argumentsC
             bodyC] method]
@@ -1044,7 +1044,7 @@
 
 (def: (override_method_analysis archive [class_name class_tvars] supers method)
   (-> Archive Declaration (List (Type Class)) (Override Code) (Operation (Override Analysis)))
-  (do {! phase.monad}
+  (do [! phase.monad]
     [.let [[[super_name super_tvars] method_name strict_floating_point? annotations
             method_tvars self arguments returnJ exceptionsJ
             bodyC] method]
@@ -1074,7 +1074,7 @@
 
 (def: (virtual_method_analysis archive [class_name class_tvars] method)
   (-> Archive Declaration (Virtual Code) (Operation (Virtual Analysis)))
-  (do {! phase.monad}
+  (do [! phase.monad]
     [.let [[name privacy final? strict_floating_point? annotations method_tvars
             self arguments returnJ exceptionsJ
             bodyC] method]
@@ -1102,7 +1102,7 @@
 
 (def: (static_method_analysis archive method)
   (-> Archive (Static Code) (Operation (Static Analysis)))
-  (do {! phase.monad}
+  (do [! phase.monad]
     [.let [[name privacy strict_floating_point? annotations method_tvars
             arguments returnJ exceptionsJ
             bodyC] method]
@@ -1157,7 +1157,7 @@
 
 (def: (constructor_method_synthesis archive method)
   (-> Archive (Constructor Analysis) (Operation (Constructor Synthesis)))
-  (do {! phase.monad}
+  (do [! phase.monad]
     [.let [[privacy strict_floating_point? annotations method_tvars exceptions
             self arguments constructor_argumentsA
             bodyA] method]
@@ -1180,7 +1180,7 @@
 
 (def: (override_method_synthesis archive method)
   (-> Archive (Override Analysis) (Operation (Override Synthesis)))
-  (do {! phase.monad}
+  (do [! phase.monad]
     [.let [[[super_name super_tvars] method_name strict_floating_point? annotations
             method_tvars self arguments returnJ exceptionsJ
             bodyA] method]
@@ -1199,7 +1199,7 @@
 
 (def: (virtual_method_synthesis archive method)
   (-> Archive (Virtual Analysis) (Operation (Virtual Synthesis)))
-  (do {! phase.monad}
+  (do [! phase.monad]
     [.let [[name privacy final? strict_floating_point? annotations method_tvars
             self arguments returnJ exceptionsJ
             bodyA] method]
@@ -1218,7 +1218,7 @@
 
 (def: (static_method_synthesis archive method)
   (-> Archive (Static Analysis) (Operation (Static Synthesis)))
-  (do {! phase.monad}
+  (do [! phase.monad]
     [.let [[name privacy strict_floating_point? annotations method_tvars
             arguments returnJ exceptionsJ
             bodyA] method]
@@ -1260,7 +1260,7 @@
 
 (def: (constructor_method_generation archive super_class method)
   (-> Archive (Type Class) (Constructor Synthesis) (Operation jvm.Def))
-  (do {! phase.monad}
+  (do [! phase.monad]
     [.let [[privacy strict_floating_point? annotations method_tvars exceptions
             self arguments constructor_argumentsS
             bodyS] method]
@@ -1294,7 +1294,7 @@
 
 (def: (override_method_generation archive method)
   (-> Archive (Override Synthesis) (Operation jvm.Def))
-  (do {! phase.monad}
+  (do [! phase.monad]
     [.let [[[super_name super_tvars] method_name strict_floating_point? annotations
             method_tvars self arguments returnJ exceptionsJ
             bodyS] method]
@@ -1315,7 +1315,7 @@
 
 (def: (virtual_method_generation archive method)
   (-> Archive (Virtual Synthesis) (Operation jvm.Def))
-  (do {! phase.monad}
+  (do [! phase.monad]
     [.let [[method_name privacy final? strict_floating_point? annotations method_tvars
             self arguments returnJ exceptionsJ
             bodyS] method]
@@ -1340,7 +1340,7 @@
 
 (def: (static_method_generation archive method)
   (-> Archive (Static Synthesis) (Operation jvm.Def))
-  (do {! phase.monad}
+  (do [! phase.monad]
     [.let [[method_name privacy strict_floating_point? annotations method_tvars
             arguments returnJ exceptionsJ
             bodyS] method]
@@ -1414,7 +1414,7 @@
                   annotations
                   fields
                   methodsC])
-      (do {! phase.monad}
+      (do [! phase.monad]
         [.let [[class_name type_variables] declaration
                header (..header [class_name type_variables]
                                 super_class
@@ -1458,7 +1458,7 @@
         (<code>.tuple (<>.some ..annotation))
         (<>.some ..method_declaration))
     (function (_ extension_name phase archive [[class_name type_variables] supers annotations method_declarations])
-      (do {! phase.monad}
+      (do [! phase.monad]
         [.let [directive [class_name
                           (def.interface #jvm.V1_6 #jvm.Public jvm.noneC class_name
                                          (list\each ..constraint type_variables)
-- 
cgit v1.2.3