Changed statement kinds

src/Compiler/ModuleBuilder.cpp

@@ -29,10 +29,10 @@ shared_ptr<llvm::Module> ModuleBuilder::getModule() {
 
 void ModuleBuilder::buildStatement(shared_ptr<Statement> statement) {
     switch (statement->getKind()) {
-        case StatementKind::FUNCTION_DECLARATION:
+        case StatementKind::FUNCTION:
             buildFunctionDeclaration(dynamic_pointer_cast<StatementFunction>(statement));
             break;
-        case StatementKind::VAR_DECLARATION:
+        case StatementKind::VARIABLE:
             buildVarDeclaration(dynamic_pointer_cast<StatementVariable>(statement));
             break;
         case StatementKind::BLOCK:

src/Parser/Parser.cpp

@@ -2,9 +2,9 @@
 
 #include "Parser/Statement/StatementExpression.h"
 #include "Parser/Statement/StatementBlock.h"
+#include "Parser/Statement/StatementReturn.h"
 #include "Parser/Statement/StatementFunction.h"
 #include "Parser/Statement/StatementVariable.h"
-#include "Parser/Statement/StatementReturn.h"
 #include "Parser/Statement/StatementMetaExternFunction.h"
 #include "Parser/Statement/StatementInvalid.h"
 

src/Parser/Parser.h

@@ -7,6 +7,8 @@
 #include "Expression.h"
 #include "Parser/Statement/Statement.h"
 
+class StatementInvalid;
+
 using namespace std;
 
 class Parser {

src/Parser/Statement/Statement.h

@@ -5,21 +5,14 @@
 
 #include "Types.h"
 
-class Expression;
-class Statement;
-class StatementBlock;
-class StatementReturn;
-class StatementExpression;
-class StatementInvalid;
-
 using namespace std;
 
 enum class StatementKind {
-    FUNCTION_DECLARATION,
+    EXPRESSION,
-    VAR_DECLARATION,
     BLOCK,
     RETURN,
-    EXPRESSION,
+    FUNCTION,
+    VARIABLE,
     META_EXTERN_FUNCTION,
     INVALID
 };

src/Parser/Statement/StatementBlock.h

@@ -1,5 +1,7 @@
 #include "Parser/Statement/Statement.h"
 
+class StatementExpression;
+
 class StatementBlock: public Statement {
 private:
     vector<shared_ptr<Statement>> statements;

src/Parser/Statement/StatementFunction.cpp

@@ -16,7 +16,7 @@ static string valueTypeToString(ValueType valueType) {
 }
 
 StatementFunction::StatementFunction(string name, vector<pair<string, ValueType>> arguments, ValueType returnValueType, shared_ptr<StatementBlock> statementBlock):
-Statement(StatementKind::FUNCTION_DECLARATION), name(name), arguments(arguments), returnValueType(returnValueType), statementBlock(statementBlock) { }
+Statement(StatementKind::FUNCTION), name(name), arguments(arguments), returnValueType(returnValueType), statementBlock(statementBlock) { }
 
 string StatementFunction::getName() {
     return name;

src/Parser/Statement/StatementVariable.cpp

@@ -16,7 +16,7 @@ static string valueTypeToString(ValueType valueType) {
 }
 
 StatementVariable::StatementVariable(string name, ValueType valueType, shared_ptr<Expression> expression):
-Statement(StatementKind::VAR_DECLARATION), name(name), valueType(valueType), expression(expression) { }
+Statement(StatementKind::VARIABLE), name(name), valueType(valueType), expression(expression) { }
 
 string StatementVariable::getName() {
     return name;