[poincare] Reorder Token::Types for Parser

poincare/src/parsing/parser.cpp

@@ -14,8 +14,9 @@ Expression Parser::parseUntil(Token::Type stoppingType) {
     &Parser::parseEqual,
     &Parser::noParse, //Store, FIXME
     &Parser::noParse, //RightBracket,
+    &Parser::noParse, //RightParenthesis, //FIXME
+    &Parser::noParse, //Comma, FIXME
     &Parser::noParse, //RightBrace,
-    &Parser::noParse, //RightParenthesis,
     &Parser::parsePlus,
     &Parser::parseMinus,
     &Parser::parseTimes,
@@ -24,11 +25,10 @@ Expression Parser::parseUntil(Token::Type stoppingType) {
     &Parser::parseSquareRoot,
     &Parser::parseBang,
     &Parser::noParse, //LeftBracket, FIXME
-    &Parser::noParse, //LeftBrace, FIXME
     &Parser::parseLeftParenthesis,
+    &Parser::noParse, //LeftBrace, FIXME
     &Parser::parseNumber,
     &Parser::noParse, //Identifier, FIXME
-    &Parser::noParse, //Comma, FIXME
     &Parser::noParse //Undefined
   };
 
@@ -153,5 +153,4 @@ Expression Parser::noParse(Expression leftHandSide) { // FIXME nullptr?
   return leftHandSide;
 }
 
-
 }

poincare/src/parsing/token.h

@@ -9,12 +9,13 @@ class Token {
 public:
   enum class Type {
     // Ordered from lower to higher precedence to make parser's job easier
-    EndOfStream, // Must be the first
+    EndOfStream = 0, // Must be the first
     Equal,
     Store,
     RightBracket,
-    RightBrace,
     RightParenthesis,
+    Comma,
+    RightBrace,
     Plus,
     Minus,
     Times,
@@ -23,11 +24,10 @@ public:
     SquareRoot,
     Bang,
     LeftBracket,
-    LeftBrace,
     LeftParenthesis,
+    LeftBrace,
     Number,
     Identifier,
-    Comma,
     Undefined
   };