More CPS conversion work.

git-svn-id: http://svn.drobilla.net/resp/tuplr@150 ad02d1e2-f140-0410-9f75-f8b11f17cedd

1 files changed, 19 insertions, 7 deletions

diff --git a/write.cpp b/write.cpp
index 95079ad..ba000f3 100644
--- a/write.cpp
+++ b/write.cpp
@@ -59,18 +59,30 @@ operator<<(ostream& out, const AST* ast)
 void
 pprint_internal(ostream& out, const AST* ast, unsigned indent)
 {
-	out << string().insert(0, indent, ' ');
 	const ATuple* tup = ast->to<const ATuple*>();
-	if (tup) {
+	if (tup && tup->size() > 0) {
 		const string head = tup->at(0)->str();
-		out << "(" << head;
-		if (tup->size() > 1)
-			out << " " << tup->at(1);
-		for (size_t i = 2; i != tup->size(); ++i) {
-			out << endl;
+		ASymbol* headSym = tup->at(0)->to<ASymbol*>();
+		out << "(";
+		pprint_internal(out, tup->at(0), indent);
+		if (tup->size() > 1) {
+			out << " ";
+			if (headSym && headSym->cppstr == "fn")
+				out << tup->at(1) << " ";
+			else
+				pprint_internal(out, tup->at(1), indent + head.length() + 1);
+		}
+		for (size_t i = 2; i < tup->size(); ++i) {
+			//if (!headSym || headSym->cppstr != "def")
+				out << endl;
+			//else
+			//	out << " ";
+			out << string().insert(0, indent, ' ');
 			pprint_internal(out, tup->at(i), indent + head.length() + 2);
 		}
 		out << ")";
+		if (headSym && headSym->cppstr == "fn")
+			out << endl << string().insert(0, indent, ' ');
 	} else {
 		out << ast;
 	}