fix some leaks in parser, add debug code to node manager to find more

1 files changed, 4 insertions, 4 deletions

diff --git a/src/parser/antlr_input.cpp b/src/parser/antlr_input.cpp
index 39c8e11b3..74157acd7 100644
--- a/src/parser/antlr_input.cpp
+++ b/src/parser/antlr_input.cpp
@@ -171,7 +171,7 @@ AntlrInput::AntlrInput(AntlrInputStream& inputStream, unsigned int lookahead) :
     d_lexer(NULL),
     d_parser(NULL),
     d_antlr3InputStream( inputStream.getAntlr3InputStream() ),
-    d_tokenStream(NULL) {
+    d_tokenBuffer(NULL) {
 }
 
 /*
@@ -204,11 +204,11 @@ AntlrInput::Input(ExprManager* exprManager, const std::string& input, const std:
 */
 
 AntlrInput::~AntlrInput() {
-  d_tokenStream->free(d_tokenStream);
+  BoundedTokenBufferFree(d_tokenBuffer);
 }
 
 pANTLR3_COMMON_TOKEN_STREAM AntlrInput::getTokenStream() {
-  return d_tokenStream;
+  return d_tokenBuffer->commonTstream;
 }
 
 void AntlrInput::lexerError(pANTLR3_BASE_RECOGNIZER recognizer) {
@@ -260,7 +260,7 @@ void AntlrInput::setAntlr3Lexer(pANTLR3_LEXER pLexer) {
     throw ParserException("Couldn't create token buffer.");
   }
 
-  d_tokenStream = buffer->commonTstream;
+  d_tokenBuffer = buffer;
 
   // Override default lexer error reporting
   d_lexer->rec->reportError = &lexerError;