reid/examples/reid/fibonacci.reid

@@ -1,6 +1,6 @@
 // Main
 fn main() -> bool {
-    return (5 == fibonacci(5)) && false;
+    return (5 == fibonacci(5)) && (2 == fibonacci(3));
 }
 
 // Fibonacci

reid/examples/testcodegen.rs

@@ -17,7 +17,7 @@ fn main() {
                             // If N < 3
                             Box::new(Expression(
                                 ExprKind::BinOp(
-                                    BinaryOperator::Cmp(CmpOperator::GT),
+                                    BinaryOperator::Logic(LogicOperator::GT),
                                     Box::new(Expression(
                                         ExprKind::Variable(VariableReference(
                                             TypeKind::I32,

reid/src/ast/mod.rs

@@ -24,7 +24,6 @@ pub enum TypeKind {
 #[derive(Debug, Clone)]
 pub enum Literal {
     Number(u64),
-    Bool(bool),
 }
 
 #[derive(Debug, Clone)]

reid/src/ast/parse.rs

@@ -71,14 +71,6 @@ impl Parse for PrimaryExpression {
                     Kind::Literal(Literal::Number(v.parse().unwrap())),
                     stream.get_range().unwrap(),
                 ),
-                Token::True => Expression(
-                    Kind::Literal(Literal::Bool(true)),
-                    stream.get_range().unwrap(),
-                ),
-                Token::False => Expression(
-                    Kind::Literal(Literal::Bool(false)),
-                    stream.get_range().unwrap(),
-                ),
                 Token::ParenOpen => {
                     let exp = stream.parse()?;
                     stream.expect(Token::ParenClose)?;

reid/src/ast/process.rs

@@ -150,12 +150,12 @@ impl ast::BinaryOperator {
             ast::BinaryOperator::Minus => mir::BinaryOperator::Minus,
             ast::BinaryOperator::Mult => mir::BinaryOperator::Mult,
             ast::BinaryOperator::And => mir::BinaryOperator::And,
-            ast::BinaryOperator::LT => mir::BinaryOperator::Cmp(mir::CmpOperator::LT),
+            ast::BinaryOperator::LT => mir::BinaryOperator::Logic(mir::LogicOperator::LT),
-            ast::BinaryOperator::LE => mir::BinaryOperator::Cmp(mir::CmpOperator::LE),
+            ast::BinaryOperator::LE => mir::BinaryOperator::Logic(mir::LogicOperator::LE),
-            ast::BinaryOperator::GT => mir::BinaryOperator::Cmp(mir::CmpOperator::GT),
+            ast::BinaryOperator::GT => mir::BinaryOperator::Logic(mir::LogicOperator::GT),
-            ast::BinaryOperator::GE => mir::BinaryOperator::Cmp(mir::CmpOperator::GE),
+            ast::BinaryOperator::GE => mir::BinaryOperator::Logic(mir::LogicOperator::GE),
-            ast::BinaryOperator::EQ => mir::BinaryOperator::Cmp(mir::CmpOperator::EQ),
+            ast::BinaryOperator::EQ => mir::BinaryOperator::Logic(mir::LogicOperator::EQ),
-            ast::BinaryOperator::NE => mir::BinaryOperator::Cmp(mir::CmpOperator::NE),
+            ast::BinaryOperator::NE => mir::BinaryOperator::Logic(mir::LogicOperator::NE),
         }
     }
 }
@@ -164,7 +164,6 @@ impl ast::Literal {
     fn mir(&self) -> mir::Literal {
         match *self {
             ast::Literal::Number(v) => mir::Literal::Vague(mir::VagueLiteral::Number(v)),
-            ast::Literal::Bool(v) => mir::Literal::Bool(v),
         }
     }
 }

reid/src/codegen.rs

@@ -246,7 +246,7 @@ impl mir::Expression {
                     mir::BinaryOperator::And => {
                         scope.block.build(InstructionKind::And(lhs, rhs)).unwrap()
                     }
-                    mir::BinaryOperator::Cmp(l) => scope
+                    mir::BinaryOperator::Logic(l) => scope
                         .block
                         .build(InstructionKind::ICmp(l.int_predicate(), lhs, rhs))
                         .unwrap(),
@@ -290,15 +290,15 @@ impl mir::Expression {
     }
 }
 
-impl mir::CmpOperator {
+impl mir::LogicOperator {
     fn int_predicate(&self) -> CmpPredicate {
         match self {
-            mir::CmpOperator::LT => CmpPredicate::LT,
+            mir::LogicOperator::LT => CmpPredicate::LT,
-            mir::CmpOperator::GT => CmpPredicate::GT,
+            mir::LogicOperator::GT => CmpPredicate::GT,
-            mir::CmpOperator::LE => CmpPredicate::LE,
+            mir::LogicOperator::LE => CmpPredicate::LE,
-            mir::CmpOperator::GE => CmpPredicate::GE,
+            mir::LogicOperator::GE => CmpPredicate::GE,
-            mir::CmpOperator::EQ => CmpPredicate::EQ,
+            mir::LogicOperator::EQ => CmpPredicate::EQ,
-            mir::CmpOperator::NE => CmpPredicate::NE,
+            mir::LogicOperator::NE => CmpPredicate::NE,
         }
     }
 }
@@ -341,7 +341,6 @@ impl mir::Literal {
             mir::Literal::U32(val) => ConstValue::U32(val),
             mir::Literal::U64(val) => ConstValue::U64(val),
             mir::Literal::U128(val) => ConstValue::U128(val),
-            mir::Literal::Bool(val) => ConstValue::Bool(val),
             mir::Literal::Vague(_) => panic!("Got vague literal!"),
         })
     }

reid/src/lexer.rs

@@ -22,10 +22,6 @@ pub enum Token {
     Arrow,
     /// `if`
     If,
-    /// `true`
-    True,
-    /// `false`
-    False,
 
     // Symbols
     /// `;`
@@ -169,8 +165,6 @@ pub fn tokenize<T: Into<String>>(to_tokenize: T) -> Result<Vec<FullToken>, Error
                     "return" => Token::ReturnKeyword,
                     "fn" => Token::FnKeyword,
                     "if" => Token::If,
-                    "true" => Token::True,
-                    "false" => Token::False,
                     _ => Token::Identifier(value),
                 };
                 variant

reid/src/mir/display.rs

@@ -166,7 +166,6 @@ impl Display for Literal {
             Self::U32(val) => write!(f, "{}u32", val),
             Self::U64(val) => write!(f, "{}u64", val),
             Self::U128(val) => write!(f, "{}u128", val),
-            Self::Bool(val) => write!(f, "{}", val),
             Self::Vague(val) => val.fmt(f),
         }
     }
@@ -179,20 +178,20 @@ impl Display for BinaryOperator {
             BinaryOperator::Minus => write!(f, "-"),
             BinaryOperator::Mult => write!(f, "*"),
             BinaryOperator::And => write!(f, "&&"),
-            BinaryOperator::Cmp(op) => Display::fmt(op, f),
+            BinaryOperator::Logic(op) => Display::fmt(op, f),
         }
     }
 }
 
-impl Display for CmpOperator {
+impl Display for LogicOperator {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            CmpOperator::LT => write!(f, "<"),
+            LogicOperator::LT => write!(f, "<"),
-            CmpOperator::LE => write!(f, "<="),
+            LogicOperator::LE => write!(f, "<="),
-            CmpOperator::GT => write!(f, ">"),
+            LogicOperator::GT => write!(f, ">"),
-            CmpOperator::GE => write!(f, ">="),
+            LogicOperator::GE => write!(f, ">="),
-            CmpOperator::EQ => write!(f, "=="),
+            LogicOperator::EQ => write!(f, "=="),
-            CmpOperator::NE => write!(f, "!="),
+            LogicOperator::NE => write!(f, "!="),
         }
     }
 }

reid/src/mir/mod.rs

@@ -128,7 +128,6 @@ pub enum Literal {
     U32(u32),
     U64(u64),
     U128(u128),
-    Bool(bool),
     Vague(VagueLiteral),
 }
 
@@ -150,7 +149,6 @@ impl Literal {
             Literal::U32(_) => TypeKind::U32,
             Literal::U64(_) => TypeKind::U64,
             Literal::U128(_) => TypeKind::U128,
-            Literal::Bool(_) => TypeKind::Bool,
             Literal::Vague(VagueLiteral::Number(_)) => TypeKind::Vague(VagueType::Number),
         }
     }
@@ -162,12 +160,11 @@ pub enum BinaryOperator {
     Minus,
     Mult,
     And,
-    Cmp(CmpOperator),
+    Logic(LogicOperator),
 }
 
-/// Specifically the operators that LLVM likes to take in as "icmp" parameters
 #[derive(Debug, Clone, Copy)]
-pub enum CmpOperator {
+pub enum LogicOperator {
     LT,
     LE,
     GT,

reid/src/mir/typecheck.rs

@@ -15,8 +15,6 @@ pub enum ErrorKind {
     TypeIsVague(VagueType),
     #[error("Can not coerce {0} to vague type {1}")]
     HintIsVague(TypeKind, VagueType),
-    #[error("Literal {0} can not be coerced to type {1}")]
-    LiteralIncompatible(Literal, TypeKind),
     #[error("Types {0} and {1} are incompatible")]
     TypesIncompatible(TypeKind, TypeKind),
     #[error("Variable not defined: {0}")]
@@ -254,7 +252,6 @@ impl Literal {
                 (L::U32(_), U32) => self,
                 (L::U64(_), U64) => self,
                 (L::U128(_), U128) => self,
-                (L::Bool(_), Bool) => self,
                 (L::Vague(VagueL::Number(v)), I8) => L::I8(v as i8),
                 (L::Vague(VagueL::Number(v)), I16) => L::I16(v as i16),
                 (L::Vague(VagueL::Number(v)), I32) => L::I32(v as i32),
@@ -268,7 +265,7 @@ impl Literal {
                 // Default type for number literal if unable to find true type.
                 (L::Vague(VagueL::Number(v)), Vague(Number)) => L::I32(v as i32),
                 (_, Vague(_)) => self,
-                _ => Err(ErrorKind::LiteralIncompatible(self, hint))?,
+                _ => Err(ErrorKind::TypesIncompatible(self.as_type(), hint))?,
             })
         } else {
             Ok(self)
@@ -302,7 +299,7 @@ impl TypeKind {
             BinaryOperator::Minus => res,
             BinaryOperator::Mult => res,
             BinaryOperator::And => res,
-            BinaryOperator::Cmp(_) => Bool,
+            BinaryOperator::Logic(_) => Bool,
         })
     }
 }