Fixes for conditional statements

Author: remaininlight

compiler/src/ast/expression.rs

@@ -30,9 +30,9 @@ pub struct CastExpression {
 
 #[derive(Debug)]
 pub struct ConditionalExpression {
-    pub condition: SubExpression,
-    pub consequence: SubExpression,
-    pub alternative: SubExpression,
+    pub condition: Block,
+    pub consequence: Block,
+    pub alternative: Block,
 }
 
 #[derive(Debug)]

compiler/src/codegen/block/gen_conditional.rs

@@ -4,9 +4,9 @@ use inkwell::{FloatPredicate};
 
 pub fn gen_conditional_statement(
     index: usize,
-    condition: &usize,
-    consequence: &usize,
-    alternative: &usize,
+    condition: usize,
+    consequence: usize,
+    alternative: usize,
     node: &mut BlockContext,
 ) -> PointerValue {
 
@@ -17,7 +17,8 @@ pub fn gen_conditional_statement(
     // From https://github.com/TheDan64/inkwell/blob/master/examples/kaleidoscope/main.rs#L999
     // TODO Why is float created here?
     // TODO Find a way to invoke a compile_expr function
-    let condition = self.compile_expr(condition)?;
+    //let condition = self.compile_expr(condition)?;
+    let condition = node.get_statement(condition);
     let condition = builder.build_float_compare(FloatPredicate::ONE, condition, zero_const, "ifcond");
 
     let then_bb = node
@@ -38,14 +39,14 @@ pub fn gen_conditional_statement(
 
     // build then block
     builder.position_at_end(&then_bb);
-    let then_val = self.compile_expr(consequence)?;
+    let then_val = node.get_statement(consequence);
     builder.build_unconditional_branch(&cont_bb);
 
     let then_bb = builder.get_insert_block().unwrap();
 
     // build else block
     builder.position_at_end(&else_bb);
-    let else_val = self.compile_expr(alternative)?;
+    let else_val = node.get_statement(alternative);
     builder.build_unconditional_branch(&cont_bb);
 
     let else_bb = builder.get_insert_block().unwrap();
@@ -60,6 +61,5 @@ pub fn gen_conditional_statement(
         (&else_val, &else_bb)
     ]);
 
-    // TODO This should return inkwell::values::PointerValue but instead returns std::result::Result
-    Ok(phi.as_basic_value().into_float_value())
+    phi.as_basic_value().into_pointer_value()
 }

compiler/src/parser/mod.rs

@@ -670,12 +670,7 @@ impl Parser {
     fn parse_conditional_expr(stream: &mut TokenStream) -> ExprResult {
         let if_token = Parser::expect_token(TokenType::If, stream.next())?;
 
-        let token_type = match stream.peek() {
-            Some(token) => token.token_type,
-            None => return Err(CompileError::UnexpectedEnd),
-        };
-
-        let cond = Parser::parse_expression(stream, Parser::get_operator_precedence(token_type))?;
+        let cond = Parser::parse_expression(stream, PRECEDENCE_ALL)?;
 
         Parser::expect_token(TokenType::Then, stream.next())?;
 
@@ -693,10 +688,6 @@ impl Parser {
         };
         let alternative = Parser::parse_expression(stream, Parser::get_operator_precedence(alternative_token_type))?;
 
-        let end_pos = Parser::expect_token(TokenType::CloseBracket, stream.next())?
-            .pos
-            .1;
-
         Ok(Expression::new_conditional(
             SourceRange(if_token.pos.0, end_pos),
             Box::new(cond),