Made extension-definition macros specify their bindings the same way as syntax:.

1 files changed, 19 insertions, 19 deletions

diff --git a/lux-jvm/source/luxc/lang/directive/jvm.lux b/lux-jvm/source/luxc/lang/directive/jvm.lux
index 7f1df4db3..99ac39c78 100644
--- a/lux-jvm/source/luxc/lang/directive/jvm.lux
+++ b/lux-jvm/source/luxc/lang/directive/jvm.lux
@@ -572,8 +572,8 @@
          _ (|> handlerV
                (..true_handler extender)
                (extension.install extender (:as Text name))
-               directive.lift_generation)
-         _ (directive.lift_generation
+               directive.lifted_generation)
+         _ (directive.lifted_generation
             (generation.log! (format "Generation " (%.text (:as Text name)))))]
         (in directive.no_requirements))
 
@@ -601,7 +601,7 @@
      (Parser <type>)
      (do {! <>.monad}
        [raw <code>.text]
-       (<>.lift (<text>.result <parser> raw))))]
+       (<>.lifted (<text>.result <parser> raw))))]
 
   [class_declaration Declaration parser.declaration']
   [class (Type Class) parser.class]
@@ -1012,7 +1012,7 @@
             self arguments constructor_argumentsC
             bodyC] method]
      analyse directive.analysis]
-    (directive.lift_analysis
+    (directive.lifted_analysis
      (do !
        [mapping (//A.with_fresh_type_vars class_tvars luxT.fresh)
         mapping (//A.with_fresh_type_vars method_tvars mapping)
@@ -1047,7 +1047,7 @@
             method_tvars self arguments returnJ exceptionsJ
             bodyC] method]
      analyse directive.analysis]
-    (directive.lift_analysis
+    (directive.lifted_analysis
      (do !
        [mapping (//A.with_fresh_type_vars class_tvars luxT.fresh)
         .let [parent_type (/type.class super_name super_tvars)]
@@ -1077,7 +1077,7 @@
             self arguments returnJ exceptionsJ
             bodyC] method]
      analyse directive.analysis]
-    (directive.lift_analysis
+    (directive.lifted_analysis
      (do !
        [mapping (//A.with_fresh_type_vars class_tvars luxT.fresh)
         mapping (//A.with_fresh_type_vars method_tvars mapping)
@@ -1105,7 +1105,7 @@
             arguments returnJ exceptionsJ
             bodyC] method]
      analyse directive.analysis]
-    (directive.lift_analysis
+    (directive.lifted_analysis
      (do !
        [mapping (//A.with_fresh_type_vars method_tvars luxT.fresh)
         arguments' (monad.map !
@@ -1160,7 +1160,7 @@
             self arguments constructor_argumentsA
             bodyA] method]
      synthesise directive.synthesis]
-    (directive.lift_synthesis
+    (directive.lifted_synthesis
      (do !
        [constructor_argumentsS (monad.map ! (function (_ [typeJ termA])
                                               (\ ! map (|>> [typeJ])
@@ -1183,7 +1183,7 @@
             method_tvars self arguments returnJ exceptionsJ
             bodyA] method]
      synthesise directive.synthesis]
-    (directive.lift_synthesis
+    (directive.lifted_synthesis
      (do !
        [bodyS (synthesise archive (#analysis.Function (list) (//A.hide_method_body (list.size arguments) bodyA)))]
        (in [[super_name super_tvars] method_name strict_floating_point? annotations
@@ -1202,7 +1202,7 @@
             self arguments returnJ exceptionsJ
             bodyA] method]
      synthesise directive.synthesis]
-    (directive.lift_synthesis
+    (directive.lifted_synthesis
      (do !
        [bodyS (synthesise archive (#analysis.Function (list) (//A.hide_method_body (list.size arguments) bodyA)))]
        (in [name privacy final? strict_floating_point? annotations method_tvars
@@ -1221,7 +1221,7 @@
             arguments returnJ exceptionsJ
             bodyA] method]
      synthesise directive.synthesis]
-    (directive.lift_synthesis
+    (directive.lifted_synthesis
      (do !
        [bodyS (synthesise archive (#analysis.Function (list) (//A.hide_method_body (list.size arguments) bodyA)))]
        (in [name privacy strict_floating_point? annotations method_tvars
@@ -1263,7 +1263,7 @@
             self arguments constructor_argumentsS
             bodyS] method]
      generate directive.generation]
-    (directive.lift_generation
+    (directive.lifted_generation
      (do !
        [constructor_argumentsG (monad.map ! (|>> product.right (generate archive))
                                           constructor_argumentsS)
@@ -1297,7 +1297,7 @@
             method_tvars self arguments returnJ exceptionsJ
             bodyS] method]
      generate directive.generation]
-    (directive.lift_generation
+    (directive.lifted_generation
      (do !
        [bodyG (generate archive (//G.hidden_method_body (list.size arguments) bodyS))
         .let [argumentsT (list\map product.right arguments)]]
@@ -1318,7 +1318,7 @@
             self arguments returnJ exceptionsJ
             bodyS] method]
      generate directive.generation]
-    (directive.lift_generation
+    (directive.lifted_generation
      (do !
        [bodyG (generate archive (//G.hidden_method_body (list.size arguments) bodyS))
         .let [argumentsT (list\map product.right arguments)]]
@@ -1343,7 +1343,7 @@
             arguments returnJ exceptionsJ
             bodyS] method]
      generate directive.generation]
-    (directive.lift_generation
+    (directive.lifted_generation
      (do !
        [bodyG (generate archive (//G.hidden_method_body (list.size arguments) bodyS))
         .let [argumentsT (list\map product.right arguments)]]
@@ -1421,14 +1421,14 @@
                                 fields
                                 methodsC)]
          ... Necessary for reflection to work properly during analysis.
-         _ (directive.lift_generation
+         _ (directive.lifted_generation
             (generation.execute! header))
          .let [supers (: (List (Type Class))
                          (list& super_class super_interfaces))]
          _ (|> methodsC
                (list.all ..convert_overriden_method)
                (//A.require_complete_method_concretion class_loader supers)
-               directive.lift_analysis)
+               directive.lifted_analysis)
          methodsA (monad.map ! (method_analysis archive declaration supers) methodsC)
          methodsS (monad.map ! (method_synthesis archive) methodsA)
          methodsG (monad.map ! (method_generation archive super_class) methodsS)
@@ -1439,7 +1439,7 @@
                                      super_interfaces
                                      (def.fuse (list\compose (list\map ..field_header fields)
                                                              methodsG)))]]]
-        (directive.lift_generation
+        (directive.lifted_generation
          (do !
            [artifact_id (generation.learn_custom class_name)
             _ (generation.execute! directive)
@@ -1466,7 +1466,7 @@
                                                          (def.abstract_method #jvm.Public jvm.noneM name
                                                                               (/type.method [type_variables arguments return exceptions]))))
                                              def.fuse))]]]
-        (directive.lift_generation
+        (directive.lifted_generation
          (do !
            [artifact_id (generation.learn_custom class_name)
             _ (generation.execute! directive)