some general code refactors

Author: robertDurst

src/ast/Expression.h

@@ -13,8 +13,8 @@ class Expression
     {
         GroupingExpression,
         NewExpression,
-        UnaryExpression,
         PrimaryExpression,
+        UnaryExpression,
     };
     virtual ExpressionType getExpressionType() = 0;
 };

src/ast/GeneralDefinition.h

@@ -11,8 +11,8 @@ class GeneralDefinition
   public:
     enum GeneralDefinitionType
     {
-        ListDefinition,
         DictionaryDefinition,
+        ListDefinition,
         NewUDTDefinition,
         PrimitiveDefition,
     };

src/ast/New.h

@@ -11,8 +11,8 @@ class New
   public:
     enum NewType
     {
-        ListLiteral,
         DictionaryLiteral,
+        ListLiteral,
         UserDefinedType,
     };
     virtual NewType getNewType() = 0;

src/ast/Primary.h

@@ -11,15 +11,15 @@ class Primary
   public:
     enum PrimaryType
     {
-        IdentifierLiteral,
-        StringLiteral,
-        BooleanLiteral,
-        IntegerLiteral,
-        FloatLiteral,
         AttributeAccessLiteral,
         AttributeMethodAccessLiteral,
-        MethodAccessLiteral,
+        BooleanLiteral,
+        FloatLiteral,
         FunctionCallLiteral,
+        IdentifierLiteral,
+        IntegerLiteral,
+        MethodAccessLiteral,
+        StringLiteral,
     };
     virtual PrimaryType getPrimaryType() = 0;
 };

src/ast/SourcePart.h

@@ -13,8 +13,8 @@ class SourcePart
     {
         GeneralDecleration,
         FunctionDefinitionPart,
-        UserDefinedTypeDefinition,
         InitialExecutionBody,
+        UserDefinedTypeDefinition,
     };
     // must defined a default value for the virtual function
     // https://stackoverflow.com/questions/307352/g-undefined-reference-to-typeinfo

src/ast/Statement.h

@@ -10,11 +10,11 @@ class Statement
   public:
     enum StatementType
     {
-        IfStatement,
-        ReturnStatement,
+        BinaryExpressionStatement,
         BlockStatement,
         GeneralDecleration,
-        BinaryExpressionStatement,
+        IfStatement,
+        ReturnStatement,
     };
     virtual StatementType getStatementType() = 0;
 };

src/common/ReservedWords.cpp

@@ -5,7 +5,7 @@
 #include "ReservedWords.h"
 
 bool
-isKeyword(std::string v)
+isKeyword(const std::string v)
 {
     if (v == "fun" || v == "Cat" || v == "Cfn" || v == "dec" || v == "exp" ||
         v == "if" || v == "else" || v == "return" || v == "import" ||
@@ -16,7 +16,7 @@ isKeyword(std::string v)
 }
 
 bool
-isPrimitive(std::string type)
+isPrimitive(const std::string type)
 {
     if (type == "int" || type == "flt" || type == "str" || type == "bool" ||
         type == "void")

src/common/ReservedWords.h

@@ -5,5 +5,5 @@
 #pragma once
 #include <string>
 
-bool isKeyword(std::string);
-bool isPrimitive(std::string);
+bool isKeyword(const std::string);
+bool isPrimitive(const std::string);

src/errorhandler/Error.h

@@ -9,24 +9,22 @@
 class Error
 {
   private:
-    int line;
+    int lineNumber;
     std::string msg;
     std::string errtype;
 
   public:
     // constructor
-    Error(int l, std::string m)
+    Error(const int l, const std::string m)
     {
-        line = l;
+        lineNumber = l;
         msg = m;
     }
     // destructor
-    ~Error()
-    {
-    }
+    ~Error(){};
     // set method for receiving type to utilize internally
     void
-    setErrorType(std::string e)
+    setErrorType(const std::string e)
     {
         errtype = e;
     }
@@ -35,7 +33,7 @@ class Error
     std::string
     getPrettyMessage()
     {
-        return "[" + errtype + " Error at line: " + std::to_string(line) +
+        return "[" + errtype + " Error at line: " + std::to_string(lineNumber) +
                "]: " + msg + "\n";
     }
     // get methods

src/lexar/Lexar.cpp

@@ -17,14 +17,13 @@ createTokenPutback(Kind k, char c, std::string buffer, Scanner* scanner,
                    int linenum, int colNum)
 {
     if (!isspace(c))
-    {
         buffer.pop_back();
-    }
+
     scanner->putBackChar(c);
     return new Token(k, buffer, linenum, colNum);
 }
 
-Lexar::Lexar(std::string filename)
+Lexar::Lexar(const std::string filename)
 {
     scanner = new Scanner(filename);
     currentLineNum = 0;
@@ -66,24 +65,20 @@ Lexar::getNextToken()
         else
         {
             if (state == State::STRING || !isspace(c))
-            {
                 buffer += c;
-            }
+
             switch (state)
             {
             case State::START:
                 if (isalpha(c))
-                {
                     state = State::IDENTIFIER;
-                }
+
                 else if (isdigit(c))
-                {
                     state = State::INTEGER;
-                }
+
                 else if (isspace(c))
-                {
                     state = State::START;
-                }
+
                 else
                 {
                     switch (c)