Added namespaces to most classes, general cleanup

2019-06-17 18:35:12 +02:00
parent 21d3329c55
commit fde102d954
66 changed files with 4301 additions and 3909 deletions
--- a/src/Binder/Binder.hpp
+++ b/src/Binder/Binder.hpp
@@ -8,36 +8,54 @@
 #include "../Parser/ParsedExpressions/ParsedTableExpression.hpp"

 using namespace std;
+using namespace Porygon::Parser;

-class Binder {
-    Script* _scriptData;
-    BoundScope* _scope;
-    shared_ptr<FunctionScriptType> _currentFunction;
+namespace Porygon::Binder {
+    class Binder {
+        Porygon::Script *_scriptData;
+        BoundScope *_scope;
+        shared_ptr<FunctionScriptType> _currentFunction;

-    ~Binder();
+        ~Binder();

-    BoundStatement *BindStatement(const ParsedStatement *statement);
-    BoundStatement *BindBlockStatement(const ParsedStatement *statement);
-    BoundStatement *BindExpressionStatement(const ParsedStatement *statement);
-    BoundStatement *BindAssignmentStatement(const ParsedStatement *statement);
-    BoundStatement *BindIndexAssignmentStatement(const ParsedStatement *statement);
-    BoundStatement *BindFunctionDeclarationStatement(const ParsedStatement * statement);
-    BoundStatement *BindReturnStatement(const ParsedStatement *statement);
-    BoundStatement *BindConditionalStatement(const ParsedStatement *statement);
+        BoundStatement *BindStatement(const ParsedStatement *statement);

-    BoundExpression *BindExpression(const ParsedExpression *expression);
-    BoundExpression *BindVariableExpression(const VariableExpression *expression);
-    BoundExpression *BindBinaryOperator(const BinaryExpression *expression);
-    BoundExpression *BindUnaryOperator(const UnaryExpression *expression);
-    BoundExpression *BindFunctionCall(const FunctionCallExpression *expression);
-    BoundExpression *BindIndexExpression(const IndexExpression *expression, bool setter);
-    BoundExpression *BindNumericalTableExpression(const ParsedNumericalTableExpression *expression);
-    BoundExpression *BindTableExpression(const ParsedTableExpression * expression);
-public:
-    static BoundScriptStatement* Bind(Script* script, const ParsedScriptStatement* s, BoundScope* scriptScope);
+        BoundStatement *BindBlockStatement(const ParsedStatement *statement);

-    BoundExpression *BindPeriodIndexExpression(const PeriodIndexExpression *expression, bool setter);
-};
+        BoundStatement *BindExpressionStatement(const ParsedStatement *statement);

+        BoundStatement *BindAssignmentStatement(const ParsedStatement *statement);
+
+        BoundStatement *BindIndexAssignmentStatement(const ParsedStatement *statement);
+
+        BoundStatement *BindFunctionDeclarationStatement(const ParsedStatement *statement);
+
+        BoundStatement *BindReturnStatement(const ParsedStatement *statement);
+
+        BoundStatement *BindConditionalStatement(const ParsedStatement *statement);
+
+        BoundExpression *BindExpression(const ParsedExpression *expression);
+
+        BoundExpression *BindVariableExpression(const VariableExpression *expression);
+
+        BoundExpression *BindBinaryOperator(const BinaryExpression *expression);
+
+        BoundExpression *BindUnaryOperator(const UnaryExpression *expression);
+
+        BoundExpression *BindFunctionCall(const FunctionCallExpression *expression);
+
+        BoundExpression *BindIndexExpression(const IndexExpression *expression, bool setter);
+
+        BoundExpression *BindNumericalTableExpression(const ParsedNumericalTableExpression *expression);
+
+        BoundExpression *BindTableExpression(const ParsedTableExpression *expression);
+
+    public:
+        static BoundScriptStatement *
+        Bind(Porygon::Script *script, const ParsedScriptStatement *s, BoundScope *scriptScope);
+
+        BoundExpression *BindPeriodIndexExpression(const PeriodIndexExpression *expression, bool setter);
+    };
+}

 #endif //PORYGONLANG_BINDER_HPP