From f92c4dc2f813b40f14d240491daa665942165e7e Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 2 Dec 2017 01:06:34 -0400
Subject: - Adjusted new-luxc to new macro-templating syntax.

---
 new-luxc/source/luxc/lang/analysis/structure.lux | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'new-luxc/source/luxc/lang/analysis/structure.lux')

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)
-- 
cgit v1.2.3


From 5c4a26c9344898c4fa958946b47b55e1c84818bd Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 2 Dec 2017 13:55:48 -0400
Subject: - "gensym" went back to producing Code, instead of Ident.

---
 new-luxc/source/luxc/lang/analysis/structure.lux | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'new-luxc/source/luxc/lang/analysis/structure.lux')

diff --git a/new-luxc/source/luxc/lang/analysis/structure.lux b/new-luxc/source/luxc/lang/analysis/structure.lux
index 4561388c9..ce678837e 100644
--- a/new-luxc/source/luxc/lang/analysis/structure.lux
+++ b/new-luxc/source/luxc/lang/analysis/structure.lux
@@ -156,12 +156,11 @@
         ## blurring the line between what was wanted (the separation)
         ## and what was analysed.
         [tailT tailC]
-        (do @
-          [g!tail (macro.gensym "tail")]
+        (macro.with-gensyms [g!tail]
           (&.with-type tailT
             (analyse (` ("lux case" [(~+ tailC)]
-                         (~@ g!tail)
-                         (~@ g!tail))))))
+                         (~ g!tail)
+                         (~ g!tail))))))
         ))))
 
 (def: #export (analyse-product analyse membersC)
-- 
cgit v1.2.3