Some parsing errors fixed and new lexemes accepted

Author: robertDurst

examples/test2.fish

@@ -1,3 +1,23 @@
+import foo : "foo.fish"
+import bar : "bar.fish"
+
+(fun some_function(int i)(void){
+   i = i + 1
+   return i
+})
+
 start {
-   f.f = f.f + 10
+   f.f = f...foo() + (5 * 11 ** (4  and 6))
+   z = 7
+
+   Tree (
+      (|1 == 2| {
+         z = 2
+      })
+
+       (|1 != 2 and (!true)| {
+         z = new Foo { z: 1, f: "hello from the otherside" }
+         --z
+      })
+   )
 }

src/lexar/Lexar2.cpp

@@ -240,13 +240,20 @@ Lexar2::getNextToken()
             break;
 
         case State::SUBTRACTION:
-            return c == '='
-                       ? makeToken(TokenKind::SUBFROM, buffer)
-                       : makeTokenPutback(TokenKind::SUBTRACTION, buffer, c);
+            if (c == '=')
+                return makeToken(TokenKind::SUBFROM, buffer);
+            else if (c == '-')
+                return makeToken(TokenKind::UNARYMINUS, buffer);
+            else
+                return makeTokenPutback(TokenKind::SUBTRACTION, buffer, c);
 
         case State::ADDITION:
-            return c == '=' ? makeToken(TokenKind::ADDTO, buffer)
-                            : makeTokenPutback(TokenKind::ADDITION, buffer, c);
+            if (c == '=')
+                return makeToken(TokenKind::ADDTO, buffer);
+            else if (c == '+')
+                return makeToken(TokenKind::UNARYADD, buffer);
+            else
+                return makeTokenPutback(TokenKind::ADDITION, buffer, c);
 
         case State::ASSIGNMENT:
             return c == '='

src/lexar/Token2.cpp

@@ -75,6 +75,10 @@ displayKind(const TokenKind& k)
         return "ASSIGNMENT";
     case TokenKind::NEGATION:
         return "NEGATION";
+    case TokenKind::UNARYADD:
+        return "UNARYADD";
+    case TokenKind::UNARYMINUS:
+        return "UNARYMINUS";
     case TokenKind::COMMENT:
         return "COMMENT";
     case TokenKind::UNDERSCORE:

src/lexar/Token2.h

@@ -48,7 +48,11 @@ enum class TokenKind
     EQUIVALENCE,
     NONEQUIVALENCE,
     ASSIGNMENT,
+
+    // unaries
     NEGATION,
+    UNARYADD,
+    UNARYMINUS,
 
     // Structure
     COMMENT,

src/main/CommandLine.h

@@ -8,7 +8,6 @@
 #include "../lexar/Lexar2.h"
 #include "../parser/Parser.h"
 #include "../parser/Parser2.h"
-#include "../parser/display.h"
 #include "../semantics/SemanticAnalyzer.h"
 #include "../transpiler/Transpiler.h"
 #include <iostream>

src/parser/Lexeme.cpp

@@ -111,6 +111,18 @@ disp(OP o)
         return "UDT dec";
     case OP::UDTDECITEM:
         return "UDT dec item";
+    case OP::UNARYADD:
+        return "Unary add";
+    case OP::UNARYMINUS:
+        return "Unary minus";
+    case OP::ADDTO:
+        return "Add to";
+    case OP::SUBFROM:
+        return "Sub from";
+    case OP::DIVFROM:
+        return "Div from";
+    case OP::MULTTO:
+        return "Mult to";
     default:
         return "Unknown";
     }

src/parser/Lexeme.h

@@ -60,6 +60,12 @@ enum class OP
     FUNCTION_CALL,
     UDTDEC,
     UDTDECITEM,
+    UNARYADD,
+    UNARYMINUS,
+    ADDTO,
+    SUBFROM,
+    DIVFROM,
+    MULTTO,
 };
 std::string disp(OP o);