Now using the new syntax for variants (even though they still work the old way... for now)

3 files changed, 15 insertions, 17 deletions

diff --git a/luxc/src/lux/analyser.clj b/luxc/src/lux/analyser.clj
index 4522b9aea..abdd0acd7 100644
--- a/luxc/src/lux/analyser.clj
+++ b/luxc/src/lux/analyser.clj
@@ -182,8 +182,9 @@
                   (&&common/analyse-proc analyse exo-type ?procedure parameters))))
         
         (&/$Nat idx)
-        (&/with-analysis-meta cursor exo-type
-          (&&lux/analyse-variant analyse (&/$Right exo-type) idx nil parameters))
+        (|let [(&/$Cons [_ (&/$Bit ?right)] parameters*) parameters]
+          (&/with-analysis-meta cursor exo-type
+            (&&lux/analyse-variant analyse (&/$Right exo-type) (if ?right (inc idx) idx) ?right parameters*)))
 
         (&/$Tag ?ident)
         (&/with-analysis-meta cursor exo-type
diff --git a/luxc/src/lux/analyser/case.clj b/luxc/src/lux/analyser/case.clj
index 4d7b4ccca..d059ce189 100644
--- a/luxc/src/lux/analyser/case.clj
+++ b/luxc/src/lux/analyser/case.clj
@@ -360,15 +360,16 @@
             [=test =kont] (analyse-pattern &/$None case-type unit-tuple kont)]
         (return (&/T [($VariantTestAC (&/T [idx (&/|length group) =test])) =kont])))
 
-      (&/$Form (&/$Cons [_ (&/$Nat idx)] ?values))
-      (|do [value-type* (adjust-type value-type)
-            case-type (&type/sum-at idx value-type*)
-            [=test =kont] (case (int (&/|length ?values))
-                            0 (analyse-pattern &/$None case-type unit-tuple kont)
-                            1 (analyse-pattern &/$None case-type (&/|head ?values) kont)
-                            ;; 1+
-                            (analyse-pattern &/$None case-type (&/T [(&/T ["" -1 -1]) (&/$Tuple ?values)]) kont))]
-        (return (&/T [($VariantTestAC (&/T [idx (&/|length (&type/flatten-sum value-type*)) =test])) =kont])))
+      (&/$Form (&/$Cons [_ (&/$Nat idx)] (&/$Cons [_ (&/$Bit right?)] ?values)))
+      (let [idx (if right? (inc idx) idx)]
+        (|do [value-type* (adjust-type value-type)
+              case-type (&type/sum-at idx value-type*)
+              [=test =kont] (case (int (&/|length ?values))
+                              0 (analyse-pattern &/$None case-type unit-tuple kont)
+                              1 (analyse-pattern &/$None case-type (&/|head ?values) kont)
+                              ;; 1+
+                              (analyse-pattern &/$None case-type (&/T [(&/T ["" -1 -1]) (&/$Tuple ?values)]) kont))]
+          (return (&/T [($VariantTestAC (&/T [idx (&/|length (&type/flatten-sum value-type*)) =test])) =kont]))))
 
       (&/$Form (&/$Cons [_ (&/$Tag ?ident)] ?values))
       (|do [[=module =name] (&&/resolved-ident ?ident)
diff --git a/luxc/src/lux/analyser/lux.clj b/luxc/src/lux/analyser/lux.clj
index fee56b624..eb47ac039 100644
--- a/luxc/src/lux/analyser/lux.clj
+++ b/luxc/src/lux/analyser/lux.clj
@@ -213,15 +213,11 @@
         (|case exo-type*
           (&/$Sum _)
           (|do [vtype (&type/sum-at idx exo-type*)
-                :let [num-variant-types (&/|length (&type/flatten-sum exo-type*))
-                      is-last?* (if (nil? is-last?)
-                                  (= idx (dec num-variant-types))
-                                  is-last?)]
                 =value (analyse-variant-body analyse vtype ?values)
                 _cursor &/cursor]
-            (if (= 1 num-variant-types)
+            (if (= 1 (&/|length (&type/flatten-sum exo-type*)))
               (return (&/|list =value))
-              (return (&/|list (&&/|meta exo-type _cursor (&&/$variant idx is-last?* =value))))
+              (return (&/|list (&&/|meta exo-type _cursor (&&/$variant idx is-last? =value))))
               ))
 
           (&/$UnivQ _)