Fix bug in Logic Operator conversion

reid-llvm-lib/src/compile.rs

@@ -359,12 +359,12 @@ impl CmpPredicate {
         use LLVMIntPredicate::*;
         match (self, signed) {
             (LT, true) => LLVMIntSLT,
-            (GT, true) => LLVMIntSGT,
             (LE, true) => LLVMIntSLE,
+            (GT, true) => LLVMIntSGT,
             (GE, true) => LLVMIntSGE,
             (LT, false) => LLVMIntULT,
-            (GT, false) => LLVMIntUGT,
             (LE, false) => LLVMIntULE,
+            (GT, false) => LLVMIntUGT,
             (GE, false) => LLVMIntUGE,
             (EQ, _) => LLVMIntEQ,
             (NE, _) => LLVMIntNE,

reid/examples/reid/fibonacci.reid

@@ -1,12 +1,12 @@
 // Main
 fn main() -> bool {
-    return 1 == fibonacci(3);
+    return 2 == fibonacci(3);
 }
 
 // Fibonacci
 fn fibonacci(value: u16) -> u16 {
-    if value < 3 {
+    if value <= 2 {
         return 1;
     }
-    return 5 + fibonacci(value - 2);
+    return fibonacci(value - 1) + fibonacci(value - 2);
 }

reid/src/codegen.rs

@@ -291,7 +291,7 @@ impl mir::LogicOperator {
         match self {
             mir::LogicOperator::LT => CmpPredicate::LT,
             mir::LogicOperator::GT => CmpPredicate::GT,
-            mir::LogicOperator::LE => CmpPredicate::LT,
+            mir::LogicOperator::LE => CmpPredicate::LE,
             mir::LogicOperator::GE => CmpPredicate::GE,
             mir::LogicOperator::EQ => CmpPredicate::EQ,
             mir::LogicOperator::NE => CmpPredicate::NE,

reid/src/lexer.rs

@@ -134,6 +134,9 @@ pub fn tokenize<T: Into<String>>(to_tokenize: T) -> Result<Vec<FullToken>, Error
     let mut tokens = Vec::new();
 
     while let Some(character) = &cursor.next() {
+        // Save "current" token first character position
+        let position = (cursor.position.0 - 1, cursor.position.1);
+
         let variant = match character {
             // Whitespace
             w if w.is_whitespace() => continue,
@@ -204,7 +207,7 @@ pub fn tokenize<T: Into<String>>(to_tokenize: T) -> Result<Vec<FullToken>, Error
 
         tokens.push(FullToken {
             token: variant,
-            position: cursor.position,
+            position,
         });
     }