From 911b30089ccc5b8ece1654312b16ad81812e7da4 Mon Sep 17 00:00:00 2001
From: garak <garakmon@gmail.com>
Date: Sat, 21 Sep 2019 17:06:04 -0400
Subject: [PATCH] rename TokenType to TokenClass to fix Windows issues

---
 include/core/parseutil.h | 10 +++++-----
 src/core/parseutil.cpp   |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/core/parseutil.h b/include/core/parseutil.h
index 606550c0..df2492a6 100644
--- a/include/core/parseutil.h
+++ b/include/core/parseutil.h
@@ -9,7 +9,7 @@
 #include <QMap>
 #include <QRegularExpression>
 
-enum TokenType {
+enum TokenClass {
     Number,
     Operator,
     Error,
@@ -19,19 +19,19 @@ class Token {
 public:
     Token(QString value = "", QString type = "") {
         this->value = value;
-        this->type = TokenType::Operator;
+        this->type = TokenClass::Operator;
         if (type == "decimal" || type == "hex") {
-            this->type = TokenType::Number;
+            this->type = TokenClass::Number;
             this->operatorPrecedence = -1;
         } else if (type == "operator") {
             this->operatorPrecedence = precedenceMap[value];
         } else if (type == "error") {
-            this->type = TokenType::Error;
+            this->type = TokenClass::Error;
         }
     }
     static QMap<QString, int> precedenceMap;
     QString value;
-    TokenType type;
+    TokenClass type;
     int operatorPrecedence; // only relevant for operator tokens
 };
 
diff --git a/src/core/parseutil.cpp b/src/core/parseutil.cpp
index c26794f0..8d683c7a 100644
--- a/src/core/parseutil.cpp
+++ b/src/core/parseutil.cpp
@@ -157,7 +157,7 @@ QList<Token> ParseUtil::generatePostfix(QList<Token> tokens) {
     QList<Token> output;
     QStack<Token> operatorStack;
     for (Token token : tokens) {
-        if (token.type == TokenType::Number) {
+        if (token.type == TokenClass::Number) {
             output.append(token);
         } else if (token.value == "(") {
             operatorStack.push(token);
@@ -198,7 +198,7 @@ QList<Token> ParseUtil::generatePostfix(QList<Token> tokens) {
 int ParseUtil::evaluatePostfix(QList<Token> postfix) {
     QStack<Token> stack;
     for (Token token : postfix) {
-        if (token.type == TokenType::Operator && stack.size() > 1) {
+        if (token.type == TokenClass::Operator && stack.size() > 1) {
             int op2 = stack.pop().value.toInt(nullptr, 0);
             int op1 = stack.pop().value.toInt(nullptr, 0);
             int result = 0;
@@ -222,7 +222,7 @@ int ParseUtil::evaluatePostfix(QList<Token> postfix) {
                 result = op1 | op2;
             }
             stack.push(Token(QString("%1").arg(result), "decimal"));
-        } else if (token.type != TokenType::Error) {
+        } else if (token.type != TokenClass::Error) {
             stack.push(token);
         } // else ignore errored tokens, we have already warned the user.
     }