From 34c2b43371bfb2a023c5f7f14ffc11d56d4deb90 Mon Sep 17 00:00:00 2001
From: greg <greg.shuflin@protonmail.com>
Date: Wed, 15 Aug 2018 18:32:44 -0700
Subject: [PATCH] More work on if matching

---
 schala-lang/src/reduced_ast.rs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/schala-lang/src/reduced_ast.rs b/schala-lang/src/reduced_ast.rs
index 9f16155..81858cf 100644
--- a/schala-lang/src/reduced_ast.rs
+++ b/schala-lang/src/reduced_ast.rs
@@ -135,7 +135,9 @@ impl Expression {
 fn reduce_if_expression(discriminator: &Discriminator, body: &IfExpressionBody, symbol_table: &SymbolTable) -> Expr {
   let cond = Box::new(match *discriminator {
     Discriminator::Simple(ref expr) => expr.reduce(symbol_table),
-    _ => panic!(),
+    Discriminator::BinOp(ref expr, ref binop) => {
+      panic!()
+    }
   });
   match *body {
     IfExpressionBody::SimpleConditional(ref then_clause, ref else_clause) => {
@@ -190,13 +192,14 @@ fn reduce_if_expression(discriminator: &Discriminator, body: &IfExpressionBody,
     },
     IfExpressionBody::GuardList(ref guard_arms) => {
       let alternatives = guard_arms.iter().map(|arm| {
-        Alternative {
-          tag: Some(0),
-          bound_vars: vec![],
-          item: arm.body.iter().map(|expr| expr.reduce(symbol_table)).collect(),
-        }
-      });
-      Expr::UnimplementedSigilValue
+        let (tag, bound_vars) = match arm.guard {
+          _ => (Some(0), vec![]),
+        };
+
+        let item = arm.body.iter().map(|expr| expr.reduce(symbol_table)).collect();
+        Alternative { tag, bound_vars, item }
+      }).collect();
+      Expr::CaseMatch { cond, alternatives }
     }
   }
 }