- Adjusted new-luxc to new macro-templating syntax.

5 files changed, 13 insertions, 13 deletions

diff --git a/new-luxc/source/luxc/lang/analysis/case.lux b/new-luxc/source/luxc/lang/analysis/case.lux
index 16f775907..c40bb2ac3 100644
--- a/new-luxc/source/luxc/lang/analysis/case.lux
+++ b/new-luxc/source/luxc/lang/analysis/case.lux
@@ -214,7 +214,7 @@
                                              [nextA next]
                                              (wrap [(list) nextA]))
                                            (list.reverse matches))]
-              (wrap [(` ("lux case tuple" [(~@ memberP+)]))
+              (wrap [(` ("lux case tuple" [(~+ memberP+)]))
                      thenA])))
 
           _
@@ -250,12 +250,12 @@
                 (do macro.Monad<Meta>
                   [[testP nextA] (analyse-pattern #.None
                                                   (type.variant (list.drop (n/dec num-cases) flat-sum))
-                                                  (` [(~@ values)])
+                                                  (` [(~+ values)])
                                                   next)]
                   (wrap [(` ("lux case variant" (~ (code.nat idx)) (~ (code.nat num-cases)) (~ testP)))
                          nextA]))
                 (do macro.Monad<Meta>
-                  [[testP nextA] (analyse-pattern #.None case-type (` [(~@ values)]) next)]
+                  [[testP nextA] (analyse-pattern #.None case-type (` [(~+ values)]) next)]
                   (wrap [(` ("lux case variant" (~ (code.nat idx)) (~ (code.nat num-cases)) (~ testP)))
                          nextA])))
 
@@ -274,7 +274,7 @@
          [idx group variantT] (macro.resolve-tag tag)
          _ (&.with-type-env
              (tc.check inputT variantT))]
-        (analyse-pattern (#.Some (list.size group)) inputT (` ((~ (code.nat idx)) (~@ values))) next)))
+        (analyse-pattern (#.Some (list.size group)) inputT (` ((~ (code.nat idx)) (~+ values))) next)))
 
     _
     (&.throw Unrecognized-Pattern-Syntax (%code pattern))
diff --git a/new-luxc/source/luxc/lang/analysis/case/coverage.lux b/new-luxc/source/luxc/lang/analysis/case/coverage.lux
index 5d34387b4..ae72b47e4 100644
--- a/new-luxc/source/luxc/lang/analysis/case/coverage.lux
+++ b/new-luxc/source/luxc/lang/analysis/case/coverage.lux
@@ -71,7 +71,7 @@
 
     ## Tuple patterns can be exhaustive if there is exhaustiveness for all of
     ## their sub-patterns.
-    (^code ("lux case tuple" [(~@ subs)]))
+    (^code ("lux case tuple" [(~+ subs)]))
     (loop [subs subs]
       (case subs
         #.Nil
diff --git a/new-luxc/source/luxc/lang/analysis/expression.lux b/new-luxc/source/luxc/lang/analysis/expression.lux
index 0f3cdcf6e..1463e7ec5 100644
--- a/new-luxc/source/luxc/lang/analysis/expression.lux
+++ b/new-luxc/source/luxc/lang/analysis/expression.lux
@@ -74,7 +74,7 @@
                    (<analyser> analyse tag value)
 
                    _
-                   (<analyser> analyse tag (` [(~@ values)]))))
+                   (<analyser> analyse tag (` [(~+ values)]))))
                ([#.Nat structureA.analyse-sum]
                 [#.Tag structureA.analyse-tagged-sum])
 
diff --git a/new-luxc/source/luxc/lang/analysis/function.lux b/new-luxc/source/luxc/lang/analysis/function.lux
index 758acd681..a502a9d19 100644
--- a/new-luxc/source/luxc/lang/analysis/function.lux
+++ b/new-luxc/source/luxc/lang/analysis/function.lux
@@ -74,7 +74,7 @@
 
           (#.Function inputT outputT)
           (<| (:: @ map (function [[scope bodyA]]
-                          (` ("lux function" [(~@ (list/map code.int (variableL.environment scope)))]
+                          (` ("lux function" [(~+ (list/map code.int (variableL.environment scope)))]
                               (~ bodyA)))))
               &.with-scope
               ## Functions have access not only to their argument, but
diff --git a/new-luxc/source/luxc/lang/analysis/structure.lux b/new-luxc/source/luxc/lang/analysis/structure.lux
index fb521d02e..4561388c9 100644
--- a/new-luxc/source/luxc/lang/analysis/structure.lux
+++ b/new-luxc/source/luxc/lang/analysis/structure.lux
@@ -159,9 +159,9 @@
         (do @
           [g!tail (macro.gensym "tail")]
           (&.with-type tailT
-            (analyse (` ("lux case" [(~@ tailC)]
-                         (~ g!tail)
-                         (~ g!tail))))))
+            (analyse (` ("lux case" [(~+ tailC)]
+                         (~@ g!tail)
+                         (~@ g!tail))))))
         ))))
 
 (def: #export (analyse-product analyse membersC)
@@ -170,7 +170,7 @@
     [expectedT macro.expected-type]
     (&.with-stacked-errors
       (function [_] (Cannot-Analyse-Tuple (format "      Type: " (%type expectedT) "\n"
-                                                  "Expression: " (%code (` [(~@ membersC)])))))
+                                                  "Expression: " (%code (` [(~+ membersC)])))))
       (case expectedT
         (#.Product _)
         (analyse-typed-product analyse membersC)
@@ -219,7 +219,7 @@
 
               _
               (&.throw Invalid-Tuple-Type (format "      Type: " (%type expectedT) "\n"
-                                                  "Expression: " (%code (` [(~@ membersC)]))))))
+                                                  "Expression: " (%code (` [(~+ membersC)]))))))
 
           _
           (case (type.apply (list inputT) funT)
@@ -232,7 +232,7 @@
         
         _
         (&.throw Invalid-Tuple-Type (format "      Type: " (%type expectedT) "\n"
-                                            "Expression: " (%code (` [(~@ membersC)]))))
+                                            "Expression: " (%code (` [(~+ membersC)]))))
         ))))
 
 (def: #export (analyse-tagged-sum analyse tag valueC)