ASTParser proper intendation. (#16)

3 files changed, 119 insertions, 51 deletions

diff --git a/JSImpl/src/ASTPrinter.cpp b/JSImpl/src/ASTPrinter.cpp
index b77f54c..3d33f0a 100644
--- a/JSImpl/src/ASTPrinter.cpp
+++ b/JSImpl/src/ASTPrinter.cpp
@@ -4,88 +4,108 @@
 #include <iostream>
 
 ASTPrinter::ASTPrinter(std::ostream& os)
- : os(os)
+	: os(os)
+	, nest_level(0)
+	, indent_next_accept(true)
 {}
 
-void Print(std::ostream& os, ASTPrinter &printer, const char* name, const ExpressionPtr& expr, bool isLast)
+void PrepNextElem(std::ostream& os, bool isLast)
 {
-	os << "\"" << name << "\" : ";
-	expr->Accept(printer);
 	if (!isLast)
 	{
 		os << ",";
 	}
+	os << "\n";
+}
+
+void Print(std::ostream& os, ASTPrinter &printer, const char* name, const ExpressionPtr& expr, bool isLast)
+{
+	printer.InsertIndent();
+	os << "\"" << name << "\": ";
+	printer.NoIndentNextAccept();
+	expr->Accept(printer);
+	PrepNextElem(os, isLast);
 }
 
 void Print(std::ostream& os, ASTPrinter &printer, const char* name, const IPLVector<ExpressionPtr>& list, bool isLast)
 {
-	os << "\"" << name << "\" : [ \n";
+	printer.InsertIndent();
+	os << "\"" << name << "\": [";
+	if (list.empty())
+	{
+		os << "]";
+		PrepNextElem(os, isLast);
+		return;
+	}
+
+	printer.Enter();
 	for (auto i = 0u; i < list.size(); ++i)
 	{
+		printer.IndentNextAccept();
 		list[i]->Accept(printer);
 		if (i + 1 != list.size())
 		{
-			os << ",";
+			os << ",\n";
 		}
 	}
-	os << "]";
-	if (!isLast)
-	{
-		os << ",";
-	}
+	printer.Exit();
 	os << "\n";
+	printer.InsertIndent();
+	os << "]";
+	PrepNextElem(os, isLast);
 }
 
-void Print(std::ostream& os, ASTPrinter & /*printer*/, const char* name, const IPLVector<IPLString>& list, bool isLast)
+void Print(std::ostream& os, ASTPrinter& printer, const char* name, const IPLVector<IPLString>& list, bool isLast)
 {
-	os << "\"" << name << "\" : [";
+	printer.InsertIndent();
+	os << "\"" << name << "\": [";
+	if (list.empty())
+	{
+		os << "]";
+		PrepNextElem(os, isLast);
+		return;
+	}
+
+	printer.Enter();
 	for (auto i = 0u; i < list.size(); ++i)
 	{
+		printer.InsertIndent();
 		os << "\"" << list[i] << "\"";
 		if (i + 1 != list.size())
 		{
-			os << ",";
+			os << ",\n";
 		}
 	}
-	os << "]";
-	if (!isLast)
-	{
-		os << ",";
-	}
+	printer.Exit();
 	os << "\n";
+	printer.InsertIndent();
+	os << "]";
+	PrepNextElem(os, isLast);
 }
 
 template<typename T>
-void Print(std::ostream& os, ASTPrinter &/*printer*/, const char* name, T member, bool isLast)
+void Print(std::ostream& os, ASTPrinter& printer, const char* name, T member, bool isLast)
 {
-	os << "\"" << name << "\" :" << member;
-	if (!isLast)
-	{
-		os << ",";
-	}
-	os << "\n";
+	printer.InsertIndent();
+	os << "\"" << name << "\": " << member;
+	PrepNextElem(os, isLast);
 }
 
-template<>
-void Print<IPLString>(std::ostream& os, ASTPrinter  &/*printer*/, const char* name, IPLString member, bool isLast)
+IPLString StripString(const IPLString& str)
 {
-	os << "\"" << name << "\" : \"" << member << "\"";
-	if (!isLast)
+	if (str.front() == '\"')
 	{
-		os << ",";
+		return str.substr(1, str.length() - 2);
 	}
-	os << "\n";
+	return str;
 }
 
 template<>
-void Print<const IPLString&>(std::ostream& os, ASTPrinter &/*printer*/, const char* name, const IPLString& member, bool isLast)
+void Print<IPLString>(std::ostream& os, ASTPrinter& printer, const char* name, IPLString member, bool isLast)
 {
-	os << "\"" << name << "\" : \"" << member << "\"";
-	if (!isLast)
-	{
-		os << ",";
-	}
-	os << "\n";
+	printer.InsertIndent();
+	os << "\"" << name << "\": \"" << StripString(member) << "\"";
+	PrepNextElem(os, isLast);
 }
 
 std::ostream& operator<<(std::ostream& os, const TokenType& t)
@@ -187,21 +207,60 @@ std::ostream& operator<<(std::ostream& os, const TokenType& t)
 }
 
 #define MEMBERS_COUNT(type, name, def) ++membersCount;
-#define VISIT_MEMBER(type, name, def) ++currentVisitCount; Print(os, *this, #name, e->Get##name(), currentVisitCount == membersCount);;
+#define VISIT_MEMBER(type, name, def) ++currentVisitCount; Print(os, *this, #name, e->Get##name(), currentVisitCount == membersCount);
 
-#define GENERATE_AST_PRINTER_FUNCTION(ClassName, Base, MEMBERS_ITERATOR)\
+#define GENERATE_AST_PRINTER_FUNCTION(ClassName, Base, MEMBERS_ITERATOR)     \
 	void ASTPrinter::Visit(ClassName* e)                                     \
 	{                                                                        \
 		int membersCount = 0, currentVisitCount = 0;                         \
-		(void)currentVisitCount;(void)e;                               \
+		(void)currentVisitCount;(void)e;                                     \
 		MEMBERS_ITERATOR(MEMBERS_COUNT);                                     \
-		if(membersCount)                                                     \
-			os << "{\n \"ExpresionType\": \"" << #ClassName "\","<< '\n';    \
-		else                                                                 \
-			os << "{\n \"ExpresionType\": \"" << #ClassName "\"" << '\n';    \
+		if (indent_next_accept)                                              \
+		{                                                                    \
+			InsertIndent();                                                  \
+		}                                                                    \
+		os << "{";                                                           \
+		Enter();                                                             \
+		InsertIndent();                                                      \
+		os << "\"ExpresionType\": \"" << #ClassName "\"";                    \
+		if (membersCount)                                                    \
+		{                                                                    \
+			os << ",";                                                       \
+		}                                                                    \
+		os << "\n";                                                          \
 		MEMBERS_ITERATOR(VISIT_MEMBER);                                      \
-		os << "}\n";                                                         \
+		Exit();                                                              \
+		InsertIndent();                                                      \
+		os << "}";                                                           \
 	}
 
-
 EXPRESSION_DEFINITION_ITERATOR(GENERATE_AST_PRINTER_FUNCTION);
+
+void ASTPrinter::Enter()
+{
+	os << "\n";
+	++nest_level;
+}
+
+void ASTPrinter::Exit()
+{
+	--nest_level;
+}
+
+void ASTPrinter::IndentNextAccept()
+{
+	indent_next_accept = true;
+}
+
+void ASTPrinter::InsertIndent()
+{
+	for (unsigned i = 0; i < nest_level; ++i)
+	{
+		os << "  ";
+	}
+}
+
+void ASTPrinter::NoIndentNextAccept()
+{
+	indent_next_accept = false;
+}
diff --git a/JSImpl/src/ASTPrinter.h b/JSImpl/src/ASTPrinter.h
index 9d74fa6..cdc0743 100644
--- a/JSImpl/src/ASTPrinter.h
+++ b/JSImpl/src/ASTPrinter.h
@@ -28,7 +28,14 @@ public:
 	virtual void Visit(FunctionDeclaration* e) override;
 	virtual void Visit(TopStatements* e) override;
 	virtual void Visit(EmptyExpression* e) override;
+
+	inline void Enter();
+	inline void Exit();
+	inline void NoIndentNextAccept();
+	inline void IndentNextAccept();
+	inline void InsertIndent();
 private:
 	std::ostream& os;
-
+	unsigned nest_level;
+	bool indent_next_accept;
 };
diff --git a/JSImpl/src/main.cpp b/JSImpl/src/main.cpp
index dd54f38..a7d489c 100644
--- a/JSImpl/src/main.cpp
+++ b/JSImpl/src/main.cpp
@@ -191,12 +191,13 @@ void TestCommentError()
 void TestParseUnaryExpr()
 {
 	IPLVector<Token> tokens;
-	Tokenize("function pesho() { var a = 0; return a; }", tokens);
+	Tokenize("function pesho() { var a = 0; return a; } var a = \"3\";", tokens);
 
 	// TODO make actual test :D
 	auto expr = Parse(tokens);
 	ASTPrinter p(std::cout);
 	expr->Accept(p);
+	std::cout << "\n";
 }
 
 void RunParseCalc()
@@ -258,7 +259,8 @@ int main()
 	EXECUTE_TEST(TestScientificNotationNumber);
 
 	//TestParseUnaryExpr();
-        RunParseCalc();
+  RunParseCalc();
+
 #if defined(_WIN32)
 	std::system("pause");
 #endif