Moved ScriptType classes into separate directory

src/Binder/Binder.cpp

@@ -1,7 +1,7 @@
 #include <memory>
 
 #include "Binder.hpp"
-#include "../TableScriptType.hpp"
+#include "../ScriptTypes/TableScriptType.hpp"
 #include "BoundExpressions/BoundTableExpression.hpp"
 #include "BoundExpressions/BoundFunctionCallExpression.hpp"
 #include "../UserData/UserDataScriptType.hpp"

src/Binder/Binder.hpp

@@ -6,7 +6,7 @@
 #include "../Script.hpp"
 #include "BoundVariables/BoundScope.hpp"
 #include "../Parser/ParsedExpressions/ParsedTableExpression.hpp"
-#include "../FunctionScriptType.hpp"
+#include "../ScriptTypes/FunctionScriptType.hpp"
 
 using namespace std;
 using namespace Porygon::Parser;

src/Binder/BoundExpressions/BoundExpression.hpp

@@ -4,10 +4,10 @@
 #include <string>
 #include <memory>
 #include <utility>
-#include "../../ScriptType.hpp"
+#include "../../ScriptTypes/ScriptType.hpp"
 #include "../BoundOperators.hpp"
 #include "../BoundVariables/BoundVariableKey.hpp"
-#include "../../FunctionScriptType.hpp"
+#include "../../ScriptTypes/FunctionScriptType.hpp"
 
 using namespace std;
 

src/Binder/BoundStatements/BoundFunctionDeclarationStatement.hpp

@@ -4,7 +4,7 @@
 
 #include <memory>
 #include "BoundStatement.hpp"
-#include "../../FunctionScriptType.hpp"
+#include "../../ScriptTypes/FunctionScriptType.hpp"
 
 namespace Porygon::Binder {
     class BoundFunctionDeclarationStatement : public BoundStatement {

src/Binder/BoundVariables/BoundVariable.hpp

@@ -5,7 +5,7 @@
 
 #include <utility>
 #include <memory>
-#include "../../ScriptType.hpp"
+#include "../../ScriptTypes/ScriptType.hpp"
 
 using namespace std;
 

src/Evaluator/EvalValues/EvalValue.hpp

@@ -5,7 +5,7 @@
 #include <string>
 #include <sstream>
 #include <memory>
-#include "../../ScriptType.hpp"
+#include "../../ScriptTypes/ScriptType.hpp"
 #include "../EvaluationException.hpp"
 namespace Porygon::Evaluation{
     class EvalValue;

src/Evaluator/EvalValues/ScriptFunctionEvalValue.hpp

@@ -5,11 +5,11 @@
 #include <memory>
 #include <utility>
 #include <unordered_map>
-#include "../../ScriptType.hpp"
+#include "../../ScriptTypes/ScriptType.hpp"
 #include "EvalValue.hpp"
 #include "../../Binder/BoundStatements/BoundStatement.hpp"
 #include "../EvaluationScope/EvaluationScope.hpp"
-#include "../../FunctionScriptType.hpp"
+#include "../../ScriptTypes/FunctionScriptType.hpp"
 
 using namespace std;
 

src/Evaluator/Evaluator.cpp

@@ -7,7 +7,7 @@
 #include "EvalValues/TableEvalValue.hpp"
 #include "../Binder/BoundExpressions/BoundTableExpression.hpp"
 #include "../Binder/BoundExpressions/BoundFunctionCallExpression.hpp"
-#include "../TableScriptType.hpp"
+#include "../ScriptTypes/TableScriptType.hpp"
 #include "../UserData/UserDataFunction.hpp"
 #include "EvalValues/NumericalTableEvalValue.hpp"
 

src/ScriptTypes/ScriptType.cpp

@@ -1,5 +1,5 @@
-#include "Script.hpp"
+#include "../Script.hpp"
-#include "UserData/UserDataFunctionType.hpp"
+#include "../UserData/UserDataFunctionType.hpp"
 
 namespace Porygon{
     inline bool ScriptType::CanBeIndexedWith(const ScriptType *) const{

src/ScriptTypes/ScriptType.hpp

@@ -7,8 +7,8 @@
 #include <utility>
 #include <vector>
 #include <memory>
-#include "Binder/BoundVariables/BoundVariableKey.hpp"
+#include "../Binder/BoundVariables/BoundVariableKey.hpp"
-#include "Utilities/HashedString.hpp"
+#include "../Utilities/HashedString.hpp"
 
 using namespace std;
 

src/ScriptTypes/TableScriptType.hpp

@@ -2,7 +2,7 @@
 #ifndef PORYGONLANG_TABLESCRIPTTYPE_HPP
 #define PORYGONLANG_TABLESCRIPTTYPE_HPP
 #include <unordered_map>
-#include "Binder/BoundVariables/BoundVariable.hpp"
+#include "../Binder/BoundVariables/BoundVariable.hpp"
 
 namespace Porygon{
     class TableScriptType : public ScriptType{

src/UserData/UserDataFunction.hpp

@@ -3,7 +3,7 @@
 
 #include "../Evaluator/EvalValues/ScriptFunctionEvalValue.hpp"
 #include "UserDataFunctionType.hpp"
-#include "../FunctionScriptType.hpp"
+#include "../ScriptTypes/FunctionScriptType.hpp"
 
 namespace Porygon::UserData{
     class UserDataFunction : public Evaluation::GenericFunctionOption {

src/UserData/UserDataFunctionType.hpp

@@ -2,8 +2,8 @@
 #define PORYGONLANG_USERDATAFUNCTIONTYPE_HPP
 
 #include <utility>
-#include "../ScriptType.hpp"
+#include "../ScriptTypes/ScriptType.hpp"
-#include "../FunctionScriptType.hpp"
+#include "../ScriptTypes/FunctionScriptType.hpp"
 
 namespace Porygon::UserData{
     class UserDataFunctionOption : public GenericFunctionOption{

src/UserData/UserDataScriptType.hpp

@@ -4,7 +4,7 @@
 #define PORYGONLANG_USERDATASCRIPTTYPE_HPP
 
 #include <utility>
-#include "../ScriptType.hpp"
+#include "../ScriptTypes/ScriptType.hpp"
 #include "UserData.hpp"
 #include "UserDataStorage.hpp"