Split visitor from expressions and introduce ASTPrint.

7 files changed, 125 insertions, 42 deletions

diff --git a/JSImpl/solution/JSImpl.vcxproj b/JSImpl/solution/JSImpl.vcxproj
index 59d1a78..e55b38d 100644
--- a/JSImpl/solution/JSImpl.vcxproj
+++ b/JSImpl/solution/JSImpl.vcxproj
@@ -103,7 +103,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat>None</DebugInformationFormat>
       <WholeProgramOptimization>true</WholeProgramOptimization>
     </ClCompile>
     <Link>
@@ -112,12 +112,16 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\src\ASTPrinter.h" />
     <ClInclude Include="..\src\CommonTypes.h" />
     <ClInclude Include="..\src\Expression.h" />
+    <ClInclude Include="..\src\ExpressionsFwd.h" />
+    <ClInclude Include="..\src\ExpressionVisitor.h" />
     <ClInclude Include="..\src\Lexer.h" />
     <ClInclude Include="..\src\Parser.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\src\ASTPrinter.cpp" />
     <ClCompile Include="..\src\Expression.cpp" />
     <ClCompile Include="..\src\Lexer.cpp" />
     <ClCompile Include="..\src\main.cpp" />
diff --git a/JSImpl/solution/JSImpl.vcxproj.filters b/JSImpl/solution/JSImpl.vcxproj.filters
index 4944210..d56f6a1 100644
--- a/JSImpl/solution/JSImpl.vcxproj.filters
+++ b/JSImpl/solution/JSImpl.vcxproj.filters
@@ -23,6 +23,15 @@
     <ClInclude Include="..\src\Expression.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\ASTPrinter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\ExpressionsFwd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\ExpressionVisitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\Lexer.cpp">
@@ -37,5 +46,8 @@
     <ClCompile Include="..\src\Expression.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\ASTPrinter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/JSImpl/src/ASTPrinter.cpp b/JSImpl/src/ASTPrinter.cpp
new file mode 100644
index 0000000..0cbfa4c
--- /dev/null
+++ b/JSImpl/src/ASTPrinter.cpp
@@ -0,0 +1,34 @@
+#include "ASTPrinter.h"
+
+ASTPrinter::ASTPrinter(std::ostream& os)
+{}
+void ASTPrinter::Visit(BinaryExpression* e)
+{}
+void ASTPrinter::Visit(UnaryExpression* e)
+{}
+void ASTPrinter::Visit(LiteralExpression* e)
+{}
+void ASTPrinter::Visit(IdentifierExpression* e)
+{}
+void ASTPrinter::Visit(ListExpression* e)
+{}
+void ASTPrinter::Visit(VariableDefinitionExpression* e)
+{}
+void ASTPrinter::Visit(BlockStatement* e)
+{}
+void ASTPrinter::Visit(LabeledStatement* e)
+{}
+void ASTPrinter::Visit(IfStatement* e)
+{}
+void ASTPrinter::Visit(SwitchStatement* e)
+{}
+void ASTPrinter::Visit(WhileStatement* e)
+{}
+void ASTPrinter::Visit(ForStatement* e)
+{}
+void ASTPrinter::Visit(FunctionDeclaration* e)
+{}
+void ASTPrinter::Visit(TopStatements* e)
+{}
+void ASTPrinter::Visit(EmptyExpression* e)
+{}
\ No newline at end of file
diff --git a/JSImpl/src/ASTPrinter.h b/JSImpl/src/ASTPrinter.h
new file mode 100644
index 0000000..bbfcd70
--- /dev/null
+++ b/JSImpl/src/ASTPrinter.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "ExpressionVisitor.h"
+
+namespace std
+{
+class ostream;
+}
+
+class ASTPrinter : public ExpressionVisitor
+{
+public:
+	ASTPrinter(std::ostream& os);
+	~ASTPrinter() {}
+	virtual void Visit(BinaryExpression* e) = 0;
+	virtual void Visit(UnaryExpression* e) = 0;
+	virtual void Visit(LiteralExpression* e) = 0;
+	virtual void Visit(IdentifierExpression* e) = 0;
+	virtual void Visit(ListExpression* e) = 0;
+	virtual void Visit(VariableDefinitionExpression* e) = 0;
+	virtual void Visit(BlockStatement* e) = 0;
+	virtual void Visit(LabeledStatement* e) = 0;
+	virtual void Visit(IfStatement* e) = 0;
+	virtual void Visit(SwitchStatement* e) = 0;
+	virtual void Visit(WhileStatement* e) = 0;
+	virtual void Visit(ForStatement* e) = 0;
+	virtual void Visit(FunctionDeclaration* e) = 0;
+	virtual void Visit(TopStatements* e) = 0;
+	virtual void Visit(EmptyExpression* e) = 0;
+};
diff --git a/JSImpl/src/Expression.h b/JSImpl/src/Expression.h
index 1934afc..0927ba8 100644
--- a/JSImpl/src/Expression.h
+++ b/JSImpl/src/Expression.h
@@ -2,56 +2,16 @@
 
 #include "CommonTypes.h"
 #include "Lexer.h"
-
-class Expression;
-class BinaryExpression;
-class UnaryExpression;
-class LiteralExpression;
-class IdentifierExpression;
-class ListExpression;
-class VariableDefinitionExpression;
-class BlockStatement;
-class LabeledStatement;
-class IfStatement;
-class SwitchStatement;
-class WhileStatement;
-class ForStatement;
-class FunctionDeclaration;
-class TopStatements;
-class EmptyExpression;
-using ExpressionPtr = IPLSharedPtr<Expression>;
-
-class ExpressionVisitor
-{
-public:
-	~ExpressionVisitor(){}
-	virtual void Visit(BinaryExpression* e) = 0;
-	virtual void Visit(UnaryExpression* e) = 0;
-	virtual void Visit(LiteralExpression* e) = 0;
-	virtual void Visit(IdentifierExpression* e) = 0;
-	virtual void Visit(ListExpression* e) = 0;
-	virtual void Visit(VariableDefinitionExpression* e) = 0;
-	virtual void Visit(BlockStatement* e) = 0;
-	virtual void Visit(LabeledStatement* e) = 0;
-	virtual void Visit(IfStatement* e) = 0;
-	virtual void Visit(SwitchStatement* e) = 0;
-	virtual void Visit(WhileStatement* e) = 0;
-	virtual void Visit(ForStatement* e) = 0;
-	virtual void Visit(FunctionDeclaration* e) = 0;
-	virtual void Visit(TopStatements* e) = 0;
-	virtual void Visit(EmptyExpression* e) = 0;
-};
+#include "ExpressionVisitor.h"
 
 class Expression : public IPLEnableShared<Expression>
 {
-
 	public:
 		virtual ~Expression() {}
 		virtual void Print(std::ostream& os) const {};
 		virtual void Accept(ExpressionVisitor& v) = 0;
 };
 
-
 // binary:= expression operator expression
 class BinaryExpression : public Expression
 {
diff --git a/JSImpl/src/ExpressionVisitor.h b/JSImpl/src/ExpressionVisitor.h
new file mode 100644
index 0000000..7a893bb
--- /dev/null
+++ b/JSImpl/src/ExpressionVisitor.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "ExpressionsFwd.h"
+
+class ExpressionVisitor
+{
+public:
+	~ExpressionVisitor() {}
+	virtual void Visit(BinaryExpression* e) = 0;
+	virtual void Visit(UnaryExpression* e) = 0;
+	virtual void Visit(LiteralExpression* e) = 0;
+	virtual void Visit(IdentifierExpression* e) = 0;
+	virtual void Visit(ListExpression* e) = 0;
+	virtual void Visit(VariableDefinitionExpression* e) = 0;
+	virtual void Visit(BlockStatement* e) = 0;
+	virtual void Visit(LabeledStatement* e) = 0;
+	virtual void Visit(IfStatement* e) = 0;
+	virtual void Visit(SwitchStatement* e) = 0;
+	virtual void Visit(WhileStatement* e) = 0;
+	virtual void Visit(ForStatement* e) = 0;
+	virtual void Visit(FunctionDeclaration* e) = 0;
+	virtual void Visit(TopStatements* e) = 0;
+	virtual void Visit(EmptyExpression* e) = 0;
+};
\ No newline at end of file
diff --git a/JSImpl/src/ExpressionsFwd.h b/JSImpl/src/ExpressionsFwd.h
new file mode 100644
index 0000000..654fe41
--- /dev/null
+++ b/JSImpl/src/ExpressionsFwd.h
@@ -0,0 +1,19 @@
+#pragma once
+
+class Expression;
+class BinaryExpression;
+class UnaryExpression;
+class LiteralExpression;
+class IdentifierExpression;
+class ListExpression;
+class VariableDefinitionExpression;
+class BlockStatement;
+class LabeledStatement;
+class IfStatement;
+class SwitchStatement;
+class WhileStatement;
+class ForStatement;
+class FunctionDeclaration;
+class TopStatements;
+class EmptyExpression;
+using ExpressionPtr = IPLSharedPtr<Expression>;
\ No newline at end of file