Coherent AString and Lexeme implementation.

A Lexeme is any "token" read from input, a lexeme has not yet beeen parsed
and could parse to anything, e.g. a string, an expression, a number, etc.
Lexemes are not (yet?) exposed to the language or ever compiled.

A String is a string literal, which can contain any character directly
except " and \.  There are two special escapes: \" and \\, any other
character following a \ is a syntax error.

Fix garbage collection of REPL objects, leading to type errors from
type variable re-use because a type variable for a given AST's /address/
exists, but that address has actually been deleted and reused by new
(i.e. make top level REPL expressions and types be GC roots).


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

1 files changed, 5 insertions, 1 deletions

diff --git a/src/pprint.cpp b/src/pprint.cpp
index 5ee5736..391609a 100644
--- a/src/pprint.cpp
+++ b/src/pprint.cpp
@@ -24,6 +24,10 @@
 ostream&
 operator<<(ostream& out, const AST* ast)
 {
+	const ALexeme* lexeme = ast->to<const ALexeme*>();
+	if (lexeme)
+		return out << *lexeme;
+
 	const ALiteral<float>* flit = ast->to<const ALiteral<float>*>();
 	if (flit)
 		return out << showpoint << flit->val;
@@ -38,7 +42,7 @@ operator<<(ostream& out, const AST* ast)
 
 	const AString* str = ast->to<const AString*>();
 	if (str)
-		return out << *str;
+		return out << '"' << *str << '"';
 
 	const ASymbol* sym = ast->to<const ASymbol*>();
 	if (sym)