From f03d33317e125975053aadb47386d66f983a4c6e Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibre5041@ibrezina.net>
Date: Fri, 7 Feb 2014 18:28:30 +0100
Subject: [PATCH 01/53] When you name your source files *.c, MSVC (2010)
 assumes it's compiling C, which means C89. All block-local variables need to
 be declared at the beginning of your functions. Or at begginning of {} block.

---
 runtime/C/src/antlr3baserecognizer.c | 18 ++++++++++--------
 runtime/C/src/antlr3basetree.c       |  8 +++++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/runtime/C/src/antlr3baserecognizer.c b/runtime/C/src/antlr3baserecognizer.c
index 8c6b105c7..667ad7ac9 100644
--- a/runtime/C/src/antlr3baserecognizer.c
+++ b/runtime/C/src/antlr3baserecognizer.c
@@ -2141,14 +2141,16 @@ reset(pANTLR3_BASE_RECOGNIZER recognizer)
 			recognizer->state->ruleMemo = antlr3IntTrieNew(15);	/* 16 bit depth is enough for 32768 rules! */
 		}
 	}
-	
-  // ml: 2013-11-05, added reset of old exceptions.
-  pANTLR3_EXCEPTION thisE = recognizer->state->exception;
-  if	(thisE != NULL)
-  {
-    thisE->freeEx(thisE);
-    recognizer->state->exception = NULL;
-  }
+
+	{
+		// ml: 2013-11-05, added reset of old exceptions.
+		pANTLR3_EXCEPTION thisE = recognizer->state->exception;
+		if	(thisE != NULL)
+		{
+			thisE->freeEx(thisE);
+			recognizer->state->exception = NULL;
+		}
+	}
 
     // Install a new following set
     //
diff --git a/runtime/C/src/antlr3basetree.c b/runtime/C/src/antlr3basetree.c
index f191f6fde..593f52b5d 100644
--- a/runtime/C/src/antlr3basetree.c
+++ b/runtime/C/src/antlr3basetree.c
@@ -214,9 +214,11 @@ addChild (pANTLR3_BASE_TREE tree, pANTLR3_BASE_TREE child)
 			tree->createChildrenList(tree);
 		}
 
-		ANTLR3_UINT32 count = tree->children->add(tree->children, child, (void (ANTLR3_CDECL *)(void *))child->free);
-		child->setChildIndex(child, count - 1);
-		child->setParent(child, tree);
+		{
+			ANTLR3_UINT32 count = tree->children->add(tree->children, child, (void (ANTLR3_CDECL *)(void *))child->free);
+			child->setChildIndex(child, count - 1);
+			child->setParent(child, tree);
+		}
 	}
 }
 

From f5d2f904d4e1624fa1b5f659f83ec4d6867db6f8 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Sun, 11 May 2014 19:46:25 +0200
Subject: [PATCH 02/53] Fix memory leak when using lexer rule label references.

Inspired by bennyk. Since this patch uses std::unique_ptr the build now requires
a compiler supporting at least some of C++11 features.
---
 runtime/Cpp/tests/Makefile                          |  2 +-
 .../org/antlr/codegen/templates/Cpp/Cpp.stg         | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/runtime/Cpp/tests/Makefile b/runtime/Cpp/tests/Makefile
index 1efad371e..b0336419c 100644
--- a/runtime/Cpp/tests/Makefile
+++ b/runtime/Cpp/tests/Makefile
@@ -15,7 +15,7 @@ STGS  = $(wildcard ../../../tool/src/main/resources/org/antlr/codegen/templates/
 
 INCLUDES= -I. -I../include/
 
-CFLAGS=-ggdb3 -O0 -fno-inline -Wall -Wno-unused-variable
+CFLAGS=-ggdb3 -O0 -fno-inline -Wall -Wno-unused-variable -std=c++0x
 #CFLAGS=-ggdb3 -O3
 
 TOBJS= utils.o
diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
index d94024b7d..25b8f6332 100755
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
@@ -142,7 +142,7 @@ outputFile( LEXER,
 /* -----------------------------------------
  * Include the ANTLR3 generated header file.
  */
-#include    "<name>.hpp"
+#include "<name>.hpp"
 <if(trace)>
 #include \<iostream>
 <endif>
@@ -151,6 +151,7 @@ outputFile( LEXER,
 //
 <recognizer.grammar.delegators: {g|#include "<g.recognizerName>.hpp" }; separator="\n">
 <endif>
+#include \<memory>
 
 <actions.(actionScope).postinclude>
 /* ----------------------------------------- */
@@ -540,7 +541,7 @@ lexer(  grammar,
         numRules,
         filterMode,
         superClass,
-        labelType="ImplTraits::CommonTokenType*") ::= <<
+        labelType="ImplTraits::CommonTokenType") ::= <<
 
 using namespace antlr3;
 
@@ -1280,7 +1281,7 @@ lexerRuleLabelDefs() ::= <<
 <[ruleDescriptor.tokenLabels,
   ruleDescriptor.tokenListLabels,
   ruleDescriptor.ruleLabels]
-    :{it |<labelType> <it.label.text> = NULL;}; separator="\n"
+    :{it |std::unique_ptr\<<labelType>\> <it.label.text> = NULL;}; separator="\n"
 >
 <ruleDescriptor.charLabels:{it |ANTLR_UINT32 <it.label.text>;}; separator="\n">
 <[ruleDescriptor.tokenListLabels,
@@ -1689,7 +1690,7 @@ ANTLR_UINT32 <label>StartLine<elementIndex> = this->getLine();
 ANTLR_UINT32 <label>StartCharPos<elementIndex> = this->getCharPositionInLine();
 this->matchs(<string>);
 <checkRuleBacktrackFailure()>
-<label> = new CommonTokenType;
+<label>.reset( new CommonTokenType );
 <label>->set_type( CommonTokenType::TOKEN_INVALID );
 <label>->set_startIndex( <label>Start);
 <label>->set_stopIndex( this->getCharIndex()-1);
@@ -1762,7 +1763,7 @@ lexerRuleRef(rule,label,args,elementIndex,scope) ::= <<
     ANTLR_UINT32 <label>StartCharPos<elementIndex> = this->getCharPositionInLine();
     <if(scope)>m_<scope:delegateName()>-><endif>m<rule.name>(<if(scope)>m_<scope:delegateName()><endif> <if(args)>, <endif><args; separator=", ">);
     <checkRuleBacktrackFailure()>
-    <label> = new CommonTokenType();
+    <label>.reset( new CommonTokenType() );
     <label>->set_type( CommonTokenType::TOKEN_INVALID);
     <label>->set_startIndex( <label>Start<elementIndex> );
     <label>->set_stopIndex( this->getCharIndex()-1 );
@@ -1793,7 +1794,7 @@ lexerMatchEOF(label,elementIndex) ::= <<
     <label>Start<elementIndex> = this->getCharIndex();
     this->matchc(ANTLR_CHARSTREAM_EOF);
     <checkRuleBacktrackFailure()>
-    <label> = new CommonTokenType();
+    <label>.reset( new CommonTokenType() );
     <label>->set_type( CommonTokenType::TOKEN_EOF );
     <label>->set_startIndex(<label>Start<elementIndex>);
     <label>->set_stopIndex(this->getCharIndex()-1);

From 700d2dfcf208efcfb18d8ba171e1278178dba5c7 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibre5041@ibrezina.net>
Date: Mon, 12 May 2014 13:31:19 +0200
Subject: [PATCH 03/53] Fix lexer labels onto EOF token

+ minor fix - remover StringTemplate warning in matchSet/terminalOptions
---
 .../main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
index 25b8f6332..9409e5a3a 100755
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
@@ -1632,7 +1632,7 @@ this->matchRange(<a>, <b>);
 >>
 
 /** For now, sets are interval tests and must be tested inline */
-matchSet(s,label,elementIndex,terminalOptions,postmatchCode="") ::= <<
+matchSet(s,label,elementIndex,postmatchCode="",terminalOptions={}) ::= <<
 <if(label)>
 <if(LEXER)>
 <label>= this->LA(1);<\n>
@@ -1787,11 +1787,9 @@ lexerRuleRefAndListLabel(rule,label,args,elementIndex,scope) ::= <<
 lexerMatchEOF(label,elementIndex) ::= <<
 <if(label)>
 {
-    ANTLR_UINT32 <label>Start<elementIndex>;
+    ANTLR_UINT32 <label>Start<elementIndex> = this->getCharIndex();
     ANTLR_UINT32 <label>StartLine<elementIndex> = this->getLine();
     ANTLR_UINT32 <label>StartCharPos<elementIndex> = this->getCharPositionInLine();
-    <labelType> <label>;
-    <label>Start<elementIndex> = this->getCharIndex();
     this->matchc(ANTLR_CHARSTREAM_EOF);
     <checkRuleBacktrackFailure()>
     <label>.reset( new CommonTokenType() );

From 0c90ab8f8506a46e37f54988207cb4d6a1d2596a Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibre5041@ibrezina.net>
Date: Thu, 20 Jun 2013 17:48:52 +0200
Subject: [PATCH 04/53] All Token labels are declared as const*

---
 tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
index 9409e5a3a..1799efe79 100755
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
@@ -1008,7 +1008,7 @@ parser(	grammar,
 		bitsets,
 		ASTLabelType,
 		superClass="Parser",
-		labelType="ImplTraits::CommonTokenType*",
+		labelType="ImplTraits::CommonTokenType const*",
 		members={<actions.parser.members>}
 		) ::= <<
 <beginNamespace(actions)>

From c243a872cdeedcd2ab75ba1613bd62c6e886d22b Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibre5041@ibrezina.net>
Date: Mon, 12 May 2014 15:26:42 +0200
Subject: [PATCH 05/53] Fix to lexer label refs(array form)

+= operator
---
 runtime/Cpp/include/antlr3traits.hpp                           | 3 +++
 .../src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/runtime/Cpp/include/antlr3traits.hpp b/runtime/Cpp/include/antlr3traits.hpp
index c87604412..0f95d2ec2 100755
--- a/runtime/Cpp/include/antlr3traits.hpp
+++ b/runtime/Cpp/include/antlr3traits.hpp
@@ -189,6 +189,9 @@ class Traits  : public TraitsBase<UserTraits>
 
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::CommonTokenType, 
 									 CommonToken<TraitsType> >::selected CommonTokenType;
+
+	typedef typename BaseTraitsType::AllocPolicyType::template ListType<const CommonTokenType*> TokenListType;
+
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::TokenIntStreamType, 
 		                             TokenIntStream<TraitsType> >::selected TokenIntStreamType;
 	
diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
index 1799efe79..dddd96d01 100755
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
@@ -1264,7 +1264,7 @@ ruleLabelDefs() ::= <<
     :{it |<labelType> <it.label.text> = NULL;}; separator="\n"
 >
 <[ruleDescriptor.tokenListLabels,ruleDescriptor.ruleListLabels,ruleDescriptor.wildcardTreeListLabels]
-    :{it |ImplTraits::TokenPtrsListType list_<it.label.text>;}; separator="\n"
+    :{it |ImplTraits::TokenListType list_<it.label.text>;}; separator="\n"
 >
 <ruleDescriptor.ruleLabels:ruleLabelDef(); separator="\n">
 >>

From 670347a50c33c4bfeba4c97e6db1acbaaff19d7e Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibre5041@ibrezina.net>
Date: Mon, 12 May 2014 15:34:44 +0200
Subject: [PATCH 06/53] Add test for lexer rule labels

Python target used as an example
---
 runtime/Cpp/tests/Makefile     |  8 ++++----
 runtime/Cpp/tests/t039.cpp     |  4 +++-
 runtime/Cpp/tests/t039labels.g | 13 ++++++-------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/runtime/Cpp/tests/Makefile b/runtime/Cpp/tests/Makefile
index b0336419c..811ffa4fe 100644
--- a/runtime/Cpp/tests/Makefile
+++ b/runtime/Cpp/tests/Makefile
@@ -20,7 +20,7 @@ CFLAGS=-ggdb3 -O0 -fno-inline -Wall -Wno-unused-variable -std=c++0x
 
 TOBJS= utils.o
 
-all: $(ANTLR) $(TOKENS) t001 t002 t003 t004 t005 t006 t006 t007 t008 t009 t010 t011 t012
+all: $(ANTLR) $(TOKENS) t001 t002 t003 t004 t005 t006 t006 t007 t008 t009 t010 t011 t012 t039
 
 # For devel only. This will replace .stg files in the tool in a fast way
 #
@@ -64,13 +64,13 @@ t011:	t011.cpp t011lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_H
 t012:	t012.cpp t012lexerXMLLexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
 
+t039:	t039.cpp t039labels.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
+	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
+
 t051:	t051.cpp t051lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
 
 # AST commented out
-# t039:	t039.cpp t039labels.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-# 	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
-#
 # t042:	t042.cpp t005lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 # 	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
 
diff --git a/runtime/Cpp/tests/t039.cpp b/runtime/Cpp/tests/t039.cpp
index f87ea87d6..d5797ac67 100644
--- a/runtime/Cpp/tests/t039.cpp
+++ b/runtime/Cpp/tests/t039.cpp
@@ -78,7 +78,7 @@ int testValid(string const& data)
 	
 	for(unsigned i = 0; i < r.tokens.size() ; i++)
 	{
-		t039labelsLexerTraits::CommonTokenType *token = r.tokens.at(i);
+		const t039labelsLexerTraits::CommonTokenType *token = r.tokens.at(i);
 
 		size_t startIndex = ((const char*)token->get_startIndex()) - data.c_str();
 		size_t stopIndex = ((const char*)token->get_stopIndex()) - data.c_str();
@@ -88,6 +88,8 @@ int testValid(string const& data)
 			  << std::endl;
 		
 	}
+	delete psr;
+	delete tstream;
 	delete lxr; lxr = NULL;
 	delete input; 
 	return 0;
diff --git a/runtime/Cpp/tests/t039labels.g b/runtime/Cpp/tests/t039labels.g
index dc243668b..efa4a515f 100644
--- a/runtime/Cpp/tests/t039labels.g
+++ b/runtime/Cpp/tests/t039labels.g
@@ -17,15 +17,14 @@ options {
 }
 @parser::namespace
 { Antlr3Test }
-@parser::members {
+@parser::context {
 	class TokenList {
 	public:
         TokenList() : token() {}
         TokenList(TokenList const& other) : tokens(other.tokens), token(other.token) {}
-        TokenList(ImplTraits::TokenPtrsListType const& lst, ImplTraits::CommonTokenType *t) : tokens(lst), token(t) {}
-	//private:
-        ImplTraits::TokenPtrsListType tokens;
-        ImplTraits::CommonTokenType* token;
+        TokenList(ImplTraits::TokenListType const& lst, ImplTraits::CommonTokenType const *t) : tokens(lst), token(t) {}
+        ImplTraits::TokenListType tokens;
+        const ImplTraits::CommonTokenType* token;
     };
 }
 a returns [t039labelsParser::TokenList retval]
@@ -36,8 +35,8 @@ a returns [t039labelsParser::TokenList retval]
 A: 'a'..'z';
 B: '0'..'9';
 C: a='A'         { std::cout << $a << std::endl; };
-D: a='FOOBAR'    { std::cout << $a << std::endl; };
+D: a='FOOBAR'    { std::cout << $a->getText() << std::endl; };
 E: 'GNU' a=.     { std::cout << $a << std::endl; };
-F: 'BLARZ' a=EOF { std::cout << $a << std::endl; };
+F: 'BLARZ' a=EOF { std::cout << ($a ? $a->getText() : "NULL") << std::endl; };
 
 WS: ' '+  { $channel = HIDDEN; };

From 0ef2d9f3e34c285b8cdc5c4dff295406ea21cd9d Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Mon, 7 Oct 2013 22:04:56 +0200
Subject: [PATCH 07/53] lexer token names

---
 .../org/antlr/codegen/templates/Cpp/Cpp.stg   | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
index dddd96d01..c93ec03fb 100755
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
@@ -161,6 +161,25 @@ outputFile( LEXER,
 <if(literals)>
 
 <beginNamespace(actions)>
+<if(LEXER)>
+const ANTLR_UINT8* <name>Tokens::getTokenName(ANTLR_UINT32 index)
+{
+       if( EOF_TOKEN == index)
+               return (ANTLR_UINT8*) "\<EOF>";
+       return TokenNames[index];
+}
+
+/** \brief Table of all token names in symbolic order, mainly used for debugging.
+ */
+ANTLR_UINT8* <name>Tokens::TokenNames[<length(tokens)>+4]
+       = {
+       (ANTLR_UINT8*) "\<invalid>",       /* String to print to indicate an invalid token */
+       (ANTLR_UINT8*) "\<EOR>",
+       (ANTLR_UINT8*) "\<DOWN>",
+       (ANTLR_UINT8*) "\<UP>",
+       <rest(tokens):{it |(ANTLR_UINT8*) "<it.name>",//<it.type>}; separator="\n">
+       };
+<endif>
 
 /** String literals used by <name> that we must do things like MATCHS() with.
  *  C will normally just lay down 8 bit characters, and you can use L"xxx" to
@@ -359,7 +378,12 @@ public:
 		EOF_TOKEN = <name>ImplTraits::CommonTokenType::TOKEN_EOF
 		<tokens:{it | , <it.name> = <it.type> }; separator="\n">
 	};
+<if(LEXER)>
+       static const ANTLR_UINT8* getTokenName(ANTLR_UINT32 index);
 
+protected:
+       static ANTLR_UINT8* TokenNames[];
+<endif>
 };
 
 /** Context tracking structure for <mainName()>
@@ -405,6 +429,7 @@ public:
     <name>(InputType* instream, RecognizerSharedStateType* state<recognizer.grammar.delegators:{g|, <g.recognizerName>* <g:delegateName()>}>);
     
     void init(InputType* instream <recognizer.grammar.delegators:{g|, <g.recognizerName>* <g:delegateName()>}> );
+    static ANTLR_UINT8** getTokenNames();
 
     <actions.(actionScope).context>
 
@@ -936,7 +961,7 @@ void
  *
  * \return Pointer to first char * in the table.
  */
-static ANTLR_UINT8**	getTokenNames()
+ANTLR_UINT8**	<name>::getTokenNames()
 {
         return <grammar.composite.rootGrammar.recognizerName>TokenNames;
 }

From 5b6062332f58fc7d2c430dedc0548d13fa2bb518 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibre5041@ibrezina.net>
Date: Tue, 13 May 2014 17:05:51 +0200
Subject: [PATCH 08/53] fix for filtering option

---
 runtime/Cpp/tests/Makefile                    |  5 +-
 runtime/Cpp/tests/UserTestTraits.hpp          | 19 +++++
 runtime/Cpp/tests/t020fuzzyLexer.g            | 20 ++---
 .../org/antlr/codegen/templates/Cpp/Cpp.stg   | 76 -------------------
 4 files changed, 31 insertions(+), 89 deletions(-)

diff --git a/runtime/Cpp/tests/Makefile b/runtime/Cpp/tests/Makefile
index 811ffa4fe..d1a54a701 100644
--- a/runtime/Cpp/tests/Makefile
+++ b/runtime/Cpp/tests/Makefile
@@ -20,7 +20,7 @@ CFLAGS=-ggdb3 -O0 -fno-inline -Wall -Wno-unused-variable -std=c++0x
 
 TOBJS= utils.o
 
-all: $(ANTLR) $(TOKENS) t001 t002 t003 t004 t005 t006 t006 t007 t008 t009 t010 t011 t012 t039
+all: $(ANTLR) $(TOKENS) t001 t002 t003 t004 t005 t006 t006 t007 t008 t009 t010 t011 t012 t020 t039
 
 # For devel only. This will replace .stg files in the tool in a fast way
 #
@@ -64,6 +64,9 @@ t011:	t011.cpp t011lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_H
 t012:	t012.cpp t012lexerXMLLexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
 
+t020:	t020.cpp t020fuzzyLexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
+	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
+
 t039:	t039.cpp t039labels.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
 
diff --git a/runtime/Cpp/tests/UserTestTraits.hpp b/runtime/Cpp/tests/UserTestTraits.hpp
index 85a496cd7..7189307dd 100644
--- a/runtime/Cpp/tests/UserTestTraits.hpp
+++ b/runtime/Cpp/tests/UserTestTraits.hpp
@@ -7,6 +7,10 @@
 // to locate the antlr3 runtime files and -I. to find this file
 #include <antlr3.hpp>
 
+#include <fstream>
+#include <iostream>
+#include <sstream>
+
 // Forward declaration for Lexer&Parser class(es)
 namespace Antlr3Test {
 	class S1Lexer;
@@ -26,6 +30,8 @@ namespace Antlr3Test {
 	class t012lexerXMLLexer;
 	class t051lexer;
 
+	class t020fuzzyLexer;
+
 	class t039labelsLexer;
 	class t039labelsParser;
 };
@@ -61,8 +67,21 @@ namespace Antlr3Test {
 	typedef antlr3::Traits<t012lexerXMLLexer, NoParser, UserTraits> t012lexerXMLLexerTraits;
 	typedef antlr3::Traits<t051lexer, NoParser, UserTraits> t051lexerTraits;
 
+	typedef antlr3::Traits<t020fuzzyLexer, NoParser, UserTraits> t020fuzzyLexerTraits;
+
 	typedef antlr3::Traits<t039labelsLexer, t039labelsParser, UserTraits> t039labelsLexerTraits;
 	typedef t039labelsLexerTraits t039labelsParserTraits;
+
+	inline std::string slurp(std::string const& fileName)
+	{
+		std::ifstream ifs(fileName.c_str(), std::ios::in | std::ios::binary | std::ios::ate);
+		//std::ifstream::pos_type fileSize = ifs.tellg();
+		ifs.seekg(0, std::ios::beg);
+		std::stringstream sstr;
+		sstr << ifs.rdbuf();
+		return sstr.str();
+	}
+
 };
 
 #endif
diff --git a/runtime/Cpp/tests/t020fuzzyLexer.g b/runtime/Cpp/tests/t020fuzzyLexer.g
index 0fc913f0e..1f316930a 100644
--- a/runtime/Cpp/tests/t020fuzzyLexer.g
+++ b/runtime/Cpp/tests/t020fuzzyLexer.g
@@ -11,12 +11,8 @@ options {
 @lexer::namespace
 { Antlr3Test }
 
-@header {
-from io import StringIO
-}
-
-@init {
-self.output = StringIO()
+@lexer::context {
+	ImplTraits::StringStreamType outbuf;
 }
 
 IMPORT
@@ -31,35 +27,35 @@ RETURN
 CLASS
 	:	'class' WS name=ID WS? ('extends' WS QID WS?)?
 		('implements' WS QID WS? (',' WS? QID WS?)*)? '{'
-        {self.output.write("found class "+$name.text+"\n")}
+        { outbuf << "found class " << $name->getText() << "\n"; }
 	;
 	
 METHOD
     :   TYPE WS name=ID WS? '(' ( ARG WS? (',' WS? ARG WS?)* )? ')' WS? 
        ('throws' WS QID WS? (',' WS? QID WS?)*)? '{'
-        {self.output.write("found method "+$name.text+"\n");}
+        { outbuf << "found method " << $name->getText() << "\n"; } 
     ;
 
 FIELD
     :   TYPE WS name=ID '[]'? WS? (';'|'=')
-        {self.output.write("found var "+$name.text+"\n");}
+        { outbuf << "found var " << $name->getText() << "\n"; }                
     ;
 
 STAT:	('if'|'while'|'switch'|'for') WS? '(' ;
 	
 CALL
     :   name=QID WS? '('
-        {self.output.write("found call "+$name.text+"\n");}
+        { outbuf << "found call " << $name->getText() << "\n"; }                
     ;
 
 COMMENT
     :   '/*' (options {greedy=false;} : . )* '*/'
-        {self.output.write("found comment "+self.getText()+"\n");}
+        { outbuf << "found comment " << getText() << "\n"; } 
     ;
 
 SL_COMMENT
     :   '//' (options {greedy=false;} : . )* '\n'
-        {self.output.write("found // comment "+self.getText()+"\n");}
+        { outbuf << "found // comment " << getText() << "\n"; } 
     ;
 	
 STRING
diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
index c93ec03fb..c611aebf7 100755
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
@@ -437,7 +437,6 @@ public:
 <if(recognizer.filterMode)>
     void  memoize(ANTLR_MARKER  ruleIndex, ANTLR_MARKER  ruleParseStart);
     bool  alreadyParsedRule(ANTLR_MARKER	ruleIndex);
-    <filteringNextToken()>
 <endif>    
     <rules:{r | <if(!r.ruleDescriptor.isSynPred)><headerReturnType(ruleDescriptor=r.ruleDescriptor)>  m<r.ruleDescriptor.name>( <r.ruleDescriptor.parameterScope:parameterScope()>);<endif>}; separator="\n">
     <rules:{r | <if(r.ruleDescriptor.isSynPred)>  <headerReturnType(ruleDescriptor=r.ruleDescriptor)> msynpred( antlr3::ClassForwarder\< <r.ruleDescriptor.name> > <r.ruleDescriptor.parameterScope:parameterScope()>);
@@ -751,81 +750,6 @@ void <name>::init(StreamType* instream<grammar.delegators:{g|, <g.recognizerName
 
 >>
 
-
-filteringNextToken() ::= <<
-<name>ImplTraits::CommonTokenType*
-<name>ImplTraits::TokenSourceType::nextToken()
-{
-    LexerType*   lexer;
-    typename LexerType::RecognizerSharedStateType* state;
-
-    lexer   = this->get_super();
-    state	= lexer->get_lexstate();
-
-    /* Get rid of any previous token (token factory takes care of
-     * any deallocation when this token is finally used up.
-     */
-    state->set_token_present( false );
-    state->set_error( false );	    /* Start out without an exception	*/
-    state->set_failedflag(false);
-
-    /* Record the start of the token in our input stream.
-     */
-    state->set_tokenStartCharIndex( lexer->index();
-    state->set_tokenStartCharPositionInLine( lexer->getCharPositionInLine() );
-    state->set_tokenStartLine( lexer->getLine() );
-    state->set_text("");
-
-    /* Now call the matching rules and see if we can generate a new token
-     */
-    for	(;;)
-    {
-		if (lexer->LA(1) == ANTLR_CHARSTREAM_EOF)
-		{
-			/* Reached the end of the stream, nothing more to do.
-			 */
-			CommonTokenType&    teof = m_eofToken;
-
-			teof.set_startIndex(lexer->getCharIndex());
-			teof.set_stopIndex(lexer->getCharIndex());
-			teof.setLine(lexer->getLine());
-			return  &teof;
-		}
-
-		state->set_token_present(false);
-		state->set_error(false);	    /* Start out without an exception	*/
-
-		{
-			ANTLR_MARKER   m;
-
-			m	= this->get_istream()->mark();
-			state->set_backtracking(1);				/* No exceptions */
-			state->set_failedflag(false);
-
-			/* Call the generated lexer, see if it can get a new token together.
-			 */
-			lexer->mTokens();
-    			state->set_backtracking(0);
-
-    		<! mTokens backtracks with synpred at BACKTRACKING==2
-				and we set the synpredgate to allow actions at level 1. !>
-
-			if(state->get_failed())
-			{
-				lexer->rewind(m);
-				lexer->consume(); <! advance one char and try again !>
-			}
-			else
-			{
-				lexer->emit();					/* Assemble the token and emit it to the stream */
-				TokenType& tok = state->get_token();
-				return &tok;
-			}
-		}
-    }
-}
->>
-
 actionGate() ::= "this->get_backtracking()==0"
 
 filteringActionGate() ::= "this->get_backtracking()==1"

From dd3e20a7da99674dd8d2aaa1063dc718863f1d97 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibre5041@ibrezina.net>
Date: Wed, 14 May 2014 13:26:46 +0200
Subject: [PATCH 09/53] fuzzy lexer test

---
 runtime/Cpp/tests/t012.cpp         | 12 -------
 runtime/Cpp/tests/t020.cpp         | 55 ++++++++++++++++++++++++++++++
 runtime/Cpp/tests/t020fuzzy.input  | 13 +++++++
 runtime/Cpp/tests/t020fuzzy.output | 12 +++++++
 4 files changed, 80 insertions(+), 12 deletions(-)
 create mode 100644 runtime/Cpp/tests/t020.cpp
 create mode 100644 runtime/Cpp/tests/t020fuzzy.input
 create mode 100644 runtime/Cpp/tests/t020fuzzy.output

diff --git a/runtime/Cpp/tests/t012.cpp b/runtime/Cpp/tests/t012.cpp
index fe9d0c9ef..80b45be2f 100644
--- a/runtime/Cpp/tests/t012.cpp
+++ b/runtime/Cpp/tests/t012.cpp
@@ -14,7 +14,6 @@ int testValid(string const& in, string const& out);
 int testMalformedInput1(string const& data);
 int testMalformedInput2(string const& data);
 int testMalformedInput3(string const& data);
-string slurp(string const& fileName);
 
 static t012lexerXMLLexer *lxr;
 
@@ -174,14 +173,3 @@ int testMalformedInput3(string const& data)
 	delete input; 
 	return 0;
 }
- 
-string slurp(string const& fileName)
-{
-	ifstream ifs(fileName.c_str(), ios::in | ios::binary | ios::ate);
-	ifstream::pos_type fileSize = ifs.tellg();
-	ifs.seekg(0, ios::beg);
-
-	stringstream sstr;
-	sstr << ifs.rdbuf();
-	return sstr.str();
-}
diff --git a/runtime/Cpp/tests/t020.cpp b/runtime/Cpp/tests/t020.cpp
new file mode 100644
index 000000000..7b831e5b5
--- /dev/null
+++ b/runtime/Cpp/tests/t020.cpp
@@ -0,0 +1,55 @@
+#include "UserTestTraits.hpp"
+#include "t020fuzzyLexer.hpp"
+
+#include <sys/types.h>
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+using namespace Antlr3Test;
+using namespace std;
+
+int testValid(string const& in, string const& out);
+
+static t020fuzzyLexer *lxr;
+
+int main (int argc, char *argv[])
+{
+	testValid("t020fuzzy.input", "t020fuzzy.output");
+	return 0;
+}
+
+int testValid(string const& inFilename, string const& outFilename)
+{
+	string data = slurp(inFilename);
+	t020fuzzyLexerTraits::InputStreamType* input	= new t020fuzzyLexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
+												    ANTLR_ENC_8BIT,
+												    data.length(), //strlen(data.c_str()),
+												    (ANTLR_UINT8*)inFilename.c_str());
+	if (lxr == NULL)
+		lxr = new t020fuzzyLexer(input);
+	else
+		lxr->setCharStream(input);
+
+	std::cout << "testValid: \"" << inFilename << '"' <<std::endl;
+	for(;;)
+	{
+		t020fuzzyLexerTraits::CommonTokenType *token = lxr->nextToken();
+		if( token->getType() == t020fuzzyLexerTokens::EOF_TOKEN)
+			break;
+	}
+	
+	string expOutput = slurp(outFilename);
+	string lxrOutput = lxr->outbuf.str();
+
+	ofstream out("t012.lxr.output");
+	out << lxrOutput;
+
+	std::cout << inFilename << '\t' << (expOutput == lxrOutput ?  "OK" : "Fail") << std::endl;
+
+	delete lxr; lxr = NULL;
+	delete input; 
+	return 0;
+}
+
diff --git a/runtime/Cpp/tests/t020fuzzy.input b/runtime/Cpp/tests/t020fuzzy.input
new file mode 100644
index 000000000..d01e1c1ad
--- /dev/null
+++ b/runtime/Cpp/tests/t020fuzzy.input
@@ -0,0 +1,13 @@
+import org.antlr.runtime.*;
+
+public class Main {
+	public static void main(String[] args) throws Exception {
+	    for (int i=0; i<args.length; i++) {
+		CharStream input = new ANTLRFileStream(args[i]);
+		FuzzyJava lex = new FuzzyJava(input);
+		TokenStream tokens = new CommonTokenStream(lex);
+		tokens.toString();
+		//System.out.println(tokens);
+	    }
+	}
+}
diff --git a/runtime/Cpp/tests/t020fuzzy.output b/runtime/Cpp/tests/t020fuzzy.output
new file mode 100644
index 000000000..da134f098
--- /dev/null
+++ b/runtime/Cpp/tests/t020fuzzy.output
@@ -0,0 +1,12 @@
+found class Main
+found method main
+found var i
+found var input
+found call ANTLRFileStream
+found var lex
+found call FuzzyJava
+found var tokens
+found call CommonTokenStream
+found call tokens.toString
+found // comment //System.out.println(tokens);
+

From 94202004c4afbe02a6dda25f50a7b291be4d77ca Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibre5041@ibrezina.net>
Date: Wed, 14 May 2014 13:57:01 +0200
Subject: [PATCH 10/53] use gnu make wildcards instead of shell ones

---
 runtime/Cpp/tests/Makefile | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/runtime/Cpp/tests/Makefile b/runtime/Cpp/tests/Makefile
index d1a54a701..df2f22537 100644
--- a/runtime/Cpp/tests/Makefile
+++ b/runtime/Cpp/tests/Makefile
@@ -1,6 +1,6 @@
 .PRECIOUS=.o
 
-ANTLRGRAMMARS ?= $(wildcard t0[01]*.g)
+ANTLRGRAMMARS ?= $(wildcard [st]*.g)
 HEADERS = $(wildcard *.hpp) $(wildcard *.inl)
 RUNTIME_HEADERS = $(wildcard ../include/*.hpp) $(wildcard ../include/*.inl)
 SOURCES = $(wildcard *.cpp)
@@ -29,53 +29,53 @@ $(ANTLR): $(STGS)
 	org/antlr/codegen/templates/Cpp/Cpp.stg
 
 t001:	t001.cpp t001lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
+	$(CXX) $(CFLAGS) -DUSESTL -DD $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t002:	t002.cpp t002lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t003:	t003.cpp t003lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t004:	t004.cpp t004lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t005:	t005.cpp t005lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t006:	t006.cpp t006lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t007:	t007.cpp t007lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t008:	t008.cpp t008lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t009:	t009.cpp t009lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t010:	t010.cpp t010lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t011:	t011.cpp t011lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t012:	t012.cpp t012lexerXMLLexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t020:	t020.cpp t020fuzzyLexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t039:	t039.cpp t039labels.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t051:	t051.cpp t051lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 # AST commented out
 # t042:	t042.cpp t005lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-# 	g++ $(CFLAGS) -DUSESTL $(INCLUDES) $< $@?*.cpp -o $@
+# 	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 clean:
 	rm -f *.o t0[0-9][0-9]??*.[ch]pp *.tokens t[0-9][0-9][0-9] t0[0-9][0-9].exe
@@ -97,4 +97,4 @@ endif
 endif
 
 %.o: %.cpp $(HEADERS) utils.hpp
-	g++ $(CFLAGS) -DUSESTL $(INCLUDES) -c $< -o $@
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) -c $< -o $@

From c93830e679cd9619255eaa6af2ab0b93b7eec8ba Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibre5041@ibrezina.net>
Date: Thu, 15 May 2014 18:38:12 +0200
Subject: [PATCH 11/53] remove executable flag from header files

---
 runtime/Cpp/include/antlr3.hpp                      | 0
 runtime/Cpp/include/antlr3.inl                      | 0
 runtime/Cpp/include/antlr3baserecognizer.hpp        | 0
 runtime/Cpp/include/antlr3baserecognizer.inl        | 0
 runtime/Cpp/include/antlr3bitset.hpp                | 0
 runtime/Cpp/include/antlr3bitset.inl                | 0
 runtime/Cpp/include/antlr3collections.hpp           | 0
 runtime/Cpp/include/antlr3collections.inl           | 0
 runtime/Cpp/include/antlr3commontoken.hpp           | 0
 runtime/Cpp/include/antlr3commontoken.inl           | 0
 runtime/Cpp/include/antlr3commontree.hpp            | 0
 runtime/Cpp/include/antlr3commontree.inl            | 0
 runtime/Cpp/include/antlr3commontreeadaptor.hpp     | 0
 runtime/Cpp/include/antlr3commontreeadaptor.inl     | 0
 runtime/Cpp/include/antlr3commontreenodestream.hpp  | 0
 runtime/Cpp/include/antlr3commontreenodestream.inl  | 0
 runtime/Cpp/include/antlr3convertutf.hpp            | 0
 runtime/Cpp/include/antlr3cyclicdfa.hpp             | 0
 runtime/Cpp/include/antlr3cyclicdfa.inl             | 0
 runtime/Cpp/include/antlr3debugeventlistener.hpp    | 0
 runtime/Cpp/include/antlr3defs.hpp                  | 0
 runtime/Cpp/include/antlr3errors.hpp                | 0
 runtime/Cpp/include/antlr3exception.hpp             | 0
 runtime/Cpp/include/antlr3exception.inl             | 0
 runtime/Cpp/include/antlr3filestream.hpp            | 0
 runtime/Cpp/include/antlr3filestream.inl            | 0
 runtime/Cpp/include/antlr3input.hpp                 | 0
 runtime/Cpp/include/antlr3input.inl                 | 0
 runtime/Cpp/include/antlr3interfaces.hpp            | 0
 runtime/Cpp/include/antlr3intstream.hpp             | 0
 runtime/Cpp/include/antlr3intstream.inl             | 0
 runtime/Cpp/include/antlr3lexer.hpp                 | 0
 runtime/Cpp/include/antlr3lexer.inl                 | 0
 runtime/Cpp/include/antlr3memory.hpp                | 0
 runtime/Cpp/include/antlr3parser.hpp                | 0
 runtime/Cpp/include/antlr3parser.inl                | 0
 runtime/Cpp/include/antlr3recognizersharedstate.hpp | 0
 runtime/Cpp/include/antlr3recognizersharedstate.inl | 0
 runtime/Cpp/include/antlr3rewritestreams.hpp        | 0
 runtime/Cpp/include/antlr3rewritestreams.inl        | 0
 runtime/Cpp/include/antlr3tokenstream.hpp           | 0
 runtime/Cpp/include/antlr3tokenstream.inl           | 0
 runtime/Cpp/include/antlr3traits.hpp                | 0
 runtime/Cpp/include/antlr3treeparser.hpp            | 0
 runtime/Cpp/include/antlr3treeparser.inl            | 0
 45 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 runtime/Cpp/include/antlr3.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3.inl
 mode change 100755 => 100644 runtime/Cpp/include/antlr3baserecognizer.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3baserecognizer.inl
 mode change 100755 => 100644 runtime/Cpp/include/antlr3bitset.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3bitset.inl
 mode change 100755 => 100644 runtime/Cpp/include/antlr3collections.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3collections.inl
 mode change 100755 => 100644 runtime/Cpp/include/antlr3commontoken.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3commontoken.inl
 mode change 100755 => 100644 runtime/Cpp/include/antlr3commontree.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3commontree.inl
 mode change 100755 => 100644 runtime/Cpp/include/antlr3commontreeadaptor.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3commontreeadaptor.inl
 mode change 100755 => 100644 runtime/Cpp/include/antlr3commontreenodestream.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3commontreenodestream.inl
 mode change 100755 => 100644 runtime/Cpp/include/antlr3convertutf.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3cyclicdfa.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3cyclicdfa.inl
 mode change 100755 => 100644 runtime/Cpp/include/antlr3debugeventlistener.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3defs.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3errors.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3exception.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3exception.inl
 mode change 100755 => 100644 runtime/Cpp/include/antlr3filestream.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3filestream.inl
 mode change 100755 => 100644 runtime/Cpp/include/antlr3input.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3input.inl
 mode change 100755 => 100644 runtime/Cpp/include/antlr3interfaces.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3intstream.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3intstream.inl
 mode change 100755 => 100644 runtime/Cpp/include/antlr3lexer.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3lexer.inl
 mode change 100755 => 100644 runtime/Cpp/include/antlr3memory.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3parser.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3parser.inl
 mode change 100755 => 100644 runtime/Cpp/include/antlr3recognizersharedstate.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3recognizersharedstate.inl
 mode change 100755 => 100644 runtime/Cpp/include/antlr3rewritestreams.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3rewritestreams.inl
 mode change 100755 => 100644 runtime/Cpp/include/antlr3tokenstream.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3tokenstream.inl
 mode change 100755 => 100644 runtime/Cpp/include/antlr3traits.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3treeparser.hpp
 mode change 100755 => 100644 runtime/Cpp/include/antlr3treeparser.inl

diff --git a/runtime/Cpp/include/antlr3.hpp b/runtime/Cpp/include/antlr3.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3.inl b/runtime/Cpp/include/antlr3.inl
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3baserecognizer.hpp b/runtime/Cpp/include/antlr3baserecognizer.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3baserecognizer.inl b/runtime/Cpp/include/antlr3baserecognizer.inl
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3bitset.hpp b/runtime/Cpp/include/antlr3bitset.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3bitset.inl b/runtime/Cpp/include/antlr3bitset.inl
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3collections.hpp b/runtime/Cpp/include/antlr3collections.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3collections.inl b/runtime/Cpp/include/antlr3collections.inl
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3commontoken.hpp b/runtime/Cpp/include/antlr3commontoken.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3commontoken.inl b/runtime/Cpp/include/antlr3commontoken.inl
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3commontree.hpp b/runtime/Cpp/include/antlr3commontree.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3commontree.inl b/runtime/Cpp/include/antlr3commontree.inl
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.hpp b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.inl b/runtime/Cpp/include/antlr3commontreeadaptor.inl
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3commontreenodestream.hpp b/runtime/Cpp/include/antlr3commontreenodestream.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3commontreenodestream.inl b/runtime/Cpp/include/antlr3commontreenodestream.inl
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3convertutf.hpp b/runtime/Cpp/include/antlr3convertutf.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3cyclicdfa.hpp b/runtime/Cpp/include/antlr3cyclicdfa.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3cyclicdfa.inl b/runtime/Cpp/include/antlr3cyclicdfa.inl
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3debugeventlistener.hpp b/runtime/Cpp/include/antlr3debugeventlistener.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3defs.hpp b/runtime/Cpp/include/antlr3defs.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3errors.hpp b/runtime/Cpp/include/antlr3errors.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3exception.hpp b/runtime/Cpp/include/antlr3exception.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3exception.inl b/runtime/Cpp/include/antlr3exception.inl
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3filestream.hpp b/runtime/Cpp/include/antlr3filestream.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3filestream.inl b/runtime/Cpp/include/antlr3filestream.inl
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3input.hpp b/runtime/Cpp/include/antlr3input.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3input.inl b/runtime/Cpp/include/antlr3input.inl
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3interfaces.hpp b/runtime/Cpp/include/antlr3interfaces.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3intstream.hpp b/runtime/Cpp/include/antlr3intstream.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3intstream.inl b/runtime/Cpp/include/antlr3intstream.inl
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3lexer.hpp b/runtime/Cpp/include/antlr3lexer.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3lexer.inl b/runtime/Cpp/include/antlr3lexer.inl
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3memory.hpp b/runtime/Cpp/include/antlr3memory.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3parser.hpp b/runtime/Cpp/include/antlr3parser.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3parser.inl b/runtime/Cpp/include/antlr3parser.inl
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3recognizersharedstate.hpp b/runtime/Cpp/include/antlr3recognizersharedstate.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3recognizersharedstate.inl b/runtime/Cpp/include/antlr3recognizersharedstate.inl
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3rewritestreams.hpp b/runtime/Cpp/include/antlr3rewritestreams.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3rewritestreams.inl b/runtime/Cpp/include/antlr3rewritestreams.inl
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3tokenstream.hpp b/runtime/Cpp/include/antlr3tokenstream.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3tokenstream.inl b/runtime/Cpp/include/antlr3tokenstream.inl
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3traits.hpp b/runtime/Cpp/include/antlr3traits.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3treeparser.hpp b/runtime/Cpp/include/antlr3treeparser.hpp
old mode 100755
new mode 100644
diff --git a/runtime/Cpp/include/antlr3treeparser.inl b/runtime/Cpp/include/antlr3treeparser.inl
old mode 100755
new mode 100644

From e431dd4ca9b9dbbf0ff0641e79e6d876c0ec0991 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibre5041@ibrezina.net>
Date: Fri, 30 May 2014 14:37:17 +0200
Subject: [PATCH 12/53] Do not use EOF macro in generated code

= The current code depends on the fact that EOF is #define EOF -1 is some standart C headers
= While generated enums use EOF_TOKEN
= Moreover EOF(-1) is signed value while LA an other methods return ANTLR_UINT32, this cause plenty of compiler warnings
= Moreover clang++11 refuses compile code like this:

    switch(this->LA(1)
    {
    case EOF: // -1
    ...

This patch sets EOF_TOKEN = std::numerical_limits<ANTLR_UINT32>::max()
All generated local varibles are of type ANTLR_UINT32 (instead of int)
Generated conditions use EOF_TOKEN instead if pure EOF
---
 runtime/Cpp/include/antlr3commontoken.hpp          |  4 ++--
 .../src/main/java/org/antlr/codegen/CppTarget.java | 12 ++++++++++++
 .../org/antlr/codegen/templates/Cpp/Cpp.stg        | 14 +++++++-------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/runtime/Cpp/include/antlr3commontoken.hpp b/runtime/Cpp/include/antlr3commontoken.hpp
index fd306e738..f03bfae3d 100644
--- a/runtime/Cpp/include/antlr3commontoken.hpp
+++ b/runtime/Cpp/include/antlr3commontoken.hpp
@@ -40,7 +40,7 @@
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include    <stdlib.h>
-
+#include    <limits>
 #include    "antlr3defs.hpp"
 
 ANTLR_BEGIN_NAMESPACE()
@@ -78,7 +78,7 @@ class CommonToken : public ImplTraits::AllocPolicyType
 
 		/** End of file token
 		 */
-		, TOKEN_EOF =	(ANTLR_CHARSTREAM_EOF & 0xFFFFFFFF)
+		, TOKEN_EOF = std::numeric_limits<ANTLR_UINT32>::max()
 	};
 
 	typedef typename ImplTraits::TokenIntStreamType TokenIntStreamType;
diff --git a/tool/src/main/java/org/antlr/codegen/CppTarget.java b/tool/src/main/java/org/antlr/codegen/CppTarget.java
index eef580f46..65c0447b5 100755
--- a/tool/src/main/java/org/antlr/codegen/CppTarget.java
+++ b/tool/src/main/java/org/antlr/codegen/CppTarget.java
@@ -110,6 +110,18 @@ protected ST chooseWhereCyclicDFAsGo(Tool tool,
         return recognizerST;
     }
 
+	/** Override the labels used for token types */
+    @Override
+	public String getTokenTypeAsTargetLabel(CodeGenerator generator, int ttype) {
+		String name = super.getTokenTypeAsTargetLabel(generator, ttype);
+		// If name is a EOF return EOF_TOKEN (EOF is #define macro setting EOF -1 (signed)
+		// while LA and the rest of the runtime uses unsigned integers 
+		if ( name.equals("EOF") ) {
+			return new String("EOF_TOKEN");
+		}
+		return name;
+	}
+
     /** Is scope in @scope::name {action} valid for this kind of grammar?
      *  Targets like C++ may want to allow new scopes like headerfile or
      *  some such.  The action names themselves are not policed at the
diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
index c611aebf7..8d71d3132 100755
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
@@ -1382,7 +1382,7 @@ block(alts,decls,decision,enclosingBlockLevel,blockLevel,decisionNumber,maxK,max
 
 // <fileName>:<description>
 {
-    int alt<decisionNumber>=<maxAlt>;
+    ANTLR_UINT32 alt<decisionNumber>=<maxAlt>;
     <decls>
     <@predecision()>
     <decision>
@@ -1443,7 +1443,7 @@ positiveClosureBlock(alts,decls,decision,enclosingBlockLevel,blockLevel,decision
 
     for (;;)
     {
-        int alt<decisionNumber>=<maxAlt>;
+        ANTLR_UINT32 alt<decisionNumber>=<maxAlt>;
 	<@predecision()>
 	<decision>
 	<@postdecision()>
@@ -1485,7 +1485,7 @@ closureBlock(alts,decls,decision,enclosingBlockLevel,blockLevel,decisionNumber,m
 <@preloop()>
 for (;;)
 {
-    int alt<decisionNumber>=<maxAlt>;
+    ANTLR_UINT32 alt<decisionNumber>=<maxAlt>;
     <@predecision()>
     <decision>
     <@postdecision()>
@@ -1805,7 +1805,7 @@ newFPE() ::= <<
 dfaState(k,edges,eotPredictsAlt,description,stateNumber,semPredState) ::= <<
 
 {
-    int LA<decisionNumber>_<stateNumber> = this->LA(<k>);
+    ANTLR_UINT32 LA<decisionNumber>_<stateNumber> = this->LA(<k>);
     <edges; separator="\nelse ">
     else
     {
@@ -1837,7 +1837,7 @@ ex->set_state( <stateNumber> );
  */
 dfaOptionalBlockState(k,edges,eotPredictsAlt,description,stateNumber,semPredState) ::= <<
 {
-    int LA<decisionNumber>_<stateNumber> = this->LA(<k>);
+    ANTLR_UINT32 LA<decisionNumber>_<stateNumber> = this->LA(<k>);
     <edges; separator="\nelse ">
 }
 >>
@@ -1850,13 +1850,13 @@ dfaOptionalBlockState(k,edges,eotPredictsAlt,description,stateNumber,semPredStat
  */
 
 dfaLoopbackStateDecls()::= <<
-ANTLR_UINT32   LA<decisionNumber>_<stateNumber>;
+ANTLR_UINT32 LA<decisionNumber>_<stateNumber>;
 >>
 dfaLoopbackState(k,edges,eotPredictsAlt,description,stateNumber,semPredState) ::= <<
 {
    /* dfaLoopbackState(k,edges,eotPredictsAlt,description,stateNumber,semPredState)
     */
-    int LA<decisionNumber>_<stateNumber> = this->LA(<k>);
+    ANTLR_UINT32 LA<decisionNumber>_<stateNumber> = this->LA(<k>);
     <edges; separator="\nelse "><\n>
     <if(eotPredictsAlt)>
     <if(!edges)>

From 9c9e33683bb2e43911c08a24c6c88e625602a612 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibre5041@ibrezina.net>
Date: Sat, 14 Jun 2014 21:51:38 +0200
Subject: [PATCH 13/53] Fix for MSVC. MSVC does not support const_expr

---
 runtime/Cpp/include/antlr3commontoken.hpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/runtime/Cpp/include/antlr3commontoken.hpp b/runtime/Cpp/include/antlr3commontoken.hpp
index f03bfae3d..58039a410 100644
--- a/runtime/Cpp/include/antlr3commontoken.hpp
+++ b/runtime/Cpp/include/antlr3commontoken.hpp
@@ -78,7 +78,11 @@ class CommonToken : public ImplTraits::AllocPolicyType
 
 		/** End of file token
 		 */
+#ifndef  _MSC_VER
 		, TOKEN_EOF = std::numeric_limits<ANTLR_UINT32>::max()
+#else
+		, TOKEN_EOF = 0xFFFFFFFF
+#endif
 	};
 
 	typedef typename ImplTraits::TokenIntStreamType TokenIntStreamType;

From 6a4485d01a6e62191ed0e17873cc7c95945b9c5b Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Sat, 26 Jul 2014 14:59:23 +0200
Subject: [PATCH 14/53] AST initial support (has memory leaks)

---
 runtime/Cpp/include/antlr3commontoken.inl     |   2 +-
 runtime/Cpp/include/antlr3commontree.hpp      |  35 +-
 runtime/Cpp/include/antlr3commontree.inl      | 388 +++++++--------
 .../Cpp/include/antlr3commontreeadaptor.hpp   |  17 +-
 .../Cpp/include/antlr3commontreeadaptor.inl   | 180 +++----
 runtime/Cpp/include/antlr3defs.hpp            |   2 -
 runtime/Cpp/include/antlr3intstream.hpp       |   6 +-
 runtime/Cpp/include/antlr3intstream.inl       |  12 +-
 runtime/Cpp/include/antlr3rewritestreams.hpp  | 126 +++--
 runtime/Cpp/include/antlr3rewritestreams.inl  | 314 +++++++------
 runtime/Cpp/include/antlr3traits.hpp          | 242 ++++++----
 runtime/Cpp/include/antlr3treeparser.hpp      |   6 +-
 .../org/antlr/codegen/templates/Cpp/AST.stg   | 442 ++++++++++++++++++
 .../antlr/codegen/templates/Cpp/ASTParser.stg | 200 ++++++++
 .../org/antlr/codegen/templates/Cpp/Cpp.stg   |  25 +-
 15 files changed, 1342 insertions(+), 655 deletions(-)
 create mode 100644 tool/src/main/resources/org/antlr/codegen/templates/Cpp/AST.stg
 create mode 100644 tool/src/main/resources/org/antlr/codegen/templates/Cpp/ASTParser.stg
 mode change 100755 => 100644 tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg

diff --git a/runtime/Cpp/include/antlr3commontoken.inl b/runtime/Cpp/include/antlr3commontoken.inl
index 87194dca1..b0ceac3de 100644
--- a/runtime/Cpp/include/antlr3commontoken.inl
+++ b/runtime/Cpp/include/antlr3commontoken.inl
@@ -164,7 +164,7 @@ ANTLR_INLINE void	CommonToken<ImplTraits>::setText(const char* text)
 	if( text == NULL )
 		m_tokText.clear();
 	else
-		m_tokText = (const char*) text;
+		m_tokText = text;
 }
 
 template<class ImplTraits>
diff --git a/runtime/Cpp/include/antlr3commontree.hpp b/runtime/Cpp/include/antlr3commontree.hpp
index 39096f8a0..d2de42a88 100644
--- a/runtime/Cpp/include/antlr3commontree.hpp
+++ b/runtime/Cpp/include/antlr3commontree.hpp
@@ -45,7 +45,7 @@ class CommonTree : public ImplTraits::AllocPolicyType
 	typedef typename ImplTraits::StringType	StringType;
 	typedef typename ImplTraits::CommonTokenType CommonTokenType;
 	typedef typename ImplTraits::TreeType TreeType;
-	typedef CommonTree TokenType;
+	//typedef CommonTree TokenType;
 	typedef typename AllocPolicyType::template VectorType<TreeType*> ChildrenType;
 	typedef typename AllocPolicyType::template ListType<TreeType*>	ChildListType;
 
@@ -55,10 +55,6 @@ class CommonTree : public ImplTraits::AllocPolicyType
     ///
     ChildrenType		m_children;
 
-    /// This is used to store the current child index position while descending
-    /// and ascending trees as the tree walk progresses.
-    ///
-    ANTLR_MARKER		m_savedIndex;
 
     /// Start token index that encases this tree
     ///
@@ -70,7 +66,7 @@ class CommonTree : public ImplTraits::AllocPolicyType
 
     /// A single token, this is the payload for the tree
     ///
-    CommonTokenType*    m_token;
+    const CommonTokenType*    m_token;
 
 	/// Points to the node that has this node as a child.
 	/// If this is NULL, then this is the root node.
@@ -84,17 +80,25 @@ class CommonTree : public ImplTraits::AllocPolicyType
 
 public:
 	CommonTree();
-	CommonTree( CommonTokenType* token );
-	CommonTree( CommonTree* token );
+	CommonTree( const CommonTokenType* token );
+	CommonTree( const CommonTree* token );
 	CommonTree( const CommonTree& ctree );
+	~CommonTree();
+
+	const CommonTokenType* get_token() const;
+	void set_token(CommonTokenType*);
 
-	TokenType*   get_token() const;
 	ChildrenType& get_children();
 	const ChildrenType& get_children() const;
-	ChildrenType* get_children_p();
 	ANTLR_INT32	get_childIndex() const;
 	TreeType* get_parent() const;
 
+    ANTLR_MARKER   get_startIndex() const;
+    void	set_startIndex(ANTLR_MARKER index);
+
+    ANTLR_MARKER  get_stopIndex() const;
+    void	set_stopIndex(ANTLR_MARKER index);
+
 	void    set_parent( TreeType* parent);
 	void    set_childIndex( ANTLR_INT32 );
 
@@ -102,7 +106,7 @@ class CommonTree : public ImplTraits::AllocPolicyType
 	/// Add all elements of the supplied list as children of this node
 	///
 	void	addChildren(const ChildListType& kids);
-	void    createChildrenList();
+
 	TreeType*	deleteChild(ANTLR_UINT32 i);
 	/// Delete children from start to stop and replace with t even if t is
 	/// a list (nil-root tree). Num of children can increase or decrease.
@@ -124,10 +128,11 @@ class CommonTree : public ImplTraits::AllocPolicyType
 	void	setChild(ANTLR_UINT32 i, TreeType* child);
 	StringType	toStringTree();
 	StringType	toString();
-	void	freshenPACIndexesAll();
-	void	freshenPACIndexes(ANTLR_UINT32 offset);
-	void    reuse();
-	~CommonTree();
+	void	freshenParentAndChildIndexes();
+	void	freshenParentAndChildIndexes(ANTLR_UINT32 offset);
+	void	freshenParentAndChildIndexesDeeply();
+	void	freshenParentAndChildIndexesDeeply(ANTLR_UINT32 offset);
+
 };
 
 ANTLR_END_NAMESPACE()
diff --git a/runtime/Cpp/include/antlr3commontree.inl b/runtime/Cpp/include/antlr3commontree.inl
index 8a3111bb7..0459d754b 100644
--- a/runtime/Cpp/include/antlr3commontree.inl
+++ b/runtime/Cpp/include/antlr3commontree.inl
@@ -3,90 +3,82 @@ ANTLR_BEGIN_NAMESPACE()
 template<class ImplTraits>
 CommonTree<ImplTraits>::CommonTree()
 {
-	m_savedIndex = 0;
-	m_startIndex = 0;
-	m_stopIndex  = 0;
+	m_startIndex = -1;
+	m_stopIndex  = -1;
+	m_childIndex = -1;
 	m_token		 = NULL;
 	m_parent     = NULL;
-	m_childIndex = 0;
 }
 
 template<class ImplTraits>
 CommonTree<ImplTraits>::CommonTree( const CommonTree& ctree )
 	:m_children( ctree.m_children)
 {
-	m_savedIndex = ctree.m_savedIndex;
 	m_startIndex = ctree.m_startIndex;
 	m_stopIndex  = ctree.m_stopIndex;
+	m_childIndex = ctree.m_childIndex;
 	m_token		 = ctree.m_token;
 	m_parent     = ctree.m_parent;
-	m_childIndex = ctree.m_childIndex;
 }
 
 template<class ImplTraits>
-CommonTree<ImplTraits>::CommonTree( CommonTokenType* token )
+CommonTree<ImplTraits>::CommonTree( const CommonTokenType* token )
 {
-	m_savedIndex = 0;
-	m_startIndex = 0;
-	m_stopIndex  = 0;
+	m_startIndex = -1;
+	m_stopIndex  = -1;
+	m_childIndex = -1;
 	m_token		 = token;
 	m_parent     = NULL;
-	m_childIndex = 0;
 }
 
 template<class ImplTraits>
-CommonTree<ImplTraits>::CommonTree( CommonTree* tree )
+CommonTree<ImplTraits>::CommonTree( const CommonTree* tree )
 {
-	m_savedIndex = 0;
-	m_startIndex = 0;
-	m_stopIndex  = 0;
+	m_startIndex = -1;
+	m_stopIndex  = -1;
+	m_childIndex = -1;
 	m_token		 = tree->get_token();
 	m_parent     = NULL;
-	m_childIndex = 0;
 }
 
 template<class ImplTraits>
-typename CommonTree<ImplTraits>::TokenType*   CommonTree<ImplTraits>::get_token() const
+const typename CommonTree<ImplTraits>::CommonTokenType* CommonTree<ImplTraits>::get_token() const
 {
 	return m_token;
 }
 
 template<class ImplTraits>
-typename CommonTree<ImplTraits>::ChildrenType& CommonTree<ImplTraits>::get_children()
+void CommonTree<ImplTraits>::set_token(typename CommonTree<ImplTraits>::CommonTokenType* token)
 {
-	return m_children;
+	m_token = token;
 }
 
 template<class ImplTraits>
-const typename CommonTree<ImplTraits>::ChildrenType& CommonTree<ImplTraits>::get_children() const
+typename CommonTree<ImplTraits>::ChildrenType& CommonTree<ImplTraits>::get_children()
 {
 	return m_children;
 }
 
 template<class ImplTraits>
-typename CommonTree<ImplTraits>::ChildrenType* CommonTree<ImplTraits>::get_children_p()
+const typename CommonTree<ImplTraits>::ChildrenType& CommonTree<ImplTraits>::get_children() const
 {
-	return &m_children;
+	return m_children;
 }
 
 template<class ImplTraits>
 void	CommonTree<ImplTraits>::addChild(TreeType* child)
 {
-	ANTLR_UINT32   n;
-	ANTLR_UINT32   i;
-
 	if	(child == NULL)
 		return;
 
 	ChildrenType& child_children = child->get_children();
-	ChildrenType& tree_children  = this->get_children();
+	//ChildrenType& tree_children  = this->get_children();
 
 	if	(child->isNilNode() == true)
 	{
-		if ( !child_children.empty() && child_children == tree_children )
+		if ( !child_children.empty() && child_children == m_children )
 		{
 			// TODO: Change to exception rather than ANTLR3_FPRINTF?
-			//
 			fprintf(stderr, "ANTLR3: An attempt was made to add a child list to itself!\n");
 			return;
 		}
@@ -95,55 +87,42 @@ void	CommonTree<ImplTraits>::addChild(TreeType* child)
         //
         if ( !child_children.empty() )
         {
-            if (tree_children.empty())
+            if (!m_children.empty())
             {
+                // Need to copy the children
+            	ANTLR_UINT32 n = child_children.size();
+                for (ANTLR_UINT32 i = 0; i < n; i++)
+                {
+                    TreeType* entry = child_children.at(i);
+                    // ANTLR3 lists can be sparse, unlike Array Lists (TODO: really?)
+                    if (entry != NULL)
+                        m_children.push_back(entry);
+					entry->set_parent(this);
+					entry->set_childIndex(m_children.size()-1);
+                }
+            } else {
                 // We are build ing the tree structure here, so we need not
                 // worry about duplication of pointers as the tree node
                 // factory will only clean up each node once. So we just
                 // copy in the child's children pointer as the child is
                 // a nil node (has not root itself).
                 //
-                tree_children.swap( child_children );
-                this->freshenPACIndexesAll();               
-            }
-            else
-            {
-                // Need to copy the children
-                //
-                n = child_children.size();
-
-                for (i = 0; i < n; i++)
-                {
-                    TreeType* entry;
-                    entry = child_children[i];
-
-                    // ANTLR3 lists can be sparse, unlike Array Lists
-                    //
-                    if (entry != NULL)
-                    {
-                        tree_children.push_back(entry);
-                    }
-                }
+                m_children.swap( child_children );
+                this->freshenParentAndChildIndexes();
             }
 		}
 	}
 	else
 	{
 		// Tree we are adding is not a Nil and might have children to copy
-		//
-		if  (tree_children.empty())
-		{
-			// No children in the tree we are adding to, so create a new list on
-			// the fly to hold them.
-			//
-			this->createChildrenList();
-		}
-		tree_children.push_back( child );
+		m_children.push_back( child );
+		child->set_parent(this);
+		child->set_childIndex(m_children.size()-1);
 	}
 }
 
 template<class ImplTraits>
-void	CommonTree<ImplTraits>::addChildren(const ChildListType& kids)
+void CommonTree<ImplTraits>::addChildren(const ChildListType& kids)
 {
 	for( typename ChildListType::const_iterator iter = kids.begin();
 		 iter != kids.end(); ++iter )
@@ -152,124 +131,97 @@ void	CommonTree<ImplTraits>::addChildren(const ChildListType& kids)
 	}
 }
 
-//dummy one, as vector is always there
-template<class ImplTraits>
-void    CommonTree<ImplTraits>::createChildrenList()
-{
-}
-
 template<class ImplTraits>
 typename CommonTree<ImplTraits>::TreeType*	CommonTree<ImplTraits>::deleteChild(ANTLR_UINT32 i)
 {
 	if( m_children.empty() )
 		return	NULL;
-
-	return  m_children.erase( m_children.begin() + i);
+	TreeType* killed = m_children.erase( m_children.begin() + i);
+	this->freshenParentAndChildIndexes(i);
+	return killed;
 }
 
 template<class ImplTraits>
 void	CommonTree<ImplTraits>::replaceChildren(ANTLR_INT32 startChildIndex, ANTLR_INT32 stopChildIndex, TreeType* newTree)
 {
-	ANTLR_INT32	replacingHowMany;		// How many nodes will go away
-	ANTLR_INT32	replacingWithHowMany;	// How many nodes will replace them
+
 	ANTLR_INT32	numNewChildren;			// Tracking variable
 	ANTLR_INT32	delta;					// Difference in new vs existing count
 
-	ANTLR_INT32	i;
-	ANTLR_INT32	j;
-
 	if	( m_children.empty() )
 	{
-		fprintf(stderr, "replaceChildren call: Indexes are invalid; no children in list for %s", this->getText().c_str() );
+		fprintf(stderr, "replaceChildren call: Indexes are invalid; no children in list for %s", this->get_text().c_str() );
+		// TODO throw here
 		return;
 	}
+	// How many nodes will go away
+	ANTLR_INT32 replacingHowMany		= stopChildIndex - startChildIndex + 1;
+	ANTLR_INT32	replacingWithHowMany;	// How many nodes will replace them
 
 	// Either use the existing list of children in the supplied nil node, or build a vector of the
 	// tree we were given if it is not a nil node, then we treat both situations exactly the same
 	//
-	ChildrenType newChildren_temp;
-	ChildrenType*	newChildren;			// Iterator for whatever we are going to add in
+	ChildrenType    newChildren;
+	ChildrenType   &newChildrenRef(newChildren);
 
 	if	(newTree->isNilNode())
 	{
-		newChildren = newTree->get_children_p();
-	}
-	else
-	{
-		newChildren = &newChildren_temp;
-		newChildren->push_back(newTree);
+		newChildrenRef = newTree->get_children();
+	} else {
+		newChildrenRef.push_back(newTree);
 	}
 
 	// Initialize
-	//
-	replacingHowMany		= stopChildIndex - startChildIndex + 1;
-	replacingWithHowMany	= newChildren->size();
+	replacingWithHowMany	= newChildrenRef.size();
+	numNewChildren			= newChildrenRef.size();
 	delta					= replacingHowMany - replacingWithHowMany;
-	numNewChildren			= newChildren->size();
 
 	// If it is the same number of nodes, then do a direct replacement
 	//
 	if	(delta == 0)
 	{
-		TreeType*	child;
-
-		// Same number of nodes
-		//
-		j	= 0;
-		for	(i = startChildIndex; i <= stopChildIndex; i++)
+		ANTLR_INT32 j = 0;
+		for	(ANTLR_INT32 i = startChildIndex; i <= stopChildIndex; i++)
 		{
-			child = newChildren->at(j);
-			ChildrenType& parent_children = this->get_children();
-			parent_children[i] = child;
-			child->setParent(this);
-			child->setChildIndex(i);
+			TreeType *child = newChildrenRef.at(j);
+			m_children[i] = child;
+			child->set_parent(this);
+			child->set_childIndex(i);
+			j++;
 		}
 	}
 	else if (delta > 0)
 	{
-		ANTLR_UINT32	indexToDelete;
-
 		// Less nodes than there were before
 		// reuse what we have then delete the rest
-		//
-		ChildrenType& parent_children = this->get_children();
-		for	(j = 0; j < numNewChildren; j++)
+		for	(ANTLR_UINT32 j = 0; j < numNewChildren; j++)
 		{
-			parent_children[ startChildIndex + j ] = newChildren->at(j);
+			m_children[ startChildIndex + j ] = newChildrenRef.at(j);
 		}
-
 		// We just delete the same index position until done
-		//
-		indexToDelete = startChildIndex + numNewChildren;
-
-		for	(j = indexToDelete; j <= stopChildIndex; j++)
+		ANTLR_UINT32 indexToDelete = startChildIndex + numNewChildren;
+		for	(ANTLR_UINT32 j = indexToDelete; j <= stopChildIndex; j++)
 		{
-			parent_children.erase( parent_children.begin() + indexToDelete);
+			m_children.erase( m_children.begin() + indexToDelete);
 		}
-
-		this->freshenPACIndexes(startChildIndex);
+		this->freshenParentAndChildIndexes(startChildIndex);
 	}
 	else
 	{
-		ChildrenType& parent_children = this->get_children();
-		ANTLR_UINT32 numToInsert;
-
 		// More nodes than there were before
 		// Use what we can, then start adding
-		//
-		for	(j = 0; j < replacingHowMany; j++)
+		for	(ANTLR_UINT32 j = 0; j < replacingHowMany; j++)
 		{
-			parent_children[ startChildIndex + j ] = newChildren->at(j);
+			m_children[ startChildIndex + j ] = newChildrenRef.at(j);
 		}
 
-		numToInsert = replacingWithHowMany - replacingHowMany;
-
-		for	(j = replacingHowMany; j < replacingWithHowMany; j++)
+		ANTLR_UINT32 numToInsert = replacingWithHowMany - replacingHowMany;
+		for	(ANTLR_UINT32 j = replacingHowMany; j < replacingWithHowMany; j++)
 		{
-			parent_children.push_back( newChildren->at(j) );
+			m_children.push_back( newChildrenRef.at(j) );
 		}
 
-		this->freshenPACIndexes(startChildIndex);
+		this->freshenParentAndChildIndexes(startChildIndex);
 	}
 }
 
@@ -277,14 +229,8 @@ template<class ImplTraits>
 CommonTree<ImplTraits>*	CommonTree<ImplTraits>::dupNode() const
 {
 	// The node we are duplicating is in fact the common tree (that's why we are here)
-    // so we use the super pointer to duplicate.
-    //
-    TreeType*   clone = new TreeType();
-
-	// The pointer we return is the base implementation of course
-    //
-	clone->set_token( m_token );
-	return  clone;
+	// so we use the super pointer to duplicate.
+	return new CommonTree<ImplTraits>(this);
 }
 
 template<class ImplTraits>
@@ -321,33 +267,23 @@ typename CommonTree<ImplTraits>::TreeType*	CommonTree<ImplTraits>::dupTree()
 template<class ImplTraits>
 ANTLR_UINT32	CommonTree<ImplTraits>::getCharPositionInLine()
 {
-	CommonTokenType*    token;
-	token   = m_token;
-
-	if	(token == NULL || (token->getCharPositionInLine() == -1) )
+	if(m_token == NULL || (m_token->get_charPositionInLine() == -1) )
 	{
-		if  (this->getChildCount() > 0)
-		{
-			TreeType*	child;
-
-			child   = this->getChild(0);
-
-			return child->getCharPositionInLine();
-		}
+		if(this->getChildCount() > 0)
+			return this->getChild(0)->get_charPositionInLine();
 		return 0;
 	}
-	return  token->getCharPositionInLine();
+	return m_token->get_charPositionInLine();
 }
 
 template<class ImplTraits>
 typename CommonTree<ImplTraits>::TreeType*	CommonTree<ImplTraits>::getChild(ANTLR_UINT32 i)
 {
-	if	(  m_children.empty()
-		|| i >= m_children.size() )
+	if	(  m_children.empty() || i >= m_children.size() )
 	{
 		return NULL;
 	}
-	return  m_children[i];
+	return  m_children.at(i);
 
 }
 
@@ -381,17 +317,41 @@ void     CommonTree<ImplTraits>::set_parent( TreeType* parent)
 	m_parent = parent;
 }
 
+template<class ImplTraits>
+ANTLR_MARKER CommonTree<ImplTraits>::get_startIndex() const
+{
+	if( m_startIndex==-1 && m_token!=NULL)
+		return m_token->get_tokenIndex();
+	return m_startIndex;
+}
+
+template<class ImplTraits>
+void     CommonTree<ImplTraits>::set_startIndex( ANTLR_MARKER index)
+{
+	m_startIndex = index;
+}
+
+template<class ImplTraits>
+ANTLR_MARKER CommonTree<ImplTraits>::get_stopIndex() const
+{
+	if( m_stopIndex==-1 && m_token!=NULL)
+		return m_token->get_tokenIndex();
+	return m_stopIndex;
+}
+
+template<class ImplTraits>
+void     CommonTree<ImplTraits>::set_stopIndex( ANTLR_MARKER index)
+{
+	m_stopIndex = index;
+}
+
 template<class ImplTraits>
 ANTLR_UINT32	CommonTree<ImplTraits>::getType()
 {
-	if	(this == NULL)
-	{
-		return	0;
-	}
+	if	(m_token == NULL)
+		return	CommonTokenType::TOKEN_INVALID;
 	else
-	{
-		return	m_token->getType();
-	}
+		return	m_token->get_type();
 }
 
 template<class ImplTraits>
@@ -419,21 +379,13 @@ typename CommonTree<ImplTraits>::TreeType*	CommonTree<ImplTraits>::getFirstChild
 template<class ImplTraits>
 ANTLR_UINT32	CommonTree<ImplTraits>::getLine()
 {
-	TreeType*	    cTree = this;
-	CommonTokenType* token;
-	token   = cTree->get_token();
-
-	if	(token == NULL || token->getLine() == 0)
+	if(m_token == NULL || m_token->get_line() == 0)
 	{
 		if  ( this->getChildCount() > 0)
-		{
-			TreeType*	child;
-			child   = this->getChild(0);
-			return child->getLine();
-		}
+			return this->getChild(0)->get_line();
 		return 0;
 	}
-	return  token->getLine();
+	return  m_token->get_line();
 }
 
 template<class ImplTraits>
@@ -443,118 +395,114 @@ typename CommonTree<ImplTraits>::StringType	CommonTree<ImplTraits>::getText()
 }
 
 template<class ImplTraits>
-bool	CommonTree<ImplTraits>::isNilNode()
+bool CommonTree<ImplTraits>::isNilNode()
 {
 	// This is a Nil tree if it has no payload (Token in our case)
-	//
 	if(m_token == NULL)
-	{
 		return true;
-	}
 	else
-	{
 		return false;
-	}
 }
 
 template<class ImplTraits>
-void	CommonTree<ImplTraits>::setChild(ANTLR_UINT32 i, TreeType* child)
+void CommonTree<ImplTraits>::setChild(ANTLR_UINT32 i, TreeType* child)
 {
-	if( m_children.size() >= i )
+	if( child==NULL)
+		return;
+
+	if( child->isNilNode())
+	{
+		// TODO: throw IllegalArgumentException
+		return;
+	}
+
+	if( m_children.size() <= i )
 		m_children.resize(i+1);
+
 	m_children[i] = child;
+	child->set_parent(this);
+	child->set_childIndex(i);
 }
 
 template<class ImplTraits>
 typename CommonTree<ImplTraits>::StringType	CommonTree<ImplTraits>::toStringTree()
 {
-	StringType  string;
-	ANTLR_UINT32   i;
-	ANTLR_UINT32   n;
-	TreeType*   t;
+	StringType retval;
 
 	if( m_children.empty() )
-	{
 		return	this->toString();
-	}
 
 	/* Need a new string with nothing at all in it.
 	*/
-	if	(this->isNilNode() == false)
+	if(this->isNilNode() == false)
 	{
-		string.append("(");
-		string.append(this->toString());
-		string.append(" ");
+		retval.append("(");
+		retval.append(this->toString());
+		retval.append(" ");
 	}
-	if	( m_children != NULL)
+	if	( !m_children.empty())
 	{
-		n = m_children.size();
-
-		for	(i = 0; i < n; i++)
+		ANTLR_UINT32 n = m_children.size();
+		for	(ANTLR_UINT32 i = 0; i < n; i++)
 		{   
-			t   = m_children[i];
-
+			TreeType *t = m_children.at(i);
 			if  (i > 0)
 			{
-				string.append(" ");
+				retval.append(" ");
 			}
-			string.append(t->toStringTree());
+			retval.append(t->toStringTree());
 		}
 	}
 	if	(this->isNilNode() == false)
 	{
-		string.append(")");
+		retval.append(")");
 	}
-
-	return  string;
+	return  retval;
 }
 
 template<class ImplTraits>
 typename CommonTree<ImplTraits>::StringType	CommonTree<ImplTraits>::toString()
 {
-	if  (this->isNilNode() )
-	{
-		StringType  nilNode;
-
-		nilNode	= "nil";
-
-		return nilNode;
-	}
-
+	if( this->isNilNode())
+		return StringType("nil");
 	return	m_token->getText();
 }
 
 template<class ImplTraits>
-void	CommonTree<ImplTraits>::freshenPACIndexesAll()
+void	CommonTree<ImplTraits>::freshenParentAndChildIndexes()
 {
-	this->freshenPACIndexes(0);
+	this->freshenParentAndChildIndexes(0);
 }
 
 template<class ImplTraits>
-void	CommonTree<ImplTraits>::freshenPACIndexes(ANTLR_UINT32 offset)
+void	CommonTree<ImplTraits>::freshenParentAndChildIndexes(ANTLR_UINT32 offset)
 {
-	ANTLR_UINT32	count;
-	ANTLR_UINT32	c;
-
-	count	= this->getChildCount();		// How many children do we have 
-
+	ANTLR_UINT32 count = this->getChildCount();
 	// Loop from the supplied index and set the indexes and parent
-	//
-	for	(c = offset; c < count; c++)
+	for	(ANTLR_UINT32 c = offset; c < count; c++)
 	{
-		TreeType*	child;
-
-		child = this->getChild(c);
-
-		child->setChildIndex(c);
-		child->setParent(this);
+		TreeType* child = this->getChild(c);
+		child->set_childIndex(c);
+		child->set_parent(this);
 	}
 }
 
 template<class ImplTraits>
-void    CommonTree<ImplTraits>::reuse()
+void	CommonTree<ImplTraits>::freshenParentAndChildIndexesDeeply()
+{
+	this->freshenParentAndChildIndexes(0);
+}
+
+template<class ImplTraits>
+void	CommonTree<ImplTraits>::freshenParentAndChildIndexesDeeply(ANTLR_UINT32 offset)
 {
-	delete this; //memory re-use should be taken by the library user
+	ANTLR_UINT32 count = this->getChildCount();
+	for (ANTLR_UINT32 c = offset; c < count; c++) {
+		TreeType* child = getChild(c);
+		child->set_childIndex(c);
+		child->set_parent(this);
+		child->freshenParentAndChildIndexesDeeply();
+	}
 }
 
 template<class ImplTraits>
diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.hpp b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
index 8b40f1c6d..708483182 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.hpp
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
@@ -59,7 +59,7 @@ class CommonTreeAdaptor : public ImplTraits::AllocPolicyType
     void	setParent( TreeType* child, TreeType* parent);
     TreeType*		getParent( TreeType* child);
 
-	TreeType*		errorNode( CommonTokenType* tnstream, CommonTokenType* startToken, CommonTokenType* stopToken);
+	TreeType*		errorNode( CommonTokenType* tnstream, const CommonTokenType* startToken, const CommonTokenType* stopToken);
 	bool	isNilNode( TreeType* t);
 
     TreeType*	    becomeRoot( TreeType* newRoot, TreeType* oldRoot);
@@ -67,10 +67,13 @@ class CommonTreeAdaptor : public ImplTraits::AllocPolicyType
 
     TreeType*	becomeRootToken(CommonTokenType* newRoot, TreeType* oldRoot);
 
-    TreeType*	 	create( CommonTokenType* payload);
-    TreeType* 		createTypeToken( ANTLR_UINT32 tokenType, CommonTokenType* fromToken);
-    TreeType*	   	createTypeTokenText	( ANTLR_UINT32 tokenType, CommonTokenType* fromToken, const ANTLR_UINT8* text);
-    TreeType*	    createTypeText		( ANTLR_UINT32 tokenType, const ANTLR_UINT8* text);
+    TreeType* create( CommonTokenType const* payload);
+    TreeType* create( ANTLR_UINT32 tokenType, const CommonTokenType* fromToken);
+    TreeType* create( ANTLR_UINT32 tokenType, const CommonTokenType* fromToken, const char* text);
+    TreeType* create( ANTLR_UINT32 tokenType, const char* text);
+
+    CommonTokenType* createToken( ANTLR_UINT32 tokenType, const char* text);
+    CommonTokenType* createToken( const CommonTokenType* fromToken);
 
     TreeType*	    dupNode( TreeType* treeNode);
     ANTLR_UINT32			getType( TreeType* t);
@@ -85,11 +88,9 @@ class CommonTreeAdaptor : public ImplTraits::AllocPolicyType
     ANTLR_UINT32	getChildCount( TreeType*);
 	ANTLR_UINT64	getUniqueID( TreeType*);
 
-    CommonTokenType*    createToken( ANTLR_UINT32 tokenType, const ANTLR_UINT8* text);
-    CommonTokenType*    createTokenFromToken( CommonTokenType* fromToken);
     CommonTokenType*    getToken( TreeType* t);
 
-    void setTokenBoundaries( TreeType* t, CommonTokenType* startToken, CommonTokenType* stopToken);
+    void setTokenBoundaries( TreeType* t, const CommonTokenType* startToken, const CommonTokenType* stopToken);
     ANTLR_MARKER	getTokenStartIndex( TreeType* t);
     ANTLR_MARKER	getTokenStopIndex( TreeType* t);
 
diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.inl b/runtime/Cpp/include/antlr3commontreeadaptor.inl
index 698c7d73e..aaa3a88e0 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.inl
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.inl
@@ -33,7 +33,7 @@ typename CommonTreeAdaptor<ImplTraits>::TreeType*	  CommonTreeAdaptor<ImplTraits
 
 	// Ensure new subtree root has parent/child index set
 	//
-	this->setChildIndex( newTree, t->getChildIndex() );
+	this->setChildIndex( newTree, t->get_childIndex() );
 	this->setParent(newTree, parent);
 	n = this->getChildCount(t);
 
@@ -67,24 +67,30 @@ void	CommonTreeAdaptor<ImplTraits>::addChildToken( TreeType* t, CommonTokenType*
 template<class ImplTraits>
 void	CommonTreeAdaptor<ImplTraits>::setParent( TreeType* child, TreeType* parent)
 {
-	child->setParent(parent);
+	child->set_parent(parent);
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*		CommonTreeAdaptor<ImplTraits>::getParent( TreeType* child)
+typename CommonTreeAdaptor<ImplTraits>::TreeType*
+CommonTreeAdaptor<ImplTraits>::getParent( TreeType* child)
 {
+	if ( child==NULL )
+		return NULL;
 	return child->getParent();
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*		CommonTreeAdaptor<ImplTraits>::errorNode( CommonTokenType* tnstream, CommonTokenType* startToken, CommonTokenType* stopToken)
+typename CommonTreeAdaptor<ImplTraits>::TreeType*
+CommonTreeAdaptor<ImplTraits>::errorNode( CommonTokenType* tnstream,
+											const CommonTokenType* startToken,
+											const CommonTokenType* stopToken)
 {
 	// Use the supplied common tree node stream to get another tree from the factory
 	// TODO: Look at creating the erronode as in Java, but this is complicated by the
 	// need to track and free the memory allocated to it, so for now, we just
 	// want something in the tree that isn't a NULL pointer.
 	//
-	return this->createTypeText( CommonTokenType::TOKEN_INVALID, "Tree Error Node");
+	return this->create( CommonTokenType::TOKEN_INVALID, "Tree Error Node");
 
 }
 
@@ -95,7 +101,8 @@ bool	CommonTreeAdaptor<ImplTraits>::isNilNode( TreeType* t)
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*	    CommonTreeAdaptor<ImplTraits>::becomeRoot( TreeType* newRootTree, TreeType* oldRootTree)
+typename CommonTreeAdaptor<ImplTraits>::TreeType*
+CommonTreeAdaptor<ImplTraits>::becomeRoot( TreeType* newRootTree, TreeType* oldRootTree)
 {
 	TreeType* saveRoot;
 
@@ -135,8 +142,7 @@ typename CommonTreeAdaptor<ImplTraits>::TreeType*	    CommonTreeAdaptor<ImplTrai
 		newRootTree = newRootTree->getChild(0);
 
         // Reclaim the old nilNode()
-        //
-        saveRoot->reuse();
+        delete saveRoot;
 	}
 
 	/* Add old root into new root. addChild takes care of the case where oldRoot
@@ -158,7 +164,7 @@ typename CommonTreeAdaptor<ImplTraits>::TreeType*	    CommonTreeAdaptor<ImplTrai
         // don't know necessarilly know how to do this for the real node, we just ask the tree itself
         // to do it.
         //
-        oldRootTree->reuse();
+		delete oldRootTree;
     }
 	/* Always returns new root structure
 	 */
@@ -166,71 +172,57 @@ typename CommonTreeAdaptor<ImplTraits>::TreeType*	    CommonTreeAdaptor<ImplTrai
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*	CommonTreeAdaptor<ImplTraits>::becomeRootToken(CommonTokenType* newRoot, TreeType* oldRoot)
+typename CommonTreeAdaptor<ImplTraits>::TreeType*
+CommonTreeAdaptor<ImplTraits>::becomeRootToken( CommonTokenType* newRoot, TreeType* oldRoot)
 {
 	return	this->becomeRoot(this->create(newRoot), oldRoot);
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*	 	CommonTreeAdaptor<ImplTraits>::create( CommonTokenType* payload)
+typename CommonTreeAdaptor<ImplTraits>::TreeType*
+CommonTreeAdaptor<ImplTraits>::create( CommonTokenType const* payload)
 {
 	return new TreeType(payload);
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*  CommonTreeAdaptor<ImplTraits>::createTypeToken( ANTLR_UINT32 tokenType, 
-																						  CommonTokenType* fromToken)
+typename CommonTreeAdaptor<ImplTraits>::TreeType*
+CommonTreeAdaptor<ImplTraits>::create( ANTLR_UINT32 tokenType, const CommonTokenType* fromToken)
 {
-	/* Create the new token
-	 */
-	fromToken = this->createTokenFromToken(fromToken);
-
-	/* Set the type of the new token to that supplied
-	 */
-	fromToken->setType(tokenType);
-
-	/* Return a new node based upon this token
-	 */
-	return	this->create(fromToken);
-
+	/* Create the new token */
+	CommonTokenType* newToken = this->createToken(fromToken);
+	/* Set the type of the new token to that supplied */
+	newToken->set_type(tokenType);
+	/* Return a new node based upon this token */
+	return this->create(newToken);
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*	CommonTreeAdaptor<ImplTraits>::createTypeTokenText( ANTLR_UINT32 tokenType, CommonTokenType* fromToken, const ANTLR_UINT8* text)
+typename CommonTreeAdaptor<ImplTraits>::TreeType*
+CommonTreeAdaptor<ImplTraits>::create( ANTLR_UINT32 tokenType, const CommonTokenType* fromToken, const char* text)
 {
-	/* Create the new token
-	 */
-	fromToken = this->createTokenFromToken(fromToken);
-
-	/* Set the type of the new token to that supplied
-	 */
-	fromToken->setType(tokenType);
-
-	/* Set the text of the token accordingly
-	 */
-	fromToken->setText(text);
-
-	/* Return a new node based upon this token
-	 */
+	if (fromToken == NULL)
+		return create(tokenType, text);
+	/* Create the new token */
+	fromToken = this->createToken(fromToken);
+	/* Set the type of the new token to that supplied */
+	fromToken->set_type(tokenType);
+	/* Set the text of the token accordingly */
+	fromToken->set_text(text);
+	/* Return a new node based upon this token */
 	return	this->create(fromToken);
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*	    CommonTreeAdaptor<ImplTraits>::createTypeText( ANTLR_UINT32 tokenType, const ANTLR_UINT8* text)
+typename CommonTreeAdaptor<ImplTraits>::TreeType*
+CommonTreeAdaptor<ImplTraits>::create( ANTLR_UINT32 tokenType, const char* text)
 {
-	CommonTokenType*	fromToken;
-
-	/* Create the new token
-	 */
-	fromToken = this->createToken(tokenType, text);
-
-	/* Return a new node based upon this token
-	 */
+	CommonTokenType* fromToken = this->createToken(tokenType, text);
 	return	this->create(fromToken);
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*	CommonTreeAdaptor<ImplTraits>::dupNode( TreeType* treeNode)
+typename CommonTreeAdaptor<ImplTraits>::TreeType* CommonTreeAdaptor<ImplTraits>::dupNode( TreeType* treeNode)
 {
 	return  (treeNode == NULL) ? NULL : treeNode->dupNode();
 }
@@ -238,6 +230,8 @@ typename CommonTreeAdaptor<ImplTraits>::TreeType*	CommonTreeAdaptor<ImplTraits>:
 template<class ImplTraits>
 ANTLR_UINT32	CommonTreeAdaptor<ImplTraits>::getType( TreeType* t)
 {
+	if ( t==NULL)
+		return CommonTokenType::TOKEN_INVALID;
 	return t->getType();
 }
 
@@ -250,6 +244,8 @@ typename CommonTreeAdaptor<ImplTraits>::StringType	CommonTreeAdaptor<ImplTraits>
 template<class ImplTraits>
 typename CommonTreeAdaptor<ImplTraits>::TreeType*	    CommonTreeAdaptor<ImplTraits>::getChild( TreeType* t, ANTLR_UINT32 i)
 {
+	if ( t==NULL )
+		return NULL;
 	return t->getChild(i);
 }
 
@@ -268,18 +264,23 @@ void	CommonTreeAdaptor<ImplTraits>::deleteChild( TreeType* t, ANTLR_UINT32 i)
 template<class ImplTraits>
 void	CommonTreeAdaptor<ImplTraits>::setChildIndex( TreeType* t, ANTLR_INT32 i)
 {
-	t->setChildIndex(i);
+	if( t!= NULL)
+		t->set_childIndex(i);
 }
 
 template<class ImplTraits>
 ANTLR_INT32	CommonTreeAdaptor<ImplTraits>::getChildIndex( TreeType * t)
 {
+	if ( t==NULL )
+		return 0;
 	return t->getChildIndex();
 }
 
 template<class ImplTraits>
 ANTLR_UINT32	CommonTreeAdaptor<ImplTraits>::getChildCount( TreeType* t)
 {
+	if ( t==NULL )
+		return 0;
 	return t->getChildCount();
 }
 
@@ -291,14 +292,14 @@ ANTLR_UINT64	CommonTreeAdaptor<ImplTraits>::getUniqueID( TreeType* node )
 
 template<class ImplTraits>
 typename CommonTreeAdaptor<ImplTraits>::CommonTokenType*    
-	     CommonTreeAdaptor<ImplTraits>::createToken( ANTLR_UINT32 tokenType, const ANTLR_UINT8* text)
+	CommonTreeAdaptor<ImplTraits>::createToken( ANTLR_UINT32 tokenType, const char* text)
 {
 	CommonTokenType*    newToken = new CommonTokenType;
 
     if	(newToken != NULL)
     {	
-		newToken->set_tokText( (const char*) text );
-		newToken->setType(tokenType);
+		newToken->set_tokText( text );
+		newToken->set_type(tokenType);
     }
     return  newToken;
 
@@ -306,27 +307,9 @@ typename CommonTreeAdaptor<ImplTraits>::CommonTokenType*
 
 template<class ImplTraits>
 typename CommonTreeAdaptor<ImplTraits>::CommonTokenType*    
-	CommonTreeAdaptor<ImplTraits>::createTokenFromToken( CommonTokenType* fromToken)
+	CommonTreeAdaptor<ImplTraits>::createToken( const CommonTokenType* fromToken)
 {
-	CommonTokenType*    newToken;
-
-    newToken	= new CommonTokenType;
-    
-    if	(newToken != NULL)
-    {
-		// Create the text using our own string factory to avoid complicating
-		// commontoken.
-		//
-		StringType	text = fromToken->getText();
-		newToken->set_tokText( text );
-		newToken->setLine( fromToken->getLine() );
-		newToken->setTokenIndex( fromToken->getTokenIndex() );
-		newToken->setCharPositionInLine( fromToken->getCharPositionInLine() );
-		newToken->setChannel( fromToken->getChannel() );
-		newToken->setType( fromToken->getType() );
-    }
-
-    return  newToken;
+    return new CommonTokenType(*fromToken);
 }
 
 template<class ImplTraits>
@@ -337,51 +320,37 @@ typename CommonTreeAdaptor<ImplTraits>::CommonTokenType*
 }
 
 template<class ImplTraits>
-void CommonTreeAdaptor<ImplTraits>::setTokenBoundaries( TreeType* t, CommonTokenType* startToken, CommonTokenType* stopToken)
+void CommonTreeAdaptor<ImplTraits>::setTokenBoundaries( TreeType* t, const CommonTokenType* startToken, const CommonTokenType* stopToken)
 {
-	ANTLR_MARKER   start;
-	ANTLR_MARKER   stop;
-
-	TreeType*	    ct;
+	ANTLR_MARKER   start = 0;
+	ANTLR_MARKER   stop = 0;
 
 	if	(t == NULL)
-	{
 		return;
-	}
 
 	if	( startToken != NULL)
-	{
-		start = startToken->getTokenIndex();
-	}
-	else
-	{
-		start = 0;
-	}
+		start = startToken->get_tokenIndex();
 
 	if	( stopToken != NULL)
-	{
-		stop = stopToken->getTokenIndex();
-	}
-	else
-	{
-		stop = 0;
-	}
-
-	ct	= t;
+		stop = stopToken->get_tokenIndex();
 
-	ct->set_startIndex(start);
-	ct->set_stopIndex(stop);
+	t->set_startIndex(start);
+	t->set_stopIndex(stop);
 }
 
 template<class ImplTraits>
 ANTLR_MARKER	CommonTreeAdaptor<ImplTraits>::getTokenStartIndex( TreeType* t)
 {
+	if ( t==NULL )
+		return -1;
 	return t->get_tokenStartIndex();
 }
 
 template<class ImplTraits>
 ANTLR_MARKER	CommonTreeAdaptor<ImplTraits>::getTokenStopIndex( TreeType* t)
 {
+	if ( t==NULL )
+		return -1;
 	return t->get_tokenStopIndex();
 }
 
@@ -642,12 +611,7 @@ void CommonTreeAdaptor<ImplTraits>::defineDotEdges(TreeType* t, const StringType
 template<class ImplTraits>
 typename CommonTreeAdaptor<ImplTraits>::TreeType* CommonTreeAdaptor<ImplTraits>::rulePostProcessing( TreeType* root)
 {
-	TreeType* saveRoot;
-
-    // Keep track of the root we are given. If it is a nilNode, then we
-    // can reuse it rather than orphaning it!
-    //
-    saveRoot = root;
+	TreeType* saveRoot = root;
 
 	if (root != NULL && root->isNilNode())
 	{
@@ -658,14 +622,14 @@ typename CommonTreeAdaptor<ImplTraits>::TreeType* CommonTreeAdaptor<ImplTraits>:
 		else if	(root->getChildCount() == 1)
 		{
 			root = root->getChild(0);
-			root->setParent(NULL);
-			root->setChildIndex(-1);
+			root->set_parent(NULL);
+			root->set_childIndex(-1);
 
             // The root we were given was a nil node, wiht one child, which means it has
             // been abandoned and would be lost in the node factory. However
             // nodes can be flagged as resuable to prevent this terrible waste
             //
-            saveRoot->reuse();
+			delete saveRoot;
 		}
 	}
 	return root;
diff --git a/runtime/Cpp/include/antlr3defs.hpp b/runtime/Cpp/include/antlr3defs.hpp
index b27db5f87..5175cd18a 100644
--- a/runtime/Cpp/include/antlr3defs.hpp
+++ b/runtime/Cpp/include/antlr3defs.hpp
@@ -98,8 +98,6 @@
 #define ANTLR_BEGIN_NAMESPACE() namespace antlr3 {
 #define ANTLR_END_NAMESPACE() }
 
-#define ANTLR_USE_64BIT
-
 /* Common definitions come first
  */
 #include    <antlr3errors.hpp>
diff --git a/runtime/Cpp/include/antlr3intstream.hpp b/runtime/Cpp/include/antlr3intstream.hpp
index 82c116bd2..2381df3cf 100644
--- a/runtime/Cpp/include/antlr3intstream.hpp
+++ b/runtime/Cpp/include/antlr3intstream.hpp
@@ -376,11 +376,11 @@ class TokenIntStream : public IntStream<ImplTraits, typename ImplTraits::TokenSt
 };
 
 template<class ImplTraits>
-class TreeNodeIntStream : public IntStream<ImplTraits, typename ImplTraits::CommonTreeNodeStreamType>
+class TreeNodeIntStream : public IntStream<ImplTraits, typename ImplTraits::TreeNodeStreamType>
 {
 public:
-	typedef typename ImplTraits::CommonTreeNodeStreamType CommonTreeNodeStreamType;
-	typedef IntStream<ImplTraits, CommonTreeNodeStreamType > BaseType;
+	typedef typename ImplTraits::TreeNodeStreamType TreeNodeStreamType;
+	typedef IntStream<ImplTraits, TreeNodeStreamType > BaseType;
 	typedef typename ImplTraits::TreeType TreeType;
 	typedef typename ImplTraits::CommonTokenType CommonTokenType;
 
diff --git a/runtime/Cpp/include/antlr3intstream.inl b/runtime/Cpp/include/antlr3intstream.inl
index e4de290c3..b947ee664 100644
--- a/runtime/Cpp/include/antlr3intstream.inl
+++ b/runtime/Cpp/include/antlr3intstream.inl
@@ -1570,7 +1570,7 @@ TokenIntStream<ImplTraits>::getSourceName()
 template<class ImplTraits>
 void  TreeNodeIntStream<ImplTraits>::consume()
 {
-	CommonTreeNodeStreamType* ctns = this->get_super();
+	TreeNodeStreamType* ctns = this->get_super();
 	if( ctns->get_p() == -1 )
 		ctns->fillBufferRoot();
 	ctns->inc_p();
@@ -1578,14 +1578,14 @@ void  TreeNodeIntStream<ImplTraits>::consume()
 template<class ImplTraits>
 ANTLR_MARKER		TreeNodeIntStream<ImplTraits>::tindex()
 {
-	CommonTreeNodeStreamType* ctns = this->get_super();
+	TreeNodeStreamType* ctns = this->get_super();
 	return (ANTLR_MARKER)(ctns->get_p());
 }
 
 template<class ImplTraits>
 ANTLR_UINT32		TreeNodeIntStream<ImplTraits>::_LA(ANTLR_INT32 i)
 {
-	CommonTreeNodeStreamType* tns	    = this->get_super();
+	TreeNodeStreamType* tns	    = this->get_super();
 
 	// Ask LT for the 'token' at that position
 	//
@@ -1604,7 +1604,7 @@ ANTLR_UINT32		TreeNodeIntStream<ImplTraits>::_LA(ANTLR_INT32 i)
 template<class ImplTraits>
 ANTLR_MARKER	TreeNodeIntStream<ImplTraits>::mark()
 {
-	CommonTreeNodeStreamType* ctns	    = this->get_super();
+	TreeNodeStreamType* ctns	    = this->get_super();
 	
 	if	(ctns->get_p() == -1)
 	{
@@ -1640,14 +1640,14 @@ void TreeNodeIntStream<ImplTraits>::rewindLast()
 template<class ImplTraits>
 void	TreeNodeIntStream<ImplTraits>::seek(ANTLR_MARKER index)
 {
-	CommonTreeNodeStreamType* ctns	    = this->get_super();
+	TreeNodeStreamType* ctns	    = this->get_super();
 	ctns->set_p( ANTLR_UINT32_CAST(index) );
 }
 
 template<class ImplTraits>
 ANTLR_UINT32	TreeNodeIntStream<ImplTraits>::size()
 {
-	CommonTreeNodeStreamType* ctns	    = this->get_super();
+	TreeNodeStreamType* ctns	    = this->get_super();
 	
 	if	(ctns->get_p() == -1)
 	{
diff --git a/runtime/Cpp/include/antlr3rewritestreams.hpp b/runtime/Cpp/include/antlr3rewritestreams.hpp
index e89d70a44..fb26b79d3 100644
--- a/runtime/Cpp/include/antlr3rewritestreams.hpp
+++ b/runtime/Cpp/include/antlr3rewritestreams.hpp
@@ -53,25 +53,25 @@
 ///
 ANTLR_BEGIN_NAMESPACE()
 
-template<class ImplTraits, class SuperType>
-class RewriteRuleElementStream  : public ImplTraits::AllocPolicyType
+template<class ImplTraits, class ElementType>
+//template<class ImplTraits>
+class RewriteRuleElementStream : public ImplTraits::AllocPolicyType
 {
 public:
-	typedef typename ImplTraits::TreeType TreeType;
+	//typedef typename ImplTraits::TreeType TreeType;
 	typedef typename ImplTraits::AllocPolicyType AllocPolicyType;
 	typedef typename ImplTraits::TreeAdaptorType TreeAdaptorType;
 
-	typedef typename ImplTraits::template RecognizerType< typename SuperType::StreamType > RecognizerType;
+	//typedef typename ImplTraits::template RecognizerType< typename SuperType::StreamType > RecognizerType;
 	typedef typename ImplTraits::StringType StringType;
-	typedef typename SuperType::TokenType TokenType; 
-	typedef typename AllocPolicyType::template VectorType< TokenType* > ElementsType;
+	typedef typename AllocPolicyType::template VectorType< ElementType* > ElementsType;
 
 protected:
-	/// Track single elements w/o creating a list.  Upon 2nd add, alloc list 
+	/// Track single elements w/o creating a list.  Upon 2nd add, alloc list
     ///
-    TokenType*			m_singleElement;
+    ElementType*		m_singleElement;
 
-    /// The list of tokens or subtrees we are tracking 
+    /// The list of tokens or subtrees we are tracking
     ///
     ElementsType		m_elements;
 
@@ -79,63 +79,64 @@ class RewriteRuleElementStream  : public ImplTraits::AllocPolicyType
     /// rule reference that this list tracks.  Can include rulename too, but
     /// the exception would track that info.
     ///
-    StringType			m_elementDescription;
+    StringType		m_elementDescription;
+
+private:
+	ElementType* dupImpl(typename ImplTraits::CommonTokenType* el);
+	ElementType* dupImpl(typename ImplTraits::TreeType* el);
+
 
 	/// Pointer to the tree adaptor in use for this stream
 	///
     TreeAdaptorType*	m_adaptor;
 
-	// Pointer to the recognizer shared state to which this stream belongs
-	//
-	RecognizerType*			m_rec;
-
 	/// Cursor 0..n-1.  If singleElement!=NULL, cursor is 0 until you next(),
     /// which bumps it to 1 meaning no more elements.
     ///
-    ANTLR_UINT32		m_cursor;
+    ANTLR_UINT32 m_cursor;
 
 	/// Once a node / subtree has been used in a stream, it must be dup'ed
 	/// from then on.  Streams are reset after sub rules so that the streams
 	/// can be reused in future sub rules.  So, reset must set a dirty bit.
 	/// If dirty, then next() always returns a dup.
 	///
-	bool				m_dirty;
+	bool m_dirty;
 
 public:
-	RewriteRuleElementStream(TreeAdaptorType* adaptor, RecognizerType* rec, ANTLR_UINT8* description);
-	RewriteRuleElementStream(TreeAdaptorType* adaptor, RecognizerType* rec, ANTLR_UINT8* description, TokenType* oneElement);
-	RewriteRuleElementStream(TreeAdaptorType* adaptor, RecognizerType* rec, ANTLR_UINT8* description, const ElementsType& elements);
+	RewriteRuleElementStream(TreeAdaptorType* adaptor, const char* description);
+	RewriteRuleElementStream(TreeAdaptorType* adaptor, const char* description, ElementType* oneElement);
+	RewriteRuleElementStream(TreeAdaptorType* adaptor, const char* description, const ElementsType& elements);
 
 	~RewriteRuleElementStream();
-    //   Methods 
+    //	Methods
 
     /// Reset the condition of this stream so that it appears we have
     ///  not consumed any of its elements.  Elements themselves are untouched.
     ///
-    void	reset(); 
+    void	reset();
 
     /// Add a new pANTLR3_BASE_TREE to this stream
     ///
-    void	add(TokenType* el);
+    void	add(ElementType* el);
 
     /// Return the next element in the stream.  If out of elements, throw
     /// an exception unless size()==1.  If size is 1, then return elements[0].
     ///
-	TokenType*	next();
-    TreeType*	nextTree();
-    TokenType*	nextToken();
-    TokenType*	_next();
+	//TokenType* next();
+    ElementType* nextTree();
+    //TokenType* nextToken();
+    ElementType* _next();
 
 	/// When constructing trees, sometimes we need to dup a token or AST
     ///	subtree.  Dup'ing a token means just creating another AST node
     /// around it.  For trees, you must call the adaptor.dupTree().
     ///
-	TokenType* dup( TokenType* el );
+	ElementType* dup( ElementType* el );
 
     /// Ensure stream emits trees; tokens must be converted to AST nodes.
     /// AST nodes can be passed through unmolested.
     ///
-    TreeType*	toTree(TreeType* el);
+    ElementType* toTree(ElementType* el);
 
     /// Returns true if there is a next element available
     ///
@@ -150,7 +151,7 @@ class RewriteRuleElementStream  : public ImplTraits::AllocPolicyType
     /// Referencing to a rule result twice is ok; dup entire tree as
     /// we can't be adding trees; e.g., expr expr. 
     ///
-    TreeType*	nextNode();
+    //TreeType* nextNode();
 
     /// Number of elements available in the stream
     ///
@@ -161,14 +162,15 @@ class RewriteRuleElementStream  : public ImplTraits::AllocPolicyType
     StringType getDescription();
 
 protected:
-	void init(TreeAdaptorType* adaptor, RecognizerType* rec, ANTLR_UINT8* description);
+	void init(TreeAdaptorType* adaptor, const char* description);
 };
 
 /// This is an implementation of a token stream, which is basically an element
 ///  stream that deals with tokens only.
 ///
 template<class ImplTraits>
-class RewriteRuleTokenStream : public ImplTraits::template RewriteRuleElementStreamType< typename ImplTraits::ParserType> 
+//class RewriteRuleTokenStream : public ImplTraits::template RewriteRuleElementStreamType< typename ImplTraits::ParserType>
+class RewriteRuleTokenStream : public ImplTraits::template RewriteStreamType< const typename ImplTraits::CommonTokenType >
 {
 public:
 	typedef typename ImplTraits::AllocPolicyType AllocPolicyType;
@@ -179,23 +181,26 @@ class RewriteRuleTokenStream : public ImplTraits::template RewriteRuleElementStr
 	typedef typename ImplTraits::TreeType TreeType;
 	typedef typename AllocPolicyType::template VectorType< TokenType* > ElementsType;
 	typedef typename ImplTraits::template RecognizerType< StreamType > RecognizerType;
-	typedef typename ImplTraits::template RewriteRuleElementStreamType< typename ImplTraits::ParserType> BaseType;
+	typedef typename ImplTraits::template RewriteStreamType< const typename ImplTraits::CommonTokenType > BaseType;
 
 public:
-	RewriteRuleTokenStream(TreeAdaptorType* adaptor, RecognizerType* rec, ANTLR_UINT8* description);
-	RewriteRuleTokenStream(TreeAdaptorType* adaptor, RecognizerType* rec, ANTLR_UINT8* description, TokenType* oneElement);
-	RewriteRuleTokenStream(TreeAdaptorType* adaptor, RecognizerType* rec, ANTLR_UINT8* description, const ElementsType& elements);
+	RewriteRuleTokenStream(TreeAdaptorType* adaptor, const char* description);
+	RewriteRuleTokenStream(TreeAdaptorType* adaptor, const char* description, TokenType* oneElement);
+	RewriteRuleTokenStream(TreeAdaptorType* adaptor, const char* description, const ElementsType& elements);
+
 	TreeType*	nextNode();
+	TokenType*  nextToken();
 
 private:
-	TreeType*	nextNodeToken();
+	//TreeType*	nextNodeToken();
 };
 
 /// This is an implementation of a subtree stream which is a set of trees
-///  modelled as an element stream.
+///  modeled as an element stream.
 ///
 template<class ImplTraits>
-class RewriteRuleSubtreeStream : public ImplTraits::template RewriteRuleElementStreamType< typename ImplTraits::TreeParserType> 
+//class RewriteRuleSubtreeStream : public ImplTraits::template RewriteStreamType< typename ImplTraits::TreeParserType>
+class RewriteRuleSubtreeStream : public ImplTraits::template RewriteStreamType< typename ImplTraits::TreeType >
 {
 public:
 	typedef typename ImplTraits::AllocPolicyType AllocPolicyType;
@@ -206,24 +211,46 @@ class RewriteRuleSubtreeStream : public ImplTraits::template RewriteRuleElementS
 	typedef TreeType TokenType;
 	typedef typename ImplTraits::template RecognizerType< StreamType > RecognizerType;
 	typedef typename AllocPolicyType::template VectorType< TokenType* > ElementsType;
-	typedef typename ImplTraits::template RewriteRuleElementStreamType< typename ImplTraits::TreeParserType>  BaseType;
+	typedef typename ImplTraits::template RewriteStreamType< typename ImplTraits::TreeType >  BaseType;
 
-public:
-	RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, RecognizerType* rec, ANTLR_UINT8* description);
-	RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, RecognizerType* rec, ANTLR_UINT8* description, TokenType* oneElement);
-	RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, RecognizerType* rec, ANTLR_UINT8* description, const ElementsType& elements);
+	RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description);
+	RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description, TokenType* oneElement);
+	RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description, const ElementsType& elements);
+
+	TreeType* nextNode(TreeType*);
 
+protected:
 	TreeType* dup( TreeType* el );
 
 private:
 	TreeType* dupTree( TreeType* el );
 };
 
+/* TODO This class is probably used in TreeParser only
+ * Notes about Java target
+ * - these classes reimplement only dup and toTree methods:
+ * base ElementStr
+ * 		abstract dup
+ * 		toTree(Object e) { return e; }
+ * TokenStr
+ *		dup { throw }
+ *		toTree(Object e) { return e; }
+ * SubTreeStr
+ * 		dup(Object e) { return adaptor.dupTree }
+ * NodeStr
+ * 		dup { throw }
+ * 		toTree(Object e) { return adaptor.dupNode }
+ * See: RewriteRuleElementStream::dup, RewriteRuleElementStream::dupImpl
+ *
+ * There should 3 types of specializations for RewriteRuleElementStreamType (which is not defined yet)
+ * ATM: RewriteRuleElementStreamType is replaced with ImplTraits::template RewriteStreamType
+ *
 /// This is an implementation of a node stream, which is basically an element
 ///  stream that deals with tree nodes only.
 ///
 template<class ImplTraits>
-class RewriteRuleNodeStream : public ImplTraits::template RewriteRuleElementStreamType< typename ImplTraits::TreeParserType> 
+//class RewriteRuleNodeStream : public ImplTraits::template RewriteStreamType< typename ImplTraits::TreeParserType>
+class RewriteRuleNodeStream : public ImplTraits::template RewriteStreamType< typename ImplTraits::TreeType >
 {
 public:
 	typedef typename ImplTraits::AllocPolicyType AllocPolicyType;
@@ -234,19 +261,20 @@ class RewriteRuleNodeStream : public ImplTraits::template RewriteRuleElementStre
 	typedef TreeType TokenType;	
 	typedef typename ImplTraits::template RecognizerType< StreamType > RecognizerType;
 	typedef typename AllocPolicyType::template VectorType< TokenType* > ElementsType;
-	typedef typename ImplTraits::template RewriteRuleElementStreamType< typename ImplTraits::TreeParserType>  BaseType;
+	typedef typename ImplTraits::template RewriteRuleElementStreamType< typename ImplTraits::TreeType >  BaseType;
 
 public:
-	RewriteRuleNodeStream(TreeAdaptorType* adaptor, RecognizerType* rec, ANTLR_UINT8* description);
-	RewriteRuleNodeStream(TreeAdaptorType* adaptor, RecognizerType* rec, ANTLR_UINT8* description, TokenType* oneElement);
-	RewriteRuleNodeStream(TreeAdaptorType* adaptor, RecognizerType* rec, ANTLR_UINT8* description, const ElementsType& elements);
+	RewriteRuleNodeStream(TreeAdaptorType* adaptor, const char* description);
+	RewriteRuleNodeStream(TreeAdaptorType* adaptor, const char* description, TokenType* oneElement);
+	RewriteRuleNodeStream(TreeAdaptorType* adaptor, const char* description, const ElementsType& elements);
 
+protected:
 	TreeType*	toTree(TreeType* element);
 
 private:
 	TreeType*	toTreeNode(TreeType* element);
 };
-
+*/
 ANTLR_END_NAMESPACE()
 
 #include "antlr3rewritestreams.inl"
diff --git a/runtime/Cpp/include/antlr3rewritestreams.inl b/runtime/Cpp/include/antlr3rewritestreams.inl
index 3303e8c41..7337f3c42 100644
--- a/runtime/Cpp/include/antlr3rewritestreams.inl
+++ b/runtime/Cpp/include/antlr3rewritestreams.inl
@@ -1,34 +1,35 @@
 ANTLR_BEGIN_NAMESPACE()
 
-template<class ImplTraits, class SuperType>
-RewriteRuleElementStream<ImplTraits, SuperType>::RewriteRuleElementStream(TreeAdaptorType* adaptor, 
-													RecognizerType* rec, ANTLR_UINT8* description)
+template<class ImplTraits, class ElementType>
+RewriteRuleElementStream<ImplTraits, ElementType>::RewriteRuleElementStream(TreeAdaptorType* adaptor,
+	const char* description)
 {
-	this->init(adaptor, rec, description);
+	this->init(adaptor, description);
 }
 
-template<class ImplTraits, class SuperType>
-RewriteRuleElementStream<ImplTraits, SuperType>::RewriteRuleElementStream(TreeAdaptorType* adaptor, 
-								RecognizerType* rec, ANTLR_UINT8* description, TokenType* oneElement)
+template<class ImplTraits, class ElementType>
+RewriteRuleElementStream<ImplTraits, ElementType>::RewriteRuleElementStream(TreeAdaptorType* adaptor,
+	const char* description,
+	ElementType* oneElement)
 {
-	this->init(adaptor, rec, description);
+	this->init(adaptor, description);
 	if( oneElement != NULL )
 		this->add( oneElement );
 }
 
-template<class ImplTraits, class SuperType>
-RewriteRuleElementStream<ImplTraits, SuperType>::RewriteRuleElementStream(TreeAdaptorType* adaptor, 
-						RecognizerType* rec, ANTLR_UINT8* description, const ElementsType& elements)
-						:m_elements(elements)
+template<class ImplTraits, class ElementType>
+RewriteRuleElementStream<ImplTraits, ElementType>::RewriteRuleElementStream(TreeAdaptorType* adaptor,
+	const char* description,
+	const ElementsType& elements)
+	: m_elements(elements)
 {
-	this->init(adaptor, rec, description);
+	this->init(adaptor, description);
 }
 
-template<class ImplTraits, class SuperType>
-void RewriteRuleElementStream<ImplTraits, SuperType>::init(TreeAdaptorType* adaptor, 
-								RecognizerType* rec, ANTLR_UINT8* description)
+template<class ImplTraits, class ElementType>
+void RewriteRuleElementStream<ImplTraits, ElementType>::init(TreeAdaptorType* adaptor,
+	const char* description)
 {
-	m_rec = rec;
 	m_adaptor = adaptor;
 	m_cursor  = 0;
 	m_dirty	  = false;
@@ -36,90 +37,98 @@ void RewriteRuleElementStream<ImplTraits, SuperType>::init(TreeAdaptorType* adap
 }
 
 template<class ImplTraits>
-RewriteRuleTokenStream<ImplTraits>::RewriteRuleTokenStream(TreeAdaptorType* adaptor, 
-							    RecognizerType* rec, ANTLR_UINT8* description)
-                                                              :BaseType(adaptor, rec, description)
+RewriteRuleTokenStream<ImplTraits>::RewriteRuleTokenStream(TreeAdaptorType* adaptor,
+	const char* description)
+	: BaseType(adaptor, description)
 {
 }
 
 template<class ImplTraits>
-RewriteRuleTokenStream<ImplTraits>::RewriteRuleTokenStream(TreeAdaptorType* adaptor, RecognizerType* rec, 
-							    ANTLR_UINT8* description, TokenType* oneElement)
-							:BaseType(adaptor, rec, description, oneElement)
+RewriteRuleTokenStream<ImplTraits>::RewriteRuleTokenStream(TreeAdaptorType* adaptor,
+	const char* description,
+	TokenType* oneElement)
+	: BaseType(adaptor, description, oneElement)
 {
 }
 
 template<class ImplTraits>
-RewriteRuleTokenStream<ImplTraits>::RewriteRuleTokenStream(TreeAdaptorType* adaptor, 
-						RecognizerType* rec, ANTLR_UINT8* description, const ElementsType& elements)
-						:BaseType(adaptor, rec, description, elements)
+RewriteRuleTokenStream<ImplTraits>::RewriteRuleTokenStream(TreeAdaptorType* adaptor,
+	const char* description,
+	const ElementsType& elements)
+	: BaseType(adaptor, description, elements)
 {
 }
 
 template<class ImplTraits>
-RewriteRuleSubtreeStream<ImplTraits>::RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, 
-								RecognizerType* rec, ANTLR_UINT8* description)
-						 :BaseType(adaptor, rec, description)
+RewriteRuleSubtreeStream<ImplTraits>::RewriteRuleSubtreeStream(TreeAdaptorType* adaptor,
+	const char* description)
+	: BaseType(adaptor, description)
 {
 }
 
 template<class ImplTraits>
-RewriteRuleSubtreeStream<ImplTraits>::RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, RecognizerType* rec, 
-								ANTLR_UINT8* description, TokenType* oneElement)
-							:BaseType(adaptor, rec, description, oneElement)
+RewriteRuleSubtreeStream<ImplTraits>::RewriteRuleSubtreeStream(TreeAdaptorType* adaptor,
+	const char* description,
+	TokenType* oneElement)
+	: BaseType(adaptor, description, oneElement)
 {
 }
 
 template<class ImplTraits>
-RewriteRuleSubtreeStream<ImplTraits>::RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, 
-						RecognizerType* rec, ANTLR_UINT8* description, const ElementsType& elements)
-						:BaseType(adaptor, rec, description, elements)
+RewriteRuleSubtreeStream<ImplTraits>::RewriteRuleSubtreeStream(TreeAdaptorType* adaptor,
+	const char* description,
+	const ElementsType& elements)
+	: BaseType(adaptor, description, elements)
 {
 }
 
+/*
 template<class ImplTraits>
-RewriteRuleNodeStream<ImplTraits>::RewriteRuleNodeStream(TreeAdaptorType* adaptor, 
-							 RecognizerType* rec, ANTLR_UINT8* description)
-						:BaseType(adaptor, rec, description)
+RewriteRuleNodeStream<ImplTraits>::RewriteRuleNodeStream(TreeAdaptorType* adaptor,
+	const char* description)
+	: BaseType(adaptor, description)
 {
 }
 
 template<class ImplTraits>
-RewriteRuleNodeStream<ImplTraits>::RewriteRuleNodeStream(TreeAdaptorType* adaptor, RecognizerType* rec, 
-							ANTLR_UINT8* description, TokenType* oneElement)
-						:BaseType(adaptor, rec, description, oneElement)
+RewriteRuleNodeStream<ImplTraits>::RewriteRuleNodeStream(TreeAdaptorType* adaptor,
+	const char* description,
+	TokenType* oneElement)
+	: BaseType(adaptor, description, oneElement)
 {
 }
 
 template<class ImplTraits>
-RewriteRuleNodeStream<ImplTraits>::RewriteRuleNodeStream(TreeAdaptorType* adaptor, 
-						RecognizerType* rec, ANTLR_UINT8* description, const ElementsType& elements)
-						:BaseType(adaptor, rec, description, elements)
+RewriteRuleNodeStream<ImplTraits>::RewriteRuleNodeStream(TreeAdaptorType* adaptor,
+	const char* description,
+	const ElementsType& elements)
+	: BaseType(adaptor, description, elements)
 {
 }
+*/
 
-template<class ImplTraits, class SuperType>
-void	RewriteRuleElementStream<ImplTraits, SuperType>::reset()
+template<class ImplTraits, class ElementType>
+void RewriteRuleElementStream<ImplTraits, ElementType>::reset()
 {
-	m_dirty = true;
 	m_cursor = 0;
+	m_dirty = true;
 }
 
-template<class ImplTraits, class SuperType>
-void	RewriteRuleElementStream<ImplTraits, SuperType>::add(TokenType* el)
+template<class ImplTraits, class ElementType>
+void RewriteRuleElementStream<ImplTraits, ElementType>::add(ElementType* el)
 {
-	if ( el== NULL ) 
+	if ( el== NULL )
 		return;
 
-	if ( !m_elements.empty() ) 
-	{ 
+	if ( !m_elements.empty() )
+	{
 		// if in list, just add
 		m_elements.push_back(el);
 		return;
 	}
-		
-	if ( m_singleElement == NULL ) 
-	{ 
+
+	if ( m_singleElement == NULL )
+	{
 		// no elements yet, track w/o list
 		m_singleElement = el;
 		return;
@@ -131,30 +140,23 @@ void	RewriteRuleElementStream<ImplTraits, SuperType>::add(TokenType* el)
 	m_elements.push_back(el);
 }
 
-template<class ImplTraits, class SuperType>
-typename RewriteRuleElementStream<ImplTraits, SuperType>::TokenType*  
-RewriteRuleElementStream<ImplTraits, SuperType>::_next()
+template<class ImplTraits, class ElementType>
+ElementType* RewriteRuleElementStream<ImplTraits, ElementType>::_next()
 {
-	ANTLR_UINT32		n;
-	TreeType*	t;
-
-	n = this->size();
+	ANTLR_UINT32 n = this->size();
 
 	if (n == 0)
 	{
 		// This means that the stream is empty
-		//
-		return NULL;	// Caller must cope with this
+		return NULL;	// Caller must cope with this (TODO throw RewriteEmptyStreamException)
 	}
 
 	// Traversed all the available elements already?
-	//
-	if ( m_cursor >= n)
+	if ( m_cursor >= n) // out of elements?
 	{
 		if (n == 1)
 		{
 			// Special case when size is single element, it will just dup a lot
-			//
 			return this->toTree(m_singleElement);
 		}
 
@@ -162,57 +164,50 @@ RewriteRuleElementStream<ImplTraits, SuperType>::_next()
 		// that we just duplicate the entry n times (such as ID ent+ -> ^(ID ent)+)
 		// This means we ran out of elements earlier than was expected.
 		//
-		return NULL;	// Caller must cope with this
+		return NULL;	// Caller must cope with this (TODO throw RewriteEmptyStreamException)
 	}
 
 	// Elements available either for duping or just available
-	//
 	if ( m_singleElement != NULL)
 	{
 		m_cursor++;   // Cursor advances even for single element as this tells us to dup()
 		return this->toTree(m_singleElement);
 	}
 
-	// More than just a single element so we extract it from the 
+	// More than just a single element so we extract it from the
 	// vector.
-	//
-	t = this->toTree( m_elements.at(m_cursor));
+	ElementType* t = this->toTree(m_elements.at(m_cursor));
 	m_cursor++;
 	return t;
 }
 
-template<class ImplTraits, class SuperType>
-typename RewriteRuleElementStream<ImplTraits, SuperType>::TreeType*  
-RewriteRuleElementStream<ImplTraits, SuperType>::nextTree()
+template<class ImplTraits, class ElementType>
+ElementType*
+RewriteRuleElementStream<ImplTraits, ElementType>::nextTree()
 {
-	ANTLR_UINT32		n;
-	TreeType*  el;
-
-	n = this->size();
-
-	if ( m_dirty || ( (m_cursor >=n) && (n==1)) ) 
+	ANTLR_UINT32 n = this->size();
+	if ( m_dirty || ( (m_cursor >=n) && (n==1)) )
 	{
 		// if out of elements and size is 1, dup
-		//
-		el = this->_next();
+		ElementType* el = this->_next();
 		return this->dup(el);
 	}
 
 	// test size above then fetch
-	//
-	el = this->_next();
+	ElementType*  el = this->_next();
 	return el;
 }
 
+/*
 template<class ImplTraits, class SuperType>
-typename RewriteRuleElementStream<ImplTraits, SuperType>::TokenType*	
+typename RewriteRuleElementStream<ImplTraits, SuperType>::TokenType*
 RewriteRuleElementStream<ImplTraits, SuperType>::nextToken()
 {
 	return this->_next();
 }
 
 template<class ImplTraits, class SuperType>
-typename RewriteRuleElementStream<ImplTraits, SuperType>::TokenType*		
+typename RewriteRuleElementStream<ImplTraits, SuperType>::TokenType*
 RewriteRuleElementStream<ImplTraits, SuperType>::next()
 {
 	ANTLR_UINT32   s;
@@ -226,6 +221,29 @@ RewriteRuleElementStream<ImplTraits, SuperType>::next()
 	return this->_next();
 }
 
+*/
+
+template<class ImplTraits, class ElementType>
+ElementType*
+RewriteRuleElementStream<ImplTraits, ElementType>::dup( ElementType* element)
+{
+	return dupImpl(element);
+}
+
+template<class ImplTraits, class ElementType>
+ElementType*
+RewriteRuleElementStream<ImplTraits, ElementType>::dupImpl( typename ImplTraits::CommonTokenType* element)
+{
+	return NULL; // TODO throw here
+}
+
+template<class ImplTraits, class ElementType>
+ElementType*
+RewriteRuleElementStream<ImplTraits, ElementType>::dupImpl( typename ImplTraits::TreeType* element)
+{
+	return m_adaptor->dupTree(element);
+}
+
 template<class ImplTraits>
 typename RewriteRuleSubtreeStream<ImplTraits>::TreeType*	
 RewriteRuleSubtreeStream<ImplTraits>::dup(TreeType* element)
@@ -234,35 +252,37 @@ RewriteRuleSubtreeStream<ImplTraits>::dup(TreeType* element)
 }
 
 template<class ImplTraits>
-typename RewriteRuleSubtreeStream<ImplTraits>::TreeType*	
+typename RewriteRuleSubtreeStream<ImplTraits>::TreeType*
 RewriteRuleSubtreeStream<ImplTraits>::dupTree(TreeType* element)
 {
 	return BaseType::m_adaptor->dupNode(element);
 }
 
-template<class ImplTraits, class SuperType>
-typename RewriteRuleElementStream<ImplTraits, SuperType>::TreeType*	
-RewriteRuleElementStream<ImplTraits, SuperType>::toTree( TreeType* element)
+template<class ImplTraits, class ElementType>
+ElementType*
+RewriteRuleElementStream<ImplTraits, ElementType>::toTree( ElementType* element)
 {
 	return element;
 }
 
+/*
 template<class ImplTraits>
-typename RewriteRuleNodeStream<ImplTraits>::TreeType*	
+typename RewriteRuleNodeStream<ImplTraits>::TreeType*
 RewriteRuleNodeStream<ImplTraits>::toTree(TreeType* element)
 {
 	return this->toTreeNode(element);
 }
 
 template<class ImplTraits>
-typename RewriteRuleNodeStream<ImplTraits>::TreeType*	
+typename RewriteRuleNodeStream<ImplTraits>::TreeType*
 RewriteRuleNodeStream<ImplTraits>::toTreeNode(TreeType* element)
 {
 	return BaseType::m_adaptor->dupNode(element);
 }
+*/
 
-template<class ImplTraits, class SuperType>
-bool RewriteRuleElementStream<ImplTraits, SuperType>::hasNext()
+template<class ImplTraits, class ElementType>
+bool RewriteRuleElementStream<ImplTraits, ElementType>::hasNext()
 {
 	if (	((m_singleElement != NULL) && (m_cursor < 1))
 		||	 ( !m_elements.empty() && m_cursor < m_elements.size()))
@@ -279,22 +299,25 @@ template<class ImplTraits >
 typename RewriteRuleTokenStream<ImplTraits>::TreeType*
 RewriteRuleTokenStream<ImplTraits>::nextNode()
 {
-	return this->nextNodeToken();
+	TokenType *Token = this->nextToken();
+	return BaseType::m_adaptor->create(Token);
 }
 
+/*
 template<class ImplTraits>
 typename RewriteRuleTokenStream<ImplTraits>::TreeType*
 RewriteRuleTokenStream<ImplTraits>::nextNodeToken()
 {
 	return BaseType::m_adaptor->create(this->_next());
 }
+*/
 
 /// Number of elements available in the stream
 ///
-template<class ImplTraits, class SuperType>
-ANTLR_UINT32	RewriteRuleElementStream<ImplTraits, SuperType>::size()
+template<class ImplTraits, class ElementType>
+ANTLR_UINT32 RewriteRuleElementStream<ImplTraits, ElementType>::size()
 {
-	ANTLR_UINT32   n = 0;
+	ANTLR_UINT32 n = 0;
 
 	/// Should be a count of one if singleElement is set. I copied this
 	/// logic from the java implementation, which I suspect is just guarding
@@ -304,20 +327,17 @@ ANTLR_UINT32	RewriteRuleElementStream<ImplTraits, SuperType>::size()
 	{
 		n = 1;
 	}
-	else
+	if ( !m_elements.empty() )
 	{
-		if ( !m_elements.empty() )
-		{
-			return (ANTLR_UINT32)(m_elements.size());
-		}
+		return (ANTLR_UINT32)(m_elements.size());
 	}
 	return n;
 
 }
 
-template<class ImplTraits, class SuperType>
-typename RewriteRuleElementStream<ImplTraits, SuperType>::StringType
-RewriteRuleElementStream<ImplTraits, SuperType>::getDescription()
+template<class ImplTraits, class ElementType>
+typename RewriteRuleElementStream<ImplTraits, ElementType>::StringType
+RewriteRuleElementStream<ImplTraits, ElementType>::getDescription()
 {
 	if ( m_elementDescription.empty() )
 	{
@@ -326,11 +346,9 @@ RewriteRuleElementStream<ImplTraits, SuperType>::getDescription()
 	return  m_elementDescription;
 }
 
-template<class ImplTraits, class SuperType>
-RewriteRuleElementStream<ImplTraits, SuperType>::~RewriteRuleElementStream()
+template<class ImplTraits, class ElementType>
+RewriteRuleElementStream<ImplTraits, ElementType>::~RewriteRuleElementStream()
 {
-	TreeType* tree;
-
     // Before placing the stream back in the pool, we
 	// need to clear any vector it has. This is so any
 	// free pointers that are associated with the
@@ -341,34 +359,62 @@ RewriteRuleElementStream<ImplTraits, SuperType>::~RewriteRuleElementStream()
 	//
 	if	( !m_elements.empty() )
 	{
-        // We have some elements to traverse
-        //
-        ANTLR_UINT32 i;
-
-        for (i = 1; i<= m_elements.size(); i++)
-        {
-            tree = m_elements.at(i-1);
-            if  ( (tree != NULL) && tree->isNilNode() )
-            {
-                // Had to remove this for now, check is not comprehensive enough
-                // tree->reuse(tree);
-            }
-        }
+	 // We have some elements to traverse
+	 //
+	 ANTLR_UINT32 i;
+
+	 for (i = 1; i<= m_elements.size(); i++)
+	 {
+	     ElementType *tree = m_elements.at(i-1);
+	     //if  ( (tree != NULL) && tree->isNilNode() )
+	     {
+		 // Had to remove this for now, check is not comprehensive enough
+		 // tree->reuse(tree);
+	     }
+	 }
 		m_elements.clear();
 	}
 	else
 	{
-        if  (m_singleElement != NULL)
-        {
-            tree = m_singleElement;
-            if  (tree->isNilNode())
-            {
-                // Had to remove this for now, check is not comprehensive enough
-              //   tree->reuse(tree);
-            }
-        }
-        m_singleElement = NULL;
+	 if  (m_singleElement != NULL)
+	 {
+	     ElementType *tree = m_singleElement;
+	     //if  (tree->isNilNode())
+	     {
+		 // Had to remove this for now, check is not comprehensive enough
+		 //   tree->reuse(tree);
+	     }
+	 }
+	 m_singleElement = NULL;
 	}
 }
 
+template<class ImplTraits>
+typename RewriteRuleTokenStream<ImplTraits>::TokenType*
+RewriteRuleTokenStream<ImplTraits>::nextToken()
+{
+	return this->_next();
+}
+
+template<class ImplTraits>
+typename RewriteRuleSubtreeStream<ImplTraits>::TreeType*
+RewriteRuleSubtreeStream<ImplTraits>::nextNode(TreeType* element)
+{
+	//System.out.println("nextNode: elements="+elements+", singleElement="+((Tree)singleElement).toStringTree());
+	ANTLR_UINT32 n = this->size();
+	if ( BaseType::m_dirty || (BaseType::m_cursor>=n && n==1) ) {
+		// if out of elements and size is 1, dup (at most a single node
+		// since this is for making root nodes).
+		TreeType* el = this->_next();
+		return BaseType::m_adaptor->dupNode(el);
+	}
+	// test size above then fetch
+	TreeType *tree = this->_next();
+	while (BaseType::m_adaptor.isNil(tree) && BaseType::m_adaptor.getChildCount(tree) == 1)
+		tree = BaseType::m_adaptor->getChild(tree, 0);
+	//System.out.println("_next="+((Tree)tree).toStringTree());
+	TreeType *el = BaseType::m_adaptor->dupNode(tree); // dup just the root (want node here)
+	return el;
+}
+
 ANTLR_END_NAMESPACE()
diff --git a/runtime/Cpp/include/antlr3traits.hpp b/runtime/Cpp/include/antlr3traits.hpp
index 0f95d2ec2..21337b292 100644
--- a/runtime/Cpp/include/antlr3traits.hpp
+++ b/runtime/Cpp/include/antlr3traits.hpp
@@ -5,8 +5,12 @@
 
 
 ANTLR_BEGIN_NAMESPACE()
-	
-//Users implementing overrides should inherit from this
+
+/**
+ * Users implementing overrides should inherit from this
+ *
+ * All classes typenames reffer to Empty class
+ */
 template<class ImplTraits>
 class CustomTraitsBase
 {
@@ -33,9 +37,11 @@ class CustomTraitsBase
 	typedef Empty LexStateType;
 
 	typedef Empty CommonTokenType;
-	typedef Empty TokenIntStreamType;
 
+	typedef Empty TokenIntStreamType;
 	typedef Empty TokenStreamType;
+
+	typedef Empty TreeNodeIntStreamType;
 	typedef Empty TreeNodeStreamType;
 
 
@@ -71,7 +77,7 @@ class CustomTraitsBase
 	typedef Empty BaseParserType;//this should be overridden with generated lexer
 	typedef Empty BaseTreeParserType;
 	
-	template<class StreamType>
+	template<class ElementType>
 	class RewriteStreamType : public Empty
 	{
 	public:
@@ -87,6 +93,9 @@ class CustomTraitsBase
 	static void displayRecognitionError( const std::string& str ) {  printf("%s", str.c_str() ); }
 };
 
+/**
+ * Traits manipulation classes
+ */
 template<class A, class B>
 class TraitsSelector
 {
@@ -129,103 +138,129 @@ class BoolSelector<false, A, B>
 	typedef B selected;
 };
 
+/**
+ * Base traits template
+ *
+ * This class contains default typenames for every trait
+ */
 template< template<class ImplTraits> class UserTraits >
 class TraitsBase
 {
 public:
 	typedef TraitsBase  TraitsType;
 	
-	typedef typename TraitsSelector< typename UserTraits<TraitsType>::AllocPolicyType, DefaultAllocPolicy >::selected  AllocPolicyType;
+	typedef typename TraitsSelector< typename UserTraits<TraitsType>::AllocPolicyType,
+					 DefaultAllocPolicy
+					 >::selected  AllocPolicyType;
 
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::StringType, 
-									std::string >::selected StringType;
+					 std::string
+					 >::selected StringType;
 	
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::StringStreamType, 
-		                             std::stringstream >::selected StringStreamType;
+					 std::stringstream
+					 >::selected StringStreamType;
 
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::StreamDataType, 
-		                             ANTLR_UINT8 >::selected StreamDataType;
+					 ANTLR_UINT8
+					 >::selected StreamDataType;
 	
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::Endianness, 
-									 RESOLVE_ENDIAN_AT_RUNTIME >::selected Endianness;
+					 RESOLVE_ENDIAN_AT_RUNTIME
+					 >::selected Endianness;
 
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::BitsetType, 
-		                             Bitset<TraitsType> >::selected BitsetType;
+					 Bitset<TraitsType>
+					 >::selected BitsetType;
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::BitsetListType, 
-		                             BitsetList<TraitsType> >::selected BitsetListType;
+					 BitsetList<TraitsType>
+					 >::selected BitsetListType;
 
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::InputStreamType, 
-		                              InputStream<TraitsType> >::selected InputStreamType;
+					 InputStream<TraitsType>
+					 >::selected InputStreamType;
 
 	template<class SuperType>
-	class IntStreamType 
-		: public TraitsOneArgSelector< 
-					typename UserTraits<TraitsType>::template IntStreamType<SuperType>, 
-		            IntStream<TraitsType, SuperType>,
-					typename UserTraits<TraitsType>::template IntStreamType<SuperType>::BaseType
-								>::selected  
+	class IntStreamType : public TraitsOneArgSelector< typename UserTraits<TraitsType>::template IntStreamType<SuperType>, 
+							   IntStream<TraitsType, SuperType>,
+							   typename UserTraits<TraitsType>::template IntStreamType<SuperType>::BaseType
+							   >::selected  
 	{ };
 	
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::LexStateType, 
-		                             LexState<TraitsType> >::selected LexStateType;
+					 LexState<TraitsType>
+					 >::selected LexStateType;
 
 	static const bool TOKENS_ACCESSED_FROM_OWNING_RULE = UserTraits<TraitsType>::TOKENS_ACCESSED_FROM_OWNING_RULE;
 	static const int  TOKEN_FILL_BUFFER_INCREMENT = UserTraits<TraitsType>::TOKEN_FILL_BUFFER_INCREMENT; //used only if the above val is true
 
-	static void displayRecognitionError( const StringType& str ) { UserTraits<TraitsType>::displayRecognitionError(str);  }
+	static void displayRecognitionError( const StringType& str ) { UserTraits<TraitsType>::displayRecognitionError(str); }
 };
 
-template<
-	     class LxrType, 
-         class PsrType, 
-		 template<class ImplTraits> class UserTraits = CustomTraitsBase, 
-		 class TreePsrType = antlr3::Empty
-         >
-class Traits  : public TraitsBase<UserTraits>
+/**
+ * Final traits
+ *
+ * They combine Traits and user provided traits(UserTraits)
+ */
+template< class LxrType, 
+	  class PsrType, 
+	  template<class ImplTraits> class UserTraits = CustomTraitsBase
+	  //,
+	  //class TreePsrType = antlr3::Empty
+	  //template<class ImplTraits> class TreePsrType = TreeParser
+	  >
+class Traits : public TraitsBase<UserTraits>
 {
 public:
 	typedef Traits TraitsType;
 	typedef TraitsBase<UserTraits> BaseTraitsType;	
 
+	// CommonTokenType
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::CommonTokenType, 
-									 CommonToken<TraitsType> >::selected CommonTokenType;
+					 CommonToken<TraitsType> >::selected CommonTokenType;
 
+	// TokenListType
 	typedef typename BaseTraitsType::AllocPolicyType::template ListType<const CommonTokenType*> TokenListType;
 
+	// TokenIntStreamType
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::TokenIntStreamType, 
-		                             TokenIntStream<TraitsType> >::selected TokenIntStreamType;
-	
-	typedef typename TraitsSelector< typename UserTraits<TraitsType>::TokenStreamType, 
-									CommonTokenStream<TraitsType> >::selected TokenStreamType;
+					 TokenIntStream<TraitsType> >::selected TokenIntStreamType;
+	// TokenStreamType
+	typedef typename TraitsSelector< typename UserTraits<TraitsType>::TokenStreamType,
+					 CommonTokenStream<TraitsType> >::selected TokenStreamType;
+
+	// TreeNodeIntStreamType
+	typedef typename TraitsSelector< typename UserTraits<TraitsType>::TreeNodeIntStreamType,
+					  TreeNodeIntStream<TraitsType> >::selected TreeNodeIntStreamType;
+
+	// TreeNodeStreamType
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::TreeNodeStreamType, 
-		                            CommonTreeNodeStream<TraitsType> >::selected TreeNodeStreamType;
-	
+					 CommonTreeNodeStream<TraitsType> >::selected TreeNodeStreamType;
+
+	// DebugEventListenerType
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::DebugEventListenerType, 
-		                            DebugEventListener<TraitsType> >::selected DebugEventListenerType;
-		
+					 DebugEventListener<TraitsType> >::selected DebugEventListenerType;
+
+	// RecognizerSharedStateType
 	template<class StreamType>
-	class  RecognizerSharedStateType 
-		          : public TraitsOneArgSelector< 
-							typename UserTraits<TraitsType>::template RecognizerSharedStateType<StreamType>, 
-							RecognizerSharedState<TraitsType, StreamType>,
-							typename UserTraits<TraitsType>::template RecognizerSharedStateType<StreamType>::BaseType
-										>::selected 
+	class  RecognizerSharedStateType : public TraitsOneArgSelector< typename UserTraits<TraitsType>::template RecognizerSharedStateType<StreamType>, 
+									RecognizerSharedState<TraitsType, StreamType>,
+									typename UserTraits<TraitsType>::template RecognizerSharedStateType<StreamType>::BaseType
+									>::selected 
 	{};
 
+	// RecognizerType
 	template<class StreamType>
-	class  RecognizerType 
-				   : public TraitsOneArgSelector< 
-				             typename UserTraits<TraitsType>::template RecognizerType<StreamType>, 
-							 BaseRecognizer<TraitsType, StreamType>,
-							 typename UserTraits<TraitsType>::template RecognizerType<StreamType>::BaseType
-									>::selected 
+	class  RecognizerType : public TraitsOneArgSelector< typename UserTraits<TraitsType>::template RecognizerType<StreamType>, 
+							     BaseRecognizer<TraitsType, StreamType>,
+							     typename UserTraits<TraitsType>::template RecognizerType<StreamType>::BaseType
+							     >::selected 
 	{
 	public:
-		typedef typename TraitsOneArgSelector< 
-							typename UserTraits<TraitsType>::template RecognizerType<StreamType>, 
-							BaseRecognizer<TraitsType, StreamType>,
-							typename UserTraits<TraitsType>::template RecognizerType<StreamType>::BaseType
-										>::selected  BaseType;
+		typedef typename TraitsOneArgSelector< typename UserTraits<TraitsType>::template RecognizerType<StreamType>, 
+						       BaseRecognizer<TraitsType, StreamType>,
+						       typename UserTraits<TraitsType>::template RecognizerType<StreamType>::BaseType
+						       >::selected  BaseType;
 		typedef typename BaseType::RecognizerSharedStateType RecognizerSharedStateType;
 
 	public:
@@ -235,24 +270,25 @@ class Traits  : public TraitsBase<UserTraits>
 		}
 	};
 
+	// TreeType
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::TreeType, 
-										CommonTree<TraitsType> >::selected TreeType;
+					 CommonTree<TraitsType> >::selected TreeType;
+	// TreeAdaptorType
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::TreeAdaptorType, 
-										CommonTreeAdaptor<TraitsType> >::selected TreeAdaptorType;
-		
+					 CommonTreeAdaptor<TraitsType> >::selected TreeAdaptorType;
+
+	// ExceptionBaseType
 	template<class StreamType>
-	class ExceptionBaseType : public TraitsOneArgSelector< 
-								typename UserTraits<TraitsType>::template ExceptionBaseType<StreamType>, 
-								ANTLR_ExceptionBase<TraitsType, StreamType>, 
-								typename UserTraits<TraitsType>::template ExceptionBaseType<StreamType>::BaseType
-													>::selected 
+	class ExceptionBaseType : public TraitsOneArgSelector< typename UserTraits<TraitsType>::template ExceptionBaseType<StreamType>, 
+							       ANTLR_ExceptionBase<TraitsType, StreamType>, 
+							       typename UserTraits<TraitsType>::template ExceptionBaseType<StreamType>::BaseType
+							       >::selected 
 	{
 	public:
-		typedef typename TraitsOneArgSelector< 
-			                    typename UserTraits<TraitsType>::template ExceptionBaseType<StreamType>, 
-								ANTLR_ExceptionBase<TraitsType, StreamType>,
-								typename UserTraits<TraitsType>::template ExceptionBaseType<StreamType>::BaseType
-							>::selected BaseType;
+		typedef typename TraitsOneArgSelector< typename UserTraits<TraitsType>::template ExceptionBaseType<StreamType>, 
+						       ANTLR_ExceptionBase<TraitsType, StreamType>,
+						       typename UserTraits<TraitsType>::template ExceptionBaseType<StreamType>::BaseType
+						       >::selected BaseType;
 	
 	protected:
 		ExceptionBaseType( const typename BaseTraitsType::StringType& message )
@@ -261,63 +297,71 @@ class Traits  : public TraitsBase<UserTraits>
 		}
 	};
 
-	//this should be overridden with generated lexer
+	// this should be overridden with generated lexer
+	// BaseLexerType
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::BaseLexerType, 
-											Lexer<TraitsType> >::selected BaseLexerType;
+					 Lexer<TraitsType> >::selected BaseLexerType;
 	typedef LxrType LexerType;
 
+	// TokenSourceType
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::TokenSourceType, 
-											TokenSource<TraitsType> >::selected TokenSourceType;
+					 TokenSource<TraitsType> >::selected TokenSourceType;
+
+	// this should be overridden with generated parser
+	// BaseParserType
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::BaseParserType, 
-											Parser<TraitsType> >::selected BaseParserType;
-	
+					 Parser<TraitsType> >::selected BaseParserType;	
 	typedef PsrType ParserType;
 
+	// this should be overridden with generated treeparser (not implemented yet)
+	// BaseTreeParserType
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::BaseTreeParserType, 
-											 TreeParser<TraitsType> >::selected BaseTreeParserType;
-	typedef TreePsrType TreeParserType;
-
-	template<class SuperType>
-	class RewriteStreamType : public TraitsOneArgSelector< 
-								typename UserTraits<TraitsType>::template RewriteStreamType<SuperType>, 
-								RewriteRuleElementStream<TraitsType, SuperType>,
-								typename UserTraits<TraitsType>::template RewriteStreamType<SuperType>::BaseType
-													>::selected 
+					 TreeParser<TraitsType> >::selected BaseTreeParserType;
+	//typedef TreePsrType<Traits> TreeParserType;
+	typedef BaseTreeParserType TreeParserType;
+
+	// RewriteStreamType
+	template<class ElementType>
+	class RewriteStreamType : public TraitsOneArgSelector< typename UserTraits<TraitsType>::template RewriteStreamType<ElementType>,
+							       RewriteRuleElementStream<TraitsType, ElementType>,
+							       typename UserTraits<TraitsType>::template RewriteStreamType<ElementType>::BaseType
+							       >::selected 
 	{
 	public:
-		typedef typename TraitsOneArgSelector< 
-				typename UserTraits<TraitsType>::template RewriteStreamType<SuperType>, 
-				RewriteRuleElementStream<TraitsType, SuperType>, 
-				typename UserTraits<TraitsType>::template RewriteStreamType<SuperType>::BaseType
-						>::selected BaseType;
+		typedef typename TraitsOneArgSelector< typename UserTraits<TraitsType>::template RewriteStreamType<ElementType>,
+						       RewriteRuleElementStream<TraitsType, ElementType>,
+						       typename UserTraits<TraitsType>::template RewriteStreamType<ElementType>::BaseType
+						       >::selected BaseType;
 
-		typedef typename SuperType::StreamType StreamType;
-		typedef typename BaseType::RecognizerType Recognizer_Type;
-		typedef typename BaseType::TokenType TokenType;
-		typedef typename BaseType::ElementsType ElementsType;			
+		//typedef typename SuperType::StreamType StreamType;
+		//typedef typename BaseType::RecognizerType Recognizer_Type;
+		//typedef typename BaseType::ElementType ElementType;
+		typedef typename BaseType::ElementsType ElementsType;
 
 	public:
-		RewriteStreamType(TreeAdaptorType* adaptor = NULL, Recognizer_Type* rec=NULL, ANTLR_UINT8* description = NULL)
-			:BaseType(adaptor, rec, description)
+		RewriteStreamType(TreeAdaptorType* adaptor = NULL, const char* description = NULL)
+			:BaseType(adaptor, description)
 		{
 		}
-		RewriteStreamType(TreeAdaptorType* adaptor, Recognizer_Type* rec, ANTLR_UINT8* description, TokenType* oneElement)
-			:BaseType(adaptor, rec, description, oneElement)
+		RewriteStreamType(TreeAdaptorType* adaptor, const char* description, ElementType* oneElement)
+			:BaseType(adaptor, description, oneElement)
 		{
 		}
-		RewriteStreamType(TreeAdaptorType* adaptor, Recognizer_Type* rec, ANTLR_UINT8* description, const ElementsType& elements)
-			:BaseType(adaptor, rec, description, elements)
+		RewriteStreamType(TreeAdaptorType* adaptor, const char* description, const ElementsType& elements)
+			:BaseType(adaptor, description, elements)
 		{
 		}
 	};
 
+	// RuleReturnValueType
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::RuleReturnValueType, 
-										typename BoolSelector< TraitsType::TOKENS_ACCESSED_FROM_OWNING_RULE, 
-														RuleReturnValue_1<TraitsType>, RuleReturnValue<TraitsType> >::selected
-								   >::selected RuleReturnValueType;
+					 typename BoolSelector< TraitsType::TOKENS_ACCESSED_FROM_OWNING_RULE, 
+								RuleReturnValue_1<TraitsType>,
+								RuleReturnValue<TraitsType>
+								>::selected
+					 >::selected RuleReturnValueType;
 };
 
-
 ANTLR_END_NAMESPACE()
 
 #endif //_ANTLR3_TRAITS_HPP
diff --git a/runtime/Cpp/include/antlr3treeparser.hpp b/runtime/Cpp/include/antlr3treeparser.hpp
index 8f83ff8ab..87c92a766 100644
--- a/runtime/Cpp/include/antlr3treeparser.hpp
+++ b/runtime/Cpp/include/antlr3treeparser.hpp
@@ -39,7 +39,7 @@
 ANTLR_BEGIN_NAMESPACE()
 
 template<class ImplTraits>
-class	TreeParser : public ImplTraits::template RecognizerType< TreeParser<ImplTraits> >
+class  TreeParser : public ImplTraits::template RecognizerType< typename ImplTraits::TreeNodeStreamType >
 {
 public:
 	typedef typename ImplTraits::TreeNodeStreamType TreeNodeStreamType;
@@ -47,8 +47,8 @@ class	TreeParser : public ImplTraits::template RecognizerType< TreeParser<ImplTr
 	typedef typename TreeNodeStreamType::IntStreamType IntStreamType;
 	typedef typename ImplTraits::TreeType TreeType;
 	typedef TreeType TokenType;
-	typedef typename ImplTraits::template ExceptionBase<TreeNodeStreamType> ExceptionBaseType;
-	typedef typename ImplTraits::template RecognizerType< TreeParser<ImplTraits> > RecognizerType;
+	typedef typename ImplTraits::template ExceptionBaseType<TreeNodeStreamType> ExceptionBaseType;
+	typedef typename ImplTraits::template RecognizerType< typename ImplTraits::TreeNodeStreamType > RecognizerType;
 	typedef typename RecognizerType::RecognizerSharedStateType RecognizerSharedStateType;
 	typedef Empty TokenSourceType;
 	typedef typename ImplTraits::BitsetListType BitsetListType;
diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/AST.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/AST.stg
new file mode 100644
index 000000000..cb130b31a
--- /dev/null
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/AST.stg
@@ -0,0 +1,442 @@
+/*
+ [The "BSD license"]
+ Copyright (c) 2005-2006 Terence Parr
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+@outputFile.imports() ::= <<
+<@super.imports()>
+<if(!TREE_PARSER)><! tree parser would already have imported !>
+import org.antlr.runtime.tree.*;<\n>
+<endif>
+>>
+*/
+
+@genericParser.members() ::= <<
+<@super.members()>
+<parserMembers()>
+>>
+
+/** Add an adaptor property that knows how to build trees */
+parserMembers() ::= <<
+//typedef CommonTreeAdaptor adaptor;
+//TreeAdaptor adaptor = new CommonTreeAdaptor();
+
+//void setTreeAdaptor(TreeAdaptor adaptor)
+//{
+//	this.adaptor = adaptor;
+//	\<grammar.directDelegates:{g|\<g:delegateName()>.setTreeAdaptor(this.adaptor);}>
+//}
+//TreeAdaptor getTreeAdaptor()
+//{
+//	return adaptor;
+//}
+>>
+
+@returnScope.ruleReturnMembers() ::= <<
+<super.ASTLabelType()> tree;
+<super.ASTLabelType()> getTree() { return tree; }
+>>
+
+@returnScope.ruleReturnMembersInit() ::= <<
+tree = NULL;
+>>
+
+@returnScope.ruleReturnMembersCopy() ::= <%
+tree = other.tree; const_cast\< <ruleDescriptor:returnStructName()>& >(other).tree = NULL;
+%>
+
+@returnScope.ruleReturnMembersDelete() ::= <<
+//if(tree != NULL)
+//    delete tree;
+>>
+
+//ruleReturnMembersInit(value, prefix) ::= <%
+//<if(!prefix)>    
+//tree = <value>;
+//<else>
+//tree = <prefix>.tree;
+//<endif>    
+//%>
+
+/** Add a variable to track rule's return AST */
+ruleDeclarations() ::= <<
+<super.ruleDeclarations()>
+<ASTLabelType> root_0 = NULL;<\n>
+>>
+
+ruleLabelDefs() ::= <<
+<super.ruleLabelDefs()>
+<if(!ruleDescriptor.isSynPred)>
+<[ruleDescriptor.tokenLabels,ruleDescriptor.wildcardTreeLabels, ruleDescriptor.wildcardTreeListLabels]:
+{it | <ASTLabelType> <it.label.text>_tree = NULL;}; separator="\n">
+<ruleDescriptor.tokenListLabels:
+{it | <ASTLabelType> <it.label.text>_tree = NULL;}; separator="\n">
+<if(ruleDescriptor.supportsLabelOptimization)>
+<ruleDescriptor.allTokenRefsInRewrites:
+{it | RewriteRule<rewriteElementType>Stream\<ImplTraits> *stream_<it> = new RewriteRule<rewriteElementType>Stream\<ImplTraits>(this,"token <it>");}; separator="\n">
+<ruleDescriptor.allRuleRefsInRewrites:
+{it | RewriteRuleSubtreeStream\<ImplTraits> *stream_<it> = new RewriteRuleSubtreeStream\<ImplTraits>(this,"rule <it>");}; separator="\n">
+<else>
+<ruleDescriptor.allTokenRefsInAltsWithRewrites
+:{it | RewriteRule<rewriteElementType>Stream\<ImplTraits> *stream_<it> = new RewriteRule<rewriteElementType>Stream\<ImplTraits>(this,"token <it>");}; separator="\n">
+<ruleDescriptor.allRuleRefsInAltsWithRewrites
+:{it | RewriteRuleSubtreeStream\<ImplTraits> *stream_<it> = new RewriteRuleSubtreeStream\<ImplTraits>(this,"rule <it>");}; separator="\n">
+<endif>
+<endif>
+>>
+
+/** When doing auto AST construction, we must define some variables;
+ *  These should be turned off if doing rewrites.  This must be a "mode"
+ *  as a rule could have both rewrite and AST within the same alternative
+ *  block.
+ */
+@alt.declarations() ::= <<
+<if(autoAST)>
+<if(outerAlt)>
+<if(!rewriteMode && !ruleDescriptor.isSynPred)>
+root_0 = TreeAdaptorType::nilNode();<\n>
+<endif>
+<endif>
+<endif>
+>>
+
+// T r a c k i n g  R u l e  E l e m e n t s
+
+/** ID and track it for use in a rewrite rule */
+tokenRefTrack(token,label,elementIndex,terminalOptions={}) ::= <<
+<tokenRefBang(...)> <! Track implies no auto AST construction!>
+<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>stream_<token>->add(<label>);<\n>
+>>
+
+/** ids+=ID and track it for use in a rewrite rule; adds to ids *and*
+ *  to the tracking list stream_ID for use in the rewrite.
+ */
+tokenRefTrackAndListLabel(token,label,elementIndex,terminalOptions={}) ::= <<
+<tokenRefTrack(...)>
+<listLabel(elem=label, ...)>
+>>
+
+/** ^(ID ...) track for rewrite */
+tokenRefRuleRootTrack(token,label,elementIndex,terminalOptions={}) ::= <<
+<tokenRefBang(...)>
+<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>stream_<token>->add(<label>);<\n>
+>>
+
+/** Match ^(label+=TOKEN ...) track for rewrite */
+tokenRefRuleRootTrackAndListLabel(token,label,elementIndex,terminalOptions={}) ::= <<
+<tokenRefRuleRootTrack(...)>
+<listLabel(elem=label, ...)>
+>>
+
+/** rule when output=AST and tracking for rewrite */
+ruleRefTrack(rule,label,elementIndex,args,scope) ::= <<
+<super.ruleRef(...)>
+<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>stream_<rule.name>->add(<label>.getTree());
+>>
+
+/** x+=rule when output=AST and tracking for rewrite */
+ruleRefTrackAndListLabel(rule,label,elementIndex,args,scope) ::= <<
+<ruleRefTrack(...)>
+<listLabel(label, {<label>.getTree()})>
+>>
+
+/** ^(rule ...) rewrite */
+ruleRefRuleRootTrack(rule,label,elementIndex,args,scope) ::= <<
+<ruleRefRuleRoot(...)>
+<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>stream_<rule>->add(<label>.getTree());
+>>
+
+/** ^(x+=rule ...) rewrite */
+ruleRefRuleRootTrackAndListLabel(rule,label,elementIndex,args,scope) ::= <<
+<ruleRefRuleRootTrack(...)>
+<listLabel(label, {<label>.getTree()})>
+>>
+
+// R e w r i t e
+
+rewriteCode(
+	alts, description,
+	referencedElementsDeep, // ALL referenced elements to right of ->
+	referencedTokenLabels,
+	referencedTokenListLabels,
+	referencedRuleLabels,
+	referencedRuleListLabels,
+	referencedWildcardLabels,
+	referencedWildcardListLabels,
+	rewriteBlockLevel, enclosingTreeLevel, treeLevel) ::=
+<<
+
+// AST REWRITE
+// elements: <referencedElementsDeep; separator=", ">
+// token labels: <referencedTokenLabels; separator=", ">
+// rule labels: <referencedRuleLabels; separator=", ">
+// token list labels: <referencedTokenListLabels; separator=", ">
+// rule list labels: <referencedRuleListLabels; separator=", ">
+// wildcard labels: <[referencedWildcardLabels,referencedWildcardListLabels]; separator=", ">
+<if(backtracking)>
+if ( <actions.(actionScope).synpredgate> ) {
+<endif>
+<prevRuleRootRef()>.tree = root_0;
+<rewriteCodeLabels()>
+root_0 = TreeAdaptorType::nilNode();
+<alts:rewriteAlt(); separator="else ">
+<! if tree parser and rewrite=true !>
+<if(TREE_PARSER)>
+<if(rewriteMode)>
+<prevRuleRootRef()>.tree = TreeAdaptorType::rulePostProcessing(root_0);
+input.replaceChildren(TreeAdaptorType::getParent(retval.start),
+					  TreeAdaptorType::getChildIndex(retval.start),
+					  TreeAdaptorType::getChildIndex(_last),
+					  retval.tree);
+<endif>
+<endif>
+<! if parser or tree-parser && rewrite!=true, we need to set result !>
+<if(!TREE_PARSER)>
+<prevRuleRootRef()>.tree = root_0;
+<else>
+<if(!rewriteMode)>
+<prevRuleRootRef()>.tree = root_0;
+<endif>
+<endif>
+<if(backtracking)>
+}
+<endif>
+>>
+
+rewriteCodeLabels() ::= <<
+<referencedTokenLabels
+	:{it | RewriteRule<rewriteElementType>Stream\<ImplTraits> *stream_<it>=new RewriteRule<rewriteElementType>Stream\<ImplTraits>(this,"token <it>",<it>);};
+	separator="\n"
+>
+<referencedTokenListLabels
+	:{it | RewriteRule<rewriteElementType>Stream\<ImplTraits> *stream_<it>=new RewriteRule<rewriteElementType>Stream\<ImplTraits>(this,"token <it>", list_<it>);};
+	separator="\n"
+>
+<referencedWildcardLabels
+	:{it | RewriteRuleSubtreeStream\<ImplTraits> *stream_<it>=new RewriteRuleSubtreeStream\<ImplTraits>(this,"wildcard <it>",<it>);};
+	separator="\n"
+>
+<referencedWildcardListLabels
+	:{it | RewriteRuleSubtreeStream\<ImplTraits> *stream_<it>=new RewriteRuleSubtreeStream\<ImplTraits>(this,"wildcard <it>",list_<it>);};
+	separator="\n"
+>
+<referencedRuleLabels
+	:{it | RewriteRuleSubtreeStream\<ImplTraits> *stream_<it>=new RewriteRuleSubtreeStream\<ImplTraits>(this,"rule <it>",<it>.getTree());};
+	separator="\n"
+>
+<referencedRuleListLabels
+	:{it | RewriteRuleSubtreeStream\<ImplTraits> *stream_<it>=new RewriteRuleSubtreeStream\<ImplTraits>(this,"token <it>",list_<it>);};
+	separator="\n"
+>
+>>
+
+/** Generate code for an optional rewrite block; note it uses the deep ref'd element
+  *  list rather shallow like other blocks.
+  */
+rewriteOptionalBlock(
+	alt,rewriteBlockLevel,
+	referencedElementsDeep, // all nested refs
+	referencedElements, // elements in immediately block; no nested blocks
+	description) ::=
+<<
+// <fileName>:<description>
+if ( <referencedElementsDeep:{el | stream_<el>->hasNext()}; separator="||"> ) {
+	<alt>
+}
+<referencedElementsDeep:{el | stream_<el>->reset();<\n>}>
+>>
+
+rewriteClosureBlock(
+	alt,rewriteBlockLevel,
+	referencedElementsDeep, // all nested refs
+	referencedElements, // elements in immediately block; no nested blocks
+	description) ::=
+<<
+// <fileName>:<description>
+while ( <referencedElements:{el | stream_<el>->hasNext()}; separator="||"> ) {
+	<alt>
+}
+<referencedElements:{el | stream_<el>->reset();<\n>}>
+>>
+
+rewritePositiveClosureBlock(
+	alt,rewriteBlockLevel,
+	referencedElementsDeep, // all nested refs
+	referencedElements, // elements in immediately block; no nested blocks
+	description) ::=
+<<
+if ( !(<referencedElements:{el | stream_<el>->hasNext()}; separator="||">) ) {
+	throw new RewriteEarlyExitException();
+}
+while ( <referencedElements:{el | stream_<el>->hasNext()}; separator="||"> ) {
+	<alt>
+}
+<referencedElements:{el | stream_<el>->reset();<\n>}>
+>>
+
+rewriteAlt(a) ::= <<
+// <a.description>
+<if(a.pred)>
+if (<a.pred>) {
+	<a.alt>
+}<\n>
+<else>
+{
+	<a.alt>
+}<\n>
+<endif>
+>>
+
+/** For empty rewrites: "r : ... -> ;" */
+rewriteEmptyAlt() ::= "root_0 = NULL;"
+
+rewriteTree(root,children,description,enclosingTreeLevel,treeLevel) ::= <<
+// <fileName>:<description>
+{
+<ASTLabelType> root_<treeLevel> = TreeAdaptorType::nilNode();
+<root:rewriteElement()>
+<children:rewriteElement()>
+TreeAdaptorType::addChild(root_<enclosingTreeLevel>, root_<treeLevel>);
+}
+>>
+
+rewriteElementList(elements) ::= "<elements:rewriteElement()>"
+
+rewriteElement(e) ::= <<
+<@pregen()>
+<e.el>
+>>
+
+/** Gen ID or ID[args] */
+rewriteTokenRef(token,elementIndex,args,terminalOptions={}) ::= <<
+TreeAdaptorType::addChild(root_<treeLevel>, <createRewriteNodeFromElement(...)>);
+>>
+
+/** Gen $label ... where defined via label=ID */
+rewriteTokenLabelRef(label,elementIndex) ::= <<
+TreeAdaptorType::addChild(root_<treeLevel>, stream_<label>->nextNode());
+>>
+
+/** Gen $label ... where defined via label+=ID */
+rewriteTokenListLabelRef(label,elementIndex) ::= <<
+TreeAdaptorType::addChild(root_<treeLevel>, stream_<label>->nextNode());
+>>
+
+/** Gen ^($label ...) */
+rewriteTokenLabelRefRoot(label,elementIndex) ::= <<
+root_<treeLevel> = TreeAdaptorType::becomeRoot(stream_<label>->nextNode(), root_<treeLevel>);
+>>
+
+/** Gen ^($label ...) where label+=... */
+rewriteTokenListLabelRefRoot ::= rewriteTokenLabelRefRoot
+
+/** Gen ^(ID ...) or ^(ID[args] ...) */
+rewriteTokenRefRoot(token,elementIndex,args,terminalOptions={}) ::= <<
+root_<treeLevel> = TreeAdaptorType::becomeRoot(<createRewriteNodeFromElement(...)>, root_<treeLevel>);
+>>
+
+rewriteImaginaryTokenRef(args,token,elementIndex,terminalOptions={}) ::= <<
+TreeAdaptorType::addChild(root_<treeLevel>, <createImaginaryNode(token,args,terminalOptions)>);
+>>
+
+rewriteImaginaryTokenRefRoot(args,token,elementIndex,terminalOptions={}) ::= <<
+root_<treeLevel> = TreeAdaptorType::becomeRoot(<createImaginaryNode(token,args,terminalOptions)>, root_<treeLevel>);
+>>
+
+/** plain -> {foo} action */
+rewriteAction(action) ::= <<
+root_0 = <action>;
+>>
+
+/** What is the name of the previous value of this rule's root tree?  This
+ *  let's us refer to $rule to mean previous value.  I am reusing the
+ *  variable 'tree' sitting in retval struct to hold the value of root_0 right
+ *  before I set it during rewrites.  The assign will be to retval.tree.
+ */
+prevRuleRootRef() ::= "retval"
+
+rewriteRuleRef(rule) ::= <<
+TreeAdaptorType::addChild(root_<treeLevel>, stream_<rule>->nextTree());
+>>
+
+rewriteRuleRefRoot(rule) ::= <<
+root_<treeLevel> = TreeAdaptorType::becomeRoot(stream_<rule>->nextNode(), root_<treeLevel>);
+>>
+
+rewriteNodeAction(action) ::= <<
+TreeAdaptorType::addChild(root_<treeLevel>, <action>);
+>>
+
+rewriteNodeActionRoot(action) ::= <<
+root_<treeLevel> = TreeAdaptorType::becomeRoot(<action>, root_<treeLevel>);
+>>
+
+/** Gen $ruleLabel ... where defined via ruleLabel=rule */
+rewriteRuleLabelRef(label) ::= <<
+TreeAdaptorType::addChild(root_<treeLevel>, stream_<label>->nextTree());
+>>
+
+/** Gen $ruleLabel ... where defined via ruleLabel+=rule */
+rewriteRuleListLabelRef(label) ::= <<
+TreeAdaptorType::addChild(root_<treeLevel>, stream_<label>->nextTree());
+>>
+
+/** Gen ^($ruleLabel ...) where ruleLabel=rule */
+rewriteRuleLabelRefRoot(label) ::= <<
+root_<treeLevel> = TreeAdaptorType::becomeRoot(stream_<label>->nextNode(), root_<treeLevel>);
+>>
+
+/** Gen ^($ruleLabel ...) where ruleLabel+=rule */
+rewriteRuleListLabelRefRoot(label) ::= <<
+root_<treeLevel> = TreeAdaptorType::becomeRoot(stream_<label>->nextNode(), root_<treeLevel>);
+>>
+
+rewriteWildcardLabelRef(label) ::= <<
+TreeAdaptorType::addChild(root_<treeLevel>, stream_<label>->nextTree());
+>>
+
+
+createImaginaryNode(tokenType,args,terminalOptions={}) ::= <%
+<if(terminalOptions.node)>
+<! new MethodNode(IDLabel, args) !>
+new <terminalOptions.node>(<tokenType><if(args)>, <args; separator=", "><endif>)
+<else>
+TreeAdaptorType::create(<tokenType>, <args; separator=", "><if(!args)>"<tokenType>"<endif>)
+<endif>
+%>
+
+createRewriteNodeFromElement(token,args,terminalOptions={}) ::= <%
+<if(terminalOptions.node)>
+new <terminalOptions.node>(stream_<token>.nextToken()<if(args)>, <args; separator=", "><endif>)
+<else>
+<if(args)> <! must create new node from old !>
+TreeAdaptorType.create(<token>, <args; separator=", ">)
+<else>
+stream_<token>->nextNode()
+<endif>
+<endif>
+%>
diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/ASTParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/ASTParser.stg
new file mode 100644
index 000000000..a4c9b4162
--- /dev/null
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/ASTParser.stg
@@ -0,0 +1,200 @@
+/*
+ [The "BSD license"]
+ Copyright (c) 2005-2006 Terence Parr
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/** Templates for building ASTs during normal parsing.
+ *
+ *  Deal with many combinations.  Dimensions are:
+ *  Auto build or rewrite
+ *    no label, label, list label  (label/no-label handled together)
+ *    child, root
+ *    token, set, rule, wildcard
+ *
+ *  The situation is not too bad as rewrite (->) usage makes ^ and !
+ *  invalid. There is no huge explosion of combinations.
+ */
+
+@rule.setErrorReturnValue() ::= <<
+//TODO
+//retval.tree = (<ASTLabelType>)TreeAdaptorType::errorNode(input, retval.start, input.LT(-1));
+retval.tree = (<ASTLabelType>)TreeAdaptorType::errorNode(NULL, retval.start, LT(-1));
+>>
+
+// TOKEN AST STUFF
+
+/** ID and output=AST */
+tokenRef(token,label,elementIndex,terminalOptions={}) ::= <<
+<super.tokenRef(...)>
+<if(!ruleDescriptor.isSynPred)>
+<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) {<endif>
+<label>_tree = <createNodeFromToken(...)>;
+TreeAdaptorType::addChild(root_0, <label>_tree);
+<if(backtracking)>}<endif>
+<endif>
+>>
+
+/** ID! and output=AST (same as plain tokenRef) */
+tokenRefBang(token,label,elementIndex,terminalOptions={}) ::= "<super.tokenRef(...)>"
+
+/** ID^ and output=AST */
+tokenRefRuleRoot(token,label,elementIndex,terminalOptions={}) ::= <<
+<super.tokenRef(...)>
+<if(!ruleDescriptor.isSynPred)>
+<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) {<endif>
+<label>_tree = <createNodeFromToken(...)>;
+root_0 = (<ASTLabelType>)TreeAdaptorType::becomeRoot(<label>_tree, root_0);
+<if(backtracking)>}<endif>
+<endif>
+>>
+
+/** ids+=ID! and output=AST */
+tokenRefBangAndListLabel(token,label,elementIndex,terminalOptions={}) ::= <<
+<tokenRefBang(...)>
+<listLabel(elem=label, ...)>
+>>
+
+/** label+=TOKEN when output=AST but not rewrite alt */
+tokenRefAndListLabel(token,label,elementIndex,terminalOptions={}) ::= <<
+<tokenRef(...)>
+<listLabel(elem=label, ...)>
+>>
+
+/** Match label+=TOKEN^ when output=AST but not rewrite alt */
+tokenRefRuleRootAndListLabel(token,label,elementIndex,terminalOptions={}) ::= <<
+<tokenRefRuleRoot(...)>
+<listLabel(elem=label, ...)>
+>>
+
+// SET AST
+
+// the match set stuff is interesting in that it uses an argument list
+// to pass code to the default matchSet; another possible way to alter
+// inherited code.  I don't use the region stuff because I need to pass
+// different chunks depending on the operator.  I don't like making
+// the template name have the operator as the number of templates gets
+// large but this is the most flexible--this is as opposed to having
+// the code generator call matchSet then add root code or ruleroot code
+// plus list label plus ...  The combinations might require complicated
+// rather than just added on code.  Investigate that refactoring when
+// I have more time.
+
+matchSet(s,label,elementIndex,postmatchCode,terminalOptions={}) ::= <%
+<super.matchSet(postmatchCode={<if(!ruleDescriptor.isSynPred)><if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>TreeAdaptorType::addChild(root_0, <createNodeFromToken(...)>);<endif>}, ...)>
+%>
+
+matchRuleBlockSet(s,label,elementIndex,postmatchCode,treeLevel="0",terminalOptions={}) ::= <<
+<matchSet(...)>
+>>
+
+matchSetBang(s,label,elementIndex,postmatchCode,terminalOptions={}) ::= "<super.matchSet(...)>"
+
+// note there is no matchSetTrack because -> rewrites force sets to be
+// plain old blocks of alts: (A|B|...|C)
+
+matchSetRuleRoot(s,label,elementIndex,debug,terminalOptions={}) ::= <<
+<if(label)>
+<label>=<castToLabelType("input.LT(1)")>;
+<endif>
+<super.matchSet(postmatchCode={<if(!ruleDescriptor.isSynPred)><if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>root_0 = (<ASTLabelType>)TreeAdaptorType::becomeRoot(<createNodeFromToken(...)>, root_0);<endif>},...)>
+>>
+
+// RULE REF AST
+
+/** rule when output=AST */
+ruleRef(rule,label,elementIndex,args,scope) ::= <<
+<super.ruleRef(...)>
+<if(!ruleDescriptor.isSynPred)>
+<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>TreeAdaptorType::addChild(root_0, <label>.getTree());
+<endif>
+>>
+
+/** rule! is same as normal rule ref */
+ruleRefBang(rule,label,elementIndex,args,scope) ::= "<super.ruleRef(...)>"
+
+/** rule^ */
+ruleRefRuleRoot(rule,label,elementIndex,args,scope) ::= <<
+<super.ruleRef(...)>
+<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>root_0 = (<ASTLabelType>)TreeAdaptorType::becomeRoot(<label>.getTree(), root_0);
+>>
+
+/** x+=rule when output=AST */
+ruleRefAndListLabel(rule,label,elementIndex,args,scope) ::= <<
+<ruleRef(...)>
+<listLabel(label, {<label>.getTree()})>
+>>
+
+/** x+=rule! when output=AST is a rule ref with list addition */
+ruleRefBangAndListLabel(rule,label,elementIndex,args,scope) ::= <<
+<ruleRefBang(...)>
+<listLabel(label, {<label>.getTree()})>
+>>
+
+/** x+=rule^ */
+ruleRefRuleRootAndListLabel(rule,label,elementIndex,args,scope) ::= <<
+<ruleRefRuleRoot(...)>
+<listLabel(label, {<label>.getTree()})>
+>>
+
+// WILDCARD AST
+
+wildcard(token,label,elementIndex,terminalOptions={}) ::= <<
+<super.wildcard(...)>
+<if(!ruleDescriptor.isSynPred)>
+<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) {<endif>
+<label>_tree = (<ASTLabelType>)TreeAdaptorType::create(<label>);
+TreeAdaptorType::addChild(root_0, <label>_tree);
+<if(backtracking)>}<endif>
+<endif>
+>>
+
+wildcardBang(label,elementIndex) ::= "<super.wildcard(token=[],...)>"
+
+wildcardRuleRoot(token,label,elementIndex,terminalOptions={}) ::= <<
+<super.wildcard(...)>
+<if(!ruleDescriptor.isSynPred)>
+<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) {<endif>
+<label>_tree = (<ASTLabelType>)TreeAdaptorType::create(<label>);
+root_0 = (<ASTLabelType>)TreeAdaptorType::becomeRoot(<label>_tree, root_0);
+<if(backtracking)>}<endif>
+<endif>
+>>
+
+createNodeFromToken(label,terminalOptions={}) ::= <%
+<if(terminalOptions.node)>
+new <terminalOptions.node>(<label>) <! new MethodNode(IDLabel) !>
+<else>
+(<ASTLabelType>)TreeAdaptorType::create(<label>)
+<endif>
+%>
+
+ruleCleanUp() ::= <<
+<super.ruleCleanUp()>
+<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) {<endif>
+retval.tree = (<ASTLabelType>)TreeAdaptorType::rulePostProcessing(root_0);
+TreeAdaptorType::setTokenBoundaries(retval.tree, retval.start, retval.stop);
+<if(backtracking)>}<endif>
+>>
diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
old mode 100755
new mode 100644
index 8d71d3132..671df886f
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
@@ -161,7 +161,7 @@ outputFile( LEXER,
 <if(literals)>
 
 <beginNamespace(actions)>
-<if(LEXER)>
+<if(LEXER)><if(!PARSER)>
 const ANTLR_UINT8* <name>Tokens::getTokenName(ANTLR_UINT32 index)
 {
        if( EOF_TOKEN == index)
@@ -179,7 +179,7 @@ ANTLR_UINT8* <name>Tokens::TokenNames[<length(tokens)>+4]
        (ANTLR_UINT8*) "\<UP>",
        <rest(tokens):{it |(ANTLR_UINT8*) "<it.name>",//<it.type>}; separator="\n">
        };
-<endif>
+<endif><endif>
 
 /** String literals used by <name> that we must do things like MATCHS() with.
  *  C will normally just lay down 8 bit characters, and you can use L"xxx" to
@@ -206,6 +206,7 @@ ANTLR_UINT8* <name>Tokens::TokenNames[<length(tokens)>+4]
  */
 
 >>
+
 headerFileExtension() ::= ".hpp"
 
 beginNamespace(actions) ::= <%
@@ -382,13 +383,18 @@ public:
        static const ANTLR_UINT8* getTokenName(ANTLR_UINT32 index);
 
 protected:
-       static ANTLR_UINT8* TokenNames[];
+	static ANTLR_UINT8* TokenNames[];
+
 <endif>
 };
 
 /** Context tracking structure for <mainName()>
  */
-class <name> : public <componentBaseType()>, public <name>Tokens
+class <name> : public <componentBaseType()>
+    , public <name>Tokens
+<if(PARSER)>
+    , <name>ImplTraits::TreeAdaptorType
+<endif>
 {
 public:
 	typedef <name>ImplTraits ImplTraits;
@@ -397,6 +403,11 @@ public:
 	typedef <componentBaseType()> BaseType;
 	typedef ImplTraits::RecognizerSharedStateType\<StreamType> RecognizerSharedStateType;
 	typedef StreamType InputType;
+<if(PARSER)>
+	typedef <name>ImplTraits::CommonTokenType CommonTokenType;
+	typedef <name>ImplTraits::TreeAdaptorType TreeAdaptorType;
+<endif>
+
 <if(recognizer.filterMode)>
 	static const bool IsFiltered = true;
 <else>
@@ -558,7 +569,7 @@ headerReturnType(ruleDescriptor) ::= <%
 // Produce the lexer output
 //
 lexer(  grammar,
-	name,
+        name,
         tokens,
         scopes,
         rules,
@@ -997,7 +1008,7 @@ treeParser(	grammar,
  */
 synpredRule(ruleName, ruleDescriptor, block, description, nakedBlock) ::=
 <<
-// $ANTLR start <ruleName>
+// $ANTLR start synpredRule <ruleName>
 void <name>::m<ruleName>_fragment( <ruleDescriptor.parameterScope:parameterScope()> )
 {
 	<ruleLabelDefs()>
@@ -2260,7 +2271,7 @@ bool
  */
 ruleLabelType(referencedRule) ::= <%
 <if(referencedRule.hasMultipleReturnValues)>
-<referencedRule.name>_return
+<referencedRule.grammar.recognizerName>::<referencedRule.name>_return
 <else>
 <if(referencedRule.hasSingleReturnValue)>
 <referencedRule.singleValueReturnType>

From e35f17a1ef65e9379102345e9437ab13c69d5b44 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Sun, 27 Jul 2014 12:04:13 +0200
Subject: [PATCH 15/53] AST memory management

---
 runtime/Cpp/include/antlr3.hpp                |   4 +-
 runtime/Cpp/include/antlr3baserecognizer.inl  |   7 +-
 runtime/Cpp/include/antlr3commontoken.hpp     |   2 +
 runtime/Cpp/include/antlr3commontree.hpp      |  27 +-
 runtime/Cpp/include/antlr3commontree.inl      | 125 +++---
 .../Cpp/include/antlr3commontreeadaptor.hpp   | 198 ++++++---
 .../Cpp/include/antlr3commontreeadaptor.inl   | 389 ++++++++++++------
 .../include/antlr3commontreenodestream.hpp    |  42 +-
 .../include/antlr3commontreenodestream.inl    |  32 +-
 .../Cpp/include/antlr3debugeventlistener.hpp  |  19 +-
 runtime/Cpp/include/antlr3interfaces.hpp      |   1 -
 runtime/Cpp/include/antlr3intstream.hpp       |   1 +
 runtime/Cpp/include/antlr3intstream.inl       |   2 +-
 runtime/Cpp/include/antlr3memory.hpp          |  21 +
 runtime/Cpp/include/antlr3parser.inl          |   8 +-
 .../include/antlr3recognizersharedstate.hpp   |  15 +-
 .../include/antlr3recognizersharedstate.inl   |  12 +
 .../antlr3rewriterulesubtreestream.hpp        | 121 ++++++
 .../antlr3rewriterulesubtreestream.inl        | 221 ++++++++++
 .../include/antlr3rewriteruletokenstream.hpp  | 133 ++++++
 .../include/antlr3rewriteruletokenstream.inl  | 233 +++++++++++
 runtime/Cpp/include/antlr3rewritestreams.hpp  |  57 ++-
 runtime/Cpp/include/antlr3rewritestreams.inl  | 143 ++-----
 runtime/Cpp/include/antlr3tokenstream.hpp     |  16 +-
 runtime/Cpp/include/antlr3traits.hpp          |  11 +-
 runtime/Cpp/include/antlr3treeparser.hpp      |   1 +
 runtime/Cpp/include/antlr3treeparser.inl      |  10 +-
 .../org/antlr/codegen/templates/Cpp/AST.stg   | 123 +++---
 .../antlr/codegen/templates/Cpp/ASTParser.stg |  38 +-
 .../org/antlr/codegen/templates/Cpp/Cpp.stg   |  76 ++--
 30 files changed, 1518 insertions(+), 570 deletions(-)
 create mode 100644 runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp
 create mode 100644 runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
 create mode 100644 runtime/Cpp/include/antlr3rewriteruletokenstream.hpp
 create mode 100644 runtime/Cpp/include/antlr3rewriteruletokenstream.inl

diff --git a/runtime/Cpp/include/antlr3.hpp b/runtime/Cpp/include/antlr3.hpp
index 4e40ba48a..6349aeba9 100644
--- a/runtime/Cpp/include/antlr3.hpp
+++ b/runtime/Cpp/include/antlr3.hpp
@@ -53,7 +53,9 @@
 #include	"antlr3commontreenodestream.hpp"
 #include    "antlr3lexer.hpp"
 #include    "antlr3parser.hpp"
-#include    "antlr3rewritestreams.hpp"
+//#include    "antlr3rewritestreams.hpp"
+#include    "antlr3rewriteruletokenstream.hpp"
+#include    "antlr3rewriterulesubtreestream.hpp"
 #include	"antlr3traits.hpp"
 #include    "antlr3treeparser.hpp"
 
diff --git a/runtime/Cpp/include/antlr3baserecognizer.inl b/runtime/Cpp/include/antlr3baserecognizer.inl
index 5d5acbfc2..0132c1d4b 100644
--- a/runtime/Cpp/include/antlr3baserecognizer.inl
+++ b/runtime/Cpp/include/antlr3baserecognizer.inl
@@ -62,15 +62,16 @@ BaseRecognizer<ImplTraits, StreamType>::match(ANTLR_UINT32 ttype, BitsetListType
 	//
 	const UnitType* matchedSymbol = this->getCurrentInputSymbol(is);
 
-    if	(is->_LA(1) == ttype)
-    {
+	//if (is->_LA(1) == ttype)
+	if (matchedSymbol->get_type() == ttype)
+	{
 		// The token was the one we were told to expect
 		//
 		is->consume();					   // Consume that token from the stream
 		m_state->set_errorRecovery(false); // Not in error recovery now (if we were)
 		m_state->set_failed(false);	// The match was a success
 		return matchedSymbol;								// We are done
-    }
+	}
 
     // We did not find the expected token type, if we are backtracking then
     // we just set the failed flag and return.
diff --git a/runtime/Cpp/include/antlr3commontoken.hpp b/runtime/Cpp/include/antlr3commontoken.hpp
index 58039a410..e163e6a3d 100644
--- a/runtime/Cpp/include/antlr3commontoken.hpp
+++ b/runtime/Cpp/include/antlr3commontoken.hpp
@@ -138,6 +138,8 @@ class CommonToken : public ImplTraits::AllocPolicyType
 	CommonToken(TOKEN_TYPE type);
 	CommonToken( const CommonToken& ctoken );
 
+	~CommonToken() {}
+
 	CommonToken& operator=( const CommonToken& ctoken );
 	bool operator==( const CommonToken& ctoken ) const;
 	bool operator<( const CommonToken& ctoken ) const;
diff --git a/runtime/Cpp/include/antlr3commontree.hpp b/runtime/Cpp/include/antlr3commontree.hpp
index d2de42a88..b3c9ba6a8 100644
--- a/runtime/Cpp/include/antlr3commontree.hpp
+++ b/runtime/Cpp/include/antlr3commontree.hpp
@@ -45,9 +45,10 @@ class CommonTree : public ImplTraits::AllocPolicyType
 	typedef typename ImplTraits::StringType	StringType;
 	typedef typename ImplTraits::CommonTokenType CommonTokenType;
 	typedef typename ImplTraits::TreeType TreeType;
+	typedef typename ImplTraits::TreeTypePtr TreeTypePtr;
 	//typedef CommonTree TokenType;
-	typedef typename AllocPolicyType::template VectorType<TreeType*> ChildrenType;
-	typedef typename AllocPolicyType::template ListType<TreeType*>	ChildListType;
+	typedef typename AllocPolicyType::template VectorType<TreeTypePtr> ChildrenType;
+	typedef typename AllocPolicyType::template ListType<TreeTypePtr> ChildListType;
 
 private:
 	/// The list of all the children that belong to this node. They are not part of the node
@@ -86,7 +87,7 @@ class CommonTree : public ImplTraits::AllocPolicyType
 	~CommonTree();
 
 	const CommonTokenType* get_token() const;
-	void set_token(CommonTokenType*);
+	void set_token(CommonTokenType const*);
 
 	ChildrenType& get_children();
 	const ChildrenType& get_children() const;
@@ -102,37 +103,41 @@ class CommonTree : public ImplTraits::AllocPolicyType
 	void    set_parent( TreeType* parent);
 	void    set_childIndex( ANTLR_INT32 );
 
-	void	addChild(TreeType* child);
+	void	addChild(TreeTypePtr& child);
 	/// Add all elements of the supplied list as children of this node
 	///
 	void	addChildren(const ChildListType& kids);
 
-	TreeType*	deleteChild(ANTLR_UINT32 i);
+	TreeTypePtr	deleteChild(ANTLR_UINT32 i);
 	/// Delete children from start to stop and replace with t even if t is
 	/// a list (nil-root tree). Num of children can increase or decrease.
 	/// For huge child lists, inserting children can force walking rest of
 	/// children to set their child index; could be slow.
 	///
-	void	replaceChildren(ANTLR_INT32 startChildIndex, ANTLR_INT32 stopChildIndex, TreeType* t);
+	void	replaceChildren(ANTLR_INT32 startChildIndex, ANTLR_INT32 stopChildIndex, TreeTypePtr t);
+
 	CommonTree*	dupNode() const;
-	TreeType*	dupTree();
+	CommonTree*	dupNode(void *) const;
+
+
 	ANTLR_UINT32	getCharPositionInLine();
-	TreeType*	getChild(ANTLR_UINT32 i);
+	TreeTypePtr&	getChild(ANTLR_UINT32 i);
 	
 	ANTLR_UINT32	getChildCount() const;
 	ANTLR_UINT32	getType();
-	TreeType*	getFirstChildWithType(ANTLR_UINT32 type);
+	TreeTypePtr&	getFirstChildWithType(ANTLR_UINT32 type);
 	ANTLR_UINT32	getLine();
 	StringType	getText();
 	bool	isNilNode();
-	void	setChild(ANTLR_UINT32 i, TreeType* child);
+	void	setChild(ANTLR_UINT32 i, TreeTypePtr child);
 	StringType	toStringTree();
 	StringType	toString();
 	void	freshenParentAndChildIndexes();
 	void	freshenParentAndChildIndexes(ANTLR_UINT32 offset);
 	void	freshenParentAndChildIndexesDeeply();
 	void	freshenParentAndChildIndexesDeeply(ANTLR_UINT32 offset);
-
+	// Prepare tree node to be re-used
+	void	reuse();
 };
 
 ANTLR_END_NAMESPACE()
diff --git a/runtime/Cpp/include/antlr3commontree.inl b/runtime/Cpp/include/antlr3commontree.inl
index 0459d754b..b82d0dd97 100644
--- a/runtime/Cpp/include/antlr3commontree.inl
+++ b/runtime/Cpp/include/antlr3commontree.inl
@@ -48,7 +48,7 @@ const typename CommonTree<ImplTraits>::CommonTokenType* CommonTree<ImplTraits>::
 }
 
 template<class ImplTraits>
-void CommonTree<ImplTraits>::set_token(typename CommonTree<ImplTraits>::CommonTokenType* token)
+void CommonTree<ImplTraits>::set_token(typename CommonTree<ImplTraits>::CommonTokenType const* token)
 {
 	m_token = token;
 }
@@ -66,7 +66,7 @@ const typename CommonTree<ImplTraits>::ChildrenType& CommonTree<ImplTraits>::get
 }
 
 template<class ImplTraits>
-void	CommonTree<ImplTraits>::addChild(TreeType* child)
+void	CommonTree<ImplTraits>::addChild(TreeTypePtr& child)
 {
 	if	(child == NULL)
 		return;
@@ -89,16 +89,16 @@ void	CommonTree<ImplTraits>::addChild(TreeType* child)
         {
             if (!m_children.empty())
             {
-                // Need to copy the children
-            	ANTLR_UINT32 n = child_children.size();
-                for (ANTLR_UINT32 i = 0; i < n; i++)
+                // Need to copy(append) the children
+                for(auto i = child_children.begin(); i != child_children.end(); ++i)
                 {
-                    TreeType* entry = child_children.at(i);
                     // ANTLR3 lists can be sparse, unlike Array Lists (TODO: really?)
-                    if (entry != NULL)
-                        m_children.push_back(entry);
-					entry->set_parent(this);
-					entry->set_childIndex(m_children.size()-1);
+					if ((*i) != NULL)
+					{
+						m_children.push_back(std::move(*i));
+						m_children.back()->set_parent(this);
+						m_children.back()->set_childIndex(m_children.size() - 1);
+					}
                 }
             } else {
                 // We are build ing the tree structure here, so we need not
@@ -115,9 +115,9 @@ void	CommonTree<ImplTraits>::addChild(TreeType* child)
 	else
 	{
 		// Tree we are adding is not a Nil and might have children to copy
-		m_children.push_back( child );
-		child->set_parent(this);
-		child->set_childIndex(m_children.size()-1);
+		m_children.push_back( std::move(child) );
+		m_children.back()->set_parent(this);
+		m_children.back()->set_childIndex(m_children.size() - 1);
 	}
 }
 
@@ -132,17 +132,17 @@ void CommonTree<ImplTraits>::addChildren(const ChildListType& kids)
 }
 
 template<class ImplTraits>
-typename CommonTree<ImplTraits>::TreeType*	CommonTree<ImplTraits>::deleteChild(ANTLR_UINT32 i)
+typename CommonTree<ImplTraits>::TreeTypePtr	CommonTree<ImplTraits>::deleteChild(ANTLR_UINT32 i)
 {
 	if( m_children.empty() )
 		return	NULL;
-	TreeType* killed = m_children.erase( m_children.begin() + i);
+	TreeTypePtr killed = m_children.erase( m_children.begin() + i);
 	this->freshenParentAndChildIndexes(i);
 	return killed;
 }
 
 template<class ImplTraits>
-void	CommonTree<ImplTraits>::replaceChildren(ANTLR_INT32 startChildIndex, ANTLR_INT32 stopChildIndex, TreeType* newTree)
+void	CommonTree<ImplTraits>::replaceChildren(ANTLR_INT32 startChildIndex, ANTLR_INT32 stopChildIndex, TreeTypePtr newTree)
 {
 
 	ANTLR_INT32	numNewChildren;			// Tracking variable
@@ -234,34 +234,11 @@ CommonTree<ImplTraits>*	CommonTree<ImplTraits>::dupNode() const
 }
 
 template<class ImplTraits>
-typename CommonTree<ImplTraits>::TreeType*	CommonTree<ImplTraits>::dupTree()
+CommonTree<ImplTraits>*	CommonTree<ImplTraits>::dupNode(void *p) const
 {
-	TreeType*	newTree;
-	ANTLR_UINT32	i;
-	ANTLR_UINT32	s;
-
-	newTree = this->dupNode();
-
-	if	( !m_children.empty() )
-	{
-		s	    = m_children.size();
-
-		for	(i = 0; i < s; i++)
-		{
-			TreeType*    t;
-			TreeType*    newNode;
-
-			t   = m_children[i];
-
-			if  (t!= NULL)
-			{
-				newNode	    = t->dupTree();
-				newTree->addChild(newNode);
-			}
-		}
-	}
-
-	return newTree;
+	// The node we are duplicating is in fact the common tree (that's why we are here)
+	// so we use the super pointer to duplicate.
+	return new (p) CommonTree<ImplTraits>(this);
 }
 
 template<class ImplTraits>
@@ -277,14 +254,15 @@ ANTLR_UINT32	CommonTree<ImplTraits>::getCharPositionInLine()
 }
 
 template<class ImplTraits>
-typename CommonTree<ImplTraits>::TreeType*	CommonTree<ImplTraits>::getChild(ANTLR_UINT32 i)
+typename CommonTree<ImplTraits>::TreeTypePtr& CommonTree<ImplTraits>::getChild(ANTLR_UINT32 i)
 {
+	static TreeTypePtr nul;
 	if	(  m_children.empty() || i >= m_children.size() )
 	{
-		return NULL;
+		// TODO throw here should not happen
+		return nul;
 	}
 	return  m_children.at(i);
-
 }
 
 template<class ImplTraits>
@@ -355,12 +333,12 @@ ANTLR_UINT32	CommonTree<ImplTraits>::getType()
 }
 
 template<class ImplTraits>
-typename CommonTree<ImplTraits>::TreeType*	CommonTree<ImplTraits>::getFirstChildWithType(ANTLR_UINT32 type)
+typename CommonTree<ImplTraits>::TreeTypePtr& CommonTree<ImplTraits>::getFirstChildWithType(ANTLR_UINT32 type)
 {
 	ANTLR_UINT32   i;
 	std::size_t   cs;
 
-	TreeType*	t;
+	TreeTypePtr	t;
 	if	( !m_children.empty() )
 	{
 		cs	= m_children.size();
@@ -405,7 +383,7 @@ bool CommonTree<ImplTraits>::isNilNode()
 }
 
 template<class ImplTraits>
-void CommonTree<ImplTraits>::setChild(ANTLR_UINT32 i, TreeType* child)
+void CommonTree<ImplTraits>::setChild(ANTLR_UINT32 i, TreeTypePtr child)
 {
 	if( child==NULL)
 		return;
@@ -440,19 +418,17 @@ typename CommonTree<ImplTraits>::StringType	CommonTree<ImplTraits>::toStringTree
 		retval.append(this->toString());
 		retval.append(" ");
 	}
+
 	if	( !m_children.empty())
 	{
-		ANTLR_UINT32 n = m_children.size();
-		for	(ANTLR_UINT32 i = 0; i < n; i++)
-		{   
-			TreeType *t = m_children.at(i);
-			if  (i > 0)
-			{
-				retval.append(" ");
-			}
-			retval.append(t->toStringTree());
+		retval.append( m_children.front()->toStringTree());
+		for (auto i = std::next(m_children.begin()); i != m_children.end(); ++i)
+		{
+			retval.append(" ");
+			retval.append((*i)->toStringTree());
 		}
 	}
+
 	if	(this->isNilNode() == false)
 	{
 		retval.append(")");
@@ -477,13 +453,23 @@ void	CommonTree<ImplTraits>::freshenParentAndChildIndexes()
 template<class ImplTraits>
 void	CommonTree<ImplTraits>::freshenParentAndChildIndexes(ANTLR_UINT32 offset)
 {
-	ANTLR_UINT32 count = this->getChildCount();
+//	ANTLR_UINT32 count = this->getChildCount();
 	// Loop from the supplied index and set the indexes and parent
-	for	(ANTLR_UINT32 c = offset; c < count; c++)
+//	for	(ANTLR_UINT32 c = offset; c < count; c++)
+//	{
+//		TreeTypePtr child = this->getChild(c);
+//		child->set_childIndex(c);
+//		child->set_parent(this);
+//	}
+	// Loop from the supplied index and set the indexes and parent
+	auto i = m_children.begin();
+	int c = offset;
+	if(offset)
+		std::advance( i, offset );
+	for(; i != m_children.end(); ++i, ++c)
 	{
-		TreeType* child = this->getChild(c);
-		child->set_childIndex(c);
-		child->set_parent(this);
+		(*i)->set_childIndex(c);
+		(*i)->set_parent(this);
 	}
 }
 
@@ -498,13 +484,24 @@ void	CommonTree<ImplTraits>::freshenParentAndChildIndexesDeeply(ANTLR_UINT32 off
 {
 	ANTLR_UINT32 count = this->getChildCount();
 	for (ANTLR_UINT32 c = offset; c < count; c++) {
-		TreeType* child = getChild(c);
+		TreeTypePtr child = getChild(c);
 		child->set_childIndex(c);
 		child->set_parent(this);
 		child->freshenParentAndChildIndexesDeeply();
 	}
 }
 
+template<class ImplTraits>
+void	CommonTree<ImplTraits>::reuse()
+{
+	m_startIndex = -1;
+	m_stopIndex  = -1;
+	m_childIndex = -1;
+	m_token		 = NULL;
+	m_parent     = NULL;
+	m_children.clear();
+}
+
 template<class ImplTraits>
 CommonTree<ImplTraits>::~CommonTree()
 {
diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.hpp b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
index 708483182..7aa60a2aa 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.hpp
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
@@ -35,68 +35,145 @@
 
 #include    "antlr3defs.hpp"
 
+#include <memory>
+#include <iostream>
+#include <algorithm>
+
 ANTLR_BEGIN_NAMESPACE()
 
-template<class ImplTraits>
-class CommonTreeAdaptor : public ImplTraits::AllocPolicyType
+template <typename ImplTraits> class CommonTreeStore;
+
+/** Helper class for unique_ptr. Implements deleter for instances of unique_ptr
+    While building AST tree dangling pointers are automatically put back into pool
+ */
+template <typename ImplTraits>
+class CommonResourcePoolManager
 {
 public:
-	typedef typename ImplTraits::StringType StringType;
 	typedef typename ImplTraits::TreeType TreeType;
-	typedef	TreeType TokenType;
-	typedef typename ImplTraits::CommonTokenType CommonTokenType;
-	typedef typename ImplTraits::DebugEventListenerType DebuggerType;
+	CommonResourcePoolManager(CommonTreeStore<ImplTraits> * pool);
+	CommonResourcePoolManager();
 
-public:
-	//The parameter is there only to provide uniform constructor interface
-	CommonTreeAdaptor(DebuggerType* dbg = NULL);
-    TreeType*	  nilNode();
-	TreeType*	  dupTree( TreeType* tree);
-    TreeType*	  dupTreeTT( TreeType* t, TreeType* tree);
+	~CommonResourcePoolManager();
 
-    void	addChild( TreeType* t, TreeType* child);
-    void	addChildToken( TreeType* t, CommonTokenType* child);
-    void	setParent( TreeType* child, TreeType* parent);
-    TreeType*		getParent( TreeType* child);
+	void operator()(TreeType* releasedResource) const;
+private:
+	CommonTreeStore<ImplTraits> * m_pool;
+};
 
-	TreeType*		errorNode( CommonTokenType* tnstream, const CommonTokenType* startToken, const CommonTokenType* stopToken);
-	bool	isNilNode( TreeType* t);
+template <class ImplTraits>
+class CommonTreeStore : public ImplTraits::AllocPolicyType
+{
+public:
+	typedef typename ImplTraits::TreeType TreeType;
+	typedef typename ImplTraits::CommonTokenType CommonTokenType;
+	typedef CommonResourcePoolManager<ImplTraits> ResourcePoolManagerType;
+	typedef std::unique_ptr<TreeType, CommonResourcePoolManager<ImplTraits> > TreeTypePtr;
+	//typedef typename ImplTraits::TreeTypePtr TreeTypePtr;
+
+	CommonTreeStore();
+	
+	TreeTypePtr create();
+	CommonTokenType* createToken();
+	CommonTokenType* createToken(const CommonTokenType* fromToken);
+	
+	// Return special kind of NULL pointer wrapped into TreeTypePtr
+	TreeTypePtr
+	null()
+	{
+		return TreeTypePtr(NULL, m_manager);
+	}
+
+	std::size_t size() const
+	{
+	    return m_treeStore.size();
+	}
+
+	template <class T>
+	bool contains(const std::vector<T> &vec, const T &value)
+	{
+		return std::find(vec.begin(), vec.end(), value) != vec.end();
+	}
+	
+protected:
+	template<typename> friend class CommonResourcePoolManager;
+	template<typename> friend class CommonTreeAdaptor;
 
-    TreeType*	    becomeRoot( TreeType* newRoot, TreeType* oldRoot);
-    TreeType*	   	rulePostProcessing( TreeType* root);
+	void reuse(TreeType* releasedResource);
 
-    TreeType*	becomeRootToken(CommonTokenType* newRoot, TreeType* oldRoot);
+	std::vector<TreeType *> m_recycleBin;
+	std::vector<std::unique_ptr<TreeType> > m_treeStore;
+	std::vector<std::unique_ptr<CommonTokenType> > m_tokenStore;
+	ResourcePoolManagerType m_manager;
+};
 
-    TreeType* create( CommonTokenType const* payload);
-    TreeType* create( ANTLR_UINT32 tokenType, const CommonTokenType* fromToken);
-    TreeType* create( ANTLR_UINT32 tokenType, const CommonTokenType* fromToken, const char* text);
-    TreeType* create( ANTLR_UINT32 tokenType, const char* text);
+template<class ImplTraits>
+class CommonTreeAdaptor
+	: public ImplTraits::AllocPolicyType
+	, public CommonTreeStore<ImplTraits>
+{
+public:
+	typedef typename ImplTraits::StringType StringType;
+	typedef typename ImplTraits::TreeType TreeType;
+	typedef typename ImplTraits::TreeTypePtr TreeTypePtr;
 
-    CommonTokenType* createToken( ANTLR_UINT32 tokenType, const char* text);
-    CommonTokenType* createToken( const CommonTokenType* fromToken);
+	typedef	TreeType TokenType;
+	typedef typename ImplTraits::CommonTokenType CommonTokenType;
+	typedef typename ImplTraits::DebugEventListenerType DebuggerType;
+	typedef typename ImplTraits::TokenStreamType TokenStreamType;
+	typedef CommonTreeStore<ImplTraits> TreeStoreType;
 
-    TreeType*	    dupNode( TreeType* treeNode);
-    ANTLR_UINT32			getType( TreeType* t);
-    StringType			getText( TreeType* t);
+public:
+	//The parameter is there only to provide uniform constructor interface
+	CommonTreeAdaptor(DebuggerType* dbg = nullptr);
+	TreeTypePtr	nilNode();
+	TreeTypePtr	dupTree( TreeTypePtr& tree);
+	TreeTypePtr	dupTreeTT( TreeTypePtr t, TreeTypePtr tree);
+
+	void	addChild( TreeTypePtr& t, TreeTypePtr& child);
+	void	addChild( TreeTypePtr& t, TreeTypePtr&& child);
+	void	addChildToken( TreeTypePtr& t, CommonTokenType* child);
+	void	setParent( TreeTypePtr& child, TreeType* parent);
+	TreeType*	getParent( TreeTypePtr& child);
+
+	TreeTypePtr	errorNode( CommonTokenType* tnstream, const CommonTokenType* startToken, const CommonTokenType* stopToken);
+	bool	isNilNode( TreeTypePtr& t);
+
+	TreeTypePtr	becomeRoot( TreeTypePtr& newRoot, TreeTypePtr& oldRoot);
+	TreeTypePtr	becomeRoot( TreeTypePtr&& newRoot, TreeTypePtr& oldRoot);
+	TreeTypePtr	becomeRootToken(CommonTokenType* newRoot, TreeTypePtr& oldRoot);
+	TreeTypePtr	rulePostProcessing( TreeTypePtr& root);
+
+	TreeTypePtr create( CommonTokenType const* payload);
+	TreeTypePtr create( ANTLR_UINT32 tokenType, const CommonTokenType* fromToken);
+	TreeTypePtr create( ANTLR_UINT32 tokenType, const CommonTokenType* fromToken, const char* text);
+	TreeTypePtr create( ANTLR_UINT32 tokenType, const char* text);
+	
+	CommonTokenType* createToken( ANTLR_UINT32 tokenType, const char* text);
+	CommonTokenType* createToken( const CommonTokenType* fromToken);
+
+	TreeTypePtr	dupNode(const TreeTypePtr& treeNode);
+	ANTLR_UINT32	getType( TreeTypePtr& t);
+	StringType	getText( TreeTypePtr& t);
         
-    TreeType*	    getChild( TreeType* t, ANTLR_UINT32 i);
-    void	setChild( TreeType* t, ANTLR_UINT32 i, TreeType* child);
-    void	deleteChild( TreeType* t, ANTLR_UINT32 i);
-    void	setChildIndex( TreeType* t, ANTLR_INT32 i);
-    ANTLR_INT32	getChildIndex( TreeType* t);
+	TreeTypePtr&	getChild( TreeTypePtr& t, ANTLR_UINT32 i);
+	void	setChild( TreeTypePtr& t, ANTLR_UINT32 i, TreeTypePtr& child);
+	void	deleteChild( TreeTypePtr& t, ANTLR_UINT32 i);
+	void	setChildIndex( TreeTypePtr& t, ANTLR_INT32 i);
+	ANTLR_INT32	getChildIndex( TreeTypePtr& t);
+	
+	ANTLR_UINT32	getChildCount( TreeTypePtr&);
+	ANTLR_UINT64	getUniqueID( TreeTypePtr&);
 
-    ANTLR_UINT32	getChildCount( TreeType*);
-	ANTLR_UINT64	getUniqueID( TreeType*);
+	CommonTokenType*	getToken( TreeTypePtr& t);
 
-    CommonTokenType*    getToken( TreeType* t);
-
-    void setTokenBoundaries( TreeType* t, const CommonTokenType* startToken, const CommonTokenType* stopToken);
-    ANTLR_MARKER	getTokenStartIndex( TreeType* t);
-    ANTLR_MARKER	getTokenStopIndex( TreeType* t);
+	void setTokenBoundaries( TreeTypePtr& t, const CommonTokenType* startToken, const CommonTokenType* stopToken);
+	ANTLR_MARKER	getTokenStartIndex( TreeTypePtr& t);
+	ANTLR_MARKER	getTokenStopIndex( TreeTypePtr& t);
 
 	/// Produce a DOT (see graphviz freeware suite) from a base tree
 	///
-	StringType			makeDot( TreeType* theTree);
+	StringType	makeDot( TreeTypePtr& theTree);
 
 	/// Replace from start to stop child index of parent with t, which might
 	/// be a list.  Number of children may be different
@@ -105,14 +182,14 @@ class CommonTreeAdaptor : public ImplTraits::AllocPolicyType
 	/// If parent is null, don't do anything; must be at root of overall tree.
 	/// Can't replace whatever points to the parent externally.  Do nothing.
 	///
-	void replaceChildren( TreeType* parent, ANTLR_INT32 startChildIndex,
-								  ANTLR_INT32 stopChildIndex, TreeType* t);
+	void replaceChildren( TreeTypePtr parent, ANTLR_INT32 startChildIndex,
+			      ANTLR_INT32 stopChildIndex, TreeTypePtr t);
 
-    ~CommonTreeAdaptor();
+	~CommonTreeAdaptor();
 
 protected:
-	void defineDotNodes(TreeType* t, const StringType& dotSpec);
-	void defineDotEdges(TreeType* t, const StringType& dotSpec);
+	void defineDotNodes(TreeTypePtr t, const StringType& dotSpec);
+	void defineDotEdges(TreeTypePtr t, const StringType& dotSpec);
 };
 
 //If someone can override the CommonTreeAdaptor at the compile time, that will be 
@@ -126,7 +203,9 @@ class DebugTreeAdaptor : public ImplTraits::CommonTreeAdaptorType
 	//the template parameter is required for pointing back at the adaptor
 	typedef typename ImplTraits::DebugEventListener DebuggerType;
 	typedef typename ImplTraits::TreeType TreeType;
+	typedef typename ImplTraits::TreeTypePtr TreeTypePtr;
 	typedef typename ImplTraits::CommonTokenType CommonTokenType;
+	typedef typename ImplTraits::CommonTreeAdaptorType super;
 
 private:
 	/// If set to something other than NULL, then this structure is
@@ -140,23 +219,24 @@ class DebugTreeAdaptor : public ImplTraits::CommonTreeAdaptorType
 public:
 	DebugTreeAdaptor( DebuggerType* debugger );
 	void setDebugEventListener( DebuggerType* debugger);
-	TreeType*	  nilNode();
-	void	addChild(TreeType* t, TreeType* child);
-	void	addChildToken(TreeType* t, CommonTokenType* child);
-	TreeType* becomeRoot( TreeType* newRootTree, TreeType* oldRootTree );
-	TreeType* becomeRootToken(TreeType* newRoot, TreeType* oldRoot);
-	TreeType* createTypeToken(ANTLR_UINT32 tokenType, CommonTokenType* fromToken);
-	TreeType* createTypeTokenText(ANTLR_UINT32 tokenType, CommonTokenType* fromToken, ANTLR_UINT8* text);	
-	TreeType* createTypeText( ANTLR_UINT32 tokenType, ANTLR_UINT8* text);
-	TreeType* dupTree( TreeType* tree);
+	TreeTypePtr	  nilNode();
+	void	addChild(TreeTypePtr& t, TreeTypePtr& child);
+	void	addChildToken(TreeTypePtr& t, CommonTokenType* child);
+	TreeTypePtr becomeRoot( TreeTypePtr& newRootTree, TreeTypePtr& oldRootTree );
+	TreeTypePtr becomeRootToken( CommonTokenType* newRoot, TreeTypePtr& oldRoot);
+
+	TreeTypePtr createTypeToken(ANTLR_UINT32 tokenType, CommonTokenType* fromToken);
+	TreeTypePtr createTypeTokenText(ANTLR_UINT32 tokenType, CommonTokenType* fromToken, ANTLR_UINT8* text);
+	TreeTypePtr createTypeText( ANTLR_UINT32 tokenType, ANTLR_UINT8* text);
+
+	TreeTypePtr dupTree( TreeTypePtr& tree);
 
 	/// Sends the required debugging events for duplicating a tree
 	/// to the debugger.
 	///
-	void simulateTreeConstruction(TreeType* tree);
+	void simulateTreeConstruction(TreeTypePtr& tree);
 };
 
-
 ANTLR_END_NAMESPACE()
 
 #include "antlr3commontreeadaptor.inl"
diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.inl b/runtime/Cpp/include/antlr3commontreeadaptor.inl
index aaa3a88e0..370d1df97 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.inl
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.inl
@@ -1,28 +1,103 @@
 ANTLR_BEGIN_NAMESPACE()
 
-template<class ImplTraits>
-ANTLR_INLINE CommonTreeAdaptor<ImplTraits>::CommonTreeAdaptor(DebuggerType*)
+template <typename ImplTraits>
+CommonResourcePoolManager<ImplTraits>::CommonResourcePoolManager(CommonTreeStore<ImplTraits> * pool)
+	: m_pool(pool)
+{}
+
+template <typename ImplTraits>
+CommonResourcePoolManager<ImplTraits>::CommonResourcePoolManager()
+	: m_pool(NULL)
+{}
+
+template <typename ImplTraits>
+CommonResourcePoolManager<ImplTraits>::~CommonResourcePoolManager()
+{};
+
+template <typename ImplTraits>
+void
+CommonResourcePoolManager<ImplTraits>::operator()(TreeType* releasedResource) const
+{
+	if (releasedResource && m_pool)
+		m_pool->reuse(releasedResource);
+}
+
+template <class ImplTraits>
+CommonTreeStore<ImplTraits>::CommonTreeStore()
+	: m_manager(this)
+{}
+
+template <class ImplTraits>
+typename CommonTreeStore<ImplTraits>::TreeTypePtr
+CommonTreeStore<ImplTraits>::create()
+{
+	if (m_recycleBin.empty())
+	{
+		TreeTypePtr retval = TreeTypePtr(new TreeType, m_manager);
+		m_treeStore.push_back(std::unique_ptr<TreeType>(retval.get()));
+		return retval;
+	} else {
+		TreeType* resource = m_recycleBin.back();
+		m_recycleBin.pop_back();
+		return TreeTypePtr(resource, m_manager);
+	}
+}
+
+template <class ImplTraits>
+typename CommonTreeStore<ImplTraits>::CommonTokenType*
+CommonTreeStore<ImplTraits>::createToken()
+{
+	CommonTokenType* retval = new CommonTokenType;
+	m_tokenStore.push_back(std::unique_ptr<CommonTokenType>(retval));
+	return retval;
+}
+
+template <class ImplTraits>
+typename CommonTreeStore<ImplTraits>::CommonTokenType*
+CommonTreeStore<ImplTraits>::createToken( const CommonTokenType* fromToken)
+{
+	CommonTokenType* retval = new CommonTokenType(*fromToken);
+	m_tokenStore.push_back(std::unique_ptr<CommonTokenType>(retval));
+	return retval;
+}
+
+template <class ImplTraits>
+void
+CommonTreeStore<ImplTraits>::reuse(TreeType* releasedResource)
 {
+	if (contains(m_recycleBin, releasedResource))
+	{
+		throw std::string("Grrr double reuse");
+	}
+	releasedResource->reuse();
+	m_recycleBin.push_back(releasedResource);
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*	  CommonTreeAdaptor<ImplTraits>::nilNode()
+CommonTreeAdaptor<ImplTraits>::CommonTreeAdaptor(DebuggerType*)
+{}
+
+template<class ImplTraits>
+typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
+CommonTreeAdaptor<ImplTraits>::nilNode()
 {
 	return this->create(NULL);
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*	  CommonTreeAdaptor<ImplTraits>::dupTree( TreeType* tree)
+typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
+CommonTreeAdaptor<ImplTraits>::dupTree( TreeTypePtr& tree)
 {
 	return this->dupTreeTT(tree, NULL);
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*	  CommonTreeAdaptor<ImplTraits>::dupTreeTT( TreeType* t, TreeType* parent)
+typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
+CommonTreeAdaptor<ImplTraits>::dupTreeTT( TreeTypePtr t, TreeTypePtr parent)
 {
-	TreeType*	newTree;
-	TreeType*	child;
-	TreeType*	newSubTree;
+	TreeTypePtr	newTree;
+	TreeTypePtr	child;
+	TreeTypePtr	newSubTree;
 	ANTLR_UINT32		n;
 	ANTLR_UINT32		i;
 
@@ -47,7 +122,7 @@ typename CommonTreeAdaptor<ImplTraits>::TreeType*	  CommonTreeAdaptor<ImplTraits
 }
 
 template<class ImplTraits>
-void	CommonTreeAdaptor<ImplTraits>::addChild( TreeType* t, TreeType* child)
+void	CommonTreeAdaptor<ImplTraits>::addChild( TreeTypePtr& t, TreeTypePtr& child)
 {
 	if	(t != NULL && child != NULL)
 	{
@@ -56,7 +131,16 @@ void	CommonTreeAdaptor<ImplTraits>::addChild( TreeType* t, TreeType* child)
 }
 
 template<class ImplTraits>
-void	CommonTreeAdaptor<ImplTraits>::addChildToken( TreeType* t, CommonTokenType* child)
+void	CommonTreeAdaptor<ImplTraits>::addChild( TreeTypePtr& t, TreeTypePtr&& child)
+{
+	if	(t != NULL && child != NULL)
+	{
+		t->addChild(child);
+	}
+}
+
+template<class ImplTraits>
+void	CommonTreeAdaptor<ImplTraits>::addChildToken( TreeTypePtr& t, CommonTokenType* child)
 {
 	if	(t != NULL && child != NULL)
 	{
@@ -65,14 +149,14 @@ void	CommonTreeAdaptor<ImplTraits>::addChildToken( TreeType* t, CommonTokenType*
 }
 
 template<class ImplTraits>
-void	CommonTreeAdaptor<ImplTraits>::setParent( TreeType* child, TreeType* parent)
+void	CommonTreeAdaptor<ImplTraits>::setParent( TreeTypePtr& child, TreeType* parent)
 {
 	child->set_parent(parent);
 }
 
 template<class ImplTraits>
 typename CommonTreeAdaptor<ImplTraits>::TreeType*
-CommonTreeAdaptor<ImplTraits>::getParent( TreeType* child)
+CommonTreeAdaptor<ImplTraits>::getParent( TreeTypePtr& child)
 {
 	if ( child==NULL )
 		return NULL;
@@ -80,7 +164,7 @@ CommonTreeAdaptor<ImplTraits>::getParent( TreeType* child)
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*
+typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
 CommonTreeAdaptor<ImplTraits>::errorNode( CommonTokenType* tnstream,
 											const CommonTokenType* startToken,
 											const CommonTokenType* stopToken)
@@ -95,24 +179,22 @@ CommonTreeAdaptor<ImplTraits>::errorNode( CommonTokenType* tnstream,
 }
 
 template<class ImplTraits>
-bool	CommonTreeAdaptor<ImplTraits>::isNilNode( TreeType* t)
+bool	CommonTreeAdaptor<ImplTraits>::isNilNode( TreeTypePtr& t)
 {
 	return t->isNilNode();
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*
-CommonTreeAdaptor<ImplTraits>::becomeRoot( TreeType* newRootTree, TreeType* oldRootTree)
+typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
+CommonTreeAdaptor<ImplTraits>::becomeRoot( TreeTypePtr& newRootTree, TreeTypePtr& oldRootTree)
 {
-	TreeType* saveRoot;
-
 	/* Protect against tree rewrites if we are in some sort of error
 	 * state, but have tried to recover. In C we can end up with a null pointer
 	 * for a tree that was not produced.
 	 */
 	if	(newRootTree == NULL)
 	{
-		return	oldRootTree;
+		return	std::move(oldRootTree);
 	}
 
 	/* root is just the new tree as is if there is no
@@ -120,7 +202,7 @@ CommonTreeAdaptor<ImplTraits>::becomeRoot( TreeType* newRootTree, TreeType* oldR
 	 */
 	if	(oldRootTree == NULL)
 	{
-		return	newRootTree;
+		return	std::move(newRootTree);
 	}
 
 	/* Produce ^(nil real-node)
@@ -132,17 +214,16 @@ CommonTreeAdaptor<ImplTraits>::becomeRoot( TreeType* newRootTree, TreeType* oldR
 			/* TODO: Handle tree exceptions 
 			 */
 			fprintf(stderr, "More than one node as root! TODO: Create tree exception handling\n");
-			return newRootTree;
+			return std::move(newRootTree);
 		}
 
 		/* The new root is the first child, keep track of the original newRoot
-         * because if it was a Nil Node, then we can reuse it now.
+		 * because if it was a Nil Node, then we can reuse it now.
 		 */
-        saveRoot    = newRootTree;
-		newRootTree = newRootTree->getChild(0);
+		TreeTypePtr saveRoot = std::move(newRootTree);
+		newRootTree = std::move(saveRoot->getChild(0));
 
-        // Reclaim the old nilNode()
-        delete saveRoot;
+		// Will Reclaim the old nilNode() saveRoot here
 	}
 
 	/* Add old root into new root. addChild takes care of the case where oldRoot
@@ -151,46 +232,86 @@ CommonTreeAdaptor<ImplTraits>::becomeRoot( TreeType* newRootTree, TreeType* oldR
 	 */
 	newRootTree->addChild(oldRootTree);
 
-    // If the oldroot tree was a nil node, then we know at this point
-    // it has become orphaned by the rewrite logic, so we tell it to do
-    // whatever it needs to do to be reused.
-    //
-    if  (oldRootTree->isNilNode())
-    {
-        // We have taken an old Root Tree and appended all its children to the new
-        // root. In addition though it was a nil node, which means the generated code
-        // will not reuse it again, so we will reclaim it here. First we want to zero out
-        // any pointers it was carrying around. We are just the baseTree handler so we
-        // don't know necessarilly know how to do this for the real node, we just ask the tree itself
-        // to do it.
-        //
-		delete oldRootTree;
-    }
 	/* Always returns new root structure
 	 */
-	return	newRootTree;
+	return	std::move(newRootTree);
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*
-CommonTreeAdaptor<ImplTraits>::becomeRootToken( CommonTokenType* newRoot, TreeType* oldRoot)
+typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
+CommonTreeAdaptor<ImplTraits>::becomeRoot( TreeTypePtr&& newRootTree, TreeTypePtr& oldRootTree)
+{
+	/* Protect against tree rewrites if we are in some sort of error
+	 * state, but have tried to recover. In C we can end up with a null pointer
+	 * for a tree that was not produced.
+	 */
+	if	(newRootTree == NULL)
+	{
+		return	std::move(oldRootTree);
+	}
+
+	/* root is just the new tree as is if there is no
+	 * current root tree.
+	 */
+	if	(oldRootTree == NULL)
+	{
+		return	std::move(newRootTree);
+	}
+
+	/* Produce ^(nil real-node)
+	 */
+	if	(newRootTree->isNilNode())
+	{
+		if	(newRootTree->getChildCount() > 1)
+		{
+			/* TODO: Handle tree exceptions
+			 */
+			fprintf(stderr, "More than one node as root! TODO: Create tree exception handling\n");
+			return std::move(newRootTree);
+		}
+
+		/* The new root is the first child, keep track of the original newRoot
+		 * because if it was a Nil Node, then we can reuse it now.
+		 */
+		TreeTypePtr saveRoot = std::move(newRootTree);
+		newRootTree = std::move(saveRoot->getChild(0));
+
+		// will Reclaim the old nilNode() here saveRoot.
+	}
+
+	/* Add old root into new root. addChild takes care of the case where oldRoot
+	 * is a flat list (nill rooted tree). All children of oldroot are added to
+	 * new root.
+	 */
+	newRootTree->addChild(oldRootTree);
+
+	/* Always returns new root structure
+	 */
+	return	std::move(newRootTree);
+}
+
+template<class ImplTraits>
+typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
+CommonTreeAdaptor<ImplTraits>::becomeRootToken( CommonTokenType* newRoot, TreeTypePtr& oldRoot)
 {
 	return	this->becomeRoot(this->create(newRoot), oldRoot);
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*
+typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
 CommonTreeAdaptor<ImplTraits>::create( CommonTokenType const* payload)
 {
-	return new TreeType(payload);
+	TreeTypePtr retval = TreeStoreType::create();
+	retval->set_token(payload);
+	return retval;
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*
+typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
 CommonTreeAdaptor<ImplTraits>::create( ANTLR_UINT32 tokenType, const CommonTokenType* fromToken)
 {
 	/* Create the new token */
-	CommonTokenType* newToken = this->createToken(fromToken);
+	auto newToken = this->createToken(fromToken);
 	/* Set the type of the new token to that supplied */
 	newToken->set_type(tokenType);
 	/* Return a new node based upon this token */
@@ -198,7 +319,7 @@ CommonTreeAdaptor<ImplTraits>::create( ANTLR_UINT32 tokenType, const CommonToken
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*
+typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
 CommonTreeAdaptor<ImplTraits>::create( ANTLR_UINT32 tokenType, const CommonTokenType* fromToken, const char* text)
 {
 	if (fromToken == NULL)
@@ -214,21 +335,26 @@ CommonTreeAdaptor<ImplTraits>::create( ANTLR_UINT32 tokenType, const CommonToken
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*
+typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
 CommonTreeAdaptor<ImplTraits>::create( ANTLR_UINT32 tokenType, const char* text)
 {
-	CommonTokenType* fromToken = this->createToken(tokenType, text);
+	auto fromToken = this->createToken(tokenType, text);
 	return	this->create(fromToken);
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType* CommonTreeAdaptor<ImplTraits>::dupNode( TreeType* treeNode)
+typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
+CommonTreeAdaptor<ImplTraits>::dupNode(const TreeTypePtr& treeNode)
 {
-	return  (treeNode == NULL) ? NULL : treeNode->dupNode();
+	if (treeNode == NULL)
+		return TreeStoreType::null();
+	TreeTypePtr retval(TreeStoreType::create());
+	treeNode->dupNode(retval.get());
+	return retval;
 }
 
 template<class ImplTraits>
-ANTLR_UINT32	CommonTreeAdaptor<ImplTraits>::getType( TreeType* t)
+ANTLR_UINT32	CommonTreeAdaptor<ImplTraits>::getType( TreeTypePtr& t)
 {
 	if ( t==NULL)
 		return CommonTokenType::TOKEN_INVALID;
@@ -236,13 +362,13 @@ ANTLR_UINT32	CommonTreeAdaptor<ImplTraits>::getType( TreeType* t)
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::StringType	CommonTreeAdaptor<ImplTraits>::getText( TreeType* t)
+typename CommonTreeAdaptor<ImplTraits>::StringType	CommonTreeAdaptor<ImplTraits>::getText( TreeTypePtr& t)
 {
 	return t->getText();
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType*	    CommonTreeAdaptor<ImplTraits>::getChild( TreeType* t, ANTLR_UINT32 i)
+typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr&	    CommonTreeAdaptor<ImplTraits>::getChild( TreeTypePtr& t, ANTLR_UINT32 i)
 {
 	if ( t==NULL )
 		return NULL;
@@ -250,26 +376,26 @@ typename CommonTreeAdaptor<ImplTraits>::TreeType*	    CommonTreeAdaptor<ImplTrai
 }
 
 template<class ImplTraits>
-void	CommonTreeAdaptor<ImplTraits>::setChild( TreeType* t, ANTLR_UINT32 i, TreeType* child)
+void	CommonTreeAdaptor<ImplTraits>::setChild( TreeTypePtr& t, ANTLR_UINT32 i, TreeTypePtr& child)
 {
 	t->setChild(i, child);
 }
 
 template<class ImplTraits>
-void	CommonTreeAdaptor<ImplTraits>::deleteChild( TreeType* t, ANTLR_UINT32 i)
+void	CommonTreeAdaptor<ImplTraits>::deleteChild( TreeTypePtr& t, ANTLR_UINT32 i)
 {
 	t->deleteChild(i);
 }
 
 template<class ImplTraits>
-void	CommonTreeAdaptor<ImplTraits>::setChildIndex( TreeType* t, ANTLR_INT32 i)
+void	CommonTreeAdaptor<ImplTraits>::setChildIndex( TreeTypePtr& t, ANTLR_INT32 i)
 {
 	if( t!= NULL)
 		t->set_childIndex(i);
 }
 
 template<class ImplTraits>
-ANTLR_INT32	CommonTreeAdaptor<ImplTraits>::getChildIndex( TreeType * t)
+ANTLR_INT32	CommonTreeAdaptor<ImplTraits>::getChildIndex( TreeTypePtr& t)
 {
 	if ( t==NULL )
 		return 0;
@@ -277,7 +403,7 @@ ANTLR_INT32	CommonTreeAdaptor<ImplTraits>::getChildIndex( TreeType * t)
 }
 
 template<class ImplTraits>
-ANTLR_UINT32	CommonTreeAdaptor<ImplTraits>::getChildCount( TreeType* t)
+ANTLR_UINT32	CommonTreeAdaptor<ImplTraits>::getChildCount( TreeTypePtr& t)
 {
 	if ( t==NULL )
 		return 0;
@@ -285,42 +411,38 @@ ANTLR_UINT32	CommonTreeAdaptor<ImplTraits>::getChildCount( TreeType* t)
 }
 
 template<class ImplTraits>
-ANTLR_UINT64	CommonTreeAdaptor<ImplTraits>::getUniqueID( TreeType* node )
+ANTLR_UINT64	CommonTreeAdaptor<ImplTraits>::getUniqueID( TreeTypePtr& node )
 {
 	return	reinterpret_cast<ANTLR_UINT64>(node);
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::CommonTokenType*    
-	CommonTreeAdaptor<ImplTraits>::createToken( ANTLR_UINT32 tokenType, const char* text)
+typename CommonTreeAdaptor<ImplTraits>::CommonTokenType*
+CommonTreeAdaptor<ImplTraits>::createToken( ANTLR_UINT32 tokenType, const char* text)
 {
-	CommonTokenType*    newToken = new CommonTokenType;
-
-    if	(newToken != NULL)
-    {	
-		newToken->set_tokText( text );
-		newToken->set_type(tokenType);
-    }
-    return  newToken;
-
+	CommonTokenType* newToken = TreeStoreType::createToken();
+	newToken->set_tokText( text );
+	newToken->set_type(tokenType);
+	return newToken;
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::CommonTokenType*    
-	CommonTreeAdaptor<ImplTraits>::createToken( const CommonTokenType* fromToken)
+typename CommonTreeAdaptor<ImplTraits>::CommonTokenType*
+CommonTreeAdaptor<ImplTraits>::createToken( const CommonTokenType* fromToken)
 {
-    return new CommonTokenType(*fromToken);
+	CommonTokenType* newToken = TreeStoreType::createToken(fromToken);
+	return newToken;
 }
 
 template<class ImplTraits>
 typename CommonTreeAdaptor<ImplTraits>::CommonTokenType*  
-		 CommonTreeAdaptor<ImplTraits>::getToken( TreeType* t)
+CommonTreeAdaptor<ImplTraits>::getToken( TreeTypePtr& t)
 {
 	return t->getToken();
 }
 
 template<class ImplTraits>
-void CommonTreeAdaptor<ImplTraits>::setTokenBoundaries( TreeType* t, const CommonTokenType* startToken, const CommonTokenType* stopToken)
+void CommonTreeAdaptor<ImplTraits>::setTokenBoundaries( TreeTypePtr& t, const CommonTokenType* startToken, const CommonTokenType* stopToken)
 {
 	ANTLR_MARKER   start = 0;
 	ANTLR_MARKER   stop = 0;
@@ -339,7 +461,7 @@ void CommonTreeAdaptor<ImplTraits>::setTokenBoundaries( TreeType* t, const Commo
 }
 
 template<class ImplTraits>
-ANTLR_MARKER	CommonTreeAdaptor<ImplTraits>::getTokenStartIndex( TreeType* t)
+ANTLR_MARKER	CommonTreeAdaptor<ImplTraits>::getTokenStartIndex( TreeTypePtr& t)
 {
 	if ( t==NULL )
 		return -1;
@@ -347,7 +469,7 @@ ANTLR_MARKER	CommonTreeAdaptor<ImplTraits>::getTokenStartIndex( TreeType* t)
 }
 
 template<class ImplTraits>
-ANTLR_MARKER	CommonTreeAdaptor<ImplTraits>::getTokenStopIndex( TreeType* t)
+ANTLR_MARKER	CommonTreeAdaptor<ImplTraits>::getTokenStopIndex( TreeTypePtr& t)
 {
 	if ( t==NULL )
 		return -1;
@@ -355,7 +477,7 @@ ANTLR_MARKER	CommonTreeAdaptor<ImplTraits>::getTokenStopIndex( TreeType* t)
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::StringType	 CommonTreeAdaptor<ImplTraits>::makeDot( TreeType* theTree)
+typename CommonTreeAdaptor<ImplTraits>::StringType	 CommonTreeAdaptor<ImplTraits>::makeDot( TreeTypePtr& theTree)
 {
 	// The string we are building up
 	//
@@ -420,7 +542,7 @@ typename CommonTreeAdaptor<ImplTraits>::StringType	 CommonTreeAdaptor<ImplTraits
 }
 
 template<class ImplTraits>
-void CommonTreeAdaptor<ImplTraits>::replaceChildren( TreeType* parent, ANTLR_INT32 startChildIndex, ANTLR_INT32 stopChildIndex, TreeType* t)
+void CommonTreeAdaptor<ImplTraits>::replaceChildren( TreeTypePtr parent, ANTLR_INT32 startChildIndex, ANTLR_INT32 stopChildIndex, TreeTypePtr t)
 {
 	if	(parent != NULL)
 		parent->replaceChildren(startChildIndex, stopChildIndex, t);
@@ -429,19 +551,39 @@ void CommonTreeAdaptor<ImplTraits>::replaceChildren( TreeType* parent, ANTLR_INT
 template<class ImplTraits>
 CommonTreeAdaptor<ImplTraits>::~CommonTreeAdaptor()
 {
+	std::cout << "SZ" << TreeStoreType::size() << std::endl;
+	std::cout << "RZ" << TreeStoreType::m_recycleBin.size() << std::endl;
+
+	auto i = TreeStoreType::m_treeStore.begin();
+
+	std::cout
+		<< ' '
+		<< "Node    " << '\t' << "Parent  " << '\t' << "Type" << '\t' << "toStringTree" << std::endl;
+
+	for(; i != TreeStoreType::m_treeStore.end(); ++i)
+	{
+		std::cout
+			<< (TreeStoreType::contains(TreeStoreType::m_recycleBin, i->get()) ? '*' : ' ')
+			<< i->get() << '\t'
+			<< (const void *) (*i)->get_parent() << '\t'
+			<< (*i)->getType() << '\t'
+			<< (*i)->getChildCount() << '\t'
+			<< (*i)->toStringTree() << '\t'
+			<< std::endl;
+	}
 }
 
 template<class ImplTraits>
-void CommonTreeAdaptor<ImplTraits>::defineDotNodes(TreeType* t, const StringType& dotSpec)
+void CommonTreeAdaptor<ImplTraits>::defineDotNodes(TreeTypePtr t, const StringType& dotSpec)
 {
 	// How many nodes are we talking about?
 	//
 	int	nCount;
 	int i;
-    TreeType* child;
+	TreeTypePtr child;
 	char	buff[64];
 	StringType	text;
-	int		j;
+	int	j;
 
 	// Count the nodes
 	//
@@ -504,7 +646,7 @@ void CommonTreeAdaptor<ImplTraits>::defineDotNodes(TreeType* t, const StringType
 }
 
 template<class ImplTraits>
-void CommonTreeAdaptor<ImplTraits>::defineDotEdges(TreeType* t, const StringType& dotSpec)
+void CommonTreeAdaptor<ImplTraits>::defineDotEdges(TreeTypePtr t, const StringType& dotSpec)
 {
 	// How many nodes are we talking about?
 	//
@@ -533,7 +675,7 @@ void CommonTreeAdaptor<ImplTraits>::defineDotEdges(TreeType* t, const StringType
 	//
 	for	(int i=0; i<nCount; i++)
 	{
-		TreeType* child;
+		TreeTypePtr child;
 		char	buff[128];
         StringType text;
 
@@ -609,30 +751,30 @@ void CommonTreeAdaptor<ImplTraits>::defineDotEdges(TreeType* t, const StringType
 }
 
 template<class ImplTraits>
-typename CommonTreeAdaptor<ImplTraits>::TreeType* CommonTreeAdaptor<ImplTraits>::rulePostProcessing( TreeType* root)
+typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr CommonTreeAdaptor<ImplTraits>::rulePostProcessing( TreeTypePtr& root)
 {
-	TreeType* saveRoot = root;
+	TreeTypePtr saveRoot = std::move(root);
 
-	if (root != NULL && root->isNilNode())
+	if (saveRoot != NULL && saveRoot->isNilNode())
 	{
-		if	(root->getChildCount() == 0)
+		if (saveRoot->getChildCount() == 0)
 		{
-			root = NULL;
+			return TreeTypePtr(NULL, root.get_deleter());
 		}
-		else if	(root->getChildCount() == 1)
+		else if (saveRoot->getChildCount() == 1)
 		{
-			root = root->getChild(0);
-			root->set_parent(NULL);
-			root->set_childIndex(-1);
-
-            // The root we were given was a nil node, wiht one child, which means it has
-            // been abandoned and would be lost in the node factory. However
-            // nodes can be flagged as resuable to prevent this terrible waste
-            //
-			delete saveRoot;
+			TreeTypePtr newRoot = std::move(saveRoot->getChild(0));
+			newRoot->set_parent(NULL);
+			newRoot->set_childIndex(-1);
+			
+			// The root we were given was a nil node, with one child, which means it has
+			// been abandoned and would be lost in the node factory.
+			// saveRoot will be releases and put back into factory
+			//
+			return newRoot;
 		}
 	}
-	return root;
+	return saveRoot;
 }
 
 template<class ImplTraits>
@@ -648,15 +790,15 @@ void DebugTreeAdaptor<ImplTraits>::setDebugEventListener( DebuggerType* debugger
 }
 
 template<class ImplTraits>
-typename DebugTreeAdaptor<ImplTraits>::TreeType*	  DebugTreeAdaptor<ImplTraits>::nilNode()
+typename DebugTreeAdaptor<ImplTraits>::TreeTypePtr	  DebugTreeAdaptor<ImplTraits>::nilNode()
 {
-	TreeType*	t = this->create(NULL);
+	TreeTypePtr	t = this->create(NULL);
 	m_debugger->createNode(t);
 	return	t;
 }
 
 template<class ImplTraits>
-void	DebugTreeAdaptor<ImplTraits>::addChild(TreeType* t, TreeType* child)
+void	DebugTreeAdaptor<ImplTraits>::addChild(TreeTypePtr& t, TreeTypePtr& child)
 {
 	if	(t != NULL && child != NULL)
 	{
@@ -666,9 +808,9 @@ void	DebugTreeAdaptor<ImplTraits>::addChild(TreeType* t, TreeType* child)
 }
 
 template<class ImplTraits>
-void	DebugTreeAdaptor<ImplTraits>::addChildToken(TreeType* t, CommonTokenType* child)
+void	DebugTreeAdaptor<ImplTraits>::addChildToken(TreeTypePtr& t, CommonTokenType* child)
 {
-	TreeType*	tc;
+	TreeTypePtr	tc;
 	if	(t != NULL && child != NULL)
 	{
 		tc = this->create(child);
@@ -678,54 +820,52 @@ void	DebugTreeAdaptor<ImplTraits>::addChildToken(TreeType* t, CommonTokenType* c
 }
 
 template<class ImplTraits>
-typename DebugTreeAdaptor<ImplTraits>::TreeType* DebugTreeAdaptor<ImplTraits>::becomeRoot( TreeType* newRootTree, TreeType* oldRootTree )
+typename DebugTreeAdaptor<ImplTraits>::TreeTypePtr DebugTreeAdaptor<ImplTraits>::becomeRoot( TreeTypePtr& newRootTree, TreeTypePtr& oldRootTree )
 {
-	TreeType* t;
-	t = this->becomeRoot(newRootTree, oldRootTree);
+	TreeTypePtr t = super::becomeRoot(newRootTree, oldRootTree);
 	m_debugger->becomeRoot(newRootTree, oldRootTree);
 	return t;
 }
 
 template<class ImplTraits>
-typename DebugTreeAdaptor<ImplTraits>::TreeType* DebugTreeAdaptor<ImplTraits>::becomeRootToken(TreeType* newRoot, TreeType* oldRoot)
+typename DebugTreeAdaptor<ImplTraits>::TreeTypePtr DebugTreeAdaptor<ImplTraits>::becomeRootToken(CommonTokenType* newRoot, TreeTypePtr& oldRoot)
 {
-	TreeType*	t;
-	t =	this->becomeRoot(this->create(newRoot), oldRoot);
+	TreeTypePtr	t =	super::becomeRoot(this->create(newRoot), oldRoot);
 	m_debugger->becomeRoot(t, oldRoot);
 	return t;
 }
 
 template<class ImplTraits>
-typename DebugTreeAdaptor<ImplTraits>::TreeType* DebugTreeAdaptor<ImplTraits>::createTypeToken(ANTLR_UINT32 tokenType, CommonTokenType* fromToken)
+typename DebugTreeAdaptor<ImplTraits>::TreeTypePtr DebugTreeAdaptor<ImplTraits>::createTypeToken(ANTLR_UINT32 tokenType, CommonTokenType* fromToken)
 {
-	TreeType* t;
+	TreeTypePtr t;
 	t = this->createTypeToken(tokenType, fromToken);
 	m_debugger->createNode(t);
 	return t;
 }
 
 template<class ImplTraits>
-typename DebugTreeAdaptor<ImplTraits>::TreeType* DebugTreeAdaptor<ImplTraits>::createTypeTokenText(ANTLR_UINT32 tokenType, CommonTokenType* fromToken, ANTLR_UINT8* text)
+typename DebugTreeAdaptor<ImplTraits>::TreeTypePtr DebugTreeAdaptor<ImplTraits>::createTypeTokenText(ANTLR_UINT32 tokenType, CommonTokenType* fromToken, ANTLR_UINT8* text)
 {
-	TreeType* t;
+	TreeTypePtr t;
 	t = this->createTypeTokenText(tokenType, fromToken, text);
 	m_debugger->createNode(t);
 	return t;
 }
 	
 template<class ImplTraits>
-typename DebugTreeAdaptor<ImplTraits>::TreeType* DebugTreeAdaptor<ImplTraits>::createTypeText( ANTLR_UINT32 tokenType, ANTLR_UINT8* text)
+typename DebugTreeAdaptor<ImplTraits>::TreeTypePtr DebugTreeAdaptor<ImplTraits>::createTypeText( ANTLR_UINT32 tokenType, ANTLR_UINT8* text)
 {
-	TreeType* t;
+	TreeTypePtr t;
 	t = this->createTypeText(tokenType, text);
 	m_debugger->createNode(t);
 	return t;
 }
 
 template<class ImplTraits>
-typename DebugTreeAdaptor<ImplTraits>::TreeType* DebugTreeAdaptor<ImplTraits>::dupTree( TreeType* tree)
+typename DebugTreeAdaptor<ImplTraits>::TreeTypePtr DebugTreeAdaptor<ImplTraits>::dupTree( TreeTypePtr& tree)
 {
-	TreeType* t;
+	TreeTypePtr t;
 
 	// Call the normal dup tree mechanism first
 	//
@@ -742,11 +882,11 @@ typename DebugTreeAdaptor<ImplTraits>::TreeType* DebugTreeAdaptor<ImplTraits>::d
 }
 
 template<class ImplTraits>
-void DebugTreeAdaptor<ImplTraits>::simulateTreeConstruction(TreeType* tree)
+void DebugTreeAdaptor<ImplTraits>::simulateTreeConstruction(TreeTypePtr& tree)
 {
 	ANTLR_UINT32		n;
 	ANTLR_UINT32		i;
-	TreeType*	child;
+	TreeTypePtr	child;
 
 	// Send the create node event
 	//
@@ -761,5 +901,4 @@ void DebugTreeAdaptor<ImplTraits>::simulateTreeConstruction(TreeType* tree)
 	}
 }
 
-
 ANTLR_END_NAMESPACE()
diff --git a/runtime/Cpp/include/antlr3commontreenodestream.hpp b/runtime/Cpp/include/antlr3commontreenodestream.hpp
index 962758f56..ae6054d88 100644
--- a/runtime/Cpp/include/antlr3commontreenodestream.hpp
+++ b/runtime/Cpp/include/antlr3commontreenodestream.hpp
@@ -50,13 +50,14 @@ class CommonTreeNodeStream : public ImplTraits::TreeNodeIntStreamType
 	};
 
 	typedef typename ImplTraits::TreeType TreeType;
+	typedef typename ImplTraits::TreeTypePtr TreeTypePtr;
 	typedef TreeType UnitType;
 	typedef typename ImplTraits::StringType StringType;
 	typedef typename ImplTraits::StringStreamType StringStreamType;
 	typedef typename ImplTraits::TreeAdaptorType TreeAdaptorType;
 	typedef typename ImplTraits::TreeNodeIntStreamType IntStreamType;
 	typedef typename ImplTraits::AllocPolicyType AllocPolicyType;
-	typedef typename AllocPolicyType::template VectorType<TreeType*>	NodesType;
+	typedef typename AllocPolicyType::template VectorType<TreeTypePtr>	NodesType;
 	typedef typename AllocPolicyType::template VectorType< TreeWalkState<ImplTraits> > MarkersType;
 	typedef typename AllocPolicyType::template StackType< ANTLR_INT32 > NodeStackType;
 	typedef typename ImplTraits::TreeParserType ComponentType;
@@ -100,7 +101,7 @@ class CommonTreeNodeStream : public ImplTraits::TreeNodeIntStreamType
 
 	/// Which tree are we navigating ?
     ///
-    TreeType*				m_root;
+    TreeTypePtr				m_root;
 
     /// Pointer to tree adaptor interface that manipulates/builds
     /// the tree.
@@ -121,11 +122,11 @@ class CommonTreeNodeStream : public ImplTraits::TreeNodeIntStreamType
 
     /// Which node are we currently visiting?
     ///
-    TreeType*		m_currentNode;
+    TreeTypePtr		m_currentNode;
 
     /// Which node did we last visit? Used for LT(-1)
     ///
-    TreeType*		m_previousNode;
+    TreeTypePtr		m_previousNode;
 
     /// Which child are we currently visiting?  If -1 we have not visited
     /// this node yet; next consume() request will set currentIndex to 0.
@@ -141,7 +142,7 @@ class CommonTreeNodeStream : public ImplTraits::TreeNodeIntStreamType
     /// to fit new lookahead depths, but consume() wraps like a circular
     /// buffer.
     ///
-    TreeType**		m_lookAhead;
+    TreeTypePtr*		m_lookAhead;
 
     /// Number of elements available in the lookahead buffer at any point in
     ///  time. This is the current size of the array.
@@ -181,7 +182,7 @@ class CommonTreeNodeStream : public ImplTraits::TreeNodeIntStreamType
 	//
 	CommonTreeNodeStream( ANTLR_UINT32 hint );
 	CommonTreeNodeStream( const CommonTreeNodeStream& ctn );
-	CommonTreeNodeStream( TreeType* tree, ANTLR_UINT32 hint );
+	CommonTreeNodeStream( TreeTypePtr tree, ANTLR_UINT32 hint );
 
 	void init( ANTLR_UINT32 hint );
 	~CommonTreeNodeStream();
@@ -197,12 +198,12 @@ class CommonTreeNodeStream : public ImplTraits::TreeNodeIntStreamType
 	/// returns a tree node instead of a token.  Makes code gen identical
 	/// for both parser and tree grammars. :)
 	///
-    TreeType*	_LT(ANTLR_INT32 k);
+    TreeTypePtr	_LT(ANTLR_INT32 k);
 
 	/// Where is this stream pulling nodes from?  This is not the name, but
 	/// the object that provides node objects.
 	///
-    TreeType*	getTreeSource();
+    TreeTypePtr	getTreeSource();
 
 	/// What adaptor can tell me how to interpret/navigate nodes and
 	/// trees.  E.g., get text of a node.
@@ -225,7 +226,7 @@ class CommonTreeNodeStream : public ImplTraits::TreeNodeIntStreamType
 	/// null or "" too, but users should not access $ruleLabel.text in
 	/// an action of course in that case.
 	///
-    StringType	toStringSS(TreeType* start, TreeType* stop);
+    StringType	toStringSS(TreeTypePtr start, TreeTypePtr stop);
 
 	/// Return the text of all nodes from start to stop, inclusive, into the
 	/// supplied buffer.
@@ -234,13 +235,13 @@ class CommonTreeNodeStream : public ImplTraits::TreeNodeIntStreamType
 	/// null or "" too, but users should not access $ruleLabel.text in
 	/// an action of course in that case.
 	///
-    void toStringWork(TreeType* start, TreeType* stop, StringType& buf);
+    void toStringWork(TreeTypePtr start, TreeTypePtr stop, StringType& buf);
 
 	/// Get a tree node at an absolute index i; 0..n-1.
 	/// If you don't want to buffer up nodes, then this method makes no
 	/// sense for you.
 	///
-	TreeType*	get(ANTLR_INT32 i);
+	TreeTypePtr	get(ANTLR_INT32 i);
 
 	// REWRITING TREES (used by tree parser)
 
@@ -254,10 +255,10 @@ class CommonTreeNodeStream : public ImplTraits::TreeNodeIntStreamType
 	/// If parent is null, don't do anything; must be at root of overall tree.
 	/// Can't replace whatever points to the parent externally.  Do nothing.
 	///
-	void replaceChildren(TreeType* parent, ANTLR_INT32 startChildIndex, 
-										ANTLR_INT32 stopChildIndex, TreeType* t);
+	void replaceChildren(TreeTypePtr parent, ANTLR_INT32 startChildIndex, 
+										ANTLR_INT32 stopChildIndex, TreeTypePtr t);
 
-	TreeType* LB(ANTLR_INT32 k);
+	TreeTypePtr LB(ANTLR_INT32 k);
 
 	/// As we flatten the tree, we use UP, DOWN nodes to represent
 	/// the tree structure.  When debugging we need unique nodes
@@ -265,9 +266,9 @@ class CommonTreeNodeStream : public ImplTraits::TreeNodeIntStreamType
 	///
     void	addNavigationNode(ANTLR_UINT32 ttype);
 
-    TreeType*	newDownNode();
+    TreeTypePtr	newDownNode();
 
-	TreeType*	newUpNode();
+	TreeTypePtr	newUpNode();
 
     bool	hasUniqueNavigationNodes() const;
 
@@ -280,7 +281,7 @@ class CommonTreeNodeStream : public ImplTraits::TreeNodeIntStreamType
     void	reset();
 
 	void fillBufferRoot();
-	void fillBuffer(TreeType* t);
+	void fillBuffer(TreeTypePtr t);
 	
 };
 
@@ -295,14 +296,15 @@ class TreeWalkState : public ImplTraits::AllocPolicyType
 {
 public:
 	typedef typename ImplTraits::TreeType TreeType;
+	typedef typename ImplTraits::TreeTypePtr TreeTypePtr;
 
 private:
     ANTLR_UINT32		m_currentChildIndex;
     ANTLR_MARKER		m_absoluteNodeIndex;
-    TreeType*		m_currentNode;
-    TreeType*		m_previousNode;
+    TreeTypePtr		m_currentNode;
+    TreeTypePtr		m_previousNode;
     ANTLR_UINT32		m_nodeStackSize;
-    TreeType*		m_lookAhead;
+    TreeTypePtr		m_lookAhead;
     ANTLR_UINT32		m_lookAheadLength;
     ANTLR_UINT32		m_tail;
     ANTLR_UINT32		m_head;
diff --git a/runtime/Cpp/include/antlr3commontreenodestream.inl b/runtime/Cpp/include/antlr3commontreenodestream.inl
index 4dce47cfb..c9af8412c 100644
--- a/runtime/Cpp/include/antlr3commontreenodestream.inl
+++ b/runtime/Cpp/include/antlr3commontreenodestream.inl
@@ -72,7 +72,7 @@ CommonTreeNodeStream<ImplTraits>::CommonTreeNodeStream( const CommonTreeNodeStre
 }
 
 template<class ImplTraits>
-CommonTreeNodeStream<ImplTraits>::CommonTreeNodeStream( TreeType* tree, ANTLR_UINT32 hint )
+CommonTreeNodeStream<ImplTraits>::CommonTreeNodeStream( TreeTypePtr tree, ANTLR_UINT32 hint )
 {
 	this->init(hint);
 	m_root = tree;
@@ -101,7 +101,7 @@ CommonTreeNodeStream<ImplTraits>::~CommonTreeNodeStream()
 }
 
 template<class ImplTraits>
-typename CommonTreeNodeStream<ImplTraits>::TreeType*	CommonTreeNodeStream<ImplTraits>::_LT(ANTLR_INT32 k)
+typename CommonTreeNodeStream<ImplTraits>::TreeTypePtr	CommonTreeNodeStream<ImplTraits>::_LT(ANTLR_INT32 k)
 {
 	if	( m_p == -1)
 	{
@@ -128,7 +128,7 @@ typename CommonTreeNodeStream<ImplTraits>::TreeType*	CommonTreeNodeStream<ImplTr
 }
 
 template<class ImplTraits>
-typename CommonTreeNodeStream<ImplTraits>::TreeType*	CommonTreeNodeStream<ImplTraits>::getTreeSource()
+typename CommonTreeNodeStream<ImplTraits>::TreeTypePtr	CommonTreeNodeStream<ImplTraits>::getTreeSource()
 {
 	return m_root;
 }
@@ -152,7 +152,7 @@ typename CommonTreeNodeStream<ImplTraits>::StringType  CommonTreeNodeStream<Impl
 }
 
 template<class ImplTraits>
-typename CommonTreeNodeStream<ImplTraits>::StringType  CommonTreeNodeStream<ImplTraits>::toStringSS(TreeType* start, TreeType* stop)
+typename CommonTreeNodeStream<ImplTraits>::StringType  CommonTreeNodeStream<ImplTraits>::toStringSS(TreeTypePtr start, TreeTypePtr stop)
 {
 	StringType  buf;
     this->toStringWork(start, stop, buf);
@@ -160,7 +160,7 @@ typename CommonTreeNodeStream<ImplTraits>::StringType  CommonTreeNodeStream<Impl
 }
 
 template<class ImplTraits>
-void CommonTreeNodeStream<ImplTraits>::toStringWork(TreeType* start, TreeType* stop, StringType& str)
+void CommonTreeNodeStream<ImplTraits>::toStringWork(TreeTypePtr start, TreeTypePtr stop, StringType& str)
 {
 	ANTLR_UINT32   n;
 	ANTLR_UINT32   c;
@@ -196,7 +196,7 @@ void CommonTreeNodeStream<ImplTraits>::toStringWork(TreeType* start, TreeType* s
 
 	for	(c = 0; c<n ; c++)
 	{
-		TreeType*   child;
+		TreeTypePtr   child;
 
 		child = start->getChild(c);
 		this->toStringWork(child, stop, buf);
@@ -211,7 +211,7 @@ void CommonTreeNodeStream<ImplTraits>::toStringWork(TreeType* start, TreeType* s
 }
 
 template<class ImplTraits>
-typename  CommonTreeNodeStream<ImplTraits>::TreeType*	CommonTreeNodeStream<ImplTraits>::get(ANTLR_INT32 k)
+typename  CommonTreeNodeStream<ImplTraits>::TreeTypePtr	CommonTreeNodeStream<ImplTraits>::get(ANTLR_INT32 k)
 {
 	if( m_p == -1 )
 	{
@@ -222,10 +222,10 @@ typename  CommonTreeNodeStream<ImplTraits>::TreeType*	CommonTreeNodeStream<ImplT
 }
 
 template<class ImplTraits>
-void	CommonTreeNodeStream<ImplTraits>::replaceChildren(TreeType* parent, 
+void	CommonTreeNodeStream<ImplTraits>::replaceChildren(TreeTypePtr parent, 
 															ANTLR_INT32 startChildIndex, 
 															ANTLR_INT32 stopChildIndex, 
-															TreeType* t)
+															TreeTypePtr t)
 {
 	if	(parent != NULL)
 	{
@@ -236,7 +236,7 @@ void	CommonTreeNodeStream<ImplTraits>::replaceChildren(TreeType* parent,
 }
 
 template<class ImplTraits>
-typename CommonTreeNodeStream<ImplTraits>::TreeType* CommonTreeNodeStream<ImplTraits>::LB(ANTLR_INT32 k)
+typename CommonTreeNodeStream<ImplTraits>::TreeTypePtr CommonTreeNodeStream<ImplTraits>::LB(ANTLR_INT32 k)
 {
 	if	( k==0)
 	{
@@ -254,7 +254,7 @@ typename CommonTreeNodeStream<ImplTraits>::TreeType* CommonTreeNodeStream<ImplTr
 template<class ImplTraits>
 void CommonTreeNodeStream<ImplTraits>::addNavigationNode(ANTLR_UINT32 ttype)
 {
-	TreeType*	    node;
+	TreeTypePtr	    node;
 
 	node = NULL;
 
@@ -287,9 +287,9 @@ void CommonTreeNodeStream<ImplTraits>::addNavigationNode(ANTLR_UINT32 ttype)
 }
 
 template<class ImplTraits>
-typename CommonTreeNodeStream<ImplTraits>::TreeType*	CommonTreeNodeStream<ImplTraits>::newDownNode()
+typename CommonTreeNodeStream<ImplTraits>::TreeTypePtr	CommonTreeNodeStream<ImplTraits>::newDownNode()
 {
-	TreeType*	    dNode;
+	TreeTypePtr	    dNode;
     CommonTokenType*    token;
 
     token					= new CommonTokenType(CommonTokenType::TOKEN_DOWN);
@@ -299,9 +299,9 @@ typename CommonTreeNodeStream<ImplTraits>::TreeType*	CommonTreeNodeStream<ImplTr
 }
 
 template<class ImplTraits>
-typename CommonTreeNodeStream<ImplTraits>::TreeType*	CommonTreeNodeStream<ImplTraits>::newUpNode()
+typename CommonTreeNodeStream<ImplTraits>::TreeTypePtr	CommonTreeNodeStream<ImplTraits>::newUpNode()
 {
-	TreeType*	    uNode;
+	TreeTypePtr	    uNode;
     CommonTokenType*    token;
 
     token					= new CommonTokenType(CommonTokenType::TOKEN_UP);
@@ -372,7 +372,7 @@ void CommonTreeNodeStream<ImplTraits>::fillBufferRoot()
 }
 
 template<class ImplTraits>
-void CommonTreeNodeStream<ImplTraits>::fillBuffer(TreeType* t)
+void CommonTreeNodeStream<ImplTraits>::fillBuffer(TreeTypePtr t)
 {
 	bool	nilNode;
 	ANTLR_UINT32	nCount;
diff --git a/runtime/Cpp/include/antlr3debugeventlistener.hpp b/runtime/Cpp/include/antlr3debugeventlistener.hpp
index 21fcf59a9..922115b48 100644
--- a/runtime/Cpp/include/antlr3debugeventlistener.hpp
+++ b/runtime/Cpp/include/antlr3debugeventlistener.hpp
@@ -60,6 +60,7 @@ class DebugEventListener  : public ImplTraits::AllocPolicyType
 {
 public:
 	typedef typename ImplTraits::TreeType TreeType;
+	typedef typename ImplTraits::TreeTypePtr TreeTypePtr;
 	typedef typename ImplTraits::StringType StringType;
 	typedef typename ImplTraits::CommonTokenType CommonTokenType;
 	typedef typename ImplTraits::TreeAdaptorType TreeAdaptorType;
@@ -311,13 +312,13 @@ class DebugEventListener  : public ImplTraits::AllocPolicyType
 	 *  know what the interface is in full, just those bits that are the base.
 	 * @param t
 	 */
-	virtual void	consumeNode( TreeType* t);
+	virtual void	consumeNode( TreeTypePtr t);
 
 	/** The tree parser looked ahead.  If the type is UP or DOWN,
 	 *  then the ID is not really meaningful as it's fixed--there is
 	 *  just one UP node and one DOWN navigation node.
 	 */
-	virtual void	LTT( int i, TreeType* t);
+	virtual void	LTT( int i, TreeTypePtr t);
 
 
 	// A S T  E v e n t s
@@ -331,13 +332,13 @@ class DebugEventListener  : public ImplTraits::AllocPolicyType
  	 *  If you are receiving this event over a socket via
 	 *  RemoteDebugEventSocketListener then only t.ID is set.
 	 */
-	virtual void	nilNode( TreeType* t);
+	virtual void	nilNode( TreeTypePtr t);
 
 	/** If a syntax error occurs, recognizers bracket the error
 	 *  with an error node if they are building ASTs. This event
 	 *  notifies the listener that this is the case
 	 */
-	virtual void	errorNode( TreeType* t);
+	virtual void	errorNode( TreeTypePtr t);
 
 	/** Announce a new node built from token elements such as type etc...
 	 *
@@ -345,7 +346,7 @@ class DebugEventListener  : public ImplTraits::AllocPolicyType
 	 *  RemoteDebugEventSocketListener then only t.ID, type, text are
 	 *  set.
 	 */
-	virtual void	createNode( TreeType* t);
+	virtual void	createNode( TreeTypePtr t);
 
 	/** Announce a new node built from an existing token.
 	 *
@@ -353,7 +354,7 @@ class DebugEventListener  : public ImplTraits::AllocPolicyType
 	 *  RemoteDebugEventSocketListener then only node.ID and token.tokenIndex
 	 *  are set.
 	 */
-	virtual void	createNodeTok( TreeType* node, CommonTokenType* token);
+	virtual void	createNodeTok( TreeTypePtr node, CommonTokenType* token);
 
 	/** Make a node the new root of an existing root.  See
 	 *
@@ -371,7 +372,7 @@ class DebugEventListener  : public ImplTraits::AllocPolicyType
 	 *
 	 *  @see org.antlr.runtime.tree.TreeAdaptor.becomeRoot()
 	 */
-	virtual void	becomeRoot( TreeType* newRoot, TreeType* oldRoot);
+	virtual void	becomeRoot( TreeTypePtr newRoot, TreeTypePtr oldRoot);
 
 	/** Make childID a child of rootID.
 	 *
@@ -380,14 +381,14 @@ class DebugEventListener  : public ImplTraits::AllocPolicyType
 	 *
 	 *  @see org.antlr.runtime.tree.TreeAdaptor.addChild()
 	 */
-	virtual void	addChild( TreeType* root, TreeType* child);
+	virtual void	addChild( TreeTypePtr root, TreeTypePtr child);
 
 	/** Set the token start/stop token index for a subtree root or node.
 	 *
 	 *  If you are receiving this event over a socket via
 	 *  RemoteDebugEventSocketListener then only t.ID is set.
 	 */
-	virtual void	setTokenBoundaries( TreeType* t, ANTLR_MARKER tokenStartIndex, ANTLR_MARKER tokenStopIndex);
+	virtual void	setTokenBoundaries( TreeTypePtr t, ANTLR_MARKER tokenStartIndex, ANTLR_MARKER tokenStopIndex);
 
 	/// Free up the resources allocated to this structure
 	///
diff --git a/runtime/Cpp/include/antlr3interfaces.hpp b/runtime/Cpp/include/antlr3interfaces.hpp
index f6297844e..3103d2413 100644
--- a/runtime/Cpp/include/antlr3interfaces.hpp
+++ b/runtime/Cpp/include/antlr3interfaces.hpp
@@ -295,7 +295,6 @@ class ComponentTypeFinder< ImplTraits, typename ImplTraits::TreeNodeStreamType>
 	typedef typename ImplTraits::TreeParserType ComponentType;
 };
 
-
 ANTLR_END_NAMESPACE()
 
 #endif
diff --git a/runtime/Cpp/include/antlr3intstream.hpp b/runtime/Cpp/include/antlr3intstream.hpp
index 2381df3cf..b7e9ea52f 100644
--- a/runtime/Cpp/include/antlr3intstream.hpp
+++ b/runtime/Cpp/include/antlr3intstream.hpp
@@ -382,6 +382,7 @@ class TreeNodeIntStream : public IntStream<ImplTraits, typename ImplTraits::Tree
 	typedef typename ImplTraits::TreeNodeStreamType TreeNodeStreamType;
 	typedef IntStream<ImplTraits, TreeNodeStreamType > BaseType;
 	typedef typename ImplTraits::TreeType TreeType;
+	typedef typename ImplTraits::TreeTypePtr TreeTypePtr;
 	typedef typename ImplTraits::CommonTokenType CommonTokenType;
 
 public:
diff --git a/runtime/Cpp/include/antlr3intstream.inl b/runtime/Cpp/include/antlr3intstream.inl
index b947ee664..f8d8b5a0c 100644
--- a/runtime/Cpp/include/antlr3intstream.inl
+++ b/runtime/Cpp/include/antlr3intstream.inl
@@ -1589,7 +1589,7 @@ ANTLR_UINT32		TreeNodeIntStream<ImplTraits>::_LA(ANTLR_INT32 i)
 
 	// Ask LT for the 'token' at that position
 	//
-	TreeType* t = tns->_LT(i);
+	TreeTypePtr t = tns->_LT(i);
 
 	if	(t == NULL)
 	{
diff --git a/runtime/Cpp/include/antlr3memory.hpp b/runtime/Cpp/include/antlr3memory.hpp
index 7713613d7..f09f2ed64 100644
--- a/runtime/Cpp/include/antlr3memory.hpp
+++ b/runtime/Cpp/include/antlr3memory.hpp
@@ -36,6 +36,7 @@
 #include <new>
 #include <set>
 #include <vector>
+#include <memory>
 
 #include   "antlr3defs.hpp"
 
@@ -110,6 +111,26 @@ class DefaultAllocPolicy
 	{
 	};
 
+	template<class TYPE>
+	class SmartPtrType : public std::unique_ptr<TYPE, std::default_delete<TYPE> >
+	{
+		typedef typename std::unique_ptr<TYPE, std::default_delete<TYPE> > BaseType;
+	public:
+		SmartPtrType() {};
+		SmartPtrType( SmartPtrType&& other )
+            : BaseType()
+		{};
+		SmartPtrType & operator=(SmartPtrType&& other) //= default;
+		{
+			BaseType::swap(other);
+			//return std::move((BaseType&)other);
+			return *this;
+		}
+	private:
+		SmartPtrType & operator=(const SmartPtrType&) /*= delete*/;
+		SmartPtrType(const SmartPtrType&) /*= delete*/;
+	};
+
 	ANTLR_INLINE static void* operator new (std::size_t bytes)
 	{ 
 		void* p = alloc(bytes);
diff --git a/runtime/Cpp/include/antlr3parser.inl b/runtime/Cpp/include/antlr3parser.inl
index 6f4d15261..f75cb1cc5 100644
--- a/runtime/Cpp/include/antlr3parser.inl
+++ b/runtime/Cpp/include/antlr3parser.inl
@@ -2,7 +2,7 @@ ANTLR_BEGIN_NAMESPACE()
 
 template< class ImplTraits >
 Parser<ImplTraits>::Parser( ANTLR_UINT32 sizeHint, RecognizerSharedStateType* state )
-	:RecognizerType( sizeHint, state )
+	: RecognizerType( sizeHint, state )
 {
 	m_tstream = NULL;
 }
@@ -10,7 +10,7 @@ Parser<ImplTraits>::Parser( ANTLR_UINT32 sizeHint, RecognizerSharedStateType* st
 template< class ImplTraits >
 Parser<ImplTraits>::Parser( ANTLR_UINT32 sizeHint, TokenStreamType* tstream,
 												RecognizerSharedStateType* state )
-												:RecognizerType( sizeHint, state )
+	: RecognizerType( sizeHint, state )
 {
 	this->setTokenStream( tstream );
 }
@@ -19,7 +19,7 @@ template< class ImplTraits >
 Parser<ImplTraits>::Parser( ANTLR_UINT32 sizeHint, TokenStreamType* tstream,
 											DebugEventListenerType* dbg,
 											RecognizerSharedStateType* state )
-											:RecognizerType( sizeHint, state )
+	: RecognizerType( sizeHint, state )
 {
 	this->setTokenStream( tstream );
 	this->setDebugListener( dbg );
@@ -219,7 +219,7 @@ typename Parser<ImplTraits>::TokenType*	Parser<ImplTraits>::getMissingSymbol( In
 	token->set_charPositionInLine( current->get_charPositionInLine());
 	token->set_channel( TOKEN_DEFAULT_CHANNEL );
 	token->set_type(expectedTokenType);
-    token->set_lineStart( current->get_lineStart() );
+	token->set_lineStart( current->get_lineStart() );
 
 	// Create the token text that shows it has been inserted
 	//
diff --git a/runtime/Cpp/include/antlr3recognizersharedstate.hpp b/runtime/Cpp/include/antlr3recognizersharedstate.hpp
index 05543963d..8d00b1e8b 100644
--- a/runtime/Cpp/include/antlr3recognizersharedstate.hpp
+++ b/runtime/Cpp/include/antlr3recognizersharedstate.hpp
@@ -58,7 +58,7 @@ class RecognizerSharedState  : public ImplTraits::AllocPolicyType
 	typedef typename ImplTraits::AllocPolicyType AllocPolicyType;
 	typedef typename StreamType::UnitType TokenType;
 	typedef typename ImplTraits::CommonTokenType CommonTokenType;
-
+	
 	typedef typename ComponentTypeFinder<ImplTraits, StreamType>::ComponentType  ComponentType;
 	typedef typename ImplTraits::template RewriteStreamType< ComponentType > RewriteStreamType;
 	typedef typename ImplTraits::StringType StringType;
@@ -67,6 +67,8 @@ class RecognizerSharedState  : public ImplTraits::AllocPolicyType
 	typedef typename ImplTraits::BitsetType BitsetType;
 	typedef typename ImplTraits::BitsetListType BitsetListType;
 
+	typedef typename ImplTraits::TreeAdaptorType TreeAdaptorType;
+
 	typedef typename AllocPolicyType::template StackType< BitsetListType > FollowingType;
 	typedef typename AllocPolicyType::template StackType< typename ImplTraits::InputStreamType* > InputStreamsType;
 	typedef InputStreamsType StreamsType;
@@ -204,6 +206,11 @@ class RecognizerSharedState  : public ImplTraits::AllocPolicyType
      */
     InputStreamsType	m_streams;
 
+    /** Tree adaptor drives an AST trie construction.
+     *  Is shared between multiple imported grammars.
+     */
+    TreeAdaptorType*    m_treeAdaptor;
+
 public:
 	RecognizerSharedState();
 	ExceptionBaseType* get_exception() const;
@@ -228,7 +235,8 @@ class RecognizerSharedState  : public ImplTraits::AllocPolicyType
 	ANTLR_MARKER get_tokenStartCharIndex() const;
 	StringType& get_text();
 	InputStreamsType& get_streams();
-
+	TreeAdaptorType* get_treeAdaptor() const;
+	
 	void  set_following( const FollowingType& following );
 	void  set_sizeHint( ANTLR_UINT32 sizeHint );
 	void  set_error( bool error );
@@ -250,7 +258,8 @@ class RecognizerSharedState  : public ImplTraits::AllocPolicyType
 	void  set_tokenStartCharIndex( ANTLR_MARKER tokenStartCharIndex );
 	void  set_text( const StringType& text );
 	void  set_streams( const InputStreamsType& streams );
-
+	void  set_treeAdaptor( TreeAdaptorType* adaptor );
+	
 	void inc_errorCount();
 	void inc_backtracking();
 	void dec_backtracking();
diff --git a/runtime/Cpp/include/antlr3recognizersharedstate.inl b/runtime/Cpp/include/antlr3recognizersharedstate.inl
index 8d9cc7fd6..1dc5c9424 100644
--- a/runtime/Cpp/include/antlr3recognizersharedstate.inl
+++ b/runtime/Cpp/include/antlr3recognizersharedstate.inl
@@ -19,6 +19,7 @@ RecognizerSharedState<ImplTraits, StreamType>::RecognizerSharedState()
 	m_tokenStartLine = 0;
 	m_tokenStartCharPositionInLine = 0;
 	m_tokenStartCharIndex = 0;
+	m_treeAdaptor = NULL;
 }
 
 template<class ImplTraits, class StreamType>
@@ -135,6 +136,12 @@ ANTLR_INLINE typename RecognizerSharedState<ImplTraits, StreamType>::StreamsType
 {
 	return m_streams;
 }
+template<class ImplTraits, class StreamType>
+ANTLR_INLINE typename RecognizerSharedState<ImplTraits, StreamType>::TreeAdaptorType* RecognizerSharedState<ImplTraits, StreamType>::get_treeAdaptor() const
+{
+	return m_treeAdaptor;
+}
+
 template<class ImplTraits, class StreamType>
 ANTLR_INLINE void RecognizerSharedState<ImplTraits, StreamType>::set_exception( ExceptionBaseType* exception )
 {
@@ -245,6 +252,11 @@ ANTLR_INLINE void RecognizerSharedState<ImplTraits, StreamType>::set_streams( co
 {
 	m_streams = streams;
 }
+template<class ImplTraits, class StreamType>
+ANTLR_INLINE void RecognizerSharedState<ImplTraits, StreamType>::set_treeAdaptor( TreeAdaptorType* adaptor )
+{
+	m_treeAdaptor = adaptor;
+}
 
 template<class ImplTraits, class StreamType>
 ANTLR_INLINE void RecognizerSharedState<ImplTraits, StreamType>::inc_errorCount()
diff --git a/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp b/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp
new file mode 100644
index 000000000..910184381
--- /dev/null
+++ b/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp
@@ -0,0 +1,121 @@
+#ifndef	ANTLR3REWRITERULESUBTREESTREAM_HPP
+#define	ANTLR3REWRITERULESUBTREESTREAM_HPP
+
+// [The "BSD licence"]
+// Copyright (c) 2005-2009 Gokulakannan Somasundaram, ElectronDB
+
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+// 3. The name of the author may not be used to endorse or promote products
+//    derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+// NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include    "antlr3defs.hpp"
+
+ANTLR_BEGIN_NAMESPACE()
+
+/// This is an implementation of a subtree stream which is a set of trees
+///  modeled as an element stream.
+///
+template<class ImplTraits>
+class RewriteRuleSubtreeStream
+{
+public:
+	typedef typename ImplTraits::StringType StringType;
+	typedef typename ImplTraits::AllocPolicyType AllocPolicyType;
+	typedef typename ImplTraits::TreeAdaptorType TreeAdaptorType;
+	typedef typename ImplTraits::TreeParserType ComponentType;
+	typedef typename ComponentType::StreamType StreamType;
+	typedef typename ImplTraits::TreeType TreeType;
+	typedef typename ImplTraits::TreeTypePtr TreeTypePtr;
+	typedef TreeType TokenType;
+	typedef typename ImplTraits::template RecognizerType< StreamType > RecognizerType;
+	typedef typename AllocPolicyType::template VectorType< TreeTypePtr > ElementsType;
+	typedef typename ImplTraits::TreeType ElementType;
+
+	RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description);
+	RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description, TreeTypePtr& oneElement);
+	RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description, const ElementsType& elements);
+	~RewriteRuleSubtreeStream();
+
+    /// Reset the condition of this stream so that it appears we have
+    ///  not consumed any of its elements.  Elements themselves are untouched.
+    ///
+    void	reset();
+
+	TreeTypePtr nextNode(TreeTypePtr);
+
+	/// TODO copied from RewriteRuleElementStreamType
+    /// Add a new pANTLR3_BASE_TREE to this stream
+    ///
+    void	add(TreeTypePtr& el);
+    bool	hasNext();
+    TreeTypePtr nextTree();
+    typename ElementsType::iterator _next();
+    ElementType* toTree(ElementType* el);
+
+    /// Number of elements available in the stream
+    ///
+    ANTLR_UINT32	size();
+
+    /// Returns the description string if there is one available (check for NULL).
+    ///
+    StringType getDescription();
+
+protected:
+	TreeTypePtr dup(const TreeTypePtr& el );
+
+private:
+	/// Pointer to the tree adaptor in use for this stream
+	///
+    TreeAdaptorType*	m_adaptor;
+
+	/// Cursor 0..n-1.  If singleElement!=NULL, cursor is 0 until you next(),
+    /// which bumps it to 1 meaning no more elements.
+    ///
+    typename ElementsType::iterator m_cursor;
+
+    /// The element or stream description; usually has name of the token or
+    /// rule reference that this list tracks.  Can include rulename too, but
+    /// the exception would track that info.
+    ///
+    StringType		m_elementDescription;
+
+    /// The list of tokens or subtrees we are tracking
+    ///
+    ElementsType		m_elements;
+
+	TreeTypePtr dupTree(const TreeTypePtr& el );
+
+	/// Once a node / subtree has been used in a stream, it must be dup'ed
+	/// from then on.  Streams are reset after sub rules so that the streams
+	/// can be reused in future sub rules.  So, reset must set a dirty bit.
+	/// If dirty, then next() always returns a dup.
+	///
+	bool m_dirty;
+};
+
+ANTLR_END_NAMESPACE()
+
+#include "antlr3rewriterulesubtreestream.inl"
+
+#endif
diff --git a/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl b/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
new file mode 100644
index 000000000..b13b7e8dd
--- /dev/null
+++ b/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
@@ -0,0 +1,221 @@
+ANTLR_BEGIN_NAMESPACE()
+
+template<class ImplTraits>
+RewriteRuleSubtreeStream<ImplTraits>::RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description)
+	: m_adaptor(adaptor)
+	, m_elementDescription(description)
+	, m_dirty(false)
+{
+	m_cursor = m_elements.begin();
+}
+
+template<class ImplTraits>
+RewriteRuleSubtreeStream<ImplTraits>::RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description,
+	TreeTypePtr& oneElement
+	)
+	: m_adaptor(adaptor)
+	, m_elementDescription(description)
+	, m_dirty(false)
+{
+	if( oneElement != NULL )
+		this->add( oneElement );
+	m_cursor = m_elements.begin();
+}
+
+template<class ImplTraits>
+RewriteRuleSubtreeStream<ImplTraits>::RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description,
+	const ElementsType& elements
+	)
+	: m_adaptor(adaptor)
+	, m_elementDescription(description)
+	, m_dirty(false)
+	, m_elements(elements)
+{
+	m_cursor = m_elements.begin();
+}
+
+template<class ImplTraits>
+void
+RewriteRuleSubtreeStream<ImplTraits>::reset()
+{
+	m_cursor = m_elements.begin();
+	m_dirty = true;
+}
+
+template<class ImplTraits>
+void
+RewriteRuleSubtreeStream<ImplTraits>::add(TreeTypePtr& el)
+{
+	if ( el == NULL )
+		return;
+	m_elements.push_back(std::move(el));
+	m_cursor = m_elements.begin();
+}
+
+template<class ImplTraits>
+typename RewriteRuleSubtreeStream<ImplTraits>::ElementsType::iterator
+RewriteRuleSubtreeStream<ImplTraits>::_next()
+{
+	if (m_elements.empty())
+	{
+		// This means that the stream is empty
+		// Caller must cope with this (TODO throw RewriteEmptyStreamException)
+		m_dirty = true;
+		return m_elements.end();
+	}
+
+	if (m_dirty && m_cursor == m_elements.end())
+	{
+		if( m_elements.size() == 1)
+		{
+			// Special case when size is single element, it will just dup a lot
+			return m_elements.begin();
+		}
+
+		// Out of elements and the size is not 1, so we cannot assume
+		// that we just duplicate the entry n times (such as ID ent+ -> ^(ID ent)+)
+		// This means we ran out of elements earlier than was expected.
+		//
+		return m_elements.end();	// Caller must cope with this (TODO throw RewriteEmptyStreamException)
+	}
+
+	// More than just a single element so we extract it from the
+	// vector.
+	m_dirty = true;
+	return m_cursor++;
+}
+
+template<class ImplTraits>
+typename RewriteRuleSubtreeStream<ImplTraits>::TreeTypePtr
+RewriteRuleSubtreeStream<ImplTraits>::nextTree()
+{
+	if ( m_dirty || ( m_cursor == m_elements.end() && m_elements.size() == 1 ))
+	{
+		// if out of elements and size is 1, dup
+		typename ElementsType::iterator el = this->_next();
+		return this->dup(*el);
+	}
+
+	// test size above then fetch
+	typename ElementsType::iterator el = this->_next();
+	return std::move(*el);
+}
+
+/*
+template<class ImplTraits, class SuperType>
+typename RewriteRuleSubtreeStream<ImplTraits, SuperType>::TokenType*
+RewriteRuleSubtreeStream<ImplTraits, SuperType>::nextToken()
+{
+	return this->_next();
+}
+
+template<class ImplTraits, class SuperType>
+typename RewriteRuleSubtreeStream<ImplTraits, SuperType>::TokenType*
+RewriteRuleSubtreeStream<ImplTraits, SuperType>::next()
+{
+	ANTLR_UINT32   s;
+	s = this->size();
+	if ( (m_cursor >= s) && (s == 1) )
+	{
+		TreeTypePtr el;
+		el = this->_next();
+		return	this->dup(el);
+	}
+	return this->_next();
+}
+
+*/
+
+template<class ImplTraits>
+typename RewriteRuleSubtreeStream<ImplTraits>::TreeTypePtr	
+RewriteRuleSubtreeStream<ImplTraits>::dup(const TreeTypePtr& element)
+{
+	return std::move(this->dupTree(element));
+}
+
+template<class ImplTraits>
+typename RewriteRuleSubtreeStream<ImplTraits>::TreeTypePtr
+RewriteRuleSubtreeStream<ImplTraits>::dupTree(const TreeTypePtr& element)
+{
+	return std::move(m_adaptor->dupNode(element));
+}
+
+template<class ImplTraits>
+typename RewriteRuleSubtreeStream<ImplTraits>::ElementType*
+RewriteRuleSubtreeStream<ImplTraits>::toTree( ElementType* element)
+{
+	return element;
+}
+
+template<class ImplTraits>
+bool RewriteRuleSubtreeStream<ImplTraits>::hasNext()
+{
+	return m_cursor != m_elements.end();
+}
+
+/// Number of elements available in the stream
+///
+template<class ImplTraits>
+ANTLR_UINT32 RewriteRuleSubtreeStream<ImplTraits>::size()
+{
+	return (ANTLR_UINT32)(m_elements.size());
+}
+
+template<class ImplTraits>
+typename RewriteRuleSubtreeStream<ImplTraits>::StringType
+RewriteRuleSubtreeStream<ImplTraits>::getDescription()
+{
+	if ( m_elementDescription.empty() )
+	{
+		m_elementDescription = "<unknown source>";
+	}
+	return  m_elementDescription;
+}
+
+template<class ImplTraits>
+RewriteRuleSubtreeStream<ImplTraits>::~RewriteRuleSubtreeStream()
+{
+    // Before placing the stream back in the pool, we
+	// need to clear any vector it has. This is so any
+	// free pointers that are associated with the
+	// entries are called. However, if this particular function is called
+    // then we know that the entries in the stream are definitely
+    // tree nodes. Hence we check to see if any of them were nilNodes as
+    // if they were, we can reuse them.
+	//
+	// We have some elements to traverse
+	//
+	for (ANTLR_UINT32 i = 0; i < m_elements.size(); i++)
+	{
+		TreeTypePtr tree(std::move(m_elements.at(i)));
+		//if  ( (tree != NULL) && tree->isNilNode() )
+		{
+			// Had to remove this for now, check is not comprehensive enough
+			// tree->reuse(tree);
+		}
+	}
+	m_elements.clear();
+}
+
+template<class ImplTraits>
+typename RewriteRuleSubtreeStream<ImplTraits>::TreeTypePtr
+RewriteRuleSubtreeStream<ImplTraits>::nextNode(TreeTypePtr element)
+{
+	//System.out.println("nextNode: elements="+elements+", singleElement="+((Tree)singleElement).toStringTree());
+	ANTLR_UINT32 n = this->size();
+	if ( m_dirty || (m_cursor>=n && n==1) ) {
+		// if out of elements and size is 1, dup (at most a single node
+		// since this is for making root nodes).
+		TreeTypePtr el = this->_next();
+		return m_adaptor->dupNode(el);
+	}
+	// test size above then fetch
+	TreeType *tree = this->_next();
+	while (m_adaptor->isNil(tree) && m_adaptor->getChildCount(tree) == 1)
+		tree = m_adaptor->getChild(tree, 0);
+	//System.out.println("_next="+((Tree)tree).toStringTree());
+	TreeType *el = m_adaptor->dupNode(tree); // dup just the root (want node here)
+	return el;
+}
+
+ANTLR_END_NAMESPACE()
diff --git a/runtime/Cpp/include/antlr3rewriteruletokenstream.hpp b/runtime/Cpp/include/antlr3rewriteruletokenstream.hpp
new file mode 100644
index 000000000..f4ea718a0
--- /dev/null
+++ b/runtime/Cpp/include/antlr3rewriteruletokenstream.hpp
@@ -0,0 +1,133 @@
+#ifndef	ANTLR3REWRITESTREAM_HPP
+#define	ANTLR3REWRITESTREAM_HPP
+
+// [The "BSD licence"]
+// Copyright (c) 2005-2009 Gokulakannan Somasundaram, ElectronDB
+
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+// 3. The name of the author may not be used to endorse or promote products
+//    derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+// NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include    "antlr3defs.hpp"
+
+ANTLR_BEGIN_NAMESPACE()
+
+/// This is an implementation of a token stream, which is basically an element
+///  stream that deals with tokens only.
+///
+template<class ImplTraits>
+class RewriteRuleTokenStream
+{
+public:
+	typedef typename ImplTraits::StringType StringType;
+	typedef typename ImplTraits::AllocPolicyType AllocPolicyType;
+	typedef typename ImplTraits::TreeAdaptorType TreeAdaptorType;
+	typedef typename ImplTraits::ParserType ComponentType;
+	typedef typename ComponentType::StreamType StreamType;
+	typedef typename ImplTraits::CommonTokenType TokenType;
+	typedef typename ImplTraits::TreeType TreeType;
+	typedef typename ImplTraits::TreeTypePtr TreeTypePtr;
+	typedef typename AllocPolicyType::template VectorType<const TokenType* > ElementsType;
+	typedef typename ImplTraits::template RecognizerType< StreamType > RecognizerType;
+	typedef typename ImplTraits::CommonTokenType ElementType;
+public:
+	RewriteRuleTokenStream(TreeAdaptorType* adaptor, const char* description);
+	RewriteRuleTokenStream(TreeAdaptorType* adaptor, const char* description, const TokenType* oneElement);
+	RewriteRuleTokenStream(TreeAdaptorType* adaptor, const char* description, const ElementsType& elements);
+	~RewriteRuleTokenStream();
+
+    /// Reset the condition of this stream so that it appears we have
+    ///  not consumed any of its elements.  Elements themselves are untouched.
+    ///
+    void	reset();
+
+	TreeTypePtr	nextNode();
+	const TokenType*  nextToken();
+
+	/// TODO copied from RewriteRuleElementStreamType
+    /// Add a new pANTLR3_BASE_TREE to this stream
+    ///
+    void	add(const ElementType* el);
+
+	/// When constructing trees, sometimes we need to dup a token or AST
+    ///	subtree.  Dup'ing a token means just creating another AST node
+    /// around it.  For trees, you must call the adaptor.dupTree().
+    ///
+	ElementType* dup( ElementType* el );
+
+    /// Ensure stream emits trees; tokens must be converted to AST nodes.
+    /// AST nodes can be passed through unmolested.
+    ///
+    TreeTypePtr toTree(const ElementType* el);
+
+	/// Pointer to the tree adaptor in use for this stream
+	///
+    TreeAdaptorType*	m_adaptor;
+    ElementType nextTree();
+	typename ElementsType::iterator _next();
+
+    /// Returns true if there is a next element available
+    ///
+    bool	hasNext();
+
+    /// Number of elements available in the stream
+    ///
+    ANTLR_UINT32	size();
+
+    /// Returns the description string if there is one available (check for NULL).
+    ///
+    StringType getDescription();
+
+private:
+	ElementType* dupImpl(typename ImplTraits::CommonTokenType* el);
+	ElementType* dupImpl(typename ImplTraits::TreeTypePtr el);
+
+	/// Cursor 0..n-1.  If singleElement!=NULL, cursor is 0 until you next(),
+    /// which bumps it to 1 meaning no more elements.
+    ///
+	typename ElementsType::iterator m_cursor;
+
+    /// The element or stream description; usually has name of the token or
+    /// rule reference that this list tracks.  Can include rulename too, but
+    /// the exception would track that info.
+    ///
+    StringType		m_elementDescription;
+
+    /// The list of tokens or subtrees we are tracking
+    ///
+    ElementsType		m_elements;
+
+	/// Once a node / subtree has been used in a stream, it must be dup'ed
+	/// from then on.  Streams are reset after sub rules so that the streams
+	/// can be reused in future sub rules.  So, reset must set a dirty bit.
+	/// If dirty, then next() always returns a dup.
+	///
+	bool m_dirty;
+};
+
+ANTLR_END_NAMESPACE()
+
+#include "antlr3rewriteruletokenstream.inl"
+
+#endif
diff --git a/runtime/Cpp/include/antlr3rewriteruletokenstream.inl b/runtime/Cpp/include/antlr3rewriteruletokenstream.inl
new file mode 100644
index 000000000..69bea763a
--- /dev/null
+++ b/runtime/Cpp/include/antlr3rewriteruletokenstream.inl
@@ -0,0 +1,233 @@
+ANTLR_BEGIN_NAMESPACE()
+
+template<class ImplTraits>
+RewriteRuleTokenStream<ImplTraits>::RewriteRuleTokenStream(TreeAdaptorType* adaptor, const char* description)
+	: m_adaptor(adaptor)
+	, m_elements()
+	, m_dirty(false)
+{
+	m_cursor = m_elements.begin();
+}
+
+template<class ImplTraits>
+RewriteRuleTokenStream<ImplTraits>::RewriteRuleTokenStream(TreeAdaptorType* adaptor, const char* description,
+	const TokenType* oneElement
+	)
+	: m_adaptor(adaptor)
+	, m_elements()
+	, m_dirty(false)
+{
+	if( oneElement != NULL )
+		this->add( oneElement );
+	m_cursor = m_elements.begin();
+}
+
+template<class ImplTraits>
+RewriteRuleTokenStream<ImplTraits>::RewriteRuleTokenStream(TreeAdaptorType* adaptor, const char* description,
+	const ElementsType& elements
+	)
+	: m_adaptor(adaptor)
+	, m_elements(elements)
+	, m_dirty(false)
+{
+	m_cursor = m_elements.begin();
+}
+
+template<class ImplTraits>
+void RewriteRuleTokenStream<ImplTraits>::reset()
+{
+	m_cursor = m_elements.begin();
+	m_dirty = true;
+}
+
+template<class ImplTraits>
+void RewriteRuleTokenStream<ImplTraits>::add(const ElementType* el)
+{
+	if ( el == NULL)
+		return;
+	m_elements.push_back(el);
+	m_cursor = m_elements.begin();
+}
+
+template<class ImplTraits>
+typename RewriteRuleTokenStream<ImplTraits>::ElementsType::iterator
+RewriteRuleTokenStream<ImplTraits>::_next()
+{
+	if (m_elements.empty())
+	{
+		// This means that the stream is empty
+		// Caller must cope with this (TODO throw RewriteEmptyStreamException)
+		m_dirty = true;
+		return m_elements.end();
+	}
+
+	if (m_dirty && m_cursor == m_elements.end())
+	{
+		if( m_elements.size() == 1)
+		{
+			// Special case when size is single element, it will just dup a lot
+			//return this->toTree(m_singleElement);
+			return m_elements.begin();
+		}
+
+		// Out of elements and the size is not 1, so we cannot assume
+		// that we just duplicate the entry n times (such as ID ent+ -> ^(ID ent)+)
+		// This means we ran out of elements earlier than was expected.
+		//
+		return m_elements.end();	// Caller must cope with this (TODO throw RewriteEmptyStreamException)
+	}
+
+	// More than just a single element so we extract it from the
+	// vector.
+	m_dirty = true;
+	return m_cursor++;
+}
+
+template<class ImplTraits>
+typename RewriteRuleTokenStream<ImplTraits>::ElementType
+RewriteRuleTokenStream<ImplTraits>::nextTree()
+{
+	ANTLR_UINT32 n = this->size();
+	if ( m_dirty || ( (m_cursor >=n) && (n==1)) )
+	{
+		// if out of elements and size is 1, dup
+		typename ElementsType::iterator el = this->_next();
+		return this->dup(*el);
+	}
+
+	// test size above then fetch
+	typename ElementsType::iterator el = this->_next();
+	return *el;
+}
+
+/*
+template<class ImplTraits, class SuperType>
+typename RewriteRuleTokenStream<ImplTraits, SuperType>::TokenType*
+RewriteRuleTokenStream<ImplTraits, SuperType>::nextToken()
+{
+	return this->_next();
+}
+
+template<class ImplTraits, class SuperType>
+typename RewriteRuleTokenStream<ImplTraits, SuperType>::TokenType*
+RewriteRuleTokenStream<ImplTraits, SuperType>::next()
+{
+	ANTLR_UINT32   s;
+	s = this->size();
+	if ( (m_cursor >= s) && (s == 1) )
+	{
+		TreeTypePtr el;
+		el = this->_next();
+		return	this->dup(el);
+	}
+	return this->_next();
+}
+
+*/
+
+template<class ImplTraits>
+typename RewriteRuleTokenStream<ImplTraits>::ElementType*
+RewriteRuleTokenStream<ImplTraits>::dup( ElementType* element)
+{
+	return dupImpl(element);
+}
+
+template<class ImplTraits>
+typename RewriteRuleTokenStream<ImplTraits>::ElementType*
+RewriteRuleTokenStream<ImplTraits>::dupImpl( typename ImplTraits::CommonTokenType* element)
+{
+	return NULL; // TODO throw here
+}
+
+template<class ImplTraits>
+typename RewriteRuleTokenStream<ImplTraits>::ElementType*
+RewriteRuleTokenStream<ImplTraits>::dupImpl( typename ImplTraits::TreeTypePtr element)
+{
+	return m_adaptor->dupTree(element);
+}
+
+template<class ImplTraits>
+typename RewriteRuleTokenStream<ImplTraits>::TreeTypePtr
+RewriteRuleTokenStream<ImplTraits>::toTree(const ElementType* element)
+{
+	return m_adaptor->create(element);
+}
+
+template<class ImplTraits>
+bool
+RewriteRuleTokenStream<ImplTraits>::hasNext()
+{
+	if ( !m_elements.empty() && m_cursor < m_elements.size())
+	{
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+template<class ImplTraits >
+typename RewriteRuleTokenStream<ImplTraits>::TreeTypePtr
+RewriteRuleTokenStream<ImplTraits>::nextNode()
+{
+	const TokenType *Token = this->nextToken();
+	return m_adaptor->create(Token);
+}
+
+/// Number of elements available in the stream
+///
+template<class ImplTraits>
+ANTLR_UINT32 RewriteRuleTokenStream<ImplTraits>::size()
+{
+	return (ANTLR_UINT32)(m_elements.size());
+}
+
+template<class ImplTraits>
+typename RewriteRuleTokenStream<ImplTraits>::StringType
+RewriteRuleTokenStream<ImplTraits>::getDescription()
+{
+	if ( m_elementDescription.empty() )
+	{
+		m_elementDescription = "<unknown source>";
+	}
+	return  m_elementDescription;
+}
+
+template<class ImplTraits>
+RewriteRuleTokenStream<ImplTraits>::~RewriteRuleTokenStream()
+{
+    // Before placing the stream back in the pool, we
+	// need to clear any vector it has. This is so any
+	// free pointers that are associated with the
+	// entries are called. However, if this particular function is called
+    // then we know that the entries in the stream are definitely
+    // tree nodes. Hence we check to see if any of them were nilNodes as
+    // if they were, we can reuse them.
+	//
+	// We have some elements to traverse
+	//
+	for (ANTLR_UINT32 i = 0; i < m_elements.size(); i++)
+	{
+		const ElementType *tree = m_elements.at(i);
+		//if  ( (tree != NULL) && tree->isNilNode() )
+		{
+			// Had to remove this for now, check is not comprehensive enough
+			// tree->reuse(tree);
+		}
+	}
+	m_elements.clear();
+}
+
+template<class ImplTraits>
+const typename RewriteRuleTokenStream<ImplTraits>::TokenType*
+RewriteRuleTokenStream<ImplTraits>::nextToken()
+{
+	auto retval = this->_next();
+	if (retval == m_elements.end())
+		return NULL;
+	else
+		return *retval;
+}
+
+ANTLR_END_NAMESPACE()
diff --git a/runtime/Cpp/include/antlr3rewritestreams.hpp b/runtime/Cpp/include/antlr3rewritestreams.hpp
index fb26b79d3..5d2dd36ac 100644
--- a/runtime/Cpp/include/antlr3rewritestreams.hpp
+++ b/runtime/Cpp/include/antlr3rewritestreams.hpp
@@ -58,6 +58,7 @@ template<class ImplTraits, class ElementType>
 class RewriteRuleElementStream : public ImplTraits::AllocPolicyType
 {
 public:
+	//typedef typename ElementTypePtr::element_type ElementType; unique_ptr
 	//typedef typename ImplTraits::TreeType TreeType;
 	typedef typename ImplTraits::AllocPolicyType AllocPolicyType;
 	typedef typename ImplTraits::TreeAdaptorType TreeAdaptorType;
@@ -67,10 +68,6 @@ class RewriteRuleElementStream : public ImplTraits::AllocPolicyType
 	typedef typename AllocPolicyType::template VectorType< ElementType* > ElementsType;
 
 protected:
-	/// Track single elements w/o creating a list.  Upon 2nd add, alloc list
-    ///
-    ElementType*		m_singleElement;
-
     /// The list of tokens or subtrees we are tracking
     ///
     ElementsType		m_elements;
@@ -83,7 +80,7 @@ class RewriteRuleElementStream : public ImplTraits::AllocPolicyType
 
 private:
 	ElementType* dupImpl(typename ImplTraits::CommonTokenType* el);
-	ElementType* dupImpl(typename ImplTraits::TreeType* el);
+	ElementType* dupImpl(typename ImplTraits::TreeTypePtr el);
 
 
 	/// Pointer to the tree adaptor in use for this stream
@@ -104,7 +101,7 @@ class RewriteRuleElementStream : public ImplTraits::AllocPolicyType
 
 public:
 	RewriteRuleElementStream(TreeAdaptorType* adaptor, const char* description);
-	RewriteRuleElementStream(TreeAdaptorType* adaptor, const char* description, ElementType* oneElement);
+	RewriteRuleElementStream(TreeAdaptorType* adaptor, const char* description, const ElementType* oneElement);
 	RewriteRuleElementStream(TreeAdaptorType* adaptor, const char* description, const ElementsType& elements);
 
 	~RewriteRuleElementStream();
@@ -123,7 +120,7 @@ class RewriteRuleElementStream : public ImplTraits::AllocPolicyType
     /// an exception unless size()==1.  If size is 1, then return elements[0].
     ///
 	//TokenType* next();
-    ElementType* nextTree();
+    ElementType nextTree();
     //TokenType* nextToken();
     ElementType* _next();
 
@@ -151,7 +148,7 @@ class RewriteRuleElementStream : public ImplTraits::AllocPolicyType
     /// Referencing to a rule result twice is ok; dup entire tree as
     /// we can't be adding trees; e.g., expr expr. 
     ///
-    //TreeType* nextNode();
+    //TreeTypePtr nextNode();
 
     /// Number of elements available in the stream
     ///
@@ -170,7 +167,8 @@ class RewriteRuleElementStream : public ImplTraits::AllocPolicyType
 ///
 template<class ImplTraits>
 //class RewriteRuleTokenStream : public ImplTraits::template RewriteRuleElementStreamType< typename ImplTraits::ParserType>
-class RewriteRuleTokenStream : public ImplTraits::template RewriteStreamType< const typename ImplTraits::CommonTokenType >
+class RewriteRuleTokenStream
+		//: public ImplTraits::template RewriteStreamType< const typename ImplTraits::CommonTokenType >
 {
 public:
 	typedef typename ImplTraits::AllocPolicyType AllocPolicyType;
@@ -179,20 +177,31 @@ class RewriteRuleTokenStream : public ImplTraits::template RewriteStreamType< co
 	typedef typename ComponentType::StreamType StreamType;
 	typedef typename ImplTraits::CommonTokenType TokenType;
 	typedef typename ImplTraits::TreeType TreeType;
+	typedef typename ImplTraits::TreeTypePtr TreeTypePtr;
 	typedef typename AllocPolicyType::template VectorType< TokenType* > ElementsType;
 	typedef typename ImplTraits::template RecognizerType< StreamType > RecognizerType;
 	typedef typename ImplTraits::template RewriteStreamType< const typename ImplTraits::CommonTokenType > BaseType;
 
 public:
 	RewriteRuleTokenStream(TreeAdaptorType* adaptor, const char* description);
-	RewriteRuleTokenStream(TreeAdaptorType* adaptor, const char* description, TokenType* oneElement);
+	RewriteRuleTokenStream(TreeAdaptorType* adaptor, const char* description, const TokenType* oneElement);
 	RewriteRuleTokenStream(TreeAdaptorType* adaptor, const char* description, const ElementsType& elements);
 
-	TreeType*	nextNode();
+	TreeTypePtr	nextNode();
 	TokenType*  nextToken();
 
+	/// TODO copied from RewriteRuleElementStreamType
+    /// Add a new pANTLR3_BASE_TREE to this stream
+    ///
+	typedef typename ImplTraits::CommonTokenType ElementType;
+    void	add(const ElementType* el);
+	/// Pointer to the tree adaptor in use for this stream
+	///
+    TreeAdaptorType*	m_adaptor;
+    ElementType* _next();
+
 private:
-	//TreeType*	nextNodeToken();
+	//TreeTypePtr	nextNodeToken();
 };
 
 /// This is an implementation of a subtree stream which is a set of trees
@@ -200,7 +209,8 @@ class RewriteRuleTokenStream : public ImplTraits::template RewriteStreamType< co
 ///
 template<class ImplTraits>
 //class RewriteRuleSubtreeStream : public ImplTraits::template RewriteStreamType< typename ImplTraits::TreeParserType>
-class RewriteRuleSubtreeStream : public ImplTraits::template RewriteStreamType< typename ImplTraits::TreeType >
+class RewriteRuleSubtreeStream
+		//: public ImplTraits::template RewriteStreamType< typename ImplTraits::TreeType >
 {
 public:
 	typedef typename ImplTraits::AllocPolicyType AllocPolicyType;
@@ -208,22 +218,31 @@ class RewriteRuleSubtreeStream : public ImplTraits::template RewriteStreamType<
 	typedef typename ImplTraits::TreeParserType ComponentType;
 	typedef typename ComponentType::StreamType StreamType;
 	typedef typename ImplTraits::TreeType TreeType;
+	typedef typename ImplTraits::TreeTypePtr TreeTypePtr;
 	typedef TreeType TokenType;
 	typedef typename ImplTraits::template RecognizerType< StreamType > RecognizerType;
 	typedef typename AllocPolicyType::template VectorType< TokenType* > ElementsType;
 	typedef typename ImplTraits::template RewriteStreamType< typename ImplTraits::TreeType >  BaseType;
 
 	RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description);
-	RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description, TokenType* oneElement);
+	RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description, TreeTypePtr& oneElement);
 	RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description, const ElementsType& elements);
 
-	TreeType* nextNode(TreeType*);
+	TreeTypePtr nextNode(TreeTypePtr);
+
+	/// TODO copied from RewriteRuleElementStreamType
+    /// Add a new pANTLR3_BASE_TREE to this stream
+    ///
+    void	add(TreeTypePtr& el);
+    bool	hasNext();
+    TreeTypePtr& nextTree();
+    void	reset();
 
 protected:
-	TreeType* dup( TreeType* el );
+	TreeTypePtr dup( TreeTypePtr el );
 
 private:
-	TreeType* dupTree( TreeType* el );
+	TreeTypePtr dupTree( TreeTypePtr el );
 };
 
 /* TODO This class is probably used in TreeParser only
@@ -269,10 +288,10 @@ class RewriteRuleNodeStream : public ImplTraits::template RewriteStreamType< typ
 	RewriteRuleNodeStream(TreeAdaptorType* adaptor, const char* description, const ElementsType& elements);
 
 protected:
-	TreeType*	toTree(TreeType* element);
+	TreeTypePtr	toTree(TreeTypePtr element);
 
 private:
-	TreeType*	toTreeNode(TreeType* element);
+	TreeTypePtr	toTreeNode(TreeTypePtr element);
 };
 */
 ANTLR_END_NAMESPACE()
diff --git a/runtime/Cpp/include/antlr3rewritestreams.inl b/runtime/Cpp/include/antlr3rewritestreams.inl
index 7337f3c42..c05e22f7d 100644
--- a/runtime/Cpp/include/antlr3rewritestreams.inl
+++ b/runtime/Cpp/include/antlr3rewritestreams.inl
@@ -10,7 +10,7 @@ RewriteRuleElementStream<ImplTraits, ElementType>::RewriteRuleElementStream(Tree
 template<class ImplTraits, class ElementType>
 RewriteRuleElementStream<ImplTraits, ElementType>::RewriteRuleElementStream(TreeAdaptorType* adaptor,
 	const char* description,
-	ElementType* oneElement)
+	const ElementType* oneElement)
 {
 	this->init(adaptor, description);
 	if( oneElement != NULL )
@@ -33,21 +33,20 @@ void RewriteRuleElementStream<ImplTraits, ElementType>::init(TreeAdaptorType* ad
 	m_adaptor = adaptor;
 	m_cursor  = 0;
 	m_dirty	  = false;
-	m_singleElement = NULL;
 }
 
 template<class ImplTraits>
 RewriteRuleTokenStream<ImplTraits>::RewriteRuleTokenStream(TreeAdaptorType* adaptor,
 	const char* description)
-	: BaseType(adaptor, description)
+	//: BaseType(adaptor, description)
 {
 }
 
 template<class ImplTraits>
 RewriteRuleTokenStream<ImplTraits>::RewriteRuleTokenStream(TreeAdaptorType* adaptor,
 	const char* description,
-	TokenType* oneElement)
-	: BaseType(adaptor, description, oneElement)
+	const TokenType* oneElement)
+	//: BaseType(adaptor, description, oneElement)
 {
 }
 
@@ -55,22 +54,22 @@ template<class ImplTraits>
 RewriteRuleTokenStream<ImplTraits>::RewriteRuleTokenStream(TreeAdaptorType* adaptor,
 	const char* description,
 	const ElementsType& elements)
-	: BaseType(adaptor, description, elements)
+	//: BaseType(adaptor, description, elements)
 {
 }
 
 template<class ImplTraits>
 RewriteRuleSubtreeStream<ImplTraits>::RewriteRuleSubtreeStream(TreeAdaptorType* adaptor,
 	const char* description)
-	: BaseType(adaptor, description)
+	//: BaseType(adaptor, description)
 {
 }
 
 template<class ImplTraits>
 RewriteRuleSubtreeStream<ImplTraits>::RewriteRuleSubtreeStream(TreeAdaptorType* adaptor,
 	const char* description,
-	TokenType* oneElement)
-	: BaseType(adaptor, description, oneElement)
+	TreeTypePtr& oneElement)
+	//: BaseType(adaptor, description, oneElement)
 {
 }
 
@@ -78,7 +77,7 @@ template<class ImplTraits>
 RewriteRuleSubtreeStream<ImplTraits>::RewriteRuleSubtreeStream(TreeAdaptorType* adaptor,
 	const char* description,
 	const ElementsType& elements)
-	: BaseType(adaptor, description, elements)
+	//: BaseType(adaptor, description, elements)
 {
 }
 
@@ -120,23 +119,6 @@ void RewriteRuleElementStream<ImplTraits, ElementType>::add(ElementType* el)
 	if ( el== NULL )
 		return;
 
-	if ( !m_elements.empty() )
-	{
-		// if in list, just add
-		m_elements.push_back(el);
-		return;
-	}
-
-	if ( m_singleElement == NULL )
-	{
-		// no elements yet, track w/o list
-		m_singleElement = el;
-		return;
-	}
-
-	// adding 2nd element, move to list
-	m_elements.push_back(m_singleElement);
-	m_singleElement = NULL;
 	m_elements.push_back(el);
 }
 
@@ -157,7 +139,8 @@ ElementType* RewriteRuleElementStream<ImplTraits, ElementType>::_next()
 		if (n == 1)
 		{
 			// Special case when size is single element, it will just dup a lot
-			return this->toTree(m_singleElement);
+			//return this->toTree(m_singleElement);
+			return this->toTree(m_elements.at(0));
 		}
 
 		// Out of elements and the size is not 1, so we cannot assume
@@ -167,13 +150,6 @@ ElementType* RewriteRuleElementStream<ImplTraits, ElementType>::_next()
 		return NULL;	// Caller must cope with this (TODO throw RewriteEmptyStreamException)
 	}
 
-	// Elements available either for duping or just available
-	if ( m_singleElement != NULL)
-	{
-		m_cursor++;   // Cursor advances even for single element as this tells us to dup()
-		return this->toTree(m_singleElement);
-	}
-
 	// More than just a single element so we extract it from the
 	// vector.
 	ElementType* t = this->toTree(m_elements.at(m_cursor));
@@ -182,7 +158,7 @@ ElementType* RewriteRuleElementStream<ImplTraits, ElementType>::_next()
 }
 
 template<class ImplTraits, class ElementType>
-ElementType*
+ElementType
 RewriteRuleElementStream<ImplTraits, ElementType>::nextTree()
 {
 	ANTLR_UINT32 n = this->size();
@@ -214,7 +190,7 @@ RewriteRuleElementStream<ImplTraits, SuperType>::next()
 	s = this->size();
 	if ( (m_cursor >= s) && (s == 1) )
 	{
-		TreeType* el;
+		TreeTypePtr el;
 		el = this->_next();
 		return	this->dup(el);
 	}
@@ -239,21 +215,21 @@ RewriteRuleElementStream<ImplTraits, ElementType>::dupImpl( typename ImplTraits:
 
 template<class ImplTraits, class ElementType>
 ElementType*
-RewriteRuleElementStream<ImplTraits, ElementType>::dupImpl( typename ImplTraits::TreeType* element)
+RewriteRuleElementStream<ImplTraits, ElementType>::dupImpl( typename ImplTraits::TreeTypePtr element)
 {
 	return m_adaptor->dupTree(element);
 }
 
 template<class ImplTraits>
-typename RewriteRuleSubtreeStream<ImplTraits>::TreeType*	
-RewriteRuleSubtreeStream<ImplTraits>::dup(TreeType* element)
+typename RewriteRuleSubtreeStream<ImplTraits>::TreeTypePtr	
+RewriteRuleSubtreeStream<ImplTraits>::dup(TreeTypePtr element)
 {
 	return this->dupTree(element);
 }
 
 template<class ImplTraits>
-typename RewriteRuleSubtreeStream<ImplTraits>::TreeType*
-RewriteRuleSubtreeStream<ImplTraits>::dupTree(TreeType* element)
+typename RewriteRuleSubtreeStream<ImplTraits>::TreeTypePtr
+RewriteRuleSubtreeStream<ImplTraits>::dupTree(TreeTypePtr element)
 {
 	return BaseType::m_adaptor->dupNode(element);
 }
@@ -267,15 +243,15 @@ RewriteRuleElementStream<ImplTraits, ElementType>::toTree( ElementType* element)
 
 /*
 template<class ImplTraits>
-typename RewriteRuleNodeStream<ImplTraits>::TreeType*
-RewriteRuleNodeStream<ImplTraits>::toTree(TreeType* element)
+typename RewriteRuleNodeStream<ImplTraits>::TreeTypePtr
+RewriteRuleNodeStream<ImplTraits>::toTree(TreeTypePtr element)
 {
 	return this->toTreeNode(element);
 }
 
 template<class ImplTraits>
-typename RewriteRuleNodeStream<ImplTraits>::TreeType*
-RewriteRuleNodeStream<ImplTraits>::toTreeNode(TreeType* element)
+typename RewriteRuleNodeStream<ImplTraits>::TreeTypePtr
+RewriteRuleNodeStream<ImplTraits>::toTreeNode(TreeTypePtr element)
 {
 	return BaseType::m_adaptor->dupNode(element);
 }
@@ -284,8 +260,7 @@ RewriteRuleNodeStream<ImplTraits>::toTreeNode(TreeType* element)
 template<class ImplTraits, class ElementType>
 bool RewriteRuleElementStream<ImplTraits, ElementType>::hasNext()
 {
-	if (	((m_singleElement != NULL) && (m_cursor < 1))
-		||	 ( !m_elements.empty() && m_cursor < m_elements.size()))
+	if ( !m_elements.empty() && m_cursor < m_elements.size())
 	{
 		return true;
 	}
@@ -296,16 +271,17 @@ bool RewriteRuleElementStream<ImplTraits, ElementType>::hasNext()
 }
 
 template<class ImplTraits >
-typename RewriteRuleTokenStream<ImplTraits>::TreeType*
+typename RewriteRuleTokenStream<ImplTraits>::TreeTypePtr
 RewriteRuleTokenStream<ImplTraits>::nextNode()
 {
 	TokenType *Token = this->nextToken();
-	return BaseType::m_adaptor->create(Token);
+	//return BaseType::m_adaptor->create(Token);
+	return m_adaptor->create(Token);
 }
 
 /*
 template<class ImplTraits>
-typename RewriteRuleTokenStream<ImplTraits>::TreeType*
+typename RewriteRuleTokenStream<ImplTraits>::TreeTypePtr
 RewriteRuleTokenStream<ImplTraits>::nextNodeToken()
 {
 	return BaseType::m_adaptor->create(this->_next());
@@ -317,22 +293,7 @@ RewriteRuleTokenStream<ImplTraits>::nextNodeToken()
 template<class ImplTraits, class ElementType>
 ANTLR_UINT32 RewriteRuleElementStream<ImplTraits, ElementType>::size()
 {
-	ANTLR_UINT32 n = 0;
-
-	/// Should be a count of one if singleElement is set. I copied this
-	/// logic from the java implementation, which I suspect is just guarding
-	/// against someone setting singleElement and forgetting to NULL it out
-	///
-	if ( m_singleElement != NULL)
-	{
-		n = 1;
-	}
-	if ( !m_elements.empty() )
-	{
-		return (ANTLR_UINT32)(m_elements.size());
-	}
-	return n;
-
+	return (ANTLR_UINT32)(m_elements.size());
 }
 
 template<class ImplTraits, class ElementType>
@@ -352,41 +313,23 @@ RewriteRuleElementStream<ImplTraits, ElementType>::~RewriteRuleElementStream()
     // Before placing the stream back in the pool, we
 	// need to clear any vector it has. This is so any
 	// free pointers that are associated with the
-	// entires are called. However, if this particular function is called
-    // then we know that the entries in the stream are definately
+	// entries are called. However, if this particular function is called
+    // then we know that the entries in the stream are definitely
     // tree nodes. Hence we check to see if any of them were nilNodes as
     // if they were, we can reuse them.
 	//
-	if	( !m_elements.empty() )
-	{
-	 // We have some elements to traverse
-	 //
-	 ANTLR_UINT32 i;
-
-	 for (i = 1; i<= m_elements.size(); i++)
-	 {
-	     ElementType *tree = m_elements.at(i-1);
-	     //if  ( (tree != NULL) && tree->isNilNode() )
-	     {
-		 // Had to remove this for now, check is not comprehensive enough
-		 // tree->reuse(tree);
-	     }
-	 }
-		m_elements.clear();
-	}
-	else
+	// We have some elements to traverse
+	//
+	for (ANTLR_UINT32 i = 0; i < m_elements.size(); i++)
 	{
-	 if  (m_singleElement != NULL)
-	 {
-	     ElementType *tree = m_singleElement;
-	     //if  (tree->isNilNode())
-	     {
-		 // Had to remove this for now, check is not comprehensive enough
-		 //   tree->reuse(tree);
-	     }
-	 }
-	 m_singleElement = NULL;
+		ElementType *tree = m_elements.at(i);
+		//if  ( (tree != NULL) && tree->isNilNode() )
+		{
+			// Had to remove this for now, check is not comprehensive enough
+			// tree->reuse(tree);
+		}
 	}
+	m_elements.clear();
 }
 
 template<class ImplTraits>
@@ -397,15 +340,15 @@ RewriteRuleTokenStream<ImplTraits>::nextToken()
 }
 
 template<class ImplTraits>
-typename RewriteRuleSubtreeStream<ImplTraits>::TreeType*
-RewriteRuleSubtreeStream<ImplTraits>::nextNode(TreeType* element)
+typename RewriteRuleSubtreeStream<ImplTraits>::TreeTypePtr
+RewriteRuleSubtreeStream<ImplTraits>::nextNode(TreeTypePtr element)
 {
 	//System.out.println("nextNode: elements="+elements+", singleElement="+((Tree)singleElement).toStringTree());
 	ANTLR_UINT32 n = this->size();
 	if ( BaseType::m_dirty || (BaseType::m_cursor>=n && n==1) ) {
 		// if out of elements and size is 1, dup (at most a single node
 		// since this is for making root nodes).
-		TreeType* el = this->_next();
+		TreeTypePtr el = this->_next();
 		return BaseType::m_adaptor->dupNode(el);
 	}
 	// test size above then fetch
diff --git a/runtime/Cpp/include/antlr3tokenstream.hpp b/runtime/Cpp/include/antlr3tokenstream.hpp
index 421ba7f7f..fb3d41008 100644
--- a/runtime/Cpp/include/antlr3tokenstream.hpp
+++ b/runtime/Cpp/include/antlr3tokenstream.hpp
@@ -333,14 +333,14 @@ class	CommonTokenStream : public TokenStream<ImplTraits>
 	void insertToken( const TokenType& tok, BoolForwarder<false>  tokens_accessed_from_owning_rule  );
 
 	/** Get a token at an absolute index i; 0..n-1.  This is really only
-     *  needed for profiling and debugging and token stream rewriting.
-     *  If you don't want to buffer up tokens, then this method makes no
-     *  sense for you.  Naturally you can't use the rewrite stream feature.
-     *  I believe DebugTokenStream can easily be altered to not use
-     *  this method, removing the dependency.
-     */
-    const TokenType*   get(ANTLR_MARKER i);
-	const TokenType*   getToken(ANTLR_MARKER i);
+	 *  needed for profiling and debugging and token stream rewriting.
+	 *  If you don't want to buffer up tokens, then this method makes no
+	 *  sense for you.  Naturally you can't use the rewrite stream feature.
+	 *  I believe DebugTokenStream can easily be altered to not use
+	 *  this method, removing the dependency.
+	 */
+	const TokenType* get(ANTLR_MARKER i);
+	const TokenType* getToken(ANTLR_MARKER i);
 	const TokenType* getToken( ANTLR_MARKER tok_idx, BoolForwarder<true>  tokens_accessed_from_owning_rule );
 	const TokenType* getToken( ANTLR_MARKER tok_idx, BoolForwarder<false>  tokens_accessed_from_owning_rule  );
 
diff --git a/runtime/Cpp/include/antlr3traits.hpp b/runtime/Cpp/include/antlr3traits.hpp
index 21337b292..1578ee84b 100644
--- a/runtime/Cpp/include/antlr3traits.hpp
+++ b/runtime/Cpp/include/antlr3traits.hpp
@@ -62,6 +62,8 @@ class CustomTraitsBase
 	
 	typedef Empty TreeType;
 	typedef Empty TreeAdaptorType;
+	typedef Empty TreeStoreType;
+  
 	
 	template<class StreamType>
 	class ExceptionBaseType : public Empty
@@ -88,7 +90,7 @@ class CustomTraitsBase
 	
 	//If we want to change the way tokens are stored
 	static const bool TOKENS_ACCESSED_FROM_OWNING_RULE = false;
-	static const int  TOKEN_FILL_BUFFER_INCREMENT = 100; //used only if the above val is true
+	static const unsigned TOKEN_FILL_BUFFER_INCREMENT = 100; //used only if the above val is true
 
 	static void displayRecognitionError( const std::string& str ) {  printf("%s", str.c_str() ); }
 };
@@ -192,7 +194,7 @@ class TraitsBase
 					 >::selected LexStateType;
 
 	static const bool TOKENS_ACCESSED_FROM_OWNING_RULE = UserTraits<TraitsType>::TOKENS_ACCESSED_FROM_OWNING_RULE;
-	static const int  TOKEN_FILL_BUFFER_INCREMENT = UserTraits<TraitsType>::TOKEN_FILL_BUFFER_INCREMENT; //used only if the above val is true
+	static const unsigned TOKEN_FILL_BUFFER_INCREMENT = UserTraits<TraitsType>::TOKEN_FILL_BUFFER_INCREMENT; //used only if the above val is true
 
 	static void displayRecognitionError( const StringType& str ) { UserTraits<TraitsType>::displayRecognitionError(str); }
 };
@@ -273,9 +275,14 @@ class Traits : public TraitsBase<UserTraits>
 	// TreeType
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::TreeType, 
 					 CommonTree<TraitsType> >::selected TreeType;
+
 	// TreeAdaptorType
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::TreeAdaptorType, 
 					 CommonTreeAdaptor<TraitsType> >::selected TreeAdaptorType;
+	typedef typename TraitsSelector< typename UserTraits<TraitsType>::TreeStoreType,
+					 CommonTreeStore<TraitsType> >::selected TreeStoreType;
+	typedef typename TreeStoreType::TreeTypePtr TreeTypePtr;
+	//typedef std::unique_ptr<TreeType, ResourcePoolManager<ImplTraits>> TreeTypePtr;
 
 	// ExceptionBaseType
 	template<class StreamType>
diff --git a/runtime/Cpp/include/antlr3treeparser.hpp b/runtime/Cpp/include/antlr3treeparser.hpp
index 87c92a766..9de5f795e 100644
--- a/runtime/Cpp/include/antlr3treeparser.hpp
+++ b/runtime/Cpp/include/antlr3treeparser.hpp
@@ -46,6 +46,7 @@ class  TreeParser : public ImplTraits::template RecognizerType< typename ImplTra
 	typedef TreeNodeStreamType StreamType;
 	typedef typename TreeNodeStreamType::IntStreamType IntStreamType;
 	typedef typename ImplTraits::TreeType TreeType;
+	typedef typename ImplTraits::TreeTypePtr TreeTypePtr;
 	typedef TreeType TokenType;
 	typedef typename ImplTraits::template ExceptionBaseType<TreeNodeStreamType> ExceptionBaseType;
 	typedef typename ImplTraits::template RecognizerType< typename ImplTraits::TreeNodeStreamType > RecognizerType;
diff --git a/runtime/Cpp/include/antlr3treeparser.inl b/runtime/Cpp/include/antlr3treeparser.inl
index f08e3efe8..066b9e80c 100644
--- a/runtime/Cpp/include/antlr3treeparser.inl
+++ b/runtime/Cpp/include/antlr3treeparser.inl
@@ -52,7 +52,7 @@ void TreeParser<ImplTraits>::fillExceptionData( ExceptionBaseType* ex )
 	// Are you ready for this? Deep breath now...
 	//
 	{
-		TreeType* tnode;
+		TreeTypePtr tnode;
 
 		tnode		= ex->get_token();
 
@@ -105,12 +105,12 @@ void TreeParser<ImplTraits>::displayRecognitionError( ANTLR_UINT8** tokenNames,
 							<< this->get_rec()->get_state()->get_exception()->get_message();
 
 	IntStreamType* is			= this->get_istream();
-	TreeType* theBaseTree	= this->get_rec()->get_state()->get_exception()->get_token();
+	TreeTypePtr theBaseTree	= this->get_rec()->get_state()->get_exception()->get_token();
 	StringType ttext		= theBaseTree->toStringTree();
 
 	if  (theBaseTree != NULL)
 	{
-		TreeType*  theCommonTree	=  static_cast<TreeType*>(theBaseTree);
+		TreeTypePtr  theCommonTree	=  static_cast<TreeTypePtr>(theBaseTree);
 		if	(theCommonTree != NULL)
 		{
 			CommonTokenType* theToken	= theBaseTree->getToken();
@@ -156,8 +156,8 @@ TreeParser<ImplTraits>::getMissingSymbol( IntStreamType* istream, ExceptionBaseT
 					  ANTLR_UINT32	 expectedTokenType, BitsetListType*	follow)
 {
 	TreeNodeStreamType*		tns;
-	TreeType*				node;
-	TreeType*				current;
+	TreeTypePtr				node;
+	TreeTypePtr				current;
 	CommonTokenType*		token;
 	StringType				text;
         ANTLR_INT32             i;
diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/AST.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/AST.stg
index cb130b31a..a78e485c2 100644
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/AST.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/AST.stg
@@ -57,18 +57,9 @@ parserMembers() ::= <<
 >>
 
 @returnScope.ruleReturnMembers() ::= <<
-<super.ASTLabelType()> tree;
-<super.ASTLabelType()> getTree() { return tree; }
+<ASTLabelType> tree;
 >>
 
-@returnScope.ruleReturnMembersInit() ::= <<
-tree = NULL;
->>
-
-@returnScope.ruleReturnMembersCopy() ::= <%
-tree = other.tree; const_cast\< <ruleDescriptor:returnStructName()>& >(other).tree = NULL;
-%>
-
 @returnScope.ruleReturnMembersDelete() ::= <<
 //if(tree != NULL)
 //    delete tree;
@@ -85,26 +76,26 @@ tree = other.tree; const_cast\< <ruleDescriptor:returnStructName()>& >(other).tr
 /** Add a variable to track rule's return AST */
 ruleDeclarations() ::= <<
 <super.ruleDeclarations()>
-<ASTLabelType> root_0 = NULL;<\n>
+<ASTLabelType> root_0;<\n>
 >>
 
 ruleLabelDefs() ::= <<
 <super.ruleLabelDefs()>
 <if(!ruleDescriptor.isSynPred)>
 <[ruleDescriptor.tokenLabels,ruleDescriptor.wildcardTreeLabels, ruleDescriptor.wildcardTreeListLabels]:
-{it | <ASTLabelType> <it.label.text>_tree = NULL;}; separator="\n">
+{it | <ASTLabelType> <it.label.text>_tree;}; separator="\n">
 <ruleDescriptor.tokenListLabels:
-{it | <ASTLabelType> <it.label.text>_tree = NULL;}; separator="\n">
+{it | <ASTLabelType> <it.label.text>_tree;}; separator="\n">
 <if(ruleDescriptor.supportsLabelOptimization)>
 <ruleDescriptor.allTokenRefsInRewrites:
-{it | RewriteRule<rewriteElementType>Stream\<ImplTraits> *stream_<it> = new RewriteRule<rewriteElementType>Stream\<ImplTraits>(this,"token <it>");}; separator="\n">
+{it | RewriteRule<rewriteElementType>Stream\<ImplTraits> stream_<it>(get_psrstate()->get_treeAdaptor(), "token <it>");}; separator="\n">
 <ruleDescriptor.allRuleRefsInRewrites:
-{it | RewriteRuleSubtreeStream\<ImplTraits> *stream_<it> = new RewriteRuleSubtreeStream\<ImplTraits>(this,"rule <it>");}; separator="\n">
+{it | RewriteRuleSubtreeStream\<ImplTraits> stream_<it>(get_psrstate()->get_treeAdaptor(), "rule <it>");}; separator="\n">
 <else>
 <ruleDescriptor.allTokenRefsInAltsWithRewrites
-:{it | RewriteRule<rewriteElementType>Stream\<ImplTraits> *stream_<it> = new RewriteRule<rewriteElementType>Stream\<ImplTraits>(this,"token <it>");}; separator="\n">
+:{it | RewriteRule<rewriteElementType>Stream\<ImplTraits> stream_<it>(get_psrstate()->get_treeAdaptor(), "token <it>");}; separator="\n">
 <ruleDescriptor.allRuleRefsInAltsWithRewrites
-:{it | RewriteRuleSubtreeStream\<ImplTraits> *stream_<it> = new RewriteRuleSubtreeStream\<ImplTraits>(this,"rule <it>");}; separator="\n">
+:{it | RewriteRuleSubtreeStream\<ImplTraits> stream_<it>(get_psrstate()->get_treeAdaptor(), "rule <it>");}; separator="\n">
 <endif>
 <endif>
 >>
@@ -118,7 +109,7 @@ ruleLabelDefs() ::= <<
 <if(autoAST)>
 <if(outerAlt)>
 <if(!rewriteMode && !ruleDescriptor.isSynPred)>
-root_0 = TreeAdaptorType::nilNode();<\n>
+root_0 = std::move(get_psrstate()->get_treeAdaptor()->nilNode());<\n>
 <endif>
 <endif>
 <endif>
@@ -129,7 +120,7 @@ root_0 = TreeAdaptorType::nilNode();<\n>
 /** ID and track it for use in a rewrite rule */
 tokenRefTrack(token,label,elementIndex,terminalOptions={}) ::= <<
 <tokenRefBang(...)> <! Track implies no auto AST construction!>
-<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>stream_<token>->add(<label>);<\n>
+<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>stream_<token>.add(<label>);<\n>
 >>
 
 /** ids+=ID and track it for use in a rewrite rule; adds to ids *and*
@@ -143,7 +134,7 @@ tokenRefTrackAndListLabel(token,label,elementIndex,terminalOptions={}) ::= <<
 /** ^(ID ...) track for rewrite */
 tokenRefRuleRootTrack(token,label,elementIndex,terminalOptions={}) ::= <<
 <tokenRefBang(...)>
-<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>stream_<token>->add(<label>);<\n>
+<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>stream_<token>.add(<label>);<\n>
 >>
 
 /** Match ^(label+=TOKEN ...) track for rewrite */
@@ -155,25 +146,25 @@ tokenRefRuleRootTrackAndListLabel(token,label,elementIndex,terminalOptions={}) :
 /** rule when output=AST and tracking for rewrite */
 ruleRefTrack(rule,label,elementIndex,args,scope) ::= <<
 <super.ruleRef(...)>
-<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>stream_<rule.name>->add(<label>.getTree());
+<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>stream_<rule.name>.add(<label>.tree);
 >>
 
 /** x+=rule when output=AST and tracking for rewrite */
 ruleRefTrackAndListLabel(rule,label,elementIndex,args,scope) ::= <<
 <ruleRefTrack(...)>
-<listLabel(label, {<label>.getTree()})>
+<listLabel(label, {<label>.tree})>
 >>
 
 /** ^(rule ...) rewrite */
 ruleRefRuleRootTrack(rule,label,elementIndex,args,scope) ::= <<
 <ruleRefRuleRoot(...)>
-<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>stream_<rule>->add(<label>.getTree());
+<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>stream_<rule>.add(<label>.tree);
 >>
 
 /** ^(x+=rule ...) rewrite */
 ruleRefRuleRootTrackAndListLabel(rule,label,elementIndex,args,scope) ::= <<
 <ruleRefRuleRootTrack(...)>
-<listLabel(label, {<label>.getTree()})>
+<listLabel(label, {<label>.tree})>
 >>
 
 // R e w r i t e
@@ -200,14 +191,14 @@ rewriteCode(
 <if(backtracking)>
 if ( <actions.(actionScope).synpredgate> ) {
 <endif>
-<prevRuleRootRef()>.tree = root_0;
+<prevRuleRootRef()>.tree = std::move(root_0);
 <rewriteCodeLabels()>
-root_0 = TreeAdaptorType::nilNode();
+root_0 = std::move(get_psrstate()->get_treeAdaptor()->nilNode());
 <alts:rewriteAlt(); separator="else ">
 <! if tree parser and rewrite=true !>
 <if(TREE_PARSER)>
 <if(rewriteMode)>
-<prevRuleRootRef()>.tree = TreeAdaptorType::rulePostProcessing(root_0);
+<prevRuleRootRef()>.tree = get_psrstate()->get_treeAdaptor()->rulePostProcessing(root_0);
 input.replaceChildren(TreeAdaptorType::getParent(retval.start),
 					  TreeAdaptorType::getChildIndex(retval.start),
 					  TreeAdaptorType::getChildIndex(_last),
@@ -216,10 +207,10 @@ input.replaceChildren(TreeAdaptorType::getParent(retval.start),
 <endif>
 <! if parser or tree-parser && rewrite!=true, we need to set result !>
 <if(!TREE_PARSER)>
-<prevRuleRootRef()>.tree = root_0;
+//<prevRuleRootRef()>.tree = std::move(root_0);
 <else>
 <if(!rewriteMode)>
-<prevRuleRootRef()>.tree = root_0;
+<prevRuleRootRef()>.tree = std::move(root_0);
 <endif>
 <endif>
 <if(backtracking)>
@@ -229,27 +220,31 @@ input.replaceChildren(TreeAdaptorType::getParent(retval.start),
 
 rewriteCodeLabels() ::= <<
 <referencedTokenLabels
-	:{it | RewriteRule<rewriteElementType>Stream\<ImplTraits> *stream_<it>=new RewriteRule<rewriteElementType>Stream\<ImplTraits>(this,"token <it>",<it>);};
+	:{it | RewriteRule<rewriteElementType>Stream\<ImplTraits> stream_<it>(get_psrstate()->get_treeAdaptor(), "token <it>",<it>);};
 	separator="\n"
 >
 <referencedTokenListLabels
-	:{it | RewriteRule<rewriteElementType>Stream\<ImplTraits> *stream_<it>=new RewriteRule<rewriteElementType>Stream\<ImplTraits>(this,"token <it>", list_<it>);};
+	:{it | RewriteRule<rewriteElementType>Stream\<ImplTraits> stream_<it>(get_psrstate()->get_treeAdaptor(), "token <it>", list_<it>);};
 	separator="\n"
 >
 <referencedWildcardLabels
-	:{it | RewriteRuleSubtreeStream\<ImplTraits> *stream_<it>=new RewriteRuleSubtreeStream\<ImplTraits>(this,"wildcard <it>",<it>);};
+	:{it | RewriteRuleSubtreeStream\<ImplTraits> stream_<it>(get_psrstate()->get_treeAdaptor(), "wildcard <it>",<it>);};
 	separator="\n"
 >
 <referencedWildcardListLabels
-	:{it | RewriteRuleSubtreeStream\<ImplTraits> *stream_<it>=new RewriteRuleSubtreeStream\<ImplTraits>(this,"wildcard <it>",list_<it>);};
+	:{it | RewriteRuleSubtreeStream\<ImplTraits> stream_<it>(get_psrstate()->get_treeAdaptor(), "wildcard <it>",list_<it>);};
+	separator="\n"
+>
+<first(referencedRuleLabels)
+	:{it | RewriteRuleSubtreeStream\<ImplTraits> stream_<it>(get_psrstate()->get_treeAdaptor(), "rule <it>",<it>.tree); // retval};
 	separator="\n"
 >
-<referencedRuleLabels
-	:{it | RewriteRuleSubtreeStream\<ImplTraits> *stream_<it>=new RewriteRuleSubtreeStream\<ImplTraits>(this,"rule <it>",<it>.getTree());};
+<rest(referencedRuleLabels)
+	:{it | RewriteRuleSubtreeStream\<ImplTraits> stream_<it>(get_psrstate()->get_treeAdaptor(), "rule <it>",<it>.tree); // rewrite alias};
 	separator="\n"
 >
 <referencedRuleListLabels
-	:{it | RewriteRuleSubtreeStream\<ImplTraits> *stream_<it>=new RewriteRuleSubtreeStream\<ImplTraits>(this,"token <it>",list_<it>);};
+	:{it | RewriteRuleSubtreeStream\<ImplTraits> stream_<it>(get_psrstate()->get_treeAdaptor(), "token <it>",list_<it>);};
 	separator="\n"
 >
 >>
@@ -264,10 +259,10 @@ rewriteOptionalBlock(
 	description) ::=
 <<
 // <fileName>:<description>
-if ( <referencedElementsDeep:{el | stream_<el>->hasNext()}; separator="||"> ) {
+if ( <referencedElementsDeep:{el | stream_<el>.hasNext()}; separator="||"> ) {
 	<alt>
 }
-<referencedElementsDeep:{el | stream_<el>->reset();<\n>}>
+<referencedElementsDeep:{el | stream_<el>.reset();<\n>}>
 >>
 
 rewriteClosureBlock(
@@ -277,10 +272,10 @@ rewriteClosureBlock(
 	description) ::=
 <<
 // <fileName>:<description>
-while ( <referencedElements:{el | stream_<el>->hasNext()}; separator="||"> ) {
+while ( <referencedElements:{el | stream_<el>.hasNext()}; separator="||"> ) {
 	<alt>
 }
-<referencedElements:{el | stream_<el>->reset();<\n>}>
+<referencedElements:{el | stream_<el>.reset();<\n>}>
 >>
 
 rewritePositiveClosureBlock(
@@ -289,13 +284,13 @@ rewritePositiveClosureBlock(
 	referencedElements, // elements in immediately block; no nested blocks
 	description) ::=
 <<
-if ( !(<referencedElements:{el | stream_<el>->hasNext()}; separator="||">) ) {
+if ( !(<referencedElements:{el | stream_<el>.hasNext()}; separator="||">) ) {
 	throw new RewriteEarlyExitException();
 }
-while ( <referencedElements:{el | stream_<el>->hasNext()}; separator="||"> ) {
+while ( <referencedElements:{el | stream_<el>.hasNext()}; separator="||"> ) {
 	<alt>
 }
-<referencedElements:{el | stream_<el>->reset();<\n>}>
+<referencedElements:{el | stream_<el>.reset();<\n>}>
 >>
 
 rewriteAlt(a) ::= <<
@@ -312,15 +307,15 @@ if (<a.pred>) {
 >>
 
 /** For empty rewrites: "r : ... -> ;" */
-rewriteEmptyAlt() ::= "root_0 = NULL;"
+rewriteEmptyAlt() ::= "root_0.release();"
 
 rewriteTree(root,children,description,enclosingTreeLevel,treeLevel) ::= <<
 // <fileName>:<description>
 {
-<ASTLabelType> root_<treeLevel> = TreeAdaptorType::nilNode();
+<ASTLabelType> root_<treeLevel> = get_psrstate()->get_treeAdaptor()->nilNode();
 <root:rewriteElement()>
 <children:rewriteElement()>
-TreeAdaptorType::addChild(root_<enclosingTreeLevel>, root_<treeLevel>);
+get_psrstate()->get_treeAdaptor()->addChild(root_<enclosingTreeLevel>, root_<treeLevel>);
 }
 >>
 
@@ -333,22 +328,22 @@ rewriteElement(e) ::= <<
 
 /** Gen ID or ID[args] */
 rewriteTokenRef(token,elementIndex,args,terminalOptions={}) ::= <<
-TreeAdaptorType::addChild(root_<treeLevel>, <createRewriteNodeFromElement(...)>);
+get_psrstate()->get_treeAdaptor()->addChild(root_<treeLevel>, <createRewriteNodeFromElement(...)>);
 >>
 
 /** Gen $label ... where defined via label=ID */
 rewriteTokenLabelRef(label,elementIndex) ::= <<
-TreeAdaptorType::addChild(root_<treeLevel>, stream_<label>->nextNode());
+get_psrstate()->get_treeAdaptor()->addChild(root_<treeLevel>, stream_<label>.nextNode());
 >>
 
 /** Gen $label ... where defined via label+=ID */
 rewriteTokenListLabelRef(label,elementIndex) ::= <<
-TreeAdaptorType::addChild(root_<treeLevel>, stream_<label>->nextNode());
+get_psrstate()->get_treeAdaptor()->addChild(root_<treeLevel>, stream_<label>.nextNode());
 >>
 
 /** Gen ^($label ...) */
 rewriteTokenLabelRefRoot(label,elementIndex) ::= <<
-root_<treeLevel> = TreeAdaptorType::becomeRoot(stream_<label>->nextNode(), root_<treeLevel>);
+root_<treeLevel> = get_psrstate()->get_treeAdaptor()->becomeRoot(stream_<label>.nextNode(), root_<treeLevel>);
 >>
 
 /** Gen ^($label ...) where label+=... */
@@ -356,15 +351,15 @@ rewriteTokenListLabelRefRoot ::= rewriteTokenLabelRefRoot
 
 /** Gen ^(ID ...) or ^(ID[args] ...) */
 rewriteTokenRefRoot(token,elementIndex,args,terminalOptions={}) ::= <<
-root_<treeLevel> = TreeAdaptorType::becomeRoot(<createRewriteNodeFromElement(...)>, root_<treeLevel>);
+root_<treeLevel> = get_psrstate()->get_treeAdaptor()->becomeRoot(<createRewriteNodeFromElement(...)>, root_<treeLevel>);
 >>
 
 rewriteImaginaryTokenRef(args,token,elementIndex,terminalOptions={}) ::= <<
-TreeAdaptorType::addChild(root_<treeLevel>, <createImaginaryNode(token,args,terminalOptions)>);
+get_psrstate()->get_treeAdaptor()->addChild(root_<treeLevel>, <createImaginaryNode(token,args,terminalOptions)>);
 >>
 
 rewriteImaginaryTokenRefRoot(args,token,elementIndex,terminalOptions={}) ::= <<
-root_<treeLevel> = TreeAdaptorType::becomeRoot(<createImaginaryNode(token,args,terminalOptions)>, root_<treeLevel>);
+root_<treeLevel> = get_psrstate()->get_treeAdaptor()->becomeRoot(<createImaginaryNode(token,args,terminalOptions)>, root_<treeLevel>);
 >>
 
 /** plain -> {foo} action */
@@ -380,43 +375,43 @@ root_0 = <action>;
 prevRuleRootRef() ::= "retval"
 
 rewriteRuleRef(rule) ::= <<
-TreeAdaptorType::addChild(root_<treeLevel>, stream_<rule>->nextTree());
+get_psrstate()->get_treeAdaptor()->addChild(root_<treeLevel>, stream_<rule>.nextTree());
 >>
 
 rewriteRuleRefRoot(rule) ::= <<
-root_<treeLevel> = TreeAdaptorType::becomeRoot(stream_<rule>->nextNode(), root_<treeLevel>);
+root_<treeLevel> = get_psrstate()->get_treeAdaptor()->becomeRoot(stream_<rule>.nextNode(), root_<treeLevel>);
 >>
 
 rewriteNodeAction(action) ::= <<
-TreeAdaptorType::addChild(root_<treeLevel>, <action>);
+get_psrstate()->get_treeAdaptor()->addChild(root_<treeLevel>, <action>);
 >>
 
 rewriteNodeActionRoot(action) ::= <<
-root_<treeLevel> = TreeAdaptorType::becomeRoot(<action>, root_<treeLevel>);
+root_<treeLevel> = get_psrstate()->get_treeAdaptor()->becomeRoot(<action>, root_<treeLevel>);
 >>
 
 /** Gen $ruleLabel ... where defined via ruleLabel=rule */
 rewriteRuleLabelRef(label) ::= <<
-TreeAdaptorType::addChild(root_<treeLevel>, stream_<label>->nextTree());
+get_psrstate()->get_treeAdaptor()->addChild(root_<treeLevel>, stream_<label>.nextTree());
 >>
 
 /** Gen $ruleLabel ... where defined via ruleLabel+=rule */
 rewriteRuleListLabelRef(label) ::= <<
-TreeAdaptorType::addChild(root_<treeLevel>, stream_<label>->nextTree());
+get_psrstate()->get_treeAdaptor()->addChild(root_<treeLevel>, stream_<label>.nextTree());
 >>
 
 /** Gen ^($ruleLabel ...) where ruleLabel=rule */
 rewriteRuleLabelRefRoot(label) ::= <<
-root_<treeLevel> = TreeAdaptorType::becomeRoot(stream_<label>->nextNode(), root_<treeLevel>);
+root_<treeLevel> = get_psrstate()->get_treeAdaptor()->becomeRoot(stream_<label>.nextNode(), root_<treeLevel>);
 >>
 
 /** Gen ^($ruleLabel ...) where ruleLabel+=rule */
 rewriteRuleListLabelRefRoot(label) ::= <<
-root_<treeLevel> = TreeAdaptorType::becomeRoot(stream_<label>->nextNode(), root_<treeLevel>);
+root_<treeLevel> = get_psrstate()->get_treeAdaptor()->becomeRoot(stream_<label>.nextNode(), root_<treeLevel>);
 >>
 
 rewriteWildcardLabelRef(label) ::= <<
-TreeAdaptorType::addChild(root_<treeLevel>, stream_<label>->nextTree());
+get_psrstate()->get_treeAdaptor()->addChild(root_<treeLevel>, stream_<label>.nextTree());
 >>
 
 
@@ -425,7 +420,7 @@ createImaginaryNode(tokenType,args,terminalOptions={}) ::= <%
 <! new MethodNode(IDLabel, args) !>
 new <terminalOptions.node>(<tokenType><if(args)>, <args; separator=", "><endif>)
 <else>
-TreeAdaptorType::create(<tokenType>, <args; separator=", "><if(!args)>"<tokenType>"<endif>)
+get_psrstate()->get_treeAdaptor()->create(<tokenType>, <args; separator=", "><if(!args)>"<tokenType>"<endif>)
 <endif>
 %>
 
@@ -436,7 +431,7 @@ new <terminalOptions.node>(stream_<token>.nextToken()<if(args)>, <args; separato
 <if(args)> <! must create new node from old !>
 TreeAdaptorType.create(<token>, <args; separator=", ">)
 <else>
-stream_<token>->nextNode()
+stream_<token>.nextNode()
 <endif>
 <endif>
 %>
diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/ASTParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/ASTParser.stg
index a4c9b4162..f9935a9e5 100644
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/ASTParser.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/ASTParser.stg
@@ -40,8 +40,8 @@
 
 @rule.setErrorReturnValue() ::= <<
 //TODO
-//retval.tree = (<ASTLabelType>)TreeAdaptorType::errorNode(input, retval.start, input.LT(-1));
-retval.tree = (<ASTLabelType>)TreeAdaptorType::errorNode(NULL, retval.start, LT(-1));
+//retval.tree = get_psrstate()->get_treeAdaptor()->errorNode(input, retval.start, input.LT(-1));
+retval.tree = get_psrstate()->get_treeAdaptor()->errorNode(NULL, retval.start, LT(-1));
 >>
 
 // TOKEN AST STUFF
@@ -51,8 +51,8 @@ tokenRef(token,label,elementIndex,terminalOptions={}) ::= <<
 <super.tokenRef(...)>
 <if(!ruleDescriptor.isSynPred)>
 <if(backtracking)>if ( <actions.(actionScope).synpredgate> ) {<endif>
-<label>_tree = <createNodeFromToken(...)>;
-TreeAdaptorType::addChild(root_0, <label>_tree);
+<label>_tree = std::move(<createNodeFromToken(...)>);
+get_psrstate()->get_treeAdaptor()->addChild(root_0, <label>_tree);
 <if(backtracking)>}<endif>
 <endif>
 >>
@@ -66,7 +66,7 @@ tokenRefRuleRoot(token,label,elementIndex,terminalOptions={}) ::= <<
 <if(!ruleDescriptor.isSynPred)>
 <if(backtracking)>if ( <actions.(actionScope).synpredgate> ) {<endif>
 <label>_tree = <createNodeFromToken(...)>;
-root_0 = (<ASTLabelType>)TreeAdaptorType::becomeRoot(<label>_tree, root_0);
+root_0 = get_psrstate()->get_treeAdaptor()->becomeRoot(<label>_tree, root_0);
 <if(backtracking)>}<endif>
 <endif>
 >>
@@ -103,7 +103,7 @@ tokenRefRuleRootAndListLabel(token,label,elementIndex,terminalOptions={}) ::= <<
 // I have more time.
 
 matchSet(s,label,elementIndex,postmatchCode,terminalOptions={}) ::= <%
-<super.matchSet(postmatchCode={<if(!ruleDescriptor.isSynPred)><if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>TreeAdaptorType::addChild(root_0, <createNodeFromToken(...)>);<endif>}, ...)>
+<super.matchSet(postmatchCode={<if(!ruleDescriptor.isSynPred)><if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>get_psrstate()->get_treeAdaptor()->addChild(root_0, <createNodeFromToken(...)>);<endif>}, ...)>
 %>
 
 matchRuleBlockSet(s,label,elementIndex,postmatchCode,treeLevel="0",terminalOptions={}) ::= <<
@@ -119,7 +119,7 @@ matchSetRuleRoot(s,label,elementIndex,debug,terminalOptions={}) ::= <<
 <if(label)>
 <label>=<castToLabelType("input.LT(1)")>;
 <endif>
-<super.matchSet(postmatchCode={<if(!ruleDescriptor.isSynPred)><if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>root_0 = (<ASTLabelType>)TreeAdaptorType::becomeRoot(<createNodeFromToken(...)>, root_0);<endif>},...)>
+<super.matchSet(postmatchCode={<if(!ruleDescriptor.isSynPred)><if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>root_0 = get_psrstate()->get_treeAdaptor()->becomeRoot(<createNodeFromToken(...)>, root_0);<endif>},...)>
 >>
 
 // RULE REF AST
@@ -128,7 +128,7 @@ matchSetRuleRoot(s,label,elementIndex,debug,terminalOptions={}) ::= <<
 ruleRef(rule,label,elementIndex,args,scope) ::= <<
 <super.ruleRef(...)>
 <if(!ruleDescriptor.isSynPred)>
-<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>TreeAdaptorType::addChild(root_0, <label>.getTree());
+<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>get_psrstate()->get_treeAdaptor()->addChild(root_0, <label>.tree);
 <endif>
 >>
 
@@ -138,25 +138,25 @@ ruleRefBang(rule,label,elementIndex,args,scope) ::= "<super.ruleRef(...)>"
 /** rule^ */
 ruleRefRuleRoot(rule,label,elementIndex,args,scope) ::= <<
 <super.ruleRef(...)>
-<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>root_0 = (<ASTLabelType>)TreeAdaptorType::becomeRoot(<label>.getTree(), root_0);
+<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>root_0 = get_psrstate()->get_treeAdaptor()->becomeRoot(<label>.tree, root_0);
 >>
 
 /** x+=rule when output=AST */
 ruleRefAndListLabel(rule,label,elementIndex,args,scope) ::= <<
 <ruleRef(...)>
-<listLabel(label, {<label>.getTree()})>
+<listLabel(label, {<label>.tree})>
 >>
 
 /** x+=rule! when output=AST is a rule ref with list addition */
 ruleRefBangAndListLabel(rule,label,elementIndex,args,scope) ::= <<
 <ruleRefBang(...)>
-<listLabel(label, {<label>.getTree()})>
+<listLabel(label, {<label>.tree})>
 >>
 
 /** x+=rule^ */
 ruleRefRuleRootAndListLabel(rule,label,elementIndex,args,scope) ::= <<
 <ruleRefRuleRoot(...)>
-<listLabel(label, {<label>.getTree()})>
+<listLabel(label, {<label>.tree})>
 >>
 
 // WILDCARD AST
@@ -165,8 +165,8 @@ wildcard(token,label,elementIndex,terminalOptions={}) ::= <<
 <super.wildcard(...)>
 <if(!ruleDescriptor.isSynPred)>
 <if(backtracking)>if ( <actions.(actionScope).synpredgate> ) {<endif>
-<label>_tree = (<ASTLabelType>)TreeAdaptorType::create(<label>);
-TreeAdaptorType::addChild(root_0, <label>_tree);
+<label>_tree = std::move(get_psrstate()->get_treeAdaptor()->create(<label>));
+get_psrstate()->get_treeAdaptor()->addChild(root_0, <label>_tree);
 <if(backtracking)>}<endif>
 <endif>
 >>
@@ -177,8 +177,8 @@ wildcardRuleRoot(token,label,elementIndex,terminalOptions={}) ::= <<
 <super.wildcard(...)>
 <if(!ruleDescriptor.isSynPred)>
 <if(backtracking)>if ( <actions.(actionScope).synpredgate> ) {<endif>
-<label>_tree = (<ASTLabelType>)TreeAdaptorType::create(<label>);
-root_0 = (<ASTLabelType>)TreeAdaptorType::becomeRoot(<label>_tree, root_0);
+<label>_tree = std::move(get_psrstate()->get_treeAdaptor()->create(<label>));
+root_0 = get_psrstate()->get_treeAdaptor()->becomeRoot(<label>_tree, root_0);
 <if(backtracking)>}<endif>
 <endif>
 >>
@@ -187,14 +187,14 @@ createNodeFromToken(label,terminalOptions={}) ::= <%
 <if(terminalOptions.node)>
 new <terminalOptions.node>(<label>) <! new MethodNode(IDLabel) !>
 <else>
-(<ASTLabelType>)TreeAdaptorType::create(<label>)
+get_psrstate()->get_treeAdaptor()->create(<label>)
 <endif>
 %>
 
 ruleCleanUp() ::= <<
 <super.ruleCleanUp()>
 <if(backtracking)>if ( <actions.(actionScope).synpredgate> ) {<endif>
-retval.tree = (<ASTLabelType>)TreeAdaptorType::rulePostProcessing(root_0);
-TreeAdaptorType::setTokenBoundaries(retval.tree, retval.start, retval.stop);
+retval.tree = get_psrstate()->get_treeAdaptor()->rulePostProcessing(root_0);
+get_psrstate()->get_treeAdaptor()->setTokenBoundaries(retval.tree, retval.start, retval.stop);
 <if(backtracking)>}<endif>
 >>
diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
index 671df886f..ff8262526 100644
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
@@ -249,7 +249,8 @@ headerFile( LEXER,
             trace,
             scopes,
             superClass,
-            literals
+            literals,
+            ASTLabelType = "ImplTraits::TreeTypePtr"
         ) ::=
 <<
 <leadIn("C++ header")>
@@ -392,9 +393,6 @@ protected:
  */
 class <name> : public <componentBaseType()>
     , public <name>Tokens
-<if(PARSER)>
-    , <name>ImplTraits::TreeAdaptorType
-<endif>
 {
 public:
 	typedef <name>ImplTraits ImplTraits;
@@ -405,7 +403,7 @@ public:
 	typedef StreamType InputType;
 <if(PARSER)>
 	typedef <name>ImplTraits::CommonTokenType CommonTokenType;
-	typedef <name>ImplTraits::TreeAdaptorType TreeAdaptorType;
+	<if(buildAST)>typedef <name>ImplTraits::TreeAdaptorType TreeAdaptorType;<endif>
 <endif>
 
 <if(recognizer.filterMode)>
@@ -661,7 +659,7 @@ const char* <name>::getGrammarFileName()
  *     - Fail NULL
  */
 <name>::<name>(StreamType* instream<grammar.delegators:{g|, <g.recognizerName>* <g:delegateName()>}>)
-:<name>ImplTraits::BaseLexerType(ANTLR_SIZE_HINT, instream, NULL)
+    :<name>ImplTraits::BaseLexerType(ANTLR_SIZE_HINT, instream, NULL)
 {
 	// See if we can create a new lexer with the standard constructor
 	//
@@ -677,7 +675,7 @@ const char* <name>::getGrammarFileName()
  *     - Fail NULL
  */
 <name>::<name>(StreamType* instream, RecognizerSharedStateType* state<grammar.delegators:{g|, <g.recognizerName>* <g:delegateName()>}>)
-:<name>ImplTraits::BaseLexerType(ANTLR_SIZE_HINT, instream, state)
+    :<name>ImplTraits::BaseLexerType(ANTLR_SIZE_HINT, instream, state)
 {
 	this->init(instream <grammar.delegators:{g|, <g:delegateName()>} >);
 }
@@ -704,7 +702,7 @@ void <name>::init(StreamType* instream<grammar.delegators:{g|, <g.recognizerName
 <endif>
 
 <if(grammar.directDelegates)>
-	// Initialize the lexers that we are going to delegate some
+	// Initialize the lexers/parsers that we are going to delegate some
 	// functions to.
 	//
 	<grammar.directDelegates:
@@ -769,7 +767,7 @@ filteringActionGate() ::= "this->get_backtracking()==1"
 genericParser(  grammar, name, scopes, tokens, tokenNames, rules, numRules,
                 bitsets, inputStreamType, superClass,
                 labelType, members,	rewriteElementType,
-                filterMode, ASTLabelType="ImplTraits::TreeType*") ::= <<
+                filterMode, ASTLabelType="ImplTraits::TreeTypePtr") ::= <<
 
 using namespace antlr3;
 <if(grammar.grammarIsRoot)>
@@ -828,6 +826,9 @@ const char* <name>::getGrammarFileName()
 
 void <name>::init(StreamType* instream<grammar.delegators:{g|, <g.recognizerName>* <g:delegateName()>}>)
 {
+	/* Allocate TreeAdaptorType 
+	 */
+	<if(buildAST)>this->get_psrstate()->set_treeAdaptor( new TreeAdaptorType() );<endif>
     <actions.parser.apifuncs>
 <if(memoize)>
 <if(grammar.grammarIsRoot)>
@@ -838,24 +839,23 @@ void <name>::init(StreamType* instream<grammar.delegators:{g|, <g.recognizerName
 <endif>
 <endif>
 <if(grammar.directDelegates)>
-	// Initialize the lexers that we are going to delegate some
+	// Initialize the lexers/parsers that we are going to delegate some
 	// functions to.
 	//
 	<grammar.directDelegates:
 	      	{g|m_<g:delegateName()> = new <g.recognizerName>(instream, this->get_psrstate(), this<grammar.delegators:{g|, <g:delegateName()>}>);}; separator="\n">
-	<endif>
-        <if(grammar.delegators)>
-     	// Install the pointers back to lexers that will delegate us to perform certain functions
-     	// for them.
-     	//
-     		<grammar.delegators: {g| m_<g:delegateName()> = <g:delegateName()>;}; separator="\n">
-	<endif>
+<endif>
+<if(grammar.delegators)>
+	// Install the pointers back to lexers that will delegate us to perform certain functions
+	// for them.
+	//
+	<grammar.delegators: {g| m_<g:delegateName()> = <g:delegateName()>;}; separator="\n">
+<endif>
 	/* Install the token table
 	*/
 	this->get_psrstate()->set_tokenNames( <grammar.composite.rootGrammar.recognizerName>TokenNames );
 
 	<@debugStuff()>
-
 }
 
 void
@@ -867,12 +867,12 @@ void
 /** Free the parser resources
  */
 <name>::~<name>()
- {
+{
     <@cleanup>
     <@end>
 <if(grammar.directDelegates)>
-	// Free the parsers that we delegated to
-	// functions to.NULL the state so we only free it once.
+	// Free the parsers that we delegated to functions to.
+	// NULL the state so we only free it once.
 	//
 	<grammar.directDelegates:
          {g| m_<g:delegateName()>->set_psrstate( NULL );
@@ -887,6 +887,11 @@ void
 	}
 <endif>
 <endif>
+<if(grammar.grammarIsRoot)>
+	/* Deallocate TreeAdaptorType 
+	 */
+	delete this->get_psrstate()->get_treeAdaptor();
+<endif>
 }
 
 /** Return token names used by this <grammarType()>
@@ -990,7 +995,7 @@ treeParser(	grammar,
 			bitsets,
 			filterMode,
 			labelType={<ASTLabelType>},
-			ASTLabelType="ImplTraits::TreeType*",
+			ASTLabelType="ImplTraits::TreeTypePtr",
 			superClass="TreeParser",
 			members={<actions.treeparser.members>}
 			) ::= <<
@@ -1129,7 +1134,7 @@ rule(ruleName,ruleDescriptor,block,emptyRule,description,exceptions,finally,memo
     <@preamble()>
     {
         <block>
-    }
+    }//...
     <ruleCleanUp()>
    
 <if(exceptions)>
@@ -2226,7 +2231,7 @@ globalAttributeScopeDef(scope) ::=
  */
 <if(scope.attributes)>
 
-StackType\< <scopeStruct(sname=scope.name)> > <scopeStack(sname=scope.name)>;
+ImplTraits::AllocPolicyType::StackType\< <scopeStruct(sname=scope.name)> > <scopeStack(sname=scope.name)>;
 
 <endif>
 >>
@@ -2235,7 +2240,7 @@ ruleAttributeScopeDef(scope) ::= <<
 <if(scope.attributes)>
 /* ruleAttributeScopeDef(scope)
  */
-StackType\< <scopeStruct(sname=scope.name)> >  <scopeStack(sname=scope.name,...)>;
+ImplTraits::AllocPolicyType::StackType\< <scopeStruct(sname=scope.name)> >  <scopeStack(sname=scope.name,...)>;
 
 <endif>
 >>
@@ -2300,8 +2305,6 @@ ruleLabelDef(label) ::= <<
 ruleLabelInitVal(label) ::= <<
 >>
 
-ASTLabelType() ::= "<if(recognizer.ASTLabelType)><recognizer.ASTLabelType><else>ImplTraits::TreeType*<endif>"
-
 /** Define a return struct for a rule if the code needs to access its
  *  start/stop tokens, tree stuff, attributes, ...  Leave a hole for
  *  subgroups to stick in members.
@@ -2317,31 +2320,32 @@ public:
     <ruleDescriptor:returnStructName()>()
         : BaseType()
         <if(scope)>, <scope.attributes:{it | <it.name>() }; separator=","><endif>
-        { init(); }
+        {}
     <ruleDescriptor:returnStructName()>( BaseParserType* parser )
         : BaseType(parser)
         <if(scope)>, <scope.attributes:{it | <it.name>() }; separator=","><endif>
-        { init(); }
-    <ruleDescriptor:returnStructName()>( const <ruleDescriptor:returnStructName()>& other )
+        {}
+    <ruleDescriptor:returnStructName()>( <ruleDescriptor:returnStructName()>&& other )
         : BaseType(other)
-    <if(scope)>, <scope.attributes:{it | <it.name>(other.<it.name>) }; separator=", "><endif>
-    { copy(other); }
+        <if(scope)>, <scope.attributes:{it | <it.name>(other.<it.name>) }; separator=", "><endif>
+    {
+        <if(buildAST)>tree = std::move(other.tree);<endif>
+    }
     ~<ruleDescriptor:returnStructName()>()
     {
         <@ruleReturnMembersDelete()>
     }
 
     <ruleDescriptor:returnStructName()>&
-    operator=( const <ruleDescriptor:returnStructName()>& other )
+    operator=( <ruleDescriptor:returnStructName()>&& other )
     {
         BaseType::operator=( other );
         <if(scope)><scope.attributes:{it | <it.name> = other.<it.name>; }; separator="\n"><endif>
-        copy(other);    
+        <if(buildAST)>tree = std::move(other.tree);<endif>
     	return *this;
     }
+
     <@ruleReturnMembers()>
-    void init() { <@ruleReturnMembersInit()> }
-    void copy( const <ruleDescriptor:returnStructName()>& other) { <@ruleReturnMembersCopy()> }    
 <else>
 struct <ruleDescriptor:returnStructName()>
 {

From bec7e9c3a43f0e15a648158116cb00777302f556 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Sun, 27 Jul 2014 12:33:31 +0200
Subject: [PATCH 16/53] AST tests

---
 runtime/Cpp/tests/.gitignore         |   10 +-
 runtime/Cpp/tests/ATestTraits.hpp    |   35 +
 runtime/Cpp/tests/Makefile           |   59 +-
 runtime/Cpp/tests/PLSQLCommons.g     |  426 +++++
 runtime/Cpp/tests/PLSQLKeys.g        | 2219 ++++++++++++++++++++++++++
 runtime/Cpp/tests/PLSQLLexer.g       |  922 +++++++++++
 runtime/Cpp/tests/PLSQLParser.g      | 1104 +++++++++++++
 runtime/Cpp/tests/PLSQL_DMLParser.g  | 1108 +++++++++++++
 runtime/Cpp/tests/PTestTraits.hpp    |  197 +++
 runtime/Cpp/tests/SQLMini.g          |  151 ++
 runtime/Cpp/tests/SQLMini2.g         |  151 ++
 runtime/Cpp/tests/SQLPLUSParser.g    |   46 +
 runtime/Cpp/tests/UserMiniTraits.hpp |   38 +
 runtime/Cpp/tests/UserTestTraits.hpp |   15 +-
 runtime/Cpp/tests/a001.cpp           |   93 ++
 runtime/Cpp/tests/a001.g             |   35 +
 runtime/Cpp/tests/a002.cpp           |  141 ++
 runtime/Cpp/tests/a002.g             |   40 +
 runtime/Cpp/tests/a003.cpp           |  146 ++
 runtime/Cpp/tests/a003.g             |   55 +
 runtime/Cpp/tests/a004.cpp           |  165 ++
 runtime/Cpp/tests/a004.g             |   57 +
 runtime/Cpp/tests/a005.cpp           |  117 ++
 runtime/Cpp/tests/a005.g             |   48 +
 runtime/Cpp/tests/direntw.h          |  372 +++++
 runtime/Cpp/tests/s001.cpp           |   92 ++
 runtime/Cpp/tests/s001.g             |   69 +
 runtime/Cpp/tests/s002.cpp           |   93 ++
 runtime/Cpp/tests/s002.g             |  102 ++
 runtime/Cpp/tests/s002.input         |    1 +
 runtime/Cpp/tests/s003.cpp           |  113 ++
 runtime/Cpp/tests/s003.g             |   66 +
 runtime/Cpp/tests/s003.input         |    1 +
 runtime/Cpp/tests/s004.cpp           |  143 ++
 runtime/Cpp/tests/s004.dual.input    |    1 +
 runtime/Cpp/tests/s004.input         |   19 +
 runtime/Cpp/tests/s005.cpp           |  204 +++
 runtime/Cpp/tests/s006.cpp           |  204 +++
 runtime/Cpp/tests/utils.cpp          |  164 ++
 runtime/Cpp/tests/utils.hpp          |   26 +
 40 files changed, 9028 insertions(+), 20 deletions(-)
 create mode 100644 runtime/Cpp/tests/ATestTraits.hpp
 create mode 100644 runtime/Cpp/tests/PLSQLCommons.g
 create mode 100644 runtime/Cpp/tests/PLSQLKeys.g
 create mode 100644 runtime/Cpp/tests/PLSQLLexer.g
 create mode 100644 runtime/Cpp/tests/PLSQLParser.g
 create mode 100644 runtime/Cpp/tests/PLSQL_DMLParser.g
 create mode 100644 runtime/Cpp/tests/PTestTraits.hpp
 create mode 100644 runtime/Cpp/tests/SQLMini.g
 create mode 100644 runtime/Cpp/tests/SQLMini2.g
 create mode 100644 runtime/Cpp/tests/SQLPLUSParser.g
 create mode 100644 runtime/Cpp/tests/UserMiniTraits.hpp
 create mode 100644 runtime/Cpp/tests/a001.cpp
 create mode 100644 runtime/Cpp/tests/a001.g
 create mode 100644 runtime/Cpp/tests/a002.cpp
 create mode 100644 runtime/Cpp/tests/a002.g
 create mode 100644 runtime/Cpp/tests/a003.cpp
 create mode 100644 runtime/Cpp/tests/a003.g
 create mode 100644 runtime/Cpp/tests/a004.cpp
 create mode 100644 runtime/Cpp/tests/a004.g
 create mode 100644 runtime/Cpp/tests/a005.cpp
 create mode 100644 runtime/Cpp/tests/a005.g
 create mode 100644 runtime/Cpp/tests/direntw.h
 create mode 100644 runtime/Cpp/tests/s001.cpp
 create mode 100644 runtime/Cpp/tests/s001.g
 create mode 100644 runtime/Cpp/tests/s002.cpp
 create mode 100644 runtime/Cpp/tests/s002.g
 create mode 100644 runtime/Cpp/tests/s002.input
 create mode 100644 runtime/Cpp/tests/s003.cpp
 create mode 100644 runtime/Cpp/tests/s003.g
 create mode 100644 runtime/Cpp/tests/s003.input
 create mode 100644 runtime/Cpp/tests/s004.cpp
 create mode 100644 runtime/Cpp/tests/s004.dual.input
 create mode 100644 runtime/Cpp/tests/s004.input
 create mode 100644 runtime/Cpp/tests/s005.cpp
 create mode 100644 runtime/Cpp/tests/s006.cpp
 create mode 100644 runtime/Cpp/tests/utils.cpp
 create mode 100644 runtime/Cpp/tests/utils.hpp

diff --git a/runtime/Cpp/tests/.gitignore b/runtime/Cpp/tests/.gitignore
index dadd82c5d..402a48623 100644
--- a/runtime/Cpp/tests/.gitignore
+++ b/runtime/Cpp/tests/.gitignore
@@ -1,13 +1,13 @@
 # Windows test files
-[st][0-9][0-9][0-9].exe
+[ast][0-9][0-9][0-9].exe
 
 # Unix test files
-[st[0-9][0-9][0-9]
+[st][0-9][0-9][0-9]
 
 # ANTLR generated files
-[st][0-9][0-9][0-9]?*.cpp
-[st][0-9][0-9][0-9]?*.hpp
-[st][0-9][0-9][0-9]*.tokens
+[ast][0-9][0-9][0-9]?*.cpp
+[ast][0-9][0-9][0-9]?*.hpp
+[ast][0-9][0-9][0-9]*.tokens
 
 # MSVC files
 *.vcxproj
diff --git a/runtime/Cpp/tests/ATestTraits.hpp b/runtime/Cpp/tests/ATestTraits.hpp
new file mode 100644
index 000000000..a5723c5d7
--- /dev/null
+++ b/runtime/Cpp/tests/ATestTraits.hpp
@@ -0,0 +1,35 @@
+#ifndef	_A_TEST_TRAITS_H
+#define	_A_TEST_TRAITS_H
+
+#include <antlr3.hpp>
+
+#include <fstream>
+#include <iostream>
+#include <sstream>
+
+// Forward declaration for Lexer&Parser class(es)
+namespace Antlr3Test {
+	//code for overriding
+	template<class ImplTraits>
+	class UserTraits : public antlr3::CustomTraitsBase<ImplTraits>
+	{
+	public:
+		//static const bool TOKENS_ACCESSED_FROM_OWNING_RULE = true;
+		//static const int  TOKEN_FILL_BUFFER_INCREMENT = 2;
+	};
+
+	class a001Lexer;	class a001Parser;
+	class a002Lexer;	class a002Parser;
+	class a003Lexer;	class a003Parser;
+	class a004Lexer;	class a004Parser;
+	class a005Lexer;	class a005Parser;
+
+	// Instantiate the Traits class(will be used for Lexer/Parser template instantiations)
+	typedef antlr3::Traits<a001Lexer, a001Parser, UserTraits> a001LexerTraits;	typedef a001LexerTraits a001ParserTraits;
+	typedef antlr3::Traits<a002Lexer, a002Parser, UserTraits> a002LexerTraits;	typedef a002LexerTraits a002ParserTraits;
+	typedef antlr3::Traits<a003Lexer, a003Parser, UserTraits> a003LexerTraits;	typedef a003LexerTraits a003ParserTraits;
+	typedef antlr3::Traits<a004Lexer, a004Parser, UserTraits> a004LexerTraits;	typedef a004LexerTraits a004ParserTraits;
+	typedef antlr3::Traits<a005Lexer, a005Parser, UserTraits> a005LexerTraits;	typedef a005LexerTraits a005ParserTraits;
+};
+
+#endif
diff --git a/runtime/Cpp/tests/Makefile b/runtime/Cpp/tests/Makefile
index df2f22537..8687887a5 100644
--- a/runtime/Cpp/tests/Makefile
+++ b/runtime/Cpp/tests/Makefile
@@ -1,6 +1,6 @@
 .PRECIOUS=.o
 
-ANTLRGRAMMARS ?= $(wildcard [st]*.g)
+ANTLRGRAMMARS ?= $(wildcard [ast]*.g)
 HEADERS = $(wildcard *.hpp) $(wildcard *.inl)
 RUNTIME_HEADERS = $(wildcard ../include/*.hpp) $(wildcard ../include/*.inl)
 SOURCES = $(wildcard *.cpp)
@@ -13,20 +13,48 @@ STGS  = $(wildcard ../../../tool/src/main/resources/org/antlr/codegen/templates/
 
 .SUFFIXES:
 
-INCLUDES= -I. -I../include/
+INCLUDES= -I. -I../include/ -I../../../../boost_1_46_1/ -I/usr/lib/gcc/x86_64-pc-cygwin/4.8.3/include/c++/ -I/usr/lib/gcc/x86_64-pc-cygwin/4.8.3/include/c++/i686-pc-cygwin/
 
-CFLAGS=-ggdb3 -O0 -fno-inline -Wall -Wno-unused-variable -std=c++0x
-#CFLAGS=-ggdb3 -O3
+CXX=clang++
+CFLAGS=-ggdb3 -O0 -fno-inline -Wall -Wno-unused-variable -Wno-unused-local-typedefs -Wno-parentheses-equality -Wno-tautological-compare -std=c++0x
+#CFLAGS=-ggdb3 -O3 -std=c++0x
 
 TOBJS= utils.o
 
-all: $(ANTLR) $(TOKENS) t001 t002 t003 t004 t005 t006 t006 t007 t008 t009 t010 t011 t012 t020 t039
+all: $(ANTLR) $(TOKENS) t001 t002 t003 t004 t005 t006 t006 t007 t008 t009 t010 t011 t012 t020 t039 \
+	s001 s002 s003 s004 a001 a002 a003 a004 a005
 
 # For devel only. This will replace .stg files in the tool in a fast way
 #
 $(ANTLR): $(STGS)
-	jar uvf $(ANTLR) -C ../../../tool/src/main/resources \
-	org/antlr/codegen/templates/Cpp/Cpp.stg
+	jar uvf $(ANTLR) \
+	-C ../../../tool/src/main/resources org/antlr/codegen/templates/Cpp/Cpp.stg \
+	-C ../../../tool/src/main/resources org/antlr/codegen/templates/Cpp/AST.stg \
+	-C ../../../tool/src/main/resources org/antlr/codegen/templates/Cpp/ASTParser.stg
+
+a001:	a001.cpp a001.tokens ATestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+
+a002:	a002.cpp a002.tokens ATestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+
+a003:	a003.cpp a003.tokens ATestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+
+a004:	a004.cpp a004.tokens ATestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+
+a005:	a005.cpp a005.tokens ATestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+
+s001:	s001.cpp s001.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) utils.cpp -o $@
+
+s002:	s002.cpp s002.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) utils.cpp -o $@
+
+s003:	s003.cpp s003.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) utils.cpp -o $@
 
 t001:	t001.cpp t001lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 	$(CXX) $(CFLAGS) -DUSESTL -DD $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
@@ -73,12 +101,23 @@ t039:	t039.cpp t039labels.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_
 t051:	t051.cpp t051lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
+s004:   s004.cpp PLSQLLexer.tokens PLSQLParser.tokens PTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
+	$(CXX) $(CFLAGS) -DUSESTL -Wno-unused-but-set-variable $(INCLUDES) $< PLSQLLexer*.cpp PLSQLParser*.cpp utils.cpp -o $@
+
+s005:   s005.cpp SQLMini.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
+	$(CXX) $(CFLAGS) -DUSESTL -Wno-parentheses-equality -Wno-unused-but-set-variable $(INCLUDES) $< SQLMiniLexer.cpp SQLMiniParser.cpp utils.cpp -o $@
+
+s006:   s006.cpp SQLMini2.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
+	$(CXX) $(CFLAGS) -DUSESTL -Wno-parentheses-equality -Wno-unused-but-set-variable $(INCLUDES) $< SQLMiniLexer.cpp SQLMiniParser.cpp utils.cpp -o $@
+
 # AST commented out
+#
 # t042:	t042.cpp t005lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 # 	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 clean:
-	rm -f *.o t0[0-9][0-9]??*.[ch]pp *.tokens t[0-9][0-9][0-9] t0[0-9][0-9].exe
+	rm -f *.o [ast]0[0-9][0-9]??*.[ch]pp *.tokens [ast][0-9][0-9][0-9] [ast]0[0-9][0-9].exe
+	rm -f PLSQLLexer.[ch]pp PLSQLParser*.[ch]pp
 
 # %.u: %.g
 # 	@echo "Bulding dependencies for "$<
@@ -87,8 +126,8 @@ clean:
 # 	@cat $@.tmp >> $@
 # 	$(RM) $@.tmp
 
-%.tokens %.cpp %Lexer.c %Parser.c %Lexer.h %Parser.h %.hpp: %.g $(ANTLR)
-	java -jar $(ANTLR) $(GRAMMAROPTIONS) $<
+%.tokens %Lexer.cpp %Parser.cpp %Lexer.hpp %Parser.hpp: %.g $(ANTLR)
+	java -Xmx512m -jar $(ANTLR) $(GRAMMAROPTIONS) $<
 
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(strip $(ANTLRGRAMMARS)),)
diff --git a/runtime/Cpp/tests/PLSQLCommons.g b/runtime/Cpp/tests/PLSQLCommons.g
new file mode 100644
index 000000000..1c3c11900
--- /dev/null
+++ b/runtime/Cpp/tests/PLSQLCommons.g
@@ -0,0 +1,426 @@
+/**
+ * Oracle(c) PL/SQL 11g Parser  
+ *
+ * Copyright (c) 2009-2011 Alexandre Porcelli <alexandre.porcelli@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+parser grammar PLSQLCommons;
+
+@includes
+{
+        #include "PTestTraits.hpp"
+}
+
+@namespace{ Antlr3Test }
+
+// $<Common SQL PL/SQL Clauses/Parts
+
+partition_extension_clause
+    :    ( subpartition_key | partition_key ) 
+        for_key? expression_list
+    ;
+
+column_alias
+options
+{
+backtrack=true;
+}
+    :    as_key? ( id | alias_quoted_string )
+    |    as_key
+    ;
+
+table_alias
+    :    ( id | alias_quoted_string )
+    ;
+
+alias_quoted_string
+    :    quoted_string
+    ;
+
+where_clause
+    :    where_key (current_of_clause|condition_wrapper)
+    ;
+
+current_of_clause
+    :    current_key of_key cursor_name
+    ;
+
+into_clause
+    :    into_key variable_name (COMMA variable_name)* 
+    |    bulk_key collect_key into_key variable_name (COMMA variable_name)* 
+    ;
+
+// $>
+
+// $<Common PL/SQL Named Elements
+
+xml_column_name
+    :    id
+    |    quoted_string
+    ;
+
+cost_class_name
+    :    id
+    ;
+
+attribute_name
+    :    id
+    ;
+
+savepoint_name
+    :    id
+    ;
+
+rollback_segment_name
+    :    id
+    ;
+
+
+table_var_name
+    :    id
+    ;
+
+schema_name
+    :    id
+    ;
+
+routine_name
+    :    id ((PERIOD id_expression)=> PERIOD id_expression)* (AT_SIGN link_name)?
+    ;
+
+package_name
+    :    id
+    ;
+
+implementation_type_name
+    :    id ((PERIOD id_expression)=> PERIOD id_expression)?
+    ;
+
+parameter_name
+    :    id
+    ;
+
+reference_model_name
+    :    id
+    ;
+
+main_model_name
+    :    id
+    ;
+
+aggregate_function_name
+    :    id ((PERIOD id_expression)=> PERIOD id_expression)*
+    ;
+
+query_name
+    :    id
+    ;
+
+constraint_name
+    :    id ((PERIOD id_expression)=> PERIOD id_expression)* (AT_SIGN link_name)?
+    ;
+
+label_name
+    :    id_expression
+    ;
+
+type_name
+    :    id_expression ((PERIOD id_expression)=> PERIOD id_expression)*
+    ;
+
+sequence_name
+    :    id_expression ((PERIOD id_expression)=> PERIOD id_expression)*
+    ;
+
+exception_name
+    :    id ((PERIOD id_expression)=> PERIOD id_expression)* 
+    ;
+
+function_name
+    :    id ((PERIOD id_expression)=> PERIOD id_expression)?
+    ;
+
+procedure_name
+    :    id ((PERIOD id_expression)=> PERIOD id_expression)?
+    ;
+
+trigger_name
+    :    id ((PERIOD id_expression)=> PERIOD id_expression)?
+    ;
+
+variable_name
+    :    (INTRODUCER char_set_name)?
+            id_expression ((PERIOD id_expression)=> PERIOD id_expression)?
+    |    bind_variable
+    ;
+
+index_name
+    :    id
+    ;
+
+cursor_name
+    :    id
+    |    bind_variable
+    ;
+
+record_name
+    :    id
+    |    bind_variable
+    ;
+
+collection_name
+    :    id ((PERIOD id_expression)=> PERIOD id_expression)?
+    ;
+
+link_name
+    :    id
+    ;
+
+column_name
+    :    id ((PERIOD id_expression)=> PERIOD id_expression)*
+    ;
+
+tableview_name
+    :    id ((PERIOD id_expression)=> PERIOD id_expression)? 
+    (    AT_SIGN link_name
+    |    {!(LA(2) == SQL92_RESERVED_BY)}?=> partition_extension_clause
+    )?
+    ;
+
+char_set_name
+    :    id_expression ((PERIOD id_expression)=> PERIOD id_expression)*
+    ;
+
+// $>
+
+// $<Common PL/SQL Specs
+
+// NOTE: In reality this applies to aggregate functions only
+keep_clause
+    :   keep_key
+        LEFT_PAREN
+            dense_rank_key (first_key|last_key)
+             order_by_clause
+        RIGHT_PAREN over_clause?
+    ;
+
+function_argument
+    :    LEFT_PAREN 
+            argument? (COMMA argument )* 
+        RIGHT_PAREN
+        keep_clause?
+    ;
+
+function_argument_analytic
+    :    LEFT_PAREN
+            (argument respect_or_ignore_nulls?)?
+            (COMMA argument respect_or_ignore_nulls? )*
+         RIGHT_PAREN
+         keep_clause?
+    ;
+
+function_argument_modeling
+    :    LEFT_PAREN
+            column_name (COMMA (numeric|null_key) (COMMA (numeric|null_key) )? )?
+            using_key
+                ( (tableview_name PERIOD ASTERISK)=> tableview_name PERIOD ASTERISK
+                | ASTERISK
+                | expression column_alias? (COMMA expression column_alias?)*
+                )
+         RIGHT_PAREN
+         keep_clause?
+    ;
+
+respect_or_ignore_nulls
+    :    (respect_key | ignore_key) nulls_key
+    ;
+
+argument
+    :    ((id EQUALS_OP GREATER_THAN_OP)=> id EQUALS_OP GREATER_THAN_OP)? expression_wrapper
+    ;
+
+type_spec
+    :     datatype
+    |    ref_key? type_name (percent_rowtype_key|percent_type_key)?
+    ;
+
+datatype
+    :    native_datatype_element
+        precision_part?
+        (with_key local_key? time_key zone_key)?
+    |    interval_key (year_key|day_key)
+                (LEFT_PAREN expression_wrapper RIGHT_PAREN)? 
+            to_key (month_key|second_key) 
+                (LEFT_PAREN expression_wrapper RIGHT_PAREN)?
+    ;
+
+precision_part
+    :    LEFT_PAREN numeric (COMMA numeric)? (char_key | byte_key)? RIGHT_PAREN
+    ;
+
+native_datatype_element
+    :    binary_integer_key
+    |    pls_integer_key
+    |    natural_key
+    |    binary_float_key
+    |    binary_double_key
+    |    naturaln_key
+    |    positive_key
+    |    positiven_key
+    |    signtype_key
+    |    simple_integer_key
+    |    nvarchar2_key
+    |    dec_key
+    |    integer_key
+    |    int_key
+    |    numeric_key
+    |    smallint_key
+    |    number_key
+    |    decimal_key 
+    |    double_key precision_key?
+    |    float_key
+    |    real_key
+    |    nchar_key
+    |    long_key raw_key?
+    |    char_key  
+    |    character_key 
+    |    varchar2_key
+    |    varchar_key
+    |    string_key
+    |    raw_key
+    |    boolean_key
+    |    date_key
+    |    rowid_key
+    |    urowid_key
+    |    year_key
+    |    month_key
+    |    day_key
+    |    hour_key
+    |    minute_key
+    |    second_key
+    |    timezone_hour_key
+    |    timezone_minute_key
+    |    timezone_region_key
+    |    timezone_abbr_key
+    |    timestamp_key
+    |    timestamp_unconstrained_key
+    |    timestamp_tz_unconstrained_key
+    |    timestamp_ltz_unconstrained_key
+    |    yminterval_unconstrained_key
+    |    dsinterval_unconstrained_key
+    |    bfile_key
+    |    blob_key
+    |    clob_key
+    |    nclob_key
+    |    mlslabel_key
+    ;
+
+bind_variable
+    :    ( BINDVAR | COLON UNSIGNED_INTEGER)
+         ( indicator_key? (BINDVAR | COLON UNSIGNED_INTEGER))?
+         ((PERIOD general_element_part)=> PERIOD general_element_part)*
+    ;
+
+general_element
+    :    general_element_part ((PERIOD general_element_part)=> PERIOD general_element_part)*
+    ;
+
+general_element_part
+    :    (INTRODUCER char_set_name)? id_expression
+            ((PERIOD id_expression)=> PERIOD id_expression)* function_argument?
+    ;
+
+table_element
+    :    (INTRODUCER char_set_name)? id_expression (PERIOD id_expression)*
+    ;
+
+// $>
+
+// $<Lexer Mappings
+
+constant
+    :    timestamp_key (quoted_string | bind_variable) (at_key time_key zone_key quoted_string)?
+    |    interval_key (quoted_string | bind_variable | general_element_part)
+         ( day_key | hour_key | minute_key | second_key)
+         ( LEFT_PAREN (UNSIGNED_INTEGER | bind_variable) (COMMA (UNSIGNED_INTEGER | bind_variable) )? RIGHT_PAREN)?
+         ( to_key
+             ( day_key | hour_key | minute_key | second_key (LEFT_PAREN (UNSIGNED_INTEGER | bind_variable) RIGHT_PAREN)? )
+         )?
+    |    numeric
+    |    date_key quoted_string
+    |    quoted_string
+    |    null_key
+    |    true_key
+    |    false_key
+    |    dbtimezone_key 
+    |    sessiontimezone_key
+    |    minvalue_key
+    |    maxvalue_key
+    |    default_key
+    ;
+
+numeric
+    :    UNSIGNED_INTEGER
+    |    EXACT_NUM_LIT
+    |    APPROXIMATE_NUM_LIT;
+
+quoted_string
+    :    CHAR_STRING
+    |    CHAR_STRING_PERL
+    |    NATIONAL_CHAR_STRING_LIT
+    ;
+
+id
+    :    (INTRODUCER char_set_name)?
+        id_expression
+    ;
+
+id_expression
+    :    REGULAR_ID
+    |    DELIMITED_ID
+    ;
+
+not_equal_op
+    :    NOT_EQUAL_OP
+    |    LESS_THAN_OP GREATER_THAN_OP
+    |    EXCLAMATION_OPERATOR_PART EQUALS_OP
+    |    CARRET_OPERATOR_PART EQUALS_OP
+    ;
+
+greater_than_or_equals_op
+    :    GREATER_THAN_OR_EQUALS_OP
+    |    GREATER_THAN_OP EQUALS_OP
+    ;
+
+less_than_or_equals_op
+    :    LESS_THAN_OR_EQUALS_OP
+    |    LESS_THAN_OP EQUALS_OP
+    ;
+
+concatenation_op
+    :    CONCATENATION_OP
+    |    VERTICAL_BAR VERTICAL_BAR
+    ;
+
+ multiset_op
+    :    multiset_key
+         ( except_key | intersect_key | union_key )
+         ( all_key | distinct_key )?
+    ;
+
+outer_join_sign
+    :    LEFT_PAREN PLUS_SIGN RIGHT_PAREN
+    ;
+
+// $>
diff --git a/runtime/Cpp/tests/PLSQLKeys.g b/runtime/Cpp/tests/PLSQLKeys.g
new file mode 100644
index 000000000..c13764807
--- /dev/null
+++ b/runtime/Cpp/tests/PLSQLKeys.g
@@ -0,0 +1,2219 @@
+/**
+ * Oracle(c) PL/SQL 11g Parser  
+ *
+ * Copyright (c) 2009-2011 Alexandre Porcelli <alexandre.porcelli@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "LICENSE");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+parser grammar PLSQLKeys;
+
+@includes
+{
+	#include "PTestTraits.hpp"
+	#include "PLSQLLexer.hpp"        
+}
+@namespace { Antlr3Test }
+
+        
+// @members{
+//     // int equalsIgnoreCase(pANTLR3_COMMON_TOKEN s1, const char* s2)        
+//     // {
+//     //     return !strcasecmp(s1->getText(s1)->chars, s2);
+//     // }
+// }
+
+create_key
+    :    SQL92_RESERVED_CREATE
+    ;
+    
+replace_key
+//  :    {input.LT(1).getText().equalsIgnoreCase("REPLACE")}?=> REGULAR_ID
+    :    {equalsIgnoreCase(LT(1)->getText(), "REPLACE" )}?  => REGULAR_ID
+    ;
+
+package_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "PACKAGE")}?=> REGULAR_ID
+    ;
+
+body_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BODY")}? REGULAR_ID
+    ;
+
+begin_key
+    :    SQL92_RESERVED_BEGIN
+    ;
+
+exit_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "EXIT")}? REGULAR_ID
+    ;
+
+declare_key
+    :    SQL92_RESERVED_DECLARE
+    ;
+
+exception_key
+    :    SQL92_RESERVED_EXCEPTION
+    ;
+
+serveroutput_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SERVEROUTPUT")}? REGULAR_ID
+    ;
+
+off_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "OFF")}? REGULAR_ID
+    ;
+
+constant_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CONSTANT")}? REGULAR_ID
+    ;
+
+subtype_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SUBTYPE")}? REGULAR_ID
+    ;
+
+cursor_key//{equalsIgnoreCase(LT(1)->getText(), "CURSOR")}? REGULAR_ID
+    :    SQL92_RESERVED_CURSOR
+    ;
+
+nextval_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NEXTVAL")}?=> REGULAR_ID
+    ;
+
+goto_key
+    :    SQL92_RESERVED_GOTO
+    ;
+
+execute_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "EXECUTE")}? REGULAR_ID
+    ;
+
+immediate_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "IMMEDIATE")}?=> REGULAR_ID
+    ;
+
+return_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "RETURN")}? REGULAR_ID
+    ;
+
+procedure_key
+    :    SQL92_RESERVED_PROCEDURE
+    ;
+
+function_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "FUNCTION")}?=> REGULAR_ID
+    ;
+
+pragma_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "PRAGMA")}? REGULAR_ID
+    ;
+
+exception_init_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "EXCEPTION_INIT")}? REGULAR_ID
+    ;
+
+type_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TYPE")}?=> REGULAR_ID
+    ;
+
+record_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "RECORD")}?=> REGULAR_ID
+    ;
+
+indexed_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INDEXED")}? REGULAR_ID
+    ;
+
+index_key
+    :    PLSQL_RESERVED_INDEX
+    ;
+
+percent_notfound_key
+    :    {equalsIgnoreCase(LT(2)->getText(), "NOTFOUND")}?=> PERCENT REGULAR_ID
+    ;
+
+percent_found_key
+    :    {equalsIgnoreCase(LT(2)->getText(), "FOUND")}?=> PERCENT REGULAR_ID
+    ;
+
+percent_isopen_key
+    :    {equalsIgnoreCase(LT(2)->getText(), "ISOPEN")}?=> PERCENT REGULAR_ID
+    ;
+
+percent_rowcount_key
+    :    {equalsIgnoreCase(LT(2)->getText(), "ROWCOUNT")}?=> PERCENT REGULAR_ID
+    ;
+
+percent_rowtype_key
+    :    {equalsIgnoreCase(LT(2)->getText(), "ROWTYPE")}?=> PERCENT REGULAR_ID 
+    ;
+
+percent_type_key
+    :    {equalsIgnoreCase(LT(2)->getText(), "TYPE")}?=> PERCENT REGULAR_ID
+    ;
+
+out_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "OUT")}?=> REGULAR_ID
+    ;
+
+inout_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INOUT")}? REGULAR_ID
+    ;
+
+extend_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "EXTEND")}?=> REGULAR_ID
+    ;
+
+raise_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "RAISE")}? REGULAR_ID
+    ;
+
+while_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "WHILE")}? REGULAR_ID
+    ;
+
+loop_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LOOP")}? REGULAR_ID
+    ;
+
+commit_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "COMMIT")}?=> REGULAR_ID
+    ;
+
+work_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "WORK")}? REGULAR_ID
+    ;
+
+if_key
+    :    PLSQL_RESERVED_IF
+    ;
+
+elsif_key
+    :    PLSQL_NON_RESERVED_ELSIF
+    ;
+
+authid_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "AUTHID")}?=> REGULAR_ID
+    ;
+
+definer_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DEFINER")}? REGULAR_ID
+    ;
+
+external_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "EXTERNAL")}? REGULAR_ID
+    ;
+
+language_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LANGUAGE")}? REGULAR_ID
+    ;
+
+java_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "JAVA")}? REGULAR_ID
+    ;
+
+name_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NAME")}?=> REGULAR_ID
+    ;
+
+deterministic_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DETERMINISTIC")}?=> REGULAR_ID
+    ;
+
+parallel_enable_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "PARALLEL_ENABLE")}?=> REGULAR_ID
+    ;
+
+result_cache_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "RESULT_CACHE")}?=> REGULAR_ID
+    ;
+
+pipelined_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "PIPELINED")}?=> REGULAR_ID
+    ;
+
+aggregate_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "AGGREGATE")}? REGULAR_ID
+    ;
+
+alter_key
+    :    SQL92_RESERVED_ALTER
+    ;
+
+compile_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "COMPILE")}? REGULAR_ID
+    ; 
+
+debug_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DEBUG")}? REGULAR_ID
+    ;
+
+reuse_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "REUSE")}? REGULAR_ID
+    ;
+
+settings_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SETTINGS")}? REGULAR_ID
+    ;
+
+specification_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SPECIFICATION")}? REGULAR_ID
+    ;
+
+drop_key
+    :    SQL92_RESERVED_DROP
+    ;
+
+trigger_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TRIGGER")}?=> REGULAR_ID
+    ;
+
+force_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "FORCE")}?=> REGULAR_ID
+    ;
+
+validate_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "VALIDATE")}? REGULAR_ID
+    ;
+
+ref_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "REF")}?=> REGULAR_ID
+    ;
+
+array_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ARRAY")}?=> REGULAR_ID
+    ;
+
+varray_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "VARRAY")}?=> REGULAR_ID
+    ;
+
+pls_integer_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "PLS_INTEGER")}?=> REGULAR_ID
+    ;
+
+serially_reusable_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SERIALLY_REUSABLE")}?=> REGULAR_ID
+    ;
+
+autonomous_transaction_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "AUTONOMOUS_TRANSACTION")}?=> REGULAR_ID
+    ;
+
+inline_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INLINE")}?=> REGULAR_ID
+    ;
+
+restrict_references_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "RESTRICT_REFERENCES")}?=> REGULAR_ID
+    ;
+
+exceptions_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "EXCEPTIONS")}?=> REGULAR_ID 
+    ;
+
+save_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SAVE")}?=> REGULAR_ID
+    ;
+
+forall_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "FORALL")}?=> REGULAR_ID
+    ;
+
+continue_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CONTINUE")}?=> REGULAR_ID
+    ;
+
+indices_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INDICES")}?=> REGULAR_ID
+    ;
+
+values_key
+    :    SQL92_RESERVED_VALUES
+    ;
+
+case_key
+    :    SQL92_RESERVED_CASE
+    ;
+
+bulk_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BULK")}?=> REGULAR_ID
+    ;
+
+collect_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "COLLECT")}?=> REGULAR_ID
+    ;
+
+committed_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "COMMITTED")}? REGULAR_ID
+    ;
+
+use_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "USE")}?=> REGULAR_ID
+    ;
+
+level_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LEVEL")}? REGULAR_ID
+    ;
+
+isolation_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ISOLATION")}?=> REGULAR_ID
+    ;
+
+serializable_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SERIALIZABLE")}? REGULAR_ID
+    ;
+
+segment_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SEGMENT")}? REGULAR_ID
+    ;
+
+write_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "WRITE")}?=> REGULAR_ID
+    ;
+
+wait_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "WAIT")}?=> REGULAR_ID
+    ;
+
+corrupt_xid_all_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CORRUPT_XID_ALL")}?=> REGULAR_ID
+    ;
+
+corrupt_xid_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CORRUPT_XID")}?=> REGULAR_ID
+    ;
+
+batch_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BATCH")}?=> REGULAR_ID
+    ;
+
+session_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SESSION")}?=> REGULAR_ID
+    ;
+
+role_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ROLE")}?=> REGULAR_ID
+    ;
+
+constraint_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CONSTRAINT")}?=> REGULAR_ID
+    ;
+
+constraints_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CONSTRAINTS")}?=> REGULAR_ID
+    ;
+
+call_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CALL")}?=> REGULAR_ID
+    ;
+
+explain_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "EXPLAIN")}?=> REGULAR_ID
+    ;
+
+merge_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "MERGE")}?=> REGULAR_ID
+    ;
+
+plan_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "PLAN")}?=> REGULAR_ID
+    ;
+
+system_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SYSTEM")}?=> REGULAR_ID
+    ;
+
+subpartition_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SUBPARTITION")}?=> REGULAR_ID
+    ;
+
+partition_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "PARTITION")}?=> REGULAR_ID
+    ;
+
+matched_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "MATCHED")}?=> REGULAR_ID
+    ;
+
+reject_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "REJECT")}?=> REGULAR_ID
+    ;
+
+log_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LOG")}?=> REGULAR_ID
+    ;
+
+unlimited_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "UNLIMITED")}?=> REGULAR_ID
+    ;
+
+limit_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LIMIT")}?=> REGULAR_ID
+    ;
+
+errors_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ERRORS")}?=> REGULAR_ID
+    ;
+
+timestamp_tz_unconstrained_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TIMESTAMP_TZ_UNCONSTRAINED")}?=> REGULAR_ID
+    ;
+
+urowid_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "UROWID")}?=> REGULAR_ID
+    ;
+
+binary_float_min_subnormal_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_FLOAT_MIN_SUBNORMAL")}?=> REGULAR_ID
+    ;
+
+binary_double_min_normal_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_DOUBLE_MIN_NORMAL")}?=> REGULAR_ID
+    ;
+
+binary_float_max_normal_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_FLOAT_MAX_NORMAL")}?=> REGULAR_ID
+    ;
+
+positiven_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "POSITIVEN")}?=> REGULAR_ID
+    ;
+
+timezone_abbr_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TIMEZONE_ABBR")}?=> REGULAR_ID
+    ;
+
+binary_double_min_subnormal_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_DOUBLE_MIN_SUBNORMAL")}?=> REGULAR_ID
+    ;
+
+binary_float_max_subnormal_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_FLOAT_MAX_SUBNORMAL")}?=> REGULAR_ID
+    ;
+
+binary_double_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_DOUBLE")}?=> REGULAR_ID
+    ;
+
+bfile_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BFILE")}?=> REGULAR_ID
+    ;
+
+binary_double_infinity_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_DOUBLE_INFINITY")}?=> REGULAR_ID
+    ;
+
+timezone_region_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TIMEZONE_REGION")}?=> REGULAR_ID
+    ;
+
+timestamp_ltz_unconstrained_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TIMESTAMP_LTZ_UNCONSTRAINED")}?=> REGULAR_ID
+    ;
+
+naturaln_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NATURALN")}?=> REGULAR_ID
+    ;
+
+simple_integer_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SIMPLE_INTEGER")}?=> REGULAR_ID
+    ;
+
+binary_double_max_subnormal_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_DOUBLE_MAX_SUBNORMAL")}?=> REGULAR_ID
+    ;
+
+byte_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BYTE")}?=> REGULAR_ID
+    ;
+
+binary_float_infinity_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_FLOAT_INFINITY")}?=> REGULAR_ID
+    ;
+
+binary_float_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_FLOAT")}?=> REGULAR_ID
+    ;
+
+range_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "RANGE")}?=> REGULAR_ID
+    ;
+
+nclob_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NCLOB")}?=> REGULAR_ID
+    ;
+
+clob_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CLOB")}?=> REGULAR_ID
+    ;
+
+dsinterval_unconstrained_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DSINTERVAL_UNCONSTRAINED")}?=> REGULAR_ID
+    ;
+
+yminterval_unconstrained_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "YMINTERVAL_UNCONSTRAINED")}?=> REGULAR_ID
+    ;
+
+rowid_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ROWID")}?=> REGULAR_ID
+    ;
+
+binary_double_nan_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_DOUBLE_NAN")}?=> REGULAR_ID
+    ;
+
+timestamp_unconstrained_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TIMESTAMP_UNCONSTRAINED")}?=> REGULAR_ID
+    ;
+
+binary_float_min_normal_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_FLOAT_MIN_NORMAL")}?=> REGULAR_ID
+    ;
+
+signtype_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SIGNTYPE")}?=> REGULAR_ID
+    ;
+
+blob_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BLOB")}?=> REGULAR_ID
+    ;
+
+nvarchar2_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NVARCHAR2")}?=> REGULAR_ID
+    ;
+
+binary_double_max_normal_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_DOUBLE_MAX_NORMAL")}?=> REGULAR_ID
+    ;
+
+binary_float_nan_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_FLOAT_NAN")}?=> REGULAR_ID
+    ;
+
+string_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "STRING")}?=> REGULAR_ID
+    ;
+
+c_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "C")}?=> REGULAR_ID
+    ;
+
+library_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LIBRARY")}?=> REGULAR_ID
+    ;
+
+context_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CONTEXT")}?=> REGULAR_ID
+    ;
+
+parameters_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "PARAMETERS")}?=> REGULAR_ID
+    ;
+
+agent_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "AGENT")}?=> REGULAR_ID
+    ;
+
+cluster_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CLUSTER")}?=> REGULAR_ID
+    ;
+
+hash_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "HASH")}?=> REGULAR_ID
+    ;
+
+relies_on_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "RELIES_ON")}?=> REGULAR_ID
+    ;
+
+returning_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "RETURNING")}?=> REGULAR_ID
+    ;    
+
+statement_id_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "STATEMENT_ID")}?=> REGULAR_ID
+    ;
+
+deferred_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DEFERRED")}?=> REGULAR_ID
+    ;
+
+advise_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ADVISE")}?=> REGULAR_ID
+    ;
+
+resumable_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "RESUMABLE")}?=> REGULAR_ID
+    ;
+
+timeout_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TIMEOUT")}?=> REGULAR_ID
+    ;
+
+parallel_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "PARALLEL")}?=> REGULAR_ID
+    ;
+
+ddl_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DDL")}?=> REGULAR_ID
+    ;
+
+query_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "QUERY")}?=> REGULAR_ID
+    ;
+
+dml_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DML")}?=> REGULAR_ID
+    ;
+
+guard_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "GUARD")}?=> REGULAR_ID
+    ;
+
+nothing_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NOTHING")}?=> REGULAR_ID
+    ;
+
+enable_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ENABLE")}?=> REGULAR_ID
+    ;
+
+database_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DATABASE")}?=> REGULAR_ID
+    ;
+
+disable_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DISABLE")}?=> REGULAR_ID
+    ;
+
+link_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LINK")}?=> REGULAR_ID
+    ;
+
+identified_key
+    :    PLSQL_RESERVED_IDENTIFIED
+    ;
+
+none_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NONE")}?=> REGULAR_ID
+    ;
+
+before_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BEFORE")}?=> REGULAR_ID 
+    ;
+
+referencing_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "REFERENCING")}?=> REGULAR_ID
+    ;
+
+logon_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LOGON")}?=> REGULAR_ID
+    ;
+
+after_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "AFTER")}? REGULAR_ID
+    ;
+
+schema_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SCHEMA")}?=> REGULAR_ID
+    ;
+
+grant_key
+    :    SQL92_RESERVED_GRANT
+    ;
+
+truncate_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TRUNCATE")}?=> REGULAR_ID
+    ;
+
+startup_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "STARTUP")}?=> REGULAR_ID
+    ;
+
+statistics_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "STATISTICS")}?=> REGULAR_ID
+    ;
+
+noaudit_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NOAUDIT")}?=> REGULAR_ID
+    ;
+
+suspend_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SUSPEND")}?=> REGULAR_ID
+    ;
+
+audit_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "AUDIT")}?=> REGULAR_ID
+    ;
+
+disassociate_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DISASSOCIATE")}?=> REGULAR_ID 
+    ;
+
+shutdown_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SHUTDOWN")}?=> REGULAR_ID
+    ;
+
+compound_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "COMPOUND")}?=> REGULAR_ID
+    ;
+
+servererror_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SERVERERROR")}?=> REGULAR_ID
+    ;
+
+parent_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "PARENT")}?=> REGULAR_ID
+    ;
+
+follows_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "FOLLOWS")}?=> REGULAR_ID
+    ;
+
+nested_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NESTED")}?=> REGULAR_ID
+    ;
+
+old_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "OLD")}?=> REGULAR_ID
+    ;
+
+statement_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "STATEMENT")}?=> REGULAR_ID
+    ;
+
+db_role_change_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DB_ROLE_CHANGE")}?=> REGULAR_ID
+    ;
+
+each_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "EACH")}?=> REGULAR_ID
+    ;
+
+logoff_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LOGOFF")}?=> REGULAR_ID
+    ;
+
+analyze_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ANALYZE")}?=> REGULAR_ID
+    ;
+
+instead_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INSTEAD")}?=> REGULAR_ID
+    ;
+
+associate_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ASSOCIATE")}?=> REGULAR_ID
+    ;
+
+new_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NEW")}?=> REGULAR_ID
+    ;
+
+revoke_key
+    :    SQL92_RESERVED_REVOKE
+    ;
+
+rename_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "RENAME")}?=> REGULAR_ID 
+    ;
+
+customdatum_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CUSTOMDATUM")}?=> REGULAR_ID
+    ;
+
+oradata_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ORADATA")}?=> REGULAR_ID
+    ;
+
+constructor_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CONSTRUCTOR")}?=> REGULAR_ID
+    ;
+
+sqldata_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SQLDATA")}?=> REGULAR_ID
+    ;
+
+member_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "MEMBER")}?=> REGULAR_ID
+    ;
+
+self_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SELF")}?=> REGULAR_ID
+    ;
+
+object_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "OBJECT")}?=> REGULAR_ID
+    ;
+
+variable_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "VARIABLE")}?=> REGULAR_ID
+    ;
+
+instantiable_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INSTANTIABLE")}?=> REGULAR_ID
+    ;
+
+final_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "FINAL")}?=> REGULAR_ID
+    ;
+
+static_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "STATIC")}?=> REGULAR_ID
+    ;
+
+oid_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "OID")}?=> REGULAR_ID
+    ;
+
+result_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "RESULT")}?=> REGULAR_ID
+    ;
+
+under_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "UNDER")}?=> REGULAR_ID
+    ;
+
+map_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "MAP")}?=> REGULAR_ID
+    ;
+
+overriding_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "OVERRIDING")}?=> REGULAR_ID
+    ;
+
+add_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ADD")}?=> REGULAR_ID
+    ;
+
+modify_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "MODIFY")}?=> REGULAR_ID
+    ;
+
+including_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INCLUDING")}?=> REGULAR_ID
+    ;
+
+substitutable_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SUBSTITUTABLE")}?=> REGULAR_ID
+    ;
+
+attribute_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ATTRIBUTE")}?=> REGULAR_ID
+    ;
+
+cascade_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CASCADE")}?=> REGULAR_ID 
+    ;
+
+data_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DATA")}?=> REGULAR_ID
+    ;
+
+invalidate_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INVALIDATE")}? REGULAR_ID
+    ;
+
+element_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ELEMENT")}?=> REGULAR_ID
+    ;
+
+first_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "FIRST")}?=> REGULAR_ID
+    ;
+
+check_key
+    :    SQL92_RESERVED_CHECK
+    ;
+
+option_key
+    :    SQL92_RESERVED_OPTION
+    ;
+
+nocycle_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NOCYCLE")}?=> REGULAR_ID
+    ;
+
+locked_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LOCKED")}?=> REGULAR_ID
+    ;
+
+block_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BLOCK")}?=> REGULAR_ID
+    ;
+
+xml_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "XML")}?=> REGULAR_ID
+    ;
+
+pivot_key//:    {(input.LT(1).getText().equalsIgnoreCase("PIVOT"))}?=> REGULAR_ID
+    :     PLSQL_NON_RESERVED_PIVOT
+    ;
+
+prior_key
+    :    SQL92_RESERVED_PRIOR
+    ;
+
+sequential_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SEQUENTIAL")}?=> REGULAR_ID
+    ;
+
+single_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SINGLE")}?=> REGULAR_ID
+    ;
+
+skip_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SKIP")}?=> REGULAR_ID
+    ;
+
+model_key
+    :    //{input.LT(1).getText().equalsIgnoreCase("MODEL")}?=> REGULAR_ID
+        PLSQL_NON_RESERVED_MODEL
+    ;
+
+updated_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "UPDATED")}?=> REGULAR_ID
+    ;
+
+increment_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INCREMENT")}?=> REGULAR_ID
+    ;
+
+exclude_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "EXCLUDE")}?=> REGULAR_ID
+    ;
+
+reference_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "REFERENCE")}?=> REGULAR_ID
+    ;
+
+sets_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SETS")}?=> REGULAR_ID
+    ;
+
+until_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "UNTIL")}?=> REGULAR_ID
+    ;
+
+seed_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SEED")}?=> REGULAR_ID
+    ;
+
+maxvalue_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "MAXVALUE")}?=> REGULAR_ID
+    ;
+
+siblings_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SIBLINGS")}?=> REGULAR_ID
+    ;
+
+cube_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CUBE")}?=> REGULAR_ID
+    ;
+
+nulls_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NULLS")}?=> REGULAR_ID
+    ;
+
+dimension_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DIMENSION")}?=> REGULAR_ID
+    ;
+
+scn_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SCN")}?=> REGULAR_ID
+    ;
+
+snapshot_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SNAPSHOT")}?=> REGULAR_ID
+    ;
+
+decrement_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DECREMENT")}?=> REGULAR_ID
+    ;
+
+unpivot_key//:    {(input.LT(1).getText().equalsIgnoreCase("UNPIVOT"))}?=> REGULAR_ID
+    :    PLSQL_NON_RESERVED_UNPIVOT
+    ;
+
+keep_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "KEEP")}?=> REGULAR_ID
+    ;
+
+measures_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "MEASURES")}?=> REGULAR_ID
+    ;
+
+rows_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ROWS")}?=> REGULAR_ID
+    ;
+
+sample_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SAMPLE")}?=> REGULAR_ID
+    ;
+
+upsert_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "UPSERT")}?=> REGULAR_ID
+    ;
+
+versions_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "VERSIONS")}?=> REGULAR_ID
+    ;
+
+rules_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "RULES")}?=> REGULAR_ID
+    ;
+
+iterate_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ITERATE")}?=> REGULAR_ID
+    ;
+
+minvalue_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "MINVALUE")}?=> REGULAR_ID
+    ;
+
+rollup_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ROLLUP")}?=> REGULAR_ID
+    ;
+
+nav_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NAV")}?=> REGULAR_ID
+    ;
+
+automatic_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "AUTOMATIC")}?=> REGULAR_ID
+    ;
+
+last_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LAST")}?=> REGULAR_ID
+    ;
+
+main_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "MAIN")}?=> REGULAR_ID
+    ;
+
+grouping_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "GROUPING")}?=> REGULAR_ID
+    ;
+
+include_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INCLUDE")}?=> REGULAR_ID
+    ;
+
+ignore_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "IGNORE")}?=> REGULAR_ID
+    ;
+
+respect_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "RESPECT")}?=> REGULAR_ID
+    ;
+
+unique_key
+    :    SQL92_RESERVED_UNIQUE
+    ;
+
+submultiset_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SUBMULTISET")}?=> REGULAR_ID
+    ;
+
+at_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "AT")}?=> REGULAR_ID
+//    :    SQL92_RESERVED_AT
+    ;
+
+a_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "A")}?=> REGULAR_ID
+    ;
+
+empty_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "EMPTY")}?=> REGULAR_ID
+    ;
+
+likec_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LIKEC")}?=> REGULAR_ID
+    ;
+
+nan_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NAN")}?=> REGULAR_ID
+    ;
+
+infinite_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INFINITE")}?=> REGULAR_ID
+    ;
+
+like2_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LIKE2")}?=> REGULAR_ID
+    ;
+
+like4_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LIKE4")}?=> REGULAR_ID
+    ;
+
+present_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "PRESENT")}?=> REGULAR_ID
+    ;
+
+dbtimezone_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DBTIMEZONE")}?=> REGULAR_ID
+    ;
+
+sessiontimezone_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SESSIONTIMEZONE")}?=> REGULAR_ID
+    ;
+
+nchar_cs_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NCHAR_CS")}?=> REGULAR_ID
+    ;
+
+decompose_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DECOMPOSE")}?=> REGULAR_ID
+    ;
+
+following_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "FOLLOWING")}?=> REGULAR_ID
+    ;
+
+first_value_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "FIRST_VALUE")}?=> REGULAR_ID
+    ;
+
+preceding_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "PRECEDING")}?=> REGULAR_ID
+    ;
+
+within_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "WITHIN")}?=> REGULAR_ID
+    ;
+
+canonical_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CANONICAL")}?=> REGULAR_ID
+    ;
+
+compatibility_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "COMPATIBILITY")}?=> REGULAR_ID
+    ;
+
+over_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "OVER")}?=> REGULAR_ID
+    ;
+
+multiset_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "MULTISET")}?=> REGULAR_ID
+    ;
+
+connect_by_root_key
+    :    PLSQL_NON_RESERVED_CONNECT_BY_ROOT
+    ;
+
+last_value_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LAST_VALUE")}?=> REGULAR_ID
+    ;
+
+current_key
+    :    SQL92_RESERVED_CURRENT
+    ;
+
+unbounded_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "UNBOUNDED")}?=> REGULAR_ID
+    ;
+
+dense_rank_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DENSE_RANK")}?=> REGULAR_ID
+    ;
+
+cost_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "COST")}?=> REGULAR_ID
+    ;
+
+char_cs_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CHAR_CS")}?=> REGULAR_ID
+    ;
+
+auto_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "AUTO")}?=> REGULAR_ID
+    ;
+
+treat_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TREAT")}?=> REGULAR_ID
+    ;
+
+content_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CONTENT")}?=> REGULAR_ID
+    ;
+
+xmlparse_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "XMLPARSE")}?=> REGULAR_ID
+    ;
+
+xmlelement_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "XMLELEMENT")}?=> REGULAR_ID
+    ;
+
+entityescaping_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ENTITYESCAPING")}?=> REGULAR_ID
+    ;
+
+standalone_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "STANDALONE")}?=> REGULAR_ID
+    ;
+
+wellformed_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "WELLFORMED")}?=> REGULAR_ID
+    ;
+
+xmlexists_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "XMLEXISTS")}?=> REGULAR_ID
+    ;
+
+version_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "VERSION")}?=> REGULAR_ID
+    ;
+
+xmlcast_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "XMLCAST")}?=> REGULAR_ID
+    ;
+
+yes_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "YES")}?=> REGULAR_ID
+    ;
+
+no_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NO")}?=> REGULAR_ID
+    ;
+
+evalname_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "EVALNAME")}?=> REGULAR_ID
+    ;
+
+xmlpi_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "XMLPI")}?=> REGULAR_ID
+    ;
+
+xmlcolattval_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "XMLCOLATTVAL")}?=> REGULAR_ID
+    ;
+
+document_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DOCUMENT")}?=> REGULAR_ID
+    ;
+
+xmlforest_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "XMLFOREST")}?=> REGULAR_ID
+    ;
+
+passing_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "PASSING")}?=> REGULAR_ID
+    ;
+
+columns_key //: PLSQL_RESERVED_COLUMNS
+    :    {equalsIgnoreCase(LT(1)->getText(), "COLUMNS")}?=> REGULAR_ID
+    ;
+
+indent_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INDENT")}?=> REGULAR_ID
+    ;
+
+hide_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "HIDE")}?=> REGULAR_ID
+    ;
+
+xmlagg_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "XMLAGG")}?=> REGULAR_ID
+    ;
+
+path_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "PATH")}?=> REGULAR_ID
+    ;
+
+xmlnamespaces_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "XMLNAMESPACES")}?=> REGULAR_ID
+    ;
+
+size_key
+    :    SQL92_RESERVED_SIZE
+    ;
+
+noschemacheck_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NOSCHEMACHECK")}?=> REGULAR_ID
+    ;
+
+noentityescaping_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NOENTITYESCAPING")}?=> REGULAR_ID
+    ;
+
+xmlquery_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "XMLQUERY")}?=> REGULAR_ID
+    ;
+
+xmltable_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "XMLTABLE")}?=> REGULAR_ID
+    ;
+
+xmlroot_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "XMLROOT")}?=> REGULAR_ID
+    ;
+
+schemacheck_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SCHEMACHECK")}?=> REGULAR_ID
+    ;
+
+xmlattributes_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "XMLATTRIBUTES")}?=> REGULAR_ID
+    ;
+
+encoding_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ENCODING")}?=> REGULAR_ID
+    ;
+
+show_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SHOW")}?=> REGULAR_ID
+    ;
+
+xmlserialize_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "XMLSERIALIZE")}?=> REGULAR_ID
+    ;
+
+ordinality_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ORDINALITY")}?=> REGULAR_ID
+    ;
+
+defaults_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DEFAULTS")}?=> REGULAR_ID
+    ;
+
+sqlerror_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SQLERROR")}? REGULAR_ID 
+    ;
+	
+oserror_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "OSERROR")}? REGULAR_ID 
+    ;
+
+success_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SUCCESS")}? REGULAR_ID 
+    ;
+
+warning_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "WARNING")}? REGULAR_ID 
+    ;
+
+failure_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "FAILURE")}? REGULAR_ID 
+    ;
+
+insert_key
+    :    SQL92_RESERVED_INSERT
+    ;
+
+order_key
+    :    SQL92_RESERVED_ORDER
+    ;
+
+minus_key
+    :    PLSQL_RESERVED_MINUS
+    ;
+
+row_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ROW")}? REGULAR_ID
+    ;
+
+mod_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "MOD")}? REGULAR_ID
+    ;
+
+raw_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "RAW")}?=> REGULAR_ID
+    ;
+
+power_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "POWER")}? REGULAR_ID
+    ;
+
+lock_key
+    :    PLSQL_RESERVED_LOCK
+    ;
+
+exists_key
+    :    SQL92_RESERVED_EXISTS
+    ;
+
+having_key
+    :    SQL92_RESERVED_HAVING
+    ;
+
+any_key
+    :    SQL92_RESERVED_ANY
+    ;
+
+with_key
+    :    SQL92_RESERVED_WITH
+    ;
+
+transaction_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TRANSACTION")}?=> REGULAR_ID
+    ;
+
+rawtohex_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "RAWTOHEX")}? REGULAR_ID
+    ;
+
+number_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NUMBER")}?=> REGULAR_ID
+    ;
+
+nocopy_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NOCOPY")}?=> REGULAR_ID
+    ;
+
+to_key
+    :    SQL92_RESERVED_TO
+    ;
+
+abs_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ABS")}? REGULAR_ID
+    ;
+
+rollback_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ROLLBACK")}?=> REGULAR_ID
+    ;
+
+share_key
+    :    PLSQL_RESERVED_SHARE
+    ;
+
+greatest_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "GREATEST")}? REGULAR_ID
+    ;
+
+vsize_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "VSIZE")}? REGULAR_ID
+    ;
+
+exclusive_key
+    :    PLSQL_RESERVED_EXCLUSIVE
+    ;
+
+varchar2_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "VARCHAR2")}?=> REGULAR_ID
+    ;
+
+rowidtochar_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ROWIDTOCHAR")}? REGULAR_ID
+    ;
+
+open_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "OPEN")}?=> REGULAR_ID
+    ;
+
+comment_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "COMMENT")}?=> REGULAR_ID
+    ;
+
+sqrt_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SQRT")}? REGULAR_ID
+    ;
+
+instr_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INSTR")}? REGULAR_ID
+    ;
+
+nowait_key
+    :    PLSQL_RESERVED_NOWAIT
+    ;
+
+lpad_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LPAD")}? REGULAR_ID
+    ;
+
+boolean_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BOOLEAN")}?=> REGULAR_ID
+    ;
+
+rpad_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "RPAD")}? REGULAR_ID
+    ;
+
+savepoint_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SAVEPOINT")}?=> REGULAR_ID
+    ;
+
+decode_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DECODE")}? REGULAR_ID
+    ;
+
+reverse_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "REVERSE")}? REGULAR_ID
+    ;
+
+least_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LEAST")}? REGULAR_ID
+    ;
+
+nvl_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NVL")}? REGULAR_ID
+    ;
+
+variance_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "VARIANCE")}? REGULAR_ID
+    ;
+
+start_key
+    :    PLSQL_RESERVED_START
+    ;
+
+desc_key
+    :    SQL92_RESERVED_DESC
+    ;
+
+concat_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CONCAT")}? REGULAR_ID
+    ;
+
+dump_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DUMP")}? REGULAR_ID
+    ;
+
+soundex_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SOUNDEX")}? REGULAR_ID
+    ;
+
+positive_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "POSITIVE")}?=> REGULAR_ID
+    ;
+
+union_key
+    :    SQL92_RESERVED_UNION
+    ;
+
+ascii_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ASCII")}? REGULAR_ID
+    ;
+
+connect_key
+    :    SQL92_RESERVED_CONNECT
+    ;
+
+asc_key
+    :    SQL92_RESERVED_ASC
+    ;
+
+hextoraw_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "HEXTORAW")}? REGULAR_ID
+    ;
+
+to_date_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TO_DATE")}? REGULAR_ID
+    ;
+
+floor_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "FLOOR")}? REGULAR_ID
+    ;
+
+sign_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SIGN")}? REGULAR_ID
+    ;
+
+update_key
+    :    SQL92_RESERVED_UPDATE
+    ;
+
+trunc_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TRUNC")}? REGULAR_ID
+    ;
+
+rtrim_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "RTRIM")}? REGULAR_ID
+    ;
+
+close_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CLOSE")}?=> REGULAR_ID
+    ;
+
+to_char_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TO_CHAR")}? REGULAR_ID
+    ;
+
+ltrim_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LTRIM")}? REGULAR_ID
+    ;
+
+mode_key
+    :    PLSQL_RESERVED_MODE
+    ;
+
+uid_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "UID")}? REGULAR_ID
+    ;
+
+chr_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CHR")}? REGULAR_ID
+    ;
+
+intersect_key
+    :    SQL92_RESERVED_INTERSECT
+    ;
+
+chartorowid_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CHARTOROWID")}? REGULAR_ID
+    ;
+
+mlslabel_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "MLSLABEL")}?=> REGULAR_ID
+    ;
+
+userenv_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "USERENV")}? REGULAR_ID
+    ;
+
+stddev_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "STDDEV")}? REGULAR_ID
+    ;
+
+length_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LENGTH")}? REGULAR_ID
+    ;
+
+fetch_key
+    :    SQL92_RESERVED_FETCH
+    ;
+
+group_key
+    :    SQL92_RESERVED_GROUP
+    ;
+
+sysdate_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SYSDATE")}? REGULAR_ID
+    ;
+
+binary_integer_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_INTEGER")}?=> REGULAR_ID
+    ;
+
+to_number_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TO_NUMBER")}? REGULAR_ID
+    ;
+
+substr_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SUBSTR")}? REGULAR_ID
+    ;
+
+ceil_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CEIL")}? REGULAR_ID
+    ;
+
+initcap_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INITCAP")}? REGULAR_ID
+    ;
+
+round_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ROUND")}? REGULAR_ID
+    ;
+
+long_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LONG")}?=> REGULAR_ID
+    ;
+
+read_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "READ")}?=> REGULAR_ID
+    ;
+
+only_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ONLY")}? REGULAR_ID
+    ;
+
+set_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SET")}?=> REGULAR_ID
+    ;
+
+nullif_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NULLIF")}? REGULAR_ID
+    ;
+
+coalesce_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "COALESCE")}? REGULAR_ID
+    ;
+
+count_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "COUNT")}? REGULAR_ID
+    ;
+
+avg_key    :    {equalsIgnoreCase(LT(1)->getText(), "AVG")}? REGULAR_ID
+    ;
+
+max_key    :    {equalsIgnoreCase(LT(1)->getText(), "MAX")}? REGULAR_ID
+    ;
+
+min_key    :    {equalsIgnoreCase(LT(1)->getText(), "MIN")}? REGULAR_ID
+    ;
+
+sum_key    :    {equalsIgnoreCase(LT(1)->getText(), "SUM")}? REGULAR_ID
+    ;
+
+unknown_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "UNKNOWN")}? REGULAR_ID
+    ;
+
+escape_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ESCAPE")}? REGULAR_ID
+    ;
+
+some_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SOME")}? REGULAR_ID
+    ;
+
+match_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "MATCH")}? REGULAR_ID
+    ;
+
+cast_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CAST")}? REGULAR_ID
+    ;
+
+full_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "FULL")}?=> REGULAR_ID
+    ;
+
+partial_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "PARTIAL")}? REGULAR_ID
+    ;
+
+character_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CHARACTER")}?=> REGULAR_ID
+    ;
+
+except_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "EXCEPT")}? REGULAR_ID
+    ;
+
+char_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CHAR")}?=> REGULAR_ID
+    ;
+
+varying_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "VARYING")}?=> REGULAR_ID
+    ;
+
+varchar_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "VARCHAR")}?=> REGULAR_ID
+    ;
+
+national_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NATIONAL")}? REGULAR_ID
+    ;
+
+nchar_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NCHAR")}? REGULAR_ID
+    ;
+
+bit_key    :    {equalsIgnoreCase(LT(1)->getText(), "BIT")}? REGULAR_ID
+    ;
+
+float_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "FLOAT")}? REGULAR_ID
+    ;
+    
+real_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "REAL")}?=> REGULAR_ID
+    ;
+
+double_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DOUBLE")}?=> REGULAR_ID
+    ;
+
+precision_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "PRECISION")}? REGULAR_ID
+    ;
+
+interval_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INTERVAL")}?=> REGULAR_ID
+    ;
+
+time_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TIME")}? REGULAR_ID
+    ;
+ 
+zone_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "ZONE")}? REGULAR_ID
+    ;
+
+timestamp_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TIMESTAMP")}? REGULAR_ID
+    ;
+
+date_key//:    {input.LT(1).getText().equalsIgnoreCase("DATE")}?=> REGULAR_ID
+    :    SQL92_RESERVED_DATE
+    ;
+
+numeric_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NUMERIC")}?=> REGULAR_ID
+    ;
+
+decimal_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DECIMAL")}?=> REGULAR_ID
+    ;
+
+dec_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DEC")}?=> REGULAR_ID
+    ;
+
+integer_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INTEGER")}?=> REGULAR_ID
+    ;
+
+int_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INT")}?=> REGULAR_ID
+    ;
+
+smallint_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SMALLINT")}?=> REGULAR_ID
+    ;
+
+corresponding_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CORRESPONDING")}? REGULAR_ID
+    ;
+
+cross_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CROSS")}?=> REGULAR_ID
+    ;
+
+join_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "JOIN")}?=> REGULAR_ID
+    ;
+
+left_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LEFT")}?=> REGULAR_ID
+    ;
+
+right_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "RIGHT")}?=> REGULAR_ID
+    ;
+
+inner_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INNER")}?=> REGULAR_ID
+    ;
+
+natural_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NATURAL")}?=> REGULAR_ID
+    ;
+
+outer_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "OUTER")}?=> REGULAR_ID
+    ;
+
+using_key
+    :    PLSQL_NON_RESERVED_USING
+    ;
+
+indicator_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "INDICATOR")}? REGULAR_ID
+    ;
+
+user_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "USER")}? REGULAR_ID
+    ;
+
+current_user_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CURRENT_USER")}? REGULAR_ID
+    ;
+
+session_user_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SESSION_USER")}? REGULAR_ID
+    ;
+
+system_user_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SYSTEM_USER")}? REGULAR_ID
+    ;
+
+value_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "VALUE")}? REGULAR_ID
+    ;
+
+substring_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SUBSTRING")}?=> REGULAR_ID
+    ;
+
+upper_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "UPPER")}? REGULAR_ID
+    ;
+
+lower_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LOWER")}? REGULAR_ID
+    ;
+
+convert_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CONVERT")}? REGULAR_ID
+    ;
+
+translate_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TRANSLATE")}? REGULAR_ID
+    ;
+
+trim_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TRIM")}? REGULAR_ID
+    ;
+
+leading_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LEADING")}? REGULAR_ID
+    ;
+
+trailing_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TRAILING")}? REGULAR_ID
+    ;
+
+both_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BOTH")}? REGULAR_ID
+    ;
+
+collate_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "COLLATE")}? REGULAR_ID
+    ;
+
+position_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "POSITION")}? REGULAR_ID
+    ;
+
+extract_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "EXTRACT")}? REGULAR_ID
+    ;
+
+second_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SECOND")}? REGULAR_ID
+    ;
+
+timezone_hour_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TIMEZONE_HOUR")}? REGULAR_ID
+    ;
+
+timezone_minute_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "TIMEZONE_MINUTE")}? REGULAR_ID
+    ;
+
+char_length_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CHAR_LENGTH")}? REGULAR_ID
+    ;
+
+octet_length_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "OCTET_LENGTH")}? REGULAR_ID
+    ;
+
+character_length_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CHARACTER_LENGTH")}? REGULAR_ID
+    ;
+
+bit_length_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BIT_LENGTH")}? REGULAR_ID
+    ;
+
+local_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "LOCAL")}? REGULAR_ID
+    ;
+
+current_timestamp_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CURRENT_TIMESTAMP")}? REGULAR_ID
+    ;
+
+current_date_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CURRENT_DATE")}? REGULAR_ID
+    ;
+
+current_time_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CURRENT_TIME")}? REGULAR_ID
+    ;
+
+module_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "MODULE")}? REGULAR_ID
+    ;
+
+global_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "GLOBAL")}? REGULAR_ID
+    ;
+
+year_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "YEAR")}?=> REGULAR_ID
+    ;
+
+month_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "MONTH")}? REGULAR_ID
+    ;
+
+day_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DAY")}?=> REGULAR_ID
+    ;
+
+hour_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "HOUR")}? REGULAR_ID
+    ;
+
+minute_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "MINUTE")}? REGULAR_ID
+    ;
+
+whenever_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "WHENEVER")}? REGULAR_ID
+    ;
+
+is_key
+    :    SQL92_RESERVED_IS
+    ;
+
+else_key
+    :    SQL92_RESERVED_ELSE
+    ;
+
+table_key
+    :    SQL92_RESERVED_TABLE
+    ;
+
+the_key
+    :    SQL92_RESERVED_THE
+    ;
+
+then_key
+    :    SQL92_RESERVED_THEN
+    ;
+
+end_key
+    :    SQL92_RESERVED_END
+    ;
+
+all_key
+    :    SQL92_RESERVED_ALL
+    ;
+
+on_key
+    :    SQL92_RESERVED_ON
+    ;
+
+or_key
+    :    SQL92_RESERVED_OR
+    ;
+
+and_key
+    :    SQL92_RESERVED_AND
+    ;
+
+not_key
+    :    SQL92_RESERVED_NOT
+    ;
+
+true_key
+    :    SQL92_RESERVED_TRUE
+    ;
+
+false_key
+    :    SQL92_RESERVED_FALSE
+    ;
+
+default_key
+    :    SQL92_RESERVED_DEFAULT
+    ;
+
+distinct_key
+    :    SQL92_RESERVED_DISTINCT
+    ;
+
+into_key
+    :    SQL92_RESERVED_INTO
+    ;
+
+by_key
+    :    SQL92_RESERVED_BY
+    ;
+
+as_key
+    :    SQL92_RESERVED_AS
+    ;
+
+in_key
+    :    SQL92_RESERVED_IN
+    ;
+
+of_key
+    :    SQL92_RESERVED_OF
+    ;
+
+null_key
+    :    SQL92_RESERVED_NULL
+    ;
+
+for_key
+    :    SQL92_RESERVED_FOR
+    ;
+
+select_key
+    :    SQL92_RESERVED_SELECT
+    ;
+
+when_key
+    :    SQL92_RESERVED_WHEN
+    ;
+
+delete_key
+    :    SQL92_RESERVED_DELETE
+    ;
+
+between_key
+    :    SQL92_RESERVED_BETWEEN
+    ;
+
+like_key
+    :    SQL92_RESERVED_LIKE
+    ;
+
+from_key
+    :    SQL92_RESERVED_FROM
+    ;
+
+where_key
+    :    SQL92_RESERVED_WHERE
+    ;
+
+sequence_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SEQUENCE")}? REGULAR_ID
+    ;
+
+noorder_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NOORDER")}? REGULAR_ID
+    ;
+
+cycle_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CYCLE")}? REGULAR_ID
+    ;
+
+cache_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "CACHE")}? REGULAR_ID
+    ;
+
+nocache_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NOCACHE")}? REGULAR_ID
+    ;
+
+nomaxvalue_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NOMAXVALUE")}? REGULAR_ID
+    ;
+
+nominvalue_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "NOMINVALUE")}? REGULAR_ID
+    ;
+
+search_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "SEARCH")}? REGULAR_ID
+    ;
+
+depth_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "DEPTH")}? REGULAR_ID
+    ;
+
+breadth_key
+    :    {equalsIgnoreCase(LT(1)->getText(), "BREADTH")}? REGULAR_ID
+    ;
diff --git a/runtime/Cpp/tests/PLSQLLexer.g b/runtime/Cpp/tests/PLSQLLexer.g
new file mode 100644
index 000000000..f261b7ffe
--- /dev/null
+++ b/runtime/Cpp/tests/PLSQLLexer.g
@@ -0,0 +1,922 @@
+/**
+ * Oracle(c) PL/SQL 11g Parser  
+ *
+ * Copyright (c) 2009-2011 Alexandre Porcelli <alexandre.porcelli@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+lexer grammar PLSQLLexer;
+
+options {
+        language=Cpp;
+//        filter=true;
+}
+
+tokens { // moved to the import vocabulary
+    UNSIGNED_INTEGER; // Imaginary token based on subtoken typecasting - see the rule <EXACT_NUM_LIT>
+    APPROXIMATE_NUM_LIT; // Imaginary token based on subtoken typecasting - see the rule <EXACT_NUM_LIT>
+    MINUS_SIGN; // Imaginary token based on subtoken typecasting - see the rule <SEPARATOR>
+    DOUBLE_PERIOD;
+    UNDERSCORE; // Imaginary token based on subtoken typecasting - see the rule <INTRODUCER>
+}
+
+@lexer::includes
+{
+	#include "PTestTraits.hpp"
+}
+@lexer::namespace
+{
+Antlr3Test
+}
+
+@header {
+/*
+ * Oracle(c) PL/SQL 11g Parser  
+ *
+ * Copyright (c) 2009-2011 Alexandre Porcelli <alexandre.porcelli@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+}
+
+@members {
+//     // buffer (queue) to hold the emit()'d tokens
+//     // private LinkedList<Token> tokenBuffer = new LinkedList<Token>();
+
+//     // public void emit(Token t) {
+//     //     tokenBuffer.add(t);
+//     // }
+
+//     // private void advanceInput(){
+//     //     state.tokenStartCharIndex = input.index();
+//     //     state.tokenStartCharPositionInLine = input.getCharPositionInLine();
+//     //     state.tokenStartLine = input.getLine();
+//     // }
+
+
+    /**
+     * Return a token from this source; i.e., match a token on the char stream.
+     */
+    // public Token nextToken() {
+    //     while (true) {
+    //         if (tokenBuffer.size() == 0) {
+    //             state.token = null;
+    //             state.channel = Token.DEFAULT_CHANNEL;
+    //             state.tokenStartCharIndex = input.index();
+    //             state.tokenStartCharPositionInLine = input.getCharPositionInLine();
+    //             state.tokenStartLine = input.getLine();
+    //             state.text = null;
+    //             if (input.LA(1) == CharStream.EOF) {
+    //                 return Token.EOF_TOKEN;
+    //             }
+    //             try {
+    //                 int m = input.mark();
+    //                 state.backtracking = 1;
+    //                 state.failed = false;
+    //                 mTokens();
+    //                 state.backtracking = 0;
+
+    //                 if (state.failed) {
+    //                     input.rewind(m);
+    //                     input.consume();
+    //                 } else {
+    //                     emit();
+    //                 }
+    //             } catch (RecognitionException re) {
+    //                 // shouldn't happen in backtracking mode, but...
+    //                 reportError(re);
+    //                 recover(re);
+    //             }
+    //         } else {
+    //             Token result = tokenBuffer.poll();
+    //             if (result == Token.SKIP_TOKEN || result.getType() == Token.INVALID_TOKEN_TYPE || result == null)
+    //             {
+    //                 // discard
+    //                 // SKIP & INVALID
+    //                 // tokens
+    //                 continue;
+    //             }
+    //             return result;
+    //         }
+    //     }
+    // }
+}
+
+FOR_NOTATION
+    :    UNSIGNED_INTEGER
+        ///{state.type = UNSIGNED_INTEGER; emit(); advanceInput();}
+        '..'
+        ///{state.type = DOUBLE_PERIOD; emit(); advanceInput();}
+        UNSIGNED_INTEGER
+        ///{state.type = UNSIGNED_INTEGER; emit(); advanceInput(); $channel=HIDDEN;}
+    ;
+
+//{ Rule #358 <NATIONAL_CHAR_STRING_LIT> - subtoken typecast in <REGULAR_ID>, it also incorporates <character_representation>
+//  Lowercase 'n' is a usual addition to the standard
+NATIONAL_CHAR_STRING_LIT
+    :    ('N' | 'n') '\'' (options{greedy=true;}: ~('\'' | '\r' | '\n' ) | '\'' '\'' | NEWLINE)* '\''
+    ;
+//}
+
+//{ Rule #040 <BIT_STRING_LIT> - subtoken typecast in <REGULAR_ID>
+//  Lowercase 'b' is a usual addition to the standard
+BIT_STRING_LIT
+    :    ('B' | 'b') ('\'' ('0' | '1')* '\'' SEPARATOR? )+
+    ;
+//}
+
+
+//{ Rule #284 <HEX_STRING_LIT> - subtoken typecast in <REGULAR_ID>
+//  Lowercase 'x' is a usual addition to the standard
+HEX_STRING_LIT
+    :    ('X' | 'x') ('\'' ('a'..'f' | 'A'..'F' | '0'..'9')* '\'' SEPARATOR? )+ 
+    ;
+//}
+
+PERIOD
+    :    '.' 
+    {    if ((char) LA(1) == '.') {
+            consume();
+            $type = DOUBLE_PERIOD;
+        }
+    }        
+    ;
+
+//{ Rule #238 <EXACT_NUM_LIT> 
+//  This rule is a bit tricky - it resolves the ambiguity with <PERIOD> 
+//  It als44o incorporates <mantisa> and <exponent> for the <APPROXIMATE_NUM_LIT>
+//  Rule #501 <signed_integer> was incorporated directly in the token <APPROXIMATE_NUM_LIT>
+//  See also the rule #617 <unsigned_num_lit>
+EXACT_NUM_LIT
+    : (
+            UNSIGNED_INTEGER
+            ( '.' UNSIGNED_INTEGER?
+            |    {$type = UNSIGNED_INTEGER;}
+            ) ( ('E' | 'e') ('+' | '-')? UNSIGNED_INTEGER {$type = APPROXIMATE_NUM_LIT;} )?
+    |    '.' UNSIGNED_INTEGER ( ('E' | 'e') ('+' | '-')? UNSIGNED_INTEGER {$type = APPROXIMATE_NUM_LIT;} )?
+    )
+    ( 'D' | 'd' | 'f' | 'F')?
+    ;
+//}
+
+//{ Rule #--- <CHAR_STRING> is a base for Rule #065 <char_string_lit> , it incorporates <character_representation>
+//  and a superfluous subtoken typecasting of the "QUOTE"
+CHAR_STRING
+    :    '\'' (options{greedy=true;}: ~('\'' | '\r' | '\n') | '\'' '\'' | NEWLINE)* '\''
+    ;
+//}
+
+// Perl-style quoted string, see Oracle SQL reference, chapter String Literals
+CHAR_STRING_PERL    : ('q'|'Q') ( QS_ANGLE | QS_BRACE | QS_BRACK | QS_PAREN | QS_OTHER) {$type = CHAR_STRING;};
+fragment QUOTE      : '\'' ;
+fragment QS_ANGLE   : QUOTE '<' ( options {greedy=false;} : . )* '>' QUOTE ;
+fragment QS_BRACE   : QUOTE '{' ( options {greedy=false;} : . )* '}' QUOTE ;
+fragment QS_BRACK   : QUOTE '[' ( options {greedy=false;} : . )* ']' QUOTE ;
+fragment QS_PAREN   : QUOTE '(' ( options {greedy=false;} : . )* ')' QUOTE ;
+
+fragment QS_OTHER_CH: ~('<'|'{'|'['|'('|' '|'\t'|'\n'|'\r');
+fragment QS_OTHER
+//    For C target we have to preserve case sensitivity.
+		// @declarations {
+   		// ANTLR3_UINT32 (*oldLA)(struct ANTLR3_INT_STREAM_struct *, ANTLR3_INT32);
+		// }
+		// @init {
+		// 	oldLA = INPUT->istream->_LA;
+        //    INPUT->setUcaseLA(INPUT, ANTLR3_FALSE);
+		// }
+		:
+		QUOTE delimiter=QS_OTHER_CH
+/* JAVA Syntax */
+//    ( { input.LT(1) != $delimiter.text.charAt(0) || ( input.LT(1) == $delimiter.text.charAt(0) && input.LT(2) != '\'') }? => . )*
+//    ( { input.LT(1) == $delimiter.text.charAt(0) && input.LT(2) == '\'' }? => . ) QUOTE
+/* C Syntax */
+//		( { LA(1) != $delimiter->getText()->chars[0] || LA(2) != '\'' }? => . )*
+//		( { LA(1) == $delimiter->getText()->chars[0] && LA(2) == '\'' }? => . ) QUOTE
+//		{ INPUT->istream->_LA = oldLA; }
+/* C++ Syntax */
+		( { LA(1) != $delimiter->getText().at(0) || LA(2) != '\'' }? => . )*
+		( { LA(1) == $delimiter->getText().at(0) && LA(2) == '\'' }? => . ) QUOTE
+		;
+
+
+//{ Rule #163 <DELIMITED_ID>
+DELIMITED_ID
+    :    '"' (~('"' | '\r' | '\n') | '"' '"')+ '"' 
+    ;
+//}
+
+//{ Rule #546 <SQL_SPECIAL_CHAR> was split into single rules
+PERCENT
+    :    '%'
+    ;
+
+AMPERSAND
+    :    '&'
+    ;
+
+LEFT_PAREN
+    :    '('
+    ;
+
+RIGHT_PAREN
+    :    ')'
+    ;
+
+DOUBLE_ASTERISK
+    :    '**'
+    ;
+
+ASTERISK
+    :    '*'
+    ;
+
+PLUS_SIGN
+    :    '+'
+    ;
+
+COMMA
+    :    ','
+    ;
+
+SOLIDUS
+    :    '/'
+    ; 
+
+AT_SIGN
+    :    '@'
+    ;
+
+ASSIGN_OP
+    :    ':='
+    ;
+
+// See OCI reference for more information about this
+BINDVAR
+    :    COLON SIMPLE_LETTER  ( SIMPLE_LETTER | '0' .. '9' | '_' )*
+    |    COLON DELIMITED_ID  // not used in SQL but spotted in v$sqltext when using cursor_sharing
+    |    COLON UNSIGNED_INTEGER
+    |    QUESTION_MARK // not in SQL, not in Oracle, not in OCI, use this for JDBC
+    ;
+
+COLON
+    :    ':'
+    ;
+
+SEMICOLON
+    :    ';'
+    ;
+
+LESS_THAN_OR_EQUALS_OP
+    :    '<='
+    ;
+
+LESS_THAN_OP
+    :    '<'
+    ;
+
+GREATER_THAN_OR_EQUALS_OP
+    :    '>='
+    ;
+
+NOT_EQUAL_OP
+    :    '!='
+    |    '<>'
+    |    '^='
+    |    '~='
+    ;
+CARRET_OPERATOR_PART
+    :    '^'
+    ;
+
+TILDE_OPERATOR_PART
+    :    '~'
+    ;
+
+EXCLAMATION_OPERATOR_PART
+    :    '!'
+    ;
+
+GREATER_THAN_OP
+    :    '>'
+    ;
+
+fragment
+QUESTION_MARK
+    :    '?'
+    ;
+
+// protected UNDERSCORE : '_' SEPARATOR ; // subtoken typecast within <INTRODUCER>
+CONCATENATION_OP
+    :    '||'
+    ;
+
+VERTICAL_BAR
+    :    '|'
+    ;
+
+EQUALS_OP
+    :    '='
+    ;
+
+//{ Rule #532 <SQL_EMBDD_LANGUAGE_CHAR> was split into single rules:
+LEFT_BRACKET
+    :    '['
+    ;
+
+RIGHT_BRACKET
+    :    ']'
+    ;
+
+//}
+
+//{ Rule #319 <INTRODUCER>
+INTRODUCER
+    :    '_' (SEPARATOR {$type = UNDERSCORE;})?
+    ;
+
+//{ Rule #479 <SEPARATOR>
+//  It was originally a protected rule set to be filtered out but the <COMMENT> and <MINUS_SIGN> clashed. 
+SEPARATOR
+    :    '-' {$type = MINUS_SIGN;}
+    |    COMMENT { $channel=HIDDEN; }
+    |    (SPACE | NEWLINE)+ { $channel=HIDDEN; }
+    ;
+//}
+
+//{ Rule #504 <SIMPLE_LETTER> - simple_latin _letter was generalised into SIMPLE_LETTER
+//  Unicode is yet to be implemented - see NSF0
+fragment
+SIMPLE_LETTER
+    :    'a'..'z'
+    |    'A'..'Z'
+    ;
+//}
+
+//  Rule #176 <DIGIT> was incorporated by <UNSIGNED_INTEGER> 
+//{ Rule #615 <UNSIGNED_INTEGER> - subtoken typecast in <EXACT_NUM_LIT> 
+fragment
+UNSIGNED_INTEGER
+    :    ('0'..'9')+ 
+    ;
+//}
+
+//{ Rule #097 <COMMENT>
+fragment
+COMMENT
+    :    '--' ( ~('\r' | '\n') )* (NEWLINE|EOF)
+    |    '/*' (options{greedy=false;} : .)* '*/'
+    ;
+//}
+
+// SQL*Plus prompt
+// TODO should be grammar rule, but tricky to implement
+PROMPT
+	: 'PROMPT' SPACE ( ~('\r' | '\n') )* (NEWLINE|EOF)
+	;
+//}
+
+
+
+//{ Rule #360 <NEWLINE>
+fragment
+NEWLINE
+    :    '\r' (options{greedy=true;}: '\n')?
+    |    '\n'
+    ;
+//}
+
+//{ Rule #522 <SPACE>
+fragment
+SPACE    :    ' '
+    |    '\t'
+    ;
+//}
+
+fragment APPROXIMATE_NUM_LIT: ;
+fragment MINUS_SIGN: ;    
+fragment UNDERSCORE: ;
+fragment DOUBLE_PERIOD: ;
+
+//{ Rule #442 <REGULAR_ID> additionally encapsulates a few STRING_LITs.
+//  Within testLiterals all reserved and non-reserved words are being resolved
+
+SQL92_RESERVED_ALL
+    :    'ALL'
+    ;
+
+SQL92_RESERVED_ALTER
+    :    'ALTER'
+    ;
+
+SQL92_RESERVED_AND
+    :    'AND'
+    ;
+
+SQL92_RESERVED_ANY
+    :    'ANY'
+    ;
+
+SQL92_RESERVED_AS
+    :    'AS'
+    ;
+
+SQL92_RESERVED_ASC
+    :    'ASC'
+    ;
+
+//SQL92_RESERVED_AT
+//    :    'AT'
+//    ;
+
+SQL92_RESERVED_BEGIN
+    :    'BEGIN'
+    ;
+
+SQL92_RESERVED_BETWEEN
+    :    'BETWEEN'
+    ;
+
+SQL92_RESERVED_BY
+    :    'BY'
+    ;
+
+SQL92_RESERVED_CASE
+    :    'CASE'
+    ;
+
+SQL92_RESERVED_CHECK
+    :    'CHECK'
+    ;
+
+PLSQL_RESERVED_CLUSTERS
+    :    'CLUSTERS'
+    ;
+
+PLSQL_RESERVED_COLAUTH
+    :    'COLAUTH'
+    ;
+
+PLSQL_RESERVED_COMPRESS
+    :    'COMPRESS'
+    ;
+
+SQL92_RESERVED_CONNECT
+    :    'CONNECT'
+    ;
+
+//PLSQL_NON_RESERVED_COLUMNS
+//    :    'COLUMNS'
+//    ;
+
+PLSQL_NON_RESERVED_CONNECT_BY_ROOT
+    :    'CONNECT_BY_ROOT'
+    ;
+
+PLSQL_RESERVED_CRASH
+    :    'CRASH'
+    ;
+
+SQL92_RESERVED_CREATE
+    :    'CREATE'
+    ;
+
+SQL92_RESERVED_CURRENT
+    :    'CURRENT'
+    ;
+
+SQL92_RESERVED_CURSOR
+    :    'CURSOR'
+    ;
+
+SQL92_RESERVED_DATE
+    :    'DATE'
+    ;
+
+SQL92_RESERVED_DECLARE
+    :    'DECLARE'
+    ;
+
+SQL92_RESERVED_DEFAULT
+    :    'DEFAULT'
+    ;
+
+SQL92_RESERVED_DELETE
+    :    'DELETE'
+    ;
+
+SQL92_RESERVED_DESC
+    :    'DESC'
+    ;
+
+SQL92_RESERVED_DISTINCT
+    :    'DISTINCT'
+    ;
+
+SQL92_RESERVED_DROP
+    :    'DROP'
+    ;
+
+SQL92_RESERVED_ELSE
+    :    'ELSE'
+    ;
+
+SQL92_RESERVED_END
+    :    'END'
+    ;
+
+SQL92_RESERVED_EXCEPTION
+//@declarations {
+//    ANTLR3_MARKER excStart; // ANTLR should declare it for us, but it does not
+//}
+    :    'EXCEPTION'
+    // "exception" is a keyword only withing the contex of the PL/SQL language
+    // while it can be an identifier(column name, table name) in SQL
+    // "exception" is a keyword if and only it is followed by "when"
+    //{
+    //        $type = SQL92_RESERVED_EXCEPTION;
+    //        excStart = MARK();
+    // exc->set_type(exc, SQL92_RESERVED_EXCEPTION);
+    // // emit(exc);
+    // // advanceInput();
+
+    // $type = Token.INVALID_TOKEN_TYPE;
+    // int markModel = input.mark();
+
+    // // Now loop over next Tokens in the input and eventually set Token's type to REGULAR_ID
+
+    // // Subclassed version will return NULL unless EOF is reached.
+    // // nextToken either returns NULL => then the next token is put into the queue tokenBuffer
+    // // or it returns Token.EOF, then nothing is put into the queue
+    // Token t1 = super.nextToken();
+    // {    // This "if" handles the situation when the "model" is the last text in the input.
+    //     if( t1 != null && t1.getType() == Token.EOF)
+    //     {
+    //          $e.set_type(REGULAR_ID);
+    //     } else {
+    //          t1 = tokenBuffer.pollLast(); // "withdraw" the next token from the queue
+    //          while(true)
+    //          {
+    //              if(t1.getType() == EOF)   // is it EOF?
+    //              {
+    //                  $e.set_type(REGULAR_ID);
+    //                  break;
+    //              }
+
+    //              if(t1.getChannel() == HIDDEN) // is it a white space? then advance to the next token
+    //              {
+    //                  t1 = super.nextToken(); if( t1 == null) { t1 = tokenBuffer.pollLast(); };
+    //                  continue;
+    //              }
+
+    //              if( t1.getType() != SQL92_RESERVED_WHEN && t1.getType() != SEMICOLON) // is something other than "when"
+    //              {
+    //                  $e.set_type(REGULAR_ID);
+    //                  break;
+    //              }
+
+    //              break; // we are in the model_clase do not rewrite anything
+    //           } // while true
+    //      } // else if( t1 != null && t1.getType() == Token.EOF)
+    // }
+    // input.rewind(markModel);
+    //        REWIND(excStart);
+    //}
+    ;
+
+PLSQL_RESERVED_EXCLUSIVE
+    :    'EXCLUSIVE'
+    ;
+
+SQL92_RESERVED_EXISTS
+    :    'EXISTS'
+    ;
+
+SQL92_RESERVED_FALSE
+    :    'FALSE'
+    ;
+
+SQL92_RESERVED_FETCH
+    :    'FETCH'
+    ;
+
+SQL92_RESERVED_FOR
+    :    'FOR'
+    ;
+
+SQL92_RESERVED_FROM
+    :    'FROM'
+    ;
+
+SQL92_RESERVED_GOTO
+    :    'GOTO'
+    ;
+
+SQL92_RESERVED_GRANT
+    :    'GRANT'
+    ;
+
+SQL92_RESERVED_GROUP
+    :    'GROUP'
+    ;
+
+SQL92_RESERVED_HAVING
+    :    'HAVING'
+    ;
+
+PLSQL_RESERVED_IDENTIFIED
+    :    'IDENTIFIED'
+    ;
+
+PLSQL_RESERVED_IF
+    :    'IF'
+    ;
+
+SQL92_RESERVED_IN
+    :    'IN'
+    ;
+
+PLSQL_RESERVED_INDEX
+    :    'INDEX'
+    ;
+
+PLSQL_RESERVED_INDEXES
+    :    'INDEXES'
+    ;
+
+SQL92_RESERVED_INSERT
+    :    'INSERT'
+    ;
+
+SQL92_RESERVED_INTERSECT
+    :    'INTERSECT'
+    ;
+
+SQL92_RESERVED_INTO
+    :    'INTO'
+    ;
+
+SQL92_RESERVED_IS
+    :    'IS'
+    ;
+
+SQL92_RESERVED_LIKE
+    :    'LIKE'
+    ;
+
+PLSQL_RESERVED_LOCK
+    :    'LOCK'
+    ;
+
+PLSQL_RESERVED_MINUS
+    :    'MINUS'
+    ;
+
+PLSQL_RESERVED_MODE
+    :    'MODE'
+    ;
+
+PLSQL_RESERVED_NOCOMPRESS
+    :    'NOCOMPRESS'
+    ;
+
+SQL92_RESERVED_NOT
+    :    'NOT'
+    ;
+
+PLSQL_RESERVED_NOWAIT
+    :    'NOWAIT'
+    ;
+
+SQL92_RESERVED_NULL
+    :    'NULL'
+    ;
+
+SQL92_RESERVED_OF
+    :    'OF'
+    ;
+
+SQL92_RESERVED_ON
+    :    'ON'
+    ;
+
+SQL92_RESERVED_OPTION
+    :    'OPTION'
+    ;
+
+SQL92_RESERVED_OR
+    :    'OR'
+    ;
+
+SQL92_RESERVED_ORDER
+    :    'ORDER'
+    ;
+
+SQL92_RESERVED_OVERLAPS
+    :    'OVERLAPS'
+    ;
+
+SQL92_RESERVED_PRIOR
+    :    'PRIOR'
+    ;
+
+SQL92_RESERVED_PROCEDURE
+    :    'PROCEDURE'
+    ;
+
+SQL92_RESERVED_PUBLIC
+    :    'PUBLIC'
+    ;
+
+PLSQL_RESERVED_RESOURCE
+    :    'RESOURCE'
+    ;
+
+SQL92_RESERVED_REVOKE
+    :    'REVOKE'
+    ;
+
+SQL92_RESERVED_SELECT
+    :    'SELECT'
+    ;
+
+PLSQL_RESERVED_SHARE
+    :    'SHARE'
+    ;
+
+SQL92_RESERVED_SIZE
+    :    'SIZE'
+    ;
+
+// SQL92_RESERVED_SQL
+//     :    'SQL'
+//     ;
+
+PLSQL_RESERVED_START
+    :    'START'
+    ;
+
+PLSQL_RESERVED_TABAUTH
+    :    'TABAUTH'
+    ;
+
+SQL92_RESERVED_TABLE
+    :    'TABLE'
+    ;
+
+SQL92_RESERVED_THE
+    :    'THE'
+    ;
+
+SQL92_RESERVED_THEN
+    :    'THEN'
+    ;
+
+SQL92_RESERVED_TO
+    :    'TO'
+    ;
+
+SQL92_RESERVED_TRUE
+    :    'TRUE'
+    ;
+
+SQL92_RESERVED_UNION
+    :    'UNION'
+    ;
+
+SQL92_RESERVED_UNIQUE
+    :    'UNIQUE'
+    ;
+
+SQL92_RESERVED_UPDATE
+    :    'UPDATE'
+    ;
+
+SQL92_RESERVED_VALUES
+    :    'VALUES'
+    ;
+
+SQL92_RESERVED_VIEW
+    :    'VIEW'
+    ;
+
+PLSQL_RESERVED_VIEWS
+    :    'VIEWS'
+    ;
+
+SQL92_RESERVED_WHEN
+    :    'WHEN'
+    ;
+
+SQL92_RESERVED_WHERE
+    :    'WHERE'
+    ;
+
+SQL92_RESERVED_WITH
+    :    'WITH'
+    ;
+
+PLSQL_NON_RESERVED_USING
+    :    'USING'
+    ;
+
+PLSQL_NON_RESERVED_MODEL
+    :    'MODEL'
+    {
+         // "MODEL" is a keyword if and only if it is followed by ("main"|"partition"|"dimension")
+         // otherwise it is a identifier(REGULAR_ID).
+         // This wodoo implements something like context sensitive lexer.
+         // Here we've matched the word "model". Then the Token is created and en-queued in tokenBuffer
+         // We still remember the reference(m) onto this Token
+         $type = PLSQL_NON_RESERVED_MODEL;
+         // emit(m);
+         // advanceInput();
+
+         // $type = Token.INVALID_TOKEN_TYPE;
+         // int markModel = input.mark();
+
+         // // Now loop over next Tokens in the input and eventually set Token's type to REGULAR_ID
+
+         // // Subclassed version will return NULL unless EOF is reached.
+         // // nextToken either returns NULL => then the next token is put into the queue tokenBuffer
+         // // or it returns Token.EOF, then nothing is put into the queue
+         // Token t1 = super.nextToken();
+         // {    // This "if" handles the situation when the "model" is the last text in the input.
+         //      if( t1 != null && t1.getType() == Token.EOF)
+         //      {
+         //          $m.set_type(REGULAR_ID);
+         //      } else {
+         //          t1 = tokenBuffer.pollLast(); // "withdraw" the next token from the queue
+         //          while(true)
+         //          {
+         //             if(t1.getType() == EOF)   // is it EOF?
+         //             {
+         //                 $m.set_type(REGULAR_ID);
+         //                 break;
+         //             }
+
+         //             if(t1.getChannel() == HIDDEN) // is it a white space? then advance to the next token
+         //             {
+         //                 t1 = super.nextToken(); if( t1 == null) { t1 = tokenBuffer.pollLast(); };
+         //                 continue;
+         //             }
+
+         //             if( t1.getType() != REGULAR_ID || // is something other than ("main"|"partition"|"dimension")
+         //                ( !t1.getText().equalsIgnoreCase("main") &&
+         //                  !t1.getText().equalsIgnoreCase("partition") &&
+         //                  !t1.getText().equalsIgnoreCase("dimension")
+         //               ))
+         //             {
+         //                 $m.set_type(REGULAR_ID);
+         //                 break;
+         //             }
+
+         //             break; // we are in the model_clase do not rewrite anything
+         //          } // while true
+         //      } // else if( t1 != null && t1.getType() == Token.EOF)
+         // }
+         // input.rewind(markModel);
+    }
+    ;
+
+PLSQL_NON_RESERVED_ELSIF
+    :    'ELSIF'
+    ;
+
+PLSQL_NON_RESERVED_PIVOT
+    :    'PIVOT'
+    ;
+
+PLSQL_NON_RESERVED_UNPIVOT
+    :    'UNPIVOT'
+    ;
+
+REGULAR_ID
+    :    (SIMPLE_LETTER) (SIMPLE_LETTER | '$' | '_' | '#' | '0'..'9')*
+    ;
+
+ZV
+    :    '@!' {$channel=HIDDEN;}
+    ;
+
+// disambiguate these
diff --git a/runtime/Cpp/tests/PLSQLParser.g b/runtime/Cpp/tests/PLSQLParser.g
new file mode 100644
index 000000000..cb6b0e2a7
--- /dev/null
+++ b/runtime/Cpp/tests/PLSQLParser.g
@@ -0,0 +1,1104 @@
+/**
+ * Oracle(c) PL/SQL 11g Parser  
+ *
+ * Copyright (c) 2009-2011 Alexandre Porcelli <alexandre.porcelli@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+parser grammar PLSQLParser;
+
+options {
+    tokenVocab=PLSQLLexer;
+    language=Cpp;
+    //memoize=true;
+    output=AST;
+}
+
+import PLSQLKeys, PLSQLCommons, PLSQL_DMLParser, SQLPLUSParser;
+
+@parser::includes
+{
+	#include "PTestTraits.hpp"
+	#include "PLSQLLexer.hpp"
+}
+@parser::namespace { Antlr3Test }
+
+@header {
+/**
+ * Oracle(c) PL/SQL 11g Parser  
+ *
+ * Copyright (c) 2009-2011 Alexandre Porcelli <alexandre.porcelli@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+}
+
+swallow_to_semi
+    :    ~( SEMICOLON )+
+    ;
+
+compilation_unit
+    :    unit_statement* EOF
+    ;
+
+sql_script
+    :   (unit_statement|sql_plus_command)* EOF
+    ;
+
+unit_statement
+options{
+backtrack=true;
+}    :    alter_function
+    |    alter_package
+    |    alter_procedure
+    |    alter_sequence
+    |    alter_trigger
+    |    alter_type
+
+    |    create_function_body
+    |    create_procedure_body
+    |    create_package
+
+//    |    create_index //TODO
+//    |    create_table //TODO
+//    |    create_view //TODO
+//    |    create_directory //TODO
+//    |    create_materialized_view //TODO
+
+    |    create_sequence
+    |    create_trigger
+    |    create_type
+
+    |    drop_function
+    |    drop_package
+    |    drop_procedure
+    |    drop_sequence
+    |    drop_trigger
+    |    drop_type
+    |    data_manipulation_language_statements
+    ;
+
+// $<DDL -> SQL Statements for Stored PL/SQL Units
+
+// $<Function DDLs
+
+drop_function
+    :    drop_key function_key function_name
+        SEMICOLON
+    ;
+
+alter_function
+    :    alter_key function_key function_name
+        compile_key debug_key? compiler_parameters_clause*
+        (reuse_key settings_key)?
+        SEMICOLON
+    ;
+
+create_function_body
+    :    (create_key ( or_key replace_key )?)? function_key function_name 
+              ( LEFT_PAREN parameter (COMMA parameter)* RIGHT_PAREN)?
+        return_key type_spec
+                (invoker_rights_clause|parallel_enable_clause|result_cache_clause|deterministic_key)*
+        (
+            (    pipelined_key? ( is_key | as_key )
+                      (    declare_key? declare_spec* body 
+                      |    call_spec)
+            )
+        |    (pipelined_key|aggregate_key) using_key implementation_type_name
+        )
+              SEMICOLON
+    ;
+
+// $<Creation Function - Specific Clauses
+
+parallel_enable_clause
+    :    parallel_enable_key partition_by_clause?
+    ;
+
+partition_by_clause
+    :    LEFT_PAREN
+            partition_key expression by_key 
+            (    any_key 
+            |    (hash_key|range_key) LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN
+            )
+            streaming_clause?
+        RIGHT_PAREN
+    ;
+
+result_cache_clause
+    :    result_cache_key relies_on_part?
+    ;
+
+relies_on_part
+    :    relies_on_key LEFT_PAREN tableview_name (COMMA tableview_name)* RIGHT_PAREN
+    ;
+
+streaming_clause
+    :    (order_key|cluster_key) expression by_key 
+        LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN
+    ;
+// $>
+// $>
+
+// $<Package DDLs
+
+drop_package
+    :    drop_key package_key body_key? package_name
+        SEMICOLON
+    ;
+
+alter_package
+    :    alter_key package_key package_name
+        compile_key debug_key? (package_key|body_key|specification_key)?
+        compiler_parameters_clause*
+        (reuse_key settings_key)?
+        SEMICOLON
+    ;
+
+create_package
+    :    create_key ( or_key replace_key )? package_key
+        ( package_spec | package_body )?
+        SEMICOLON
+    ;
+
+// $<Create Package - Specific Clauses
+
+package_body
+    :    body_key package_name (is_key | as_key)
+        package_obj_body*
+        (begin_key seq_of_statements|end_key package_name?)
+    ;
+
+package_spec
+    :    package_name invoker_rights_clause? (is_key | as_key)
+        package_obj_spec*
+        end_key package_name?
+    ;
+
+package_obj_spec
+options{
+backtrack=true;
+}    :    variable_declaration
+    |     subtype_declaration
+    |     cursor_declaration
+    |     exception_declaration
+    |     record_declaration
+    |     table_declaration
+    |     procedure_spec
+    |     function_spec
+    ;
+
+procedure_spec
+    :     procedure_key procedure_name 
+        ( LEFT_PAREN parameter ( COMMA parameter )* RIGHT_PAREN )? SEMICOLON 
+    ;
+
+function_spec
+    :    function_key function_name 
+        (LEFT_PAREN parameter ( COMMA parameter)* RIGHT_PAREN )?
+        return_key type_spec SEMICOLON 
+    ;
+
+package_obj_body
+options{
+backtrack=true;
+}    :     variable_declaration 
+    |     subtype_declaration 
+    |     cursor_declaration 
+    |     exception_declaration 
+    |     record_declaration
+    |     table_declaration
+    |     create_procedure_body
+    |     create_function_body 
+    ;
+
+// $>
+
+// $>
+
+// $<Procedure DDLs
+
+drop_procedure
+    :    drop_key procedure_key procedure_name
+        SEMICOLON
+    ;
+
+alter_procedure
+    :    alter_key procedure_key procedure_name
+        compile_key debug_key? compiler_parameters_clause*
+        (reuse_key settings_key)?
+        SEMICOLON
+    ;
+
+create_procedure_body
+    :    (create_key ( or_key replace_key )?)? procedure_key procedure_name
+              ( LEFT_PAREN parameter ( COMMA parameter )* RIGHT_PAREN )? 
+              invoker_rights_clause?
+        ( is_key | as_key )
+              (    declare_key? declare_spec* body 
+              |    call_spec 
+              |    external_key
+              )
+              SEMICOLON
+      ;
+
+// $>
+
+// $<Trigger DDLs
+
+drop_trigger
+    :    drop_key trigger_key trigger_name
+        SEMICOLON
+    ;
+
+alter_trigger
+    :    alter_key trigger_key tn1=trigger_name
+    (    (enable_key|disable_key)
+    |    rename_key to_key tn2=trigger_name
+    |    compile_key debug_key? compiler_parameters_clause* (reuse_key settings_key)?
+    )    SEMICOLON
+    ;
+
+create_trigger
+    :    create_key ( or_key replace_key )? trigger_key trigger_name
+    (    simple_dml_trigger
+    |    compound_dml_trigger
+    |    non_dml_trigger
+    )
+    trigger_follows_clause?
+    (enable_key|disable_key)?
+    trigger_when_clause? 
+    trigger_body SEMICOLON
+    ;
+
+trigger_follows_clause
+    :    follows_key trigger_name (COMMA trigger_name)*
+    ;
+
+trigger_when_clause
+    :    when_key LEFT_PAREN condition RIGHT_PAREN
+    ;
+
+// $<Create Trigger- Specific Clauses
+simple_dml_trigger
+    :    (before_key|after_key|instead_key of_key) dml_event_clause referencing_clause? for_each_row?
+    ;
+
+for_each_row
+    :    for_key each_key row_key
+    ;
+
+compound_dml_trigger
+    :    for_key dml_event_clause referencing_clause?
+    ;
+
+non_dml_trigger
+    :    (before_key|after_key) non_dml_event (or_key non_dml_event)*
+        on_key (database_key | (schema_name PERIOD)? schema_key )
+    ;
+
+trigger_body
+    :    (compound_key trigger_key)=> compound_trigger_block
+    |    (call_key id)=> call_key routine_clause 
+    |    trigger_block
+    ;
+
+routine_clause
+    :    routine_name function_argument?
+    ;
+
+compound_trigger_block
+    :    compound_key trigger_key declare_spec* timing_point_section+ end_key trigger_name
+    ;
+
+timing_point_section
+options{
+k=3;
+}    :    bk=before_key statement_key is_key trigger_block before_key statement_key SEMICOLON
+    |    bk=before_key each_key row_key is_key trigger_block before_key each_key row_key SEMICOLON
+    |    ak=after_key statement_key is_key trigger_block after_key statement_key SEMICOLON
+    |    ak=after_key each_key row_key is_key trigger_block after_key each_key row_key SEMICOLON
+    ;
+
+non_dml_event
+    :    alter_key
+    |    analyze_key
+    |    associate_key statistics_key
+    |    audit_key
+    |    comment_key
+    |    create_key
+    |    disassociate_key statistics_key
+    |    drop_key
+    |    grant_key
+    |    noaudit_key
+    |    rename_key
+    |    revoke_key
+    |    truncate_key
+    |    ddl_key
+    |    startup_key
+    |    shutdown_key
+    |    db_role_change_key
+    |    logon_key
+    |    logoff_key
+    |    servererror_key
+    |    suspend_key
+    |    database_key
+    |    schema_key
+    |    follows_key
+    ;
+
+dml_event_clause
+    :    dml_event_element (or_key dml_event_element)*
+        on_key 
+        dml_event_nested_clause? tableview_name
+    ;
+
+dml_event_element
+    :    (delete_key|insert_key|update_key) (of_key column_name (COMMA column_name)*)?
+    ;
+
+dml_event_nested_clause
+    :    nested_key table_key tableview_name of_key
+    ;
+
+referencing_clause
+    :    referencing_key referencing_element+
+    ;
+
+referencing_element
+    :    ( new_key | old_key | parent_key ) column_alias
+    ;
+
+// $>
+// $>
+
+// $<Type DDLs
+
+drop_type
+    :    drop_key type_key body_key? type_name (force_key|validate_key)?
+        SEMICOLON
+    ;
+
+alter_type
+    :    alter_key type_key type_name
+    (    compile_type_clause
+    |    replace_type_clause
+    |    {equalsIgnoreCase(LT(2)->getText(), "ATTRIBUTE")}? alter_attribute_definition
+    |    alter_method_spec
+    |    alter_collection_clauses
+    |    modifier_clause
+    )
+        dependent_handling_clause?
+        SEMICOLON
+    ;
+
+// $<Alter Type - Specific Clauses
+compile_type_clause
+    :    compile_key debug_key? (specification_key|body_key)? compiler_parameters_clause* (reuse_key settings_key)?
+    ;
+
+replace_type_clause
+    :    replace_key invoker_rights_clause? as_key object_key
+        LEFT_PAREN object_member_spec (COMMA object_member_spec)* RIGHT_PAREN
+    ;
+
+alter_method_spec
+    :     alter_method_element (COMMA alter_method_element)*
+    ;
+
+alter_method_element
+    :    (add_key|drop_key) (map_order_function_spec|subprogram_spec)
+    ;
+
+alter_attribute_definition
+    :    (add_key|modify_key|drop_key) attribute_key
+        (    attribute_definition
+        |    LEFT_PAREN attribute_definition (COMMA attribute_definition)* RIGHT_PAREN
+        )
+    ;
+
+attribute_definition
+    :    attribute_name type_spec?
+    ;
+
+alter_collection_clauses
+    :    modify_key
+    (    limit_key expression
+    |    element_key type_key type_spec
+    )
+    ;
+
+dependent_handling_clause
+    :    invalidate_key
+    |    cascade_key
+        (    convert_key to_key substitutable_key
+        |    not_key? including_key table_key data_key
+        )?
+        dependent_exceptions_part?
+    ;
+
+dependent_exceptions_part
+    :    force_key? exceptions_key into_key tableview_name
+    ;
+
+// $>
+
+create_type
+    :    create_key (or_key replace_key)? type_key
+        ( type_definition | type_body)
+        SEMICOLON
+    ;
+
+// $<Create Type - Specific Clauses
+type_definition
+    :    type_name 
+        (oid_key CHAR_STRING)?
+        object_type_def?
+    ;
+
+object_type_def
+    :    invoker_rights_clause?
+    (    object_as_part
+    |    object_under_part
+    )
+        sqlj_object_type?
+        (LEFT_PAREN object_member_spec (COMMA object_member_spec)* RIGHT_PAREN)?
+        modifier_clause*
+    ;
+
+object_as_part
+    :    (is_key|as_key) (object_key|varray_type_def|nested_table_type_def)
+    ;
+
+object_under_part
+    :    under_key type_spec
+    ;
+
+nested_table_type_def
+    :    table_key of_key type_spec
+        (not_key null_key)?
+    ;
+
+sqlj_object_type
+    :    external_key name_key expression language_key java_key using_key (sqldata_key|customdatum_key|oradata_key)
+    ;
+
+type_body
+    :    body_key type_name
+        (is_key|as_key) type_body_elements (COMMA type_body_elements)*
+        end_key
+    ;
+
+type_body_elements
+    :    map_order_func_declaration
+    |    subprog_decl_in_type
+    ;
+
+map_order_func_declaration
+    :    (map_key|order_key) member_key func_decl_in_type
+    ;
+
+subprog_decl_in_type
+    :    (member_key|static_key)
+    (    proc_decl_in_type
+    |    func_decl_in_type
+    |    constructor_declaration)
+    ;
+
+proc_decl_in_type
+    :    procedure_key procedure_name
+        LEFT_PAREN type_elements_parameter (COMMA type_elements_parameter)* RIGHT_PAREN
+        (is_key|as_key) 
+            (call_spec|declare_key? declare_spec* body SEMICOLON)
+    ;
+
+func_decl_in_type
+    :    function_key function_name 
+        (LEFT_PAREN type_elements_parameter (COMMA type_elements_parameter)* RIGHT_PAREN)? 
+        return_key type_spec
+        (is_key|as_key)
+            (call_spec |declare_key? declare_spec* body SEMICOLON)
+    ;
+
+constructor_declaration
+    :    final_key? instantiable_key? constructor_key function_key type_spec
+        (LEFT_PAREN (self_key in_key out_key type_spec COMMA) type_elements_parameter (COMMA type_elements_parameter)*  RIGHT_PAREN)?
+        return_key self_key as_key result_key 
+        (is_key|as_key) 
+            (call_spec |declare_key? declare_spec* body SEMICOLON)
+    ;
+
+// $>
+
+// $<Common Type Clauses
+
+modifier_clause
+    :    not_key? (instantiable_key|final_key|overriding_key)
+    ;
+
+object_member_spec
+options{
+backtrack=true;
+}    :    id type_spec sqlj_object_type_attr?
+    |    element_spec
+    ;
+
+sqlj_object_type_attr
+    :    external_key name_key expression
+    ;
+
+element_spec
+    :    modifier_clause?
+        element_spec_options+
+        (COMMA pragma_clause)?
+    ;
+
+element_spec_options
+    :    subprogram_spec
+    |    constructor_spec
+    |    map_order_function_spec
+    ;
+
+subprogram_spec
+    :    (member_key|static_key)
+        (type_procedure_spec|type_function_spec)
+    ;
+
+type_procedure_spec
+    :    procedure_key procedure_name
+        LEFT_PAREN type_elements_parameter (COMMA type_elements_parameter)* RIGHT_PAREN
+        ((is_key|as_key) call_spec )?
+    ;
+
+type_function_spec
+    :    function_key function_name 
+        (LEFT_PAREN type_elements_parameter (COMMA type_elements_parameter)* RIGHT_PAREN)? 
+        return_key ( type_spec | self_key as_key result_key)
+        ((is_key|as_key) call_spec | external_key variable_key? name_key expression)?
+    ;
+
+constructor_spec
+    :    final_key? instantiable_key? constructor_key function_key type_spec
+        (LEFT_PAREN (self_key in_key out_key type_spec COMMA) type_elements_parameter (COMMA type_elements_parameter)*  RIGHT_PAREN)?
+        return_key self_key as_key result_key ((is_key|as_key) call_spec)?
+    ;
+
+map_order_function_spec
+    :    (map_key|order_key) member_key type_function_spec
+    ;
+
+pragma_clause
+    :    pragma_key restrict_references_key LEFT_PAREN pragma_elements (COMMA pragma_elements)* RIGHT_PAREN
+    ;
+
+pragma_elements
+    :    id
+    |    default_key
+    ;
+
+type_elements_parameter
+    :    parameter_name type_spec
+    ;
+
+// $>
+// $>
+
+// $<Sequence DDLs
+
+drop_sequence
+    :   drop_key sequence_key sequence_name
+        SEMICOLON
+    ;
+
+alter_sequence
+    :    alter_key sequence_key sequence_name sequence_spec+
+         SEMICOLON
+    ;
+
+create_sequence
+    :    create_key sequence_key sequence_name
+    (    sequence_start_clause
+    |    sequence_spec
+    )*   SEMICOLON
+    ;
+
+// $<Common Sequence
+
+sequence_spec
+    :    increment_key by_key UNSIGNED_INTEGER
+    |    maxvalue_key UNSIGNED_INTEGER
+    |    nomaxvalue_key
+    |    minvalue_key UNSIGNED_INTEGER
+    |    nominvalue_key
+    |    cycle_key
+    |    nocycle_key
+    |    cache_key UNSIGNED_INTEGER
+    |    nocache_key
+    |    order_key
+    |    noorder_key
+    ;
+
+sequence_start_clause
+    :    start_key with_key UNSIGNED_INTEGER
+    ;
+
+// $>
+// $>
+
+// $<Common DDL Clauses
+
+invoker_rights_clause
+    :    authid_key (current_user_key|definer_key)
+    ;
+
+compiler_parameters_clause
+    :    id EQUALS_OP expression
+    ;
+
+call_spec
+    :    language_key ( java_spec | c_spec )
+    ;
+
+// $<Call Spec - Specific Clauses
+
+java_spec
+    :    java_key name_key CHAR_STRING
+    ;
+
+c_spec
+    :    c_key (name_key CHAR_STRING)? 
+        library_key id
+        c_agent_in_clause? (with_key context_key)? c_parameters_clause?
+    ;
+
+c_agent_in_clause
+    :    agent_key in_key LEFT_PAREN expression (COMMA expression)* RIGHT_PAREN
+    ;
+
+c_parameters_clause
+    :    parameters_key LEFT_PAREN (expression (COMMA expression)* | DOUBLE_PERIOD PERIOD) RIGHT_PAREN
+    ;
+
+// $>
+
+parameter
+    :    parameter_name ( in_key | out_key | inout_key | nocopy_key)* type_spec? default_value_part?
+    ;
+
+default_value_part
+    :    (ASSIGN_OP|default_key) expression
+    ;
+
+// $>
+
+// $>
+
+// $<PL/SQL Elements Declarations
+
+declare_spec
+options{
+backtrack=true;
+}    :    variable_declaration
+    |     subtype_declaration
+    |     cursor_declaration
+    |     exception_declaration
+    |     pragma_declaration
+    |     record_declaration
+    |     table_declaration
+    |     create_procedure_body
+    |     create_function_body
+    ;
+
+//incorporates constant_declaration
+variable_declaration
+    :    variable_name constant_key?
+        type_spec (not_key null_key)? 
+        default_value_part? SEMICOLON
+    ;    
+
+subtype_declaration
+      :    subtype_key type_name is_key type_spec
+          (range_key expression DOUBLE_PERIOD expression)?
+          (not_key null_key)? SEMICOLON
+      ;
+
+//cursor_declaration incorportates curscursor_body and cursor_spec
+cursor_declaration
+    :    cursor_key cursor_name
+              (LEFT_PAREN parameter_spec (COMMA parameter_spec)* RIGHT_PAREN )?
+              (return_key type_spec)? (is_key select_statement)? SEMICOLON
+    ;
+
+parameter_spec
+    :    parameter_name (in_key? type_spec)? 
+        default_value_part?
+    ;
+
+exception_declaration 
+    :    exception_name exception_key SEMICOLON
+    ;             
+
+pragma_declaration
+    :    pragma_key
+        (    serially_reusable_key 
+        |    autonomous_transaction_key
+        |    exception_init_key LEFT_PAREN exception_name COMMA numeric RIGHT_PAREN 
+        |    inline_key LEFT_PAREN id1=id COMMA expression RIGHT_PAREN
+        |    restrict_references_key LEFT_PAREN (id|default_key) (COMMA id)+ RIGHT_PAREN
+        )
+        SEMICOLON
+    ;
+
+record_declaration
+    :    record_type_dec
+    |    record_var_dec
+    ;
+
+// $<Record Declaration - Specific Clauses
+
+//incorporates ref_cursor_type_definition
+record_type_dec
+    :    type_key type_name is_key 
+    (    record_key LEFT_PAREN field_spec ( COMMA field_spec )* RIGHT_PAREN
+    |    ref_key cursor_key (return_key type_spec)?
+    )    SEMICOLON
+    ;
+
+field_spec
+    :    column_name type_spec?
+        (not_key null_key)?
+        default_value_part?
+    ;
+
+record_var_dec
+    :    record_name type_name (percent_rowtype_key|percent_type_key) SEMICOLON
+    ;
+
+// $>
+
+table_declaration
+    :    (table_type_dec | table_var_dec) SEMICOLON
+    ;
+
+table_type_dec
+    :    type_key type_name is_key 
+    (    table_key
+            of_key type_spec 
+            table_indexed_by_part?
+        (not_key null_key)?
+    |    varray_type_def
+    )
+    ;
+
+table_indexed_by_part
+    :    (idx1=indexed_key|idx2=index_key) by_key type_spec
+    ;
+
+varray_type_def
+    :    (varray_key| varying_key array_key)
+        LEFT_PAREN expression RIGHT_PAREN 
+        of_key type_spec
+        (not_key null_key)?
+    ;
+
+table_var_dec
+    :    table_var_name type_spec
+    ;
+
+// $>
+
+// $<PL/SQL Statements
+
+seq_of_statements returns[void* p, void*q]
+    :     (statement (SEMICOLON|EOF)|label_declaration)+
+    ;  
+
+label_declaration
+    :    ltp1=LESS_THAN_OP LESS_THAN_OP label_name GREATER_THAN_OP GREATER_THAN_OP
+    ;
+
+statement
+options{
+backtrack=true;
+}
+    :    create_key swallow_to_semi (SEMICOLON|EOF)
+    |    alter_key swallow_to_semi  (SEMICOLON|EOF)
+    |    grant_key swallow_to_semi  (SEMICOLON|EOF)
+    |    truncate_key swallow_to_semi  (SEMICOLON|EOF)
+    |    (begin_key) => body
+    |    (declare_key) => block
+    |    assignment_statement
+    |    continue_statement
+    |    exit_statement
+    |    goto_statement
+    |    if_statement
+    |    loop_statement
+    |    forall_statement
+    |    null_statement
+    |    raise_statement
+    |    return_statement
+    |    case_statement[true]
+    |    sql_statement
+    |    function_call
+    ;
+
+assignment_statement
+    :     (general_element|bind_variable) ASSIGN_OP expression
+    ;
+
+continue_statement
+    :    continue_key label_name? (when_key condition)?
+    ;
+
+exit_statement
+    :    exit_key label_name? (when_key condition)?
+    ;
+
+goto_statement
+    :    goto_key label_name
+    ;
+
+if_statement
+    :    if_key condition then_key seq_of_statements
+        elsif_part* else_part?
+        end_key if_key
+    ;
+
+elsif_part
+    :    elsif_key condition then_key seq_of_statements
+    ;
+
+else_part
+    :    else_key seq_of_statements
+    ;
+
+loop_statement
+    :    label_name?
+        (while_key condition | for_key cursor_loop_param)?
+        loop_key
+        seq_of_statements
+        end_key loop_key label_name?
+    ;
+
+// $<Loop - Specific Clause
+
+cursor_loop_param
+    :    (index_name in_key reverse_key? lower_bound DOUBLE_PERIOD)=> 
+            index_name in_key reverse_key? lower_bound DOUBLE_PERIOD upper_bound
+    |     record_name in_key ( cursor_name expression_list? | LEFT_PAREN select_statement RIGHT_PAREN)
+    ;
+// $>
+
+forall_statement
+    :    forall_key index_name in_key bounds_clause sql_statement (save_key exceptions_key)?
+    ;
+
+bounds_clause
+    :    lower_bound DOUBLE_PERIOD upper_bound
+    |    indices_key of_key collection_name between_bound?
+    |    values_key of_key index_name
+    ;
+
+between_bound
+    :    between_key lower_bound and_key upper_bound
+    ;
+
+lower_bound
+    :    concatenation
+    ;
+
+upper_bound
+    :    concatenation
+    ;
+
+null_statement
+    :    null_key
+    ;
+
+raise_statement
+    :    raise_key exception_name?
+    ;
+
+return_statement
+    :    return_key cn1=condition?
+    ;
+
+function_call
+    :    call_key? routine_name function_argument?
+    ;
+
+body
+    :    begin_key
+        seq_of_statements
+        exception_clause?
+        end_key label_name?
+    ;
+
+// $<Body - Specific Clause
+
+exception_clause
+    :    exception_key exception_handler+
+    ;
+
+exception_handler
+    :    when_key exception_name (or_key exception_name)* then_key
+        seq_of_statements
+    ;
+
+// $>
+
+trigger_block
+    :    (declare_key? declare_spec+)?
+        body
+    ;
+
+block
+    :    declare_key? declare_spec+
+        body
+    ;
+
+// $>
+
+// $<SQL PL/SQL Statements
+
+sql_statement
+options{
+backtrack=true;
+}    :    execute_immediate
+    |    data_manipulation_language_statements
+    |    cursor_manipulation_statements
+    |    transaction_control_statements
+    ;
+
+execute_immediate
+    :    execute_key immediate_key expression
+    (    into_clause using_clause?
+    |    using_clause dynamic_returning_clause?
+    |    dynamic_returning_clause
+    )?
+    ;
+
+// $<Execute Immediate - Specific Clause
+dynamic_returning_clause
+    :    (returning_key|return_key) into_clause
+    ;
+// $>
+
+
+// $<DML SQL PL/SQL Statements
+
+data_manipulation_language_statements
+    :    merge_statement
+    |    lock_table_statement
+    |    select_statement
+    |    update_statement
+    |    delete_statement
+    |    insert_statement
+    |    explain_statement
+    ;
+
+// $>
+
+// $<Cursor Manipulation SQL PL/SQL Statements
+
+cursor_manipulation_statements
+    :    close_statement
+    |    open_statement
+    |    fetch_statement
+    |    open_for_statement
+    ;
+
+close_statement
+    :     close_key cursor_name
+    ;
+
+open_statement
+    :    open_key cursor_name expression_list?
+    ;
+
+fetch_statement
+    :    fetch_key cursor_name 
+    (    it1=into_key variable_name (COMMA variable_name )*
+    |    bulk_key collect_key into_key variable_name (COMMA variable_name )*
+    )
+    ;
+
+open_for_statement
+    :    open_key variable_name for_key
+    (    (select_key|with_key)=> select_statement
+    |    expression
+    )
+        using_clause?
+    ;
+
+// $>
+
+// $<Transaction Control SQL PL/SQL Statements
+
+transaction_control_statements
+    :    set_transaction_command
+    |    set_constraint_command
+    |    commit_statement
+    |    rollback_statement
+    |    savepoint_statement
+    ;
+
+set_transaction_command
+    :    set_key transaction_key 
+    (    read_key (only_key|write_key)
+    |    isolation_key level_key (serializable_key|read_key committed_key)
+    |    use_key rollback_key segment_key rollback_segment_name
+    )?
+        (name_key quoted_string)?
+    ;
+
+set_constraint_command
+    :    set_key ( constraint_key | constraints_key )
+        ( all_key | constraint_name (COMMA constraint_name)* )
+        (immediate_key|deferred_key)
+    ;
+
+commit_statement
+    :     commit_key work_key?
+    (    comment_key expression
+    |    force_key (corrupt_xid_key expression| corrupt_xid_all_key | expression (COMMA expression)?)
+    )?
+        write_clause?
+    ;
+
+write_clause
+    :    write_key (wait_key|nowait_key)? (immediate_key|batch_key)?
+    ;
+
+rollback_statement
+    :     rollback_key work_key?
+    (     to_key savepoint_key? savepoint_name
+    |    force_key quoted_string
+    )?
+    ;
+
+savepoint_statement
+    :    savepoint_key savepoint_name 
+    ;
+
+// $>
diff --git a/runtime/Cpp/tests/PLSQL_DMLParser.g b/runtime/Cpp/tests/PLSQL_DMLParser.g
new file mode 100644
index 000000000..0646fd4a3
--- /dev/null
+++ b/runtime/Cpp/tests/PLSQL_DMLParser.g
@@ -0,0 +1,1108 @@
+/**
+ * Oracle(c) PL/SQL 11g Parser  
+ *
+ * Copyright (c) 2009-2011 Alexandre Porcelli <alexandre.porcelli@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+parser grammar PLSQL_DMLParser;
+
+// options {
+//         tokenVocab=PLSQLLexer;
+//         language=Cpp;
+// }
+
+//import PLSQLKeys, PLSQLCommons;
+
+@parser::includes
+{
+	#include "PTestTraits.hpp"
+	#include "PLSQLLexer.hpp"
+}
+@parser::namespace { Antlr3Test }
+
+//SHOULD BE OVERRIDEN!
+compilation_unit
+    :     seq_of_statements* EOF
+    ;
+
+//SHOULD BE OVERRIDEN!
+seq_of_statements 
+    :
+    (    select_statement
+    |    update_statement
+    |    delete_statement
+    |    insert_statement
+    |    lock_table_statement
+    |    merge_statement
+    |    explain_statement
+    )
+    (    SEMICOLON | EOF )
+    ;
+
+explain_statement
+    :    explain_key plan_key
+         (set_key statement_id_key EQUALS_OP quoted_string)?
+         (into_key tableview_name)?
+         for_key
+         ( select_statement
+         | update_statement
+         | delete_statement
+         | insert_statement
+         | merge_statement
+         )
+    ;
+
+select_statement
+    :    subquery_factoring_clause?
+        subquery
+        (for_update_clause|(order_key siblings_key? by_key)=> order_by_clause)*
+    ;
+
+// $<Select - Specific Clauses
+subquery_factoring_clause
+    :    with_key factoring_element (COMMA factoring_element)*
+    ;
+
+factoring_element
+    :    query_name (LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN)? as_key LEFT_PAREN subquery order_by_clause? RIGHT_PAREN
+         search_clause?
+         cycle_clause?
+    ;
+
+search_clause
+    :    search_key ( depth_key | breadth_key ) first_key by_key
+             column_name asc_key ? desc_key ? (nulls_key first_key)? (nulls_key last_key)?
+             (COMMA column_name asc_key ? desc_key ? (nulls_key first_key)? (nulls_key last_key)? )*
+             set_key column_name
+    ;
+
+cycle_clause
+    :    cycle_key column_name ( COMMA column_name)* set_key column_name to_key expression default_key expression
+    ;
+
+subquery
+    :    subquery_basic_elements subquery_operation_part*
+    ;
+
+subquery_operation_part
+    :    (union_key all_key?|intersect_key|minus_key) subquery_basic_elements
+    ;
+
+subquery_basic_elements
+    :    query_block
+    |    LEFT_PAREN subquery RIGHT_PAREN
+    ;
+
+query_block
+    :    select_key
+        ((distinct_key|unique_key|all_key)=> (distinct_key|unique_key|all_key))?
+        (ASTERISK | selected_element (COMMA selected_element)*)
+        into_clause?
+        from_clause 
+        where_clause? 
+        hierarchical_query_clause? 
+        group_by_clause?
+        model_clause?
+    ;
+
+selected_element
+    :    select_list_elements column_alias?
+    ;
+
+from_clause
+    :    from_key table_ref_list
+    ;
+
+select_list_elements
+    :    (tableview_name PERIOD ASTERISK)=> tableview_name PERIOD ASTERISK
+    |    expression
+    ;
+
+table_ref_list
+    :    table_ref (COMMA table_ref)*
+    ;
+
+// NOTE to PIVOT clause
+// according the SQL reference this should not be possible
+// according to he reality it is. Here we probably apply pivot/unpivot onto whole join clause
+// eventhough it is not enclosed in parenthesis. See pivot examples 09,10,11
+table_ref
+    :    table_ref_aux join_clause* (pivot_clause|unpivot_clause)?
+    ;
+
+table_ref_aux
+    :
+    (    (LEFT_PAREN (select_key|with_key)) => dml_table_expression_clause (pivot_clause|unpivot_clause)?
+    |    (LEFT_PAREN) => LEFT_PAREN table_ref subquery_operation_part* RIGHT_PAREN (pivot_clause|unpivot_clause)?
+    |    (only_key LEFT_PAREN) => only_key LEFT_PAREN dml_table_expression_clause RIGHT_PAREN
+    |    dml_table_expression_clause (pivot_clause|unpivot_clause)?
+    )
+        flashback_query_clause*
+        ({isTableAlias(LT(1), LT(2))}? table_alias)?
+    ;
+
+join_clause
+    :    query_partition_clause?
+        (cross_key|natural_key)? (inner_key|outer_join_type)? join_key
+        table_ref_aux
+        query_partition_clause?
+    (    join_on_part
+    |    join_using_part
+    )*
+    ;
+
+join_on_part
+    :    on_key condition
+    ;
+
+join_using_part
+    :    using_key LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN
+    ;
+
+outer_join_type
+    :    
+    (    full_key
+    |    left_key
+    |    right_key
+    )
+        outer_key?
+    ;
+
+query_partition_clause
+    :    partition_key by_key
+    (    (LEFT_PAREN (select_key|with_key)) => LEFT_PAREN subquery RIGHT_PAREN
+    |    (LEFT_PAREN)=> expression_list
+    |    expression (COMMA expression)*
+    )
+    ;
+
+flashback_query_clause
+    :    versions_key between_key (scn_key|timestamp_key) expression
+    |    as_key of_key (scn_key|timestamp_key|snapshot_key) expression
+    ;
+
+pivot_clause
+    :    pivot_key xml_key?
+        LEFT_PAREN
+            pivot_element (COMMA pivot_element)*
+            pivot_for_clause
+            pivot_in_clause  
+        RIGHT_PAREN
+    ;
+
+pivot_element
+    :    aggregate_function_name LEFT_PAREN expression RIGHT_PAREN column_alias?
+    ;
+
+pivot_for_clause
+    :    for_key 
+    (    column_name
+    |    LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN
+    )
+    ;
+
+pivot_in_clause
+    :    in_key
+        LEFT_PAREN
+            (    (select_key)=> subquery 
+            |    (any_key)=> any_key (COMMA any_key)*
+            |    pivot_in_clause_element (COMMA pivot_in_clause_element)*
+            )
+        RIGHT_PAREN
+    ;
+
+pivot_in_clause_element
+    :    pivot_in_clause_elements column_alias?
+    ;
+
+pivot_in_clause_elements
+    :    expression
+    |    (LEFT_PAREN)=> expression_list
+    ;
+
+unpivot_clause
+    :    unpivot_key 
+        ((include_key|exclude_key) nulls_key)?
+        LEFT_PAREN
+            (    column_name
+            |    LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN
+            )
+            pivot_for_clause
+            unpivot_in_clause
+        RIGHT_PAREN
+    ;
+
+unpivot_in_clause
+    :    in_key
+        LEFT_PAREN
+            unpivot_in_elements (COMMA unpivot_in_elements)*
+        RIGHT_PAREN
+    ;
+
+unpivot_in_elements
+    :   (    column_name
+        |    LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN
+        )
+        (     as_key
+         (    constant
+         |    (LEFT_PAREN)=> LEFT_PAREN constant (COMMA constant)* RIGHT_PAREN
+         )
+        )?
+    ;
+
+hierarchical_query_clause
+    :    connect_key by_key nocycle_key? condition start_part?
+    |    start_part connect_key by_key nocycle_key? condition
+    ;
+
+start_part
+    :    start_key with_key condition
+    ;
+
+group_by_clause
+    :   (group_key) => group_key by_key group_by_elements
+            ((COMMA group_by_elements)=> COMMA group_by_elements)*
+            having_clause?
+    |   (having_key) => having_clause
+            (group_key by_key group_by_elements
+            ((COMMA group_by_elements)=> COMMA group_by_elements)*)?
+    ;
+
+group_by_elements
+    :    grouping_sets_clause
+    |    rollup_cube_clause 
+    |    expression
+    ;
+
+rollup_cube_clause
+    :    (rollup_key|cube_key) LEFT_PAREN grouping_sets_elements (COMMA grouping_sets_elements)* RIGHT_PAREN 
+    ;
+
+grouping_sets_clause
+    :    grouping_key sets_key 
+        LEFT_PAREN grouping_sets_elements (COMMA grouping_sets_elements)* RIGHT_PAREN
+    ;
+
+grouping_sets_elements
+    :    (rollup_key|cube_key)=> rollup_cube_clause
+    |    (LEFT_PAREN)=> expression_list
+    |    expression
+    ;
+
+having_clause
+    :    having_key condition
+    ;
+
+model_clause
+    :    model_key cell_reference_options* return_rows_clause? reference_model* main_model
+    ;
+
+cell_reference_options
+    :    (ignore_key|keep_key) nav_key
+    |    unique_key (dimension_key|single_key reference_key) 
+    ;
+
+return_rows_clause
+    :    return_key (updated_key|all_key) rows_key
+    ;
+
+reference_model
+    :    reference_key reference_model_name on_key 
+            LEFT_PAREN subquery RIGHT_PAREN model_column_clauses 
+            cell_reference_options*
+    ;
+
+main_model
+    :    (main_key main_model_name)? model_column_clauses cell_reference_options* model_rules_clause
+    ;
+
+model_column_clauses
+    :    model_column_partition_part?
+        dimension_key by_key model_column_list measures_key model_column_list
+    ;
+
+model_column_partition_part
+    :    partition_key by_key model_column_list
+    ;
+
+model_column_list
+    :    LEFT_PAREN model_column (COMMA model_column)*  RIGHT_PAREN
+    ;
+
+model_column
+    :    expression table_alias?
+    ;
+
+model_rules_clause
+    :    model_rules_part? LEFT_PAREN model_rules_element (COMMA model_rules_element)* RIGHT_PAREN
+    ;
+
+model_rules_part
+    :    rules_key (update_key|upsert_key all_key?)? ((automatic_key|sequential_key) order_key)? model_iterate_clause?
+    ;
+
+model_rules_element
+    :    (update_key|upsert_key ((all_key)=> all_key)?)?
+        cell_assignment
+                order_by_clause?
+            EQUALS_OP expression
+    ;
+
+cell_assignment
+    :    model_expression
+    ;
+
+model_iterate_clause
+    :    iterate_key LEFT_PAREN expression RIGHT_PAREN until_part?
+    ;
+
+until_part
+    :    until_key LEFT_PAREN condition RIGHT_PAREN
+    ;
+
+order_by_clause
+    :    order_key siblings_key? by_key order_by_elements (COMMA order_by_elements)*
+    ;
+
+order_by_elements
+    :    expression (asc_key|desc_key)? (nulls_key (first_key|last_key))?
+    ;
+
+for_update_clause
+    :    for_key update_key for_update_of_part? for_update_options?
+    ;
+
+for_update_of_part
+    :    of_key column_name (COMMA column_name)*
+    ;
+
+for_update_options
+    :    skip_key locked_key
+    |    nowait_key
+    |    wait_key expression
+    ;
+
+// $>
+
+update_statement
+    :    update_key general_table_ref
+        update_set_clause
+        where_clause? static_returning_clause? error_logging_clause?
+    ;
+
+// $<Update - Specific Clauses
+update_set_clause
+    :    set_key
+    (    column_based_update_set_clause (COMMA column_based_update_set_clause)*
+    |    value_key LEFT_PAREN id RIGHT_PAREN EQUALS_OP expression
+    )
+    ;
+
+column_based_update_set_clause
+    :    column_name EQUALS_OP expression
+    |    LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN EQUALS_OP subquery
+    ;
+
+// $>
+
+delete_statement
+    :    delete_key from_key?
+        general_table_ref
+        where_clause? static_returning_clause? error_logging_clause?
+    ;
+
+insert_statement
+    :    insert_key
+    (    single_table_insert
+    |    multi_table_insert
+    )
+    ;
+
+// $<Insert - Specific Clauses
+
+single_table_insert
+    :    insert_into_clause
+    (    values_clause static_returning_clause?
+    |    select_statement
+    )
+        error_logging_clause?
+    ;
+
+multi_table_insert
+    :    
+    (    all_key multi_table_element+
+    |    conditional_insert_clause
+    )
+        select_statement
+    ;
+
+multi_table_element
+    :    insert_into_clause values_clause? error_logging_clause?
+    ;
+
+conditional_insert_clause
+    :    (all_key|first_key)?
+        conditional_insert_when_part+ conditional_insert_else_part?
+    ;
+
+conditional_insert_when_part
+    :    when_key condition then_key multi_table_element+
+    ;
+
+conditional_insert_else_part
+    :    else_key multi_table_element+
+    ;
+
+insert_into_clause
+    :    into_key general_table_ref 
+        (LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN)?
+    ;
+
+values_clause
+    :    values_key expression_list
+    ;
+
+// $>
+merge_statement
+    :    merge_key into_key tableview_name table_alias?
+        using_key selected_tableview on_key LEFT_PAREN condition RIGHT_PAREN
+        (
+            (when_key matched_key) => merge_update_clause merge_insert_clause?
+        |
+            (when_key not_key matched_key) => merge_insert_clause merge_update_clause?
+        )?
+        error_logging_clause?
+    ;
+
+// $<Merge - Specific Clauses
+
+merge_update_clause
+    :    when_key matched_key then_key update_key set_key 
+        merge_element (COMMA merge_element)*
+        where_clause? merge_update_delete_part?
+    ;
+
+merge_element
+    :    column_name EQUALS_OP expression
+    ;
+
+merge_update_delete_part
+    :    delete_key where_clause
+    ;
+
+merge_insert_clause
+    :    when_key not_key matched_key then_key insert_key 
+        (LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN)?
+        values_key expression_list where_clause?
+    ;
+
+selected_tableview
+    :    ( tableview_name | LEFT_PAREN select_statement RIGHT_PAREN ) table_alias?
+    ;
+
+// $>
+
+lock_table_statement
+    :    lock_key table_key 
+        lock_table_element (COMMA lock_table_element)* 
+        in_key lock_mode mode_key wait_nowait_part?
+    ;
+
+wait_nowait_part
+    :    wait_key expression
+    |    nowait_key
+    ;
+
+// $<Lock - Specific Clauses
+
+lock_table_element
+    :    tableview_name partition_extension_clause?
+    ;
+
+lock_mode
+    :    row_key share_key
+    |    row_key exclusive_key
+    |    share_key update_key?
+    |    share_key row_key exclusive_key
+    |    exclusive_key
+    ;
+// $>
+
+// $<Common DDL Clauses
+
+general_table_ref
+    :    (    dml_table_expression_clause
+        |    only_key LEFT_PAREN dml_table_expression_clause RIGHT_PAREN
+        )    table_alias?
+    ;
+
+static_returning_clause
+    :    (returning_key|return_key) expression (COMMA expression)* 
+        into_clause
+    ;
+
+error_logging_clause
+    :    log_key errors_key 
+        error_logging_into_part?
+        ((LEFT_PAREN)=> expression_wrapper)?
+        error_logging_reject_part?
+    ;
+
+error_logging_into_part
+    :    into_key tableview_name
+    ;
+
+error_logging_reject_part
+    :    reject_key limit_key ((unlimited_key)=>unlimited_key|expression_wrapper)
+    ;
+
+dml_table_expression_clause
+    :    table_collection_expression
+    |    LEFT_PAREN select_statement subquery_restriction_clause? RIGHT_PAREN
+    |    tableview_name sample_clause?
+    ;
+
+table_collection_expression
+    :    ( table_key | the_key)
+         ( (LEFT_PAREN (select_key | with_key)) => LEFT_PAREN subquery RIGHT_PAREN
+         | LEFT_PAREN expression RIGHT_PAREN //(LEFT_PAREN PLUS_SIGN RIGHT_PAREN)?
+         )
+    ;
+
+subquery_restriction_clause
+    :    with_key
+    (    read_key only_key
+    |    check_key option_key (constraint_key constraint_name)?
+    )
+    ;
+
+sample_clause
+    :    sample_key block_key? 
+        LEFT_PAREN expression (COMMA expression)? RIGHT_PAREN
+        seed_part?
+    ;
+
+seed_part
+    :    seed_key LEFT_PAREN expression RIGHT_PAREN
+    ;
+
+// $>
+
+// $<Expression & Condition
+cursor_expression
+    :    cursor_key LEFT_PAREN subquery RIGHT_PAREN
+    ;
+
+expression_list
+    :    LEFT_PAREN expression? (COMMA expression)* RIGHT_PAREN
+    ;
+
+condition
+    :     expression
+    ;
+
+condition_wrapper
+    :    expression
+    ;
+
+expression
+    :    (cursor_key LEFT_PAREN (select_key|with_key)) => cursor_expression
+    |    logical_and_expression ( or_key logical_and_expression )*
+    ;
+
+expression_wrapper
+    :    expression
+    ;
+
+logical_and_expression
+    :    negated_expression ( and_key negated_expression )*
+    ;
+
+negated_expression
+    :    not_key negated_expression
+    |    equality_expression
+    ;
+
+equality_expression
+    :    multiset_comparsion
+    (    is_key not_key?
+        (    null_key
+        |    nan_key
+        |    present_key
+        |    infinite_key
+        |    a_key set_key
+        |    empty_key
+        |    of_key type_key? LEFT_PAREN only_key? type_spec (COMMA type_spec)* RIGHT_PAREN
+        )
+    )?
+    ;
+
+
+multiset_comparsion
+    :    relational_expression
+    (    multiset_type of_key? concatenation)?
+    ;
+
+multiset_type
+    :    member_key
+    |    submultiset_key
+    ;
+
+relational_expression
+    :    compound_expression
+    ( ( EQUALS_OP | not_equal_op | LESS_THAN_OP | GREATER_THAN_OP | less_than_or_equals_op | greater_than_or_equals_op ) compound_expression)*
+    ;
+
+compound_expression
+    :    concatenation
+    (    not_key?
+        (    in_key in_elements
+        |    between_key between_elements
+        |    like_type concatenation like_escape_part?
+        )
+    )?
+    ;
+
+like_type
+    :    like_key
+    |    likec_key
+    |    like2_key
+    |    like4_key
+    ;
+
+like_escape_part
+    :    escape_key concatenation
+    ;
+
+in_elements
+    :    (LEFT_PAREN+ (select_key|with_key)) => LEFT_PAREN subquery RIGHT_PAREN
+    |    LEFT_PAREN concatenation_wrapper (COMMA concatenation_wrapper)* RIGHT_PAREN
+    |    constant
+    |    bind_variable
+    |    general_element
+    ;
+
+between_elements
+    :    concatenation and_key concatenation
+    ;
+
+concatenation
+    :    additive_expression (concatenation_op additive_expression)*
+    ;
+
+concatenation_wrapper
+    :    concatenation
+    ;
+
+additive_expression
+    :    multiply_expression ( ( PLUS_SIGN | MINUS_SIGN ) multiply_expression)*
+    ;
+
+multiply_expression
+    :    datetime_expression ( ( ASTERISK | SOLIDUS ) datetime_expression)*
+    ;
+
+datetime_expression
+    :    model_expression
+    (    at_key (local_key|time_key zone_key concatenation_wrapper)
+    |    (interval_expression)=> interval_expression
+    )?
+    ;
+
+interval_expression
+    :    day_key    (LEFT_PAREN concatenation_wrapper RIGHT_PAREN)? to_key second_key (LEFT_PAREN concatenation_wrapper RIGHT_PAREN)?
+    |    year_key (LEFT_PAREN concatenation_wrapper RIGHT_PAREN)? to_key month_key
+    ;
+
+model_expression
+    :    multiset_expression
+        (LEFT_BRACKET model_expression_element RIGHT_BRACKET)?
+    ;
+
+model_expression_element
+    :    ((any_key)=> any_key|condition_wrapper) (COMMA ((any_key)=> any_key|condition_wrapper))*
+    |    single_column_for_loop (COMMA single_column_for_loop)*
+    |    multi_column_for_loop
+    ;
+
+single_column_for_loop
+    :    for_key column_name 
+    (    in_key expression_list
+    |    for_like_part? from_key ex1=expression
+            to_key ex2=expression for_increment_decrement_type ex3=expression     
+    )
+    ;
+
+for_like_part
+    :    like_key expression
+    ;
+
+for_increment_decrement_type
+    :    increment_key
+    |    decrement_key
+    ;
+
+multi_column_for_loop
+    :    for_key LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN in_key
+        LEFT_PAREN
+            (    (select_key)=> subquery
+            |    (LEFT_PAREN)=> LEFT_PAREN expression_list (COMMA expression_list)* RIGHT_PAREN
+            )
+        RIGHT_PAREN
+    ;
+
+multiset_expression
+	:	unary_expression
+		( multiset_op unary_expression )*
+	;
+
+unary_expression
+options
+{
+backtrack=true;
+}
+    :    MINUS_SIGN unary_expression
+    |    PLUS_SIGN unary_expression
+    |    prior_key unary_expression
+    |    connect_by_root_key unary_expression
+    |    { // input.LT(1).getText().equalsIgnoreCase("new") && !input.LT(2).getText().equals(".")}?
+            equalsIgnoreCase(LT(1)->getText(), "NEW") && !equalsIgnoreCase(LT(2)->getText(), "." )
+         }? => new_key unary_expression
+    |    distinct_key unary_expression
+    |    all_key unary_expression
+    |    { LA(1) == SQL92_RESERVED_CASE || LA(2) == SQL92_RESERVED_CASE }? case_statement[false]
+    |    quantified_expression
+    |    standard_function
+    |    atom
+    ;
+
+case_statement [int isStatementParameter]
+scope    {
+    int isStatement;
+}
+@init    {$case_statement::isStatement = $isStatementParameter;}
+    :    (label_name? case_key when_key)=> searched_case_statement
+    |    simple_case_statement
+    ;
+
+// $<CASE - Specific Clauses
+
+simple_case_statement
+    :    label_name? ck1=case_key atom
+        simple_case_when_part+ 
+        case_else_part?
+        end_key case_key? label_name?
+    ;
+
+simple_case_when_part
+    :    when_key expression_wrapper then_key ({$case_statement::isStatement}? seq_of_statements | expression_wrapper)
+    ;
+
+searched_case_statement
+    :    label_name? ck1=case_key
+        searched_case_when_part+
+        case_else_part?
+        end_key case_key? label_name?
+    ;
+
+searched_case_when_part
+    :    when_key condition_wrapper then_key ({$case_statement::isStatement}? seq_of_statements | expression_wrapper)
+    ;
+
+case_else_part
+    :    else_key ({$case_statement::isStatement}? seq_of_statements | expression_wrapper)
+    ;
+// $>
+
+atom
+options
+{
+backtrack=true;
+}
+    :    (table_element outer_join_sign) => table_element outer_join_sign
+    |    bind_variable
+    |    constant
+    |    general_element
+    |    LEFT_PAREN
+         (
+              ( select_key | with_key)=> subquery RIGHT_PAREN subquery_operation_part*
+              | expression_or_vector RIGHT_PAREN
+         )
+    ;
+
+expression_or_vector
+    :    expression (vector_expr)?
+    ;
+
+vector_expr
+    :    COMMA expression (COMMA expression)*
+    ;
+
+quantified_expression
+    :    ( some_key | exists_key | all_key | any_key )
+         ( (LEFT_PAREN (select_key|with_key)) => LEFT_PAREN subquery RIGHT_PAREN
+           | LEFT_PAREN expression_wrapper RIGHT_PAREN
+         )
+    ;
+
+standard_function
+    :    stantard_function_enabling_over function_argument_analytic over_clause?
+    |    stantard_function_enabling_using function_argument_modeling using_clause?
+    |    count_key
+            LEFT_PAREN
+                ( ASTERISK | (distinct_key|unique_key|all_key)? concatenation_wrapper )
+            RIGHT_PAREN over_clause?
+    |    (cast_key|xmlcast_key) 
+            LEFT_PAREN
+         ( (multiset_key LEFT_PAREN+ (select_key|with_key)) => multiset_key LEFT_PAREN subquery order_by_clause? RIGHT_PAREN
+           (as_key type_spec)?
+                | concatenation_wrapper as_key type_spec
+                )
+            RIGHT_PAREN
+    |    chr_key
+            LEFT_PAREN 
+                concatenation_wrapper using_key nchar_cs_key 
+            RIGHT_PAREN
+    |    collect_key
+            LEFT_PAREN 
+                (distinct_key|unique_key)? concatenation_wrapper collect_order_by_part?
+            RIGHT_PAREN
+    |    stantard_function_enabling_within_or_over 
+            function_argument within_or_over_part+
+    |    decompose_key
+            LEFT_PAREN 
+                concatenation_wrapper (canonical_key|compatibility_key)? 
+            RIGHT_PAREN
+    |    extract_key
+            LEFT_PAREN
+                REGULAR_ID from_key concatenation_wrapper 
+            RIGHT_PAREN
+    |    (first_value_key|last_value_key) function_argument_analytic
+             respect_or_ignore_nulls? over_clause
+    |    stantard_function_pedictions
+            LEFT_PAREN
+                expression_wrapper (COMMA expression_wrapper)* cost_matrix_clause? using_clause? 
+            RIGHT_PAREN
+    |    translate_key
+            LEFT_PAREN 
+                expression_wrapper (using_key (char_cs_key|nchar_cs_key))? 
+                    (COMMA expression_wrapper)* 
+            RIGHT_PAREN
+    |    treat_key
+            LEFT_PAREN
+                expression_wrapper as_key ref_key? type_spec 
+            RIGHT_PAREN
+    |    trim_key
+            LEFT_PAREN 
+                ((leading_key|trailing_key|both_key)? quoted_string? from_key)?
+                concatenation_wrapper
+            RIGHT_PAREN
+    |    xmlagg_key
+            LEFT_PAREN 
+                expression_wrapper order_by_clause? 
+            RIGHT_PAREN
+            (PERIOD general_element_part)?
+    |    (xmlcolattval_key|xmlforest_key) 
+            LEFT_PAREN
+                xml_multiuse_expression_element (COMMA xml_multiuse_expression_element)*
+            RIGHT_PAREN
+            (PERIOD general_element_part)?
+    |    xmlelement_key
+            LEFT_PAREN
+                (entityescaping_key|noentityescaping_key)?
+                (name_key|evalname_key)? expression_wrapper
+                ({equalsIgnoreCase(LT(2)->getText(), "XMLATTRIBUTES")}? COMMA xml_attributes_clause)?
+                (COMMA expression_wrapper column_alias?)*
+            RIGHT_PAREN
+            (PERIOD general_element_part)?
+    |    xmlexists_key
+            LEFT_PAREN
+                expression_wrapper
+                xml_passing_clause?
+            RIGHT_PAREN
+    |    xmlparse_key
+            LEFT_PAREN 
+                (document_key|content_key) concatenation_wrapper wellformed_key?
+            RIGHT_PAREN
+            (PERIOD general_element_part)?
+    |    xmlpi_key
+            LEFT_PAREN 
+                (    name_key id
+                |    evalname_key concatenation_wrapper
+                )
+                (COMMA concatenation_wrapper)?
+            RIGHT_PAREN
+            (PERIOD general_element_part)?
+    |    xmlquery_key
+            LEFT_PAREN 
+                concatenation_wrapper xml_passing_clause?
+                returning_key content_key (null_key on_key empty_key)?
+            RIGHT_PAREN
+            (PERIOD general_element_part)?
+    |    xmlroot_key
+            LEFT_PAREN
+                concatenation_wrapper
+                    xmlroot_param_version_part
+                    (COMMA xmlroot_param_standalone_part)?
+            RIGHT_PAREN
+            (PERIOD general_element_part)?
+    |    xmlserialize_key
+            LEFT_PAREN
+                (document_key|content_key)
+                concatenation_wrapper (as_key type_spec)?
+                xmlserialize_param_enconding_part?
+                xmlserialize_param_version_part?
+                xmlserialize_param_ident_part?
+                ((hide_key|show_key) defaults_key)?
+            RIGHT_PAREN
+            (PERIOD general_element_part)?
+    |    xmltable_key
+            LEFT_PAREN
+                xml_namespaces_clause?
+                concatenation_wrapper
+                xml_passing_clause?
+                (columns_key xml_table_column (COMMA xml_table_column))?
+            RIGHT_PAREN
+            (PERIOD general_element_part)?
+    ;
+
+stantard_function_enabling_over
+    :    {enablesOverClause(LT(1)->getText())}?=> REGULAR_ID
+    ;
+
+stantard_function_enabling_using
+    :    {enablesUsingClause(LT(1)->getText())}?=> REGULAR_ID
+    ;
+
+stantard_function_enabling_within_or_over
+    :    {enablesWithinOrOverClause(LT(1)->getText())}?=> REGULAR_ID
+    ;
+
+stantard_function_pedictions
+    :    {isStandardPredictionFunction(LT(1)->getText())}?=> REGULAR_ID
+    ;
+
+over_clause
+    :    over_key
+        LEFT_PAREN
+            query_partition_clause?
+            (order_by_clause windowing_clause?)?
+        RIGHT_PAREN
+    ;
+
+windowing_clause
+    :    windowing_type
+    (    between_key windowing_elements and_key windowing_elements
+    |    windowing_elements    )
+    ;
+
+windowing_type
+    :    rows_key
+    |    range_key
+    ;
+
+windowing_elements
+    :    unbounded_key preceding_key
+    |    current_key row_key
+    |    concatenation_wrapper (preceding_key|following_key)
+    ;
+
+using_clause
+    :    using_key
+    (    ASTERISK
+    |    using_element (COMMA using_element)*
+    )
+    ;
+
+using_element
+    :    (in_key out_key?|out_key)? select_list_elements column_alias?
+    ;
+
+collect_order_by_part
+    :    order_key by_key concatenation_wrapper
+    ;
+
+within_or_over_part
+    :    within_key group_key LEFT_PAREN order_by_clause RIGHT_PAREN
+    |    over_clause
+    ;
+
+cost_matrix_clause
+    :    cost_key
+    (    model_key auto_key?
+    |    LEFT_PAREN cost_class_name (COMMA cost_class_name)* RIGHT_PAREN values_key 
+            expression_list
+    )
+    ;
+
+xml_passing_clause
+    :    passing_key (by_key value_key)?
+            expression_wrapper column_alias? (COMMA expression_wrapper column_alias?)
+    ;
+
+xml_attributes_clause
+    :    xmlattributes_key
+        LEFT_PAREN
+            (entityescaping_key|noentityescaping_key)?
+            (schemacheck_key|noschemacheck_key)?
+            xml_multiuse_expression_element (COMMA xml_multiuse_expression_element)*
+        RIGHT_PAREN
+    ;
+
+xml_namespaces_clause
+    :    xmlnamespaces_key
+        LEFT_PAREN
+            (concatenation_wrapper column_alias)?
+                (COMMA concatenation_wrapper column_alias)*
+            ((default_key)=> xml_general_default_part)?
+        RIGHT_PAREN
+    ;
+
+xml_table_column
+    :    xml_column_name
+    (    for_key ordinality_key
+    |    type_spec (path_key concatenation_wrapper)? ((default_key)=> xml_general_default_part)?
+    )
+    ;
+
+xml_general_default_part
+    :    default_key concatenation_wrapper
+    ;
+
+xml_multiuse_expression_element
+    :    expression (as_key (id_expression |evalname_key concatenation ))?
+    ;
+
+xmlroot_param_version_part
+    :    version_key (no_key value_key|expression_wrapper)
+    ;
+
+xmlroot_param_standalone_part
+    :    standalone_key (yes_key|no_key value_key?)
+    ;
+
+xmlserialize_param_enconding_part
+    :    encoding_key concatenation_wrapper
+    ;
+
+xmlserialize_param_version_part
+    :    version_key concatenation_wrapper
+    ;
+
+xmlserialize_param_ident_part
+    :    no_key indent_key
+    |    indent_key (size_key EQUALS_OP concatenation_wrapper)?
+    ;
+
+// $>
diff --git a/runtime/Cpp/tests/PTestTraits.hpp b/runtime/Cpp/tests/PTestTraits.hpp
new file mode 100644
index 000000000..bdf5bc3c7
--- /dev/null
+++ b/runtime/Cpp/tests/PTestTraits.hpp
@@ -0,0 +1,197 @@
+#ifndef	_T_TEST_TRAITS_H
+#define	_T_TEST_TRAITS_H
+
+// First thing we always do is include the ANTLR3 generated files, which
+// will automatically include the antlr3 runtime header files.
+// The compiler must use -I (or set the project settings in VS2005)
+// to locate the antlr3 runtime files and -I. to find this file
+#include <antlr3.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+
+#include <fstream>
+#include <iostream>
+#include <sstream>
+
+// Forward declaration for Lexer&Parser class(es)
+namespace Antlr3Test {
+	class PLSQLLexer;
+	class PLSQLParser;
+
+	typedef antlr3::Traits<PLSQLLexer, PLSQLParser> PLSQLTraits;
+	typedef PLSQLTraits PLSQLLexerTraits;
+	typedef PLSQLTraits PLSQLParserTraits;
+	typedef PLSQLTraits PLSQLParser_PLSQLKeysTraits;
+	typedef PLSQLTraits PLSQLParser_PLSQLCommonsTraits;
+	typedef PLSQLTraits PLSQLParser_PLSQL_DMLParserTraits;
+	typedef PLSQLTraits PLSQLParser_SQLPLUSParserTraits;
+	typedef PLSQLTraits PLSQLParser_PLSQL_DMLParser_PLSQLKeysTraits;
+	typedef PLSQLTraits PLSQLParser_PLSQL_DMLParser_PLSQLCommonsTraits;
+
+	//template<class StringType>
+	inline bool equalsIgnoreCase(PLSQLTraits::StringType const& s1, const char* s2)
+	{
+		// return !strcasecmp(s1.c_str(), s2);
+		// StringType s1U(s1);
+		// std::transform(s1U.begin(), s1U.end(), s1U.begin(), ::toupper);
+		// return s1U == s2;
+		PLSQLTraits::StringType ST2(s2);
+		return boost::iequals(s1, ST2);
+	}
+
+  	template<class CommonTokenType>
+	inline bool isTableAlias(CommonTokenType *LT1, CommonTokenType *LT2) {
+		static const std::string wPARTITION("PARTITION");
+		static const std::string wBY("BY");
+		static const std::string wCROSS("CROSS");
+		static const std::string wNATURAL("NATURAL");
+		static const std::string wINNER("INNER");
+		static const std::string wJOIN("JOIN");
+		static const std::string wFULL("FULL");
+		static const std::string wLEFT("LEFT");
+		static const std::string wRIGHT("RIGHT");
+		static const std::string wOUTER("OUTER");
+
+		PLSQLTraits::StringType lt1 = LT1->getText();
+		PLSQLTraits::StringType lt2 = "";
+		//std::transform(lt1.begin(), lt1.end(), lt1.begin(), ::toupper);
+        
+		if ( LT2 && LT2->getText() != ""){
+			lt2 = LT2->getText();
+			std::transform(lt2.begin(), lt2.end(), lt2.begin(), ::toupper); 
+		}
+		
+		if ( (boost::iequals(lt1, wPARTITION) && boost::iequals(lt2, wBY))
+		     || boost::iequals(lt1, wCROSS)
+		     || boost::iequals(lt1, wNATURAL)
+		     || boost::iequals(lt1, wINNER)
+		     || boost::iequals(lt1, wJOIN)
+		     || ( ( boost::iequals(lt1, wFULL) || boost::iequals(lt1, wLEFT) || boost::iequals(lt1, wRIGHT) ) && ( boost::iequals(lt2, wOUTER) || boost::iequals(lt2, wJOIN) ) )
+		     )
+		{
+			return false;
+		}
+		return true;
+	}
+
+  	template<class StringType>
+	inline bool isStandardPredictionFunction(StringType const& originalFunctionName) {
+		static const std::string wPREDICTION("PREDICTION");
+		static const std::string wPREDICTION_BOUNDS("PREDICTION_BOUNDS");
+		static const std::string wPREDICTION_COST("PREDICTION_COST");
+		static const std::string wPREDICTION_DETAILS("PREDICTION_DETAILS");
+		static const std::string wPREDICTION_PROBABILITY("PREDICTION_PROBABILITY");
+		static const std::string wPREDICTION_SET("PREDICTION_SET");		
+		// StringType  functionName = originalFunctionName;
+		// std::transform(functionName.begin(), functionName.end(), functionName.begin(), ::toupper);
+		
+		if ( boost::iequals(originalFunctionName, wPREDICTION)
+		     || boost::iequals(originalFunctionName, wPREDICTION_BOUNDS)
+		     || boost::iequals(originalFunctionName, wPREDICTION_COST)
+		     || boost::iequals(originalFunctionName, wPREDICTION_DETAILS)
+		     || boost::iequals(originalFunctionName, wPREDICTION_PROBABILITY)
+		     || boost::iequals(originalFunctionName, wPREDICTION_SET)
+			)
+		{
+			return true;
+		}
+		return false;
+	}
+
+	template<class StringType>     
+	inline bool enablesWithinOrOverClause(StringType const& originalFunctionName) {
+		static const std::string wCUME_DIST("CUME_DIST");
+		static const std::string wDENSE_RANK("DENSE_RANK");
+		static const std::string wLISTAGG("LISTAGG");
+		static const std::string wPERCENT_RANK("PERCENT_RANK");
+		static const std::string wPERCENTILE_CONT("PERCENTILE_CONT");
+		static const std::string wPERCENTILE_DISC("PERCENTILE_DISC");
+		static const std::string wRANK("RANK");		
+		// StringType functionName = originalFunctionName;
+		// std::transform(functionName.begin(), functionName.end(), functionName.begin(), ::toupper);
+		
+		if ( boost::iequals(originalFunctionName, wCUME_DIST)
+		     || boost::iequals(originalFunctionName, wDENSE_RANK)
+		     || boost::iequals(originalFunctionName, wLISTAGG)
+		     || boost::iequals(originalFunctionName, wPERCENT_RANK)
+		     || boost::iequals(originalFunctionName, wPERCENTILE_CONT)
+		     || boost::iequals(originalFunctionName, wPERCENTILE_DISC)
+		     || boost::iequals(originalFunctionName, wRANK)
+			)
+		{
+			return true;
+		}
+		return false;
+	}
+
+	template<class StringType>          
+	inline bool enablesUsingClause(StringType const& originalFunctionName) {
+		static const std::string wCLUSTER("CLUSTER_");
+		static const std::string wFEATURE("FEATURE_");		
+		// StringType functionName = originalFunctionName;
+		// std::transform(functionName.begin(), functionName.end(), functionName.begin(), ::toupper);
+		
+		if ( boost::algorithm::istarts_with(originalFunctionName, wCLUSTER)
+		     || boost::algorithm::istarts_with(originalFunctionName, wFEATURE)
+			)
+		{
+			return true;
+		}
+		return false;
+	}
+
+	//template<class StringType>     
+	inline bool enablesOverClause(PLSQLTraits::StringType const& originalFunctionName) {
+		static const std::string wREGR("REGR_");
+		static const std::string wSTDDEV("STDDEV");
+		static const std::string wVAR("VAR_");
+		static const std::string wCOVAR("COVAR_");		
+		static const std::string wAVG("AVG");
+		static const std::string wCORR("CORR");
+		static const std::string wLAG("LAG");
+		static const std::string wLEAD("LEAD");
+		static const std::string wMAX ("MAX");
+		static const std::string wMEDIAN("MEDIAN");
+		static const std::string wMIN("MIN");
+		static const std::string wNTILE("NTILE");
+		static const std::string wRATIO_TO_REPORT("RATIO_TO_REPORT");
+		static const std::string wROW_NUMBER("ROW_NUMBER");
+		static const std::string wSUM("SUM");
+		static const std::string wVARIANCE("VARIANCE");       
+		// StringType functionName = originalFunctionName;
+		// std::transform(functionName.begin(), functionName.end(), functionName.begin(), ::toupper);		
+		
+		if ( boost::iequals(originalFunctionName, wAVG)
+		     || boost::iequals(originalFunctionName, wCORR)
+		     || boost::iequals(originalFunctionName, wLAG)
+		     || boost::iequals(originalFunctionName, wLEAD)
+		     || boost::iequals(originalFunctionName, wMAX)
+		     || boost::iequals(originalFunctionName, wMEDIAN)
+		     || boost::iequals(originalFunctionName, wMIN)
+		     || boost::iequals(originalFunctionName, wNTILE)
+		     || boost::iequals(originalFunctionName, wRATIO_TO_REPORT)
+		     || boost::iequals(originalFunctionName, wROW_NUMBER)
+		     || boost::iequals(originalFunctionName, wSUM)
+		     || boost::iequals(originalFunctionName, wVARIANCE)
+		     || boost::algorithm::istarts_with(originalFunctionName, wREGR)
+		     || boost::algorithm::istarts_with(originalFunctionName, wSTDDEV)
+		     || boost::algorithm::istarts_with(originalFunctionName, wVAR)
+		     || boost::algorithm::istarts_with(originalFunctionName, wCOVAR)
+			)
+		{
+			return true;
+		}
+		return false;
+	}
+
+	inline std::string slurp(std::string const& fileName)
+	{
+		std::ifstream ifs(fileName.c_str(), std::ios::in | std::ios::binary | std::ios::ate);
+		//std::ifstream::pos_type fileSize = ifs.tellg();
+		ifs.seekg(0, std::ios::beg);
+		std::stringstream sstr;
+		sstr << ifs.rdbuf();
+		return sstr.str();
+	}
+};
+
+#endif
diff --git a/runtime/Cpp/tests/SQLMini.g b/runtime/Cpp/tests/SQLMini.g
new file mode 100644
index 000000000..ee225c664
--- /dev/null
+++ b/runtime/Cpp/tests/SQLMini.g
@@ -0,0 +1,151 @@
+grammar SQLMini;
+
+options {
+	language=Cpp;
+	backtrack=true;
+	memoize=true;
+ 	output=AST;
+}
+
+tokens 
+{
+    T_SUBQUERY='t_subquery';
+    T_FOR_UPDATE_CLAUSE='t_for_update';
+
+    T_TABLE_NAME='t_table_name';
+    T_SCHEMA_NAME='t_schema_name';
+    T_COLUMN_NAME='t_column_name';
+}
+
+@lexer::includes 
+{
+#include "UserMiniTraits.hpp"
+}
+
+@lexer::namespace{ Antlr3Mini }
+
+@lexer::members {
+
+  void advanceInput()
+  {
+    RecognizerSharedStateType *state = get_state();
+    state->set_tokenStartCharIndex(getCharIndex());    
+    state->set_tokenStartCharPositionInLine(getCharPositionInLine());
+    state->set_tokenStartLine(getLine());
+  }
+}
+        
+@parser::includes {
+#include "UserMiniTraits.hpp"
+#include "SQLMiniLexer.hpp"
+}
+
+@parser::namespace{ Antlr3Mini }
+        
+@members {
+            void perserMember();
+}
+        
+start_rule
+	: (
+            subquery
+        )            
+        (SEMI|EOF)
+        ;      
+
+subquery
+	:
+        (	
+//LPAREN select_statement RPAREN
+//        ( group_by_clause )?
+//        ( (k_model (k_main|k_partition|k_dimension) ) => model_clause )?
+//        ( union_clause )*
+        ( fu1=for_update_clause )?        
+//        ( order_by_clause )?
+        ( fu2=for_update_clause )?            
+        ) //-> ^(T_SUBQUERY $fu1 $fu2)
+	|	(
+		LPAREN subquery RPAREN
+//        ( group_by_clause )?
+//        ( (k_model (k_main|k_partition|k_dimension) ) => model_clause )?
+//        ( union_clause )*
+        ( fu1=for_update_clause )?        
+//        ( order_by_clause )?
+        ( fu2=for_update_clause )?                
+        ) //-> ^(T_SUBQUERY subquery $fu1 $fu2)
+	;
+identifier[int identifierClass, int usageType]
+	:	i=ID                  //{ $i->user1 = identifierClass; $i->user2 = usageType; }
+	;
+table_name
+	:	identifier[T_TABLE_NAME,0]
+	;
+schema_name
+	:	identifier[T_SCHEMA_NAME,0]
+	;
+column_name
+	:	identifier[T_COLUMN_NAME,0]
+	;
+
+/* ================================================================================
+    FOR UPDATE CLAUSE
+   ================================================================================ */
+for_update_clause
+	: r_for r_update ( r_of for_update_clause_part_first for_update_clause_part_next* )? (r_nowait | k_wait NUMBER | k_skip k_locked)?
+	//-> ^(T_FOR_UPDATE_CLAUSE r_for r_update r_of? for_update_clause_part_first? for_update_clause_part_next* r_nowait? k_wait? NUMBER? k_skip? k_locked?)
+	;
+for_update_clause_part_first
+	: (schema_name DOT)? (table_name DOT)? column_name
+	;
+for_update_clause_part_next
+	: COMMA (schema_name DOT)? (table_name DOT)? column_name
+	;
+	
+r_for : r='FOR' ; //{ $r->set_type($r, T_RESERVED); $r->user1 = T_RESERVED;  }  ;
+r_nowait : r='NOWAIT' ; //{ $r->set_type($r, T_RESERVED); $r->user1 = T_RESERVED;  }  ;
+r_of : r='OF' ; //{ $r->set_type($r, T_RESERVED); $r->user1 = T_OPERATOR_PART;  }  ;
+r_update : r='UPDATE' ; //{ $r->set_type($r, T_RESERVED); $r->user1 = T_RESERVED;  }  ;
+k_locked : 'LOCKED'; //{ !(strcasecmp((const char*)LT(1)->getText(LT(1))->chars, "LOCKED")) }? r=ID { $r->set_type($r, T_RESERVED); $r->user1 = T_RESERVED;  }  ;
+k_skip : 'SKIP' ; //{ !(strcasecmp((const char*)LT(1)->getText(LT(1))->chars, "SKIP")) }? r=ID { $r->set_type($r, T_RESERVED); $r->user1 = T_RESERVED;  }  ;
+k_wait : 'WAIT' ; //{ !(strcasecmp((const char*)LT(1)->getText(LT(1))->chars, "WAIT")) }? r=ID { $r->set_type($r, T_RESERVED); $r->user1 = T_RESERVED;  }  ;
+
+ID /*options { testLiterals=true; }*/
+    :	'A' .. 'Z' ( 'A' .. 'Z' | '0' .. '9' | '_' | '$' | '#' )*
+    ;
+SEMI
+	:	';'
+	;
+COMMA
+	:	','
+	;
+LPAREN
+	:	'('
+	;
+RPAREN
+	:	')'
+	;       
+DOT
+	:	POINT
+	;
+fragment
+POINT
+	:	'.'
+	;
+NUMBER
+	: (	( NUM POINT NUM ) => NUM POINT NUM
+		|	POINT NUM
+		|	NUM
+		)
+    ;
+fragment
+NUM
+	: '0' .. '9' ( '0' .. '9' )*
+	;
+WS	:	(' '|'\r'|'\t'|'\n') {$channel=HIDDEN;}
+	;
+SL_COMMENT
+	:	'--' ~('\n'|'\r')* '\r'? '\n' {$channel=HIDDEN;}
+	;
+ML_COMMENT
+	:	'/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}
+	;
diff --git a/runtime/Cpp/tests/SQLMini2.g b/runtime/Cpp/tests/SQLMini2.g
new file mode 100644
index 000000000..62cd96a33
--- /dev/null
+++ b/runtime/Cpp/tests/SQLMini2.g
@@ -0,0 +1,151 @@
+grammar SQLMini2;
+
+options {
+	language=Cpp;
+	backtrack=true;
+	memoize=true;
+	output=AST;
+}
+
+tokens 
+{
+    T_SUBQUERY='t_subquery';
+    T_FOR_UPDATE_CLAUSE='t_for_update';
+
+    T_TABLE_NAME='t_table_name';
+    T_SCHEMA_NAME='t_schema_name';
+    T_COLUMN_NAME='t_column_name';
+}
+
+@lexer::includes 
+{
+#include "UserMiniTraits.hpp"
+}
+
+@lexer::namespace{ Antlr3Mini }
+
+@lexer::members {
+
+  void advanceInput()
+  {
+    RecognizerSharedStateType *state = get_state();
+    state->set_tokenStartCharIndex(getCharIndex());    
+    state->set_tokenStartCharPositionInLine(getCharPositionInLine());
+    state->set_tokenStartLine(getLine());
+  }
+}
+        
+@parser::includes {
+#include "UserMiniTraits.hpp"
+#include "SQLMiniLexer.hpp"
+}
+
+@parser::namespace{ Antlr3Mini }
+        
+@members {
+            void perserMember();
+}
+        
+start_rule
+	: (
+            subquery
+        )            
+        (SEMI|EOF)
+        ;      
+
+subquery
+	:
+        (	
+//LPAREN select_statement RPAREN
+//        ( group_by_clause )?
+//        ( (k_model (k_main|k_partition|k_dimension) ) => model_clause )?
+//        ( union_clause )*
+        ( fu1=for_update_clause )?        
+//        ( order_by_clause )?
+        ( fu2=for_update_clause )?            
+        ) -> ^(T_SUBQUERY $fu1 $fu2)
+	|	(
+		LPAREN subquery RPAREN
+//        ( group_by_clause )?
+//        ( (k_model (k_main|k_partition|k_dimension) ) => model_clause )?
+//        ( union_clause )*
+        ( fu1=for_update_clause )?        
+//        ( order_by_clause )?
+        ( fu2=for_update_clause )?                
+        ) -> ^(T_SUBQUERY subquery $fu1 $fu2)
+	;
+identifier[int identifierClass, int usageType]
+	:	i=ID                  //{ $i->user1 = identifierClass; $i->user2 = usageType; }
+	;
+table_name
+	:	identifier[T_TABLE_NAME,0]
+	;
+schema_name
+	:	identifier[T_SCHEMA_NAME,0]
+	;
+column_name
+	:	identifier[T_COLUMN_NAME,0]
+	;
+
+/* ================================================================================
+    FOR UPDATE CLAUSE
+   ================================================================================ */
+for_update_clause
+	: r_for r_update ( r_of for_update_clause_part_first for_update_clause_part_next* )? (r_nowait | k_wait NUMBER | k_skip k_locked)?
+	-> ^(T_FOR_UPDATE_CLAUSE r_for r_update r_of? for_update_clause_part_first? for_update_clause_part_next* r_nowait? k_wait? NUMBER? k_skip? k_locked?)
+	;
+for_update_clause_part_first
+	: (schema_name DOT)? (table_name DOT)? column_name
+	;
+for_update_clause_part_next
+	: COMMA (schema_name DOT)? (table_name DOT)? column_name
+	;
+	
+r_for : r='FOR' ; //{ $r->set_type($r, T_RESERVED); $r->user1 = T_RESERVED;  }  ;
+r_nowait : r='NOWAIT' ; //{ $r->set_type($r, T_RESERVED); $r->user1 = T_RESERVED;  }  ;
+r_of : r='OF' ; //{ $r->set_type($r, T_RESERVED); $r->user1 = T_OPERATOR_PART;  }  ;
+r_update : r='UPDATE' ; //{ $r->set_type($r, T_RESERVED); $r->user1 = T_RESERVED;  }  ;
+k_locked : 'LOCKED'; //{ !(strcasecmp((const char*)LT(1)->getText(LT(1))->chars, "LOCKED")) }? r=ID { $r->set_type($r, T_RESERVED); $r->user1 = T_RESERVED;  }  ;
+k_skip : 'SKIP' ; //{ !(strcasecmp((const char*)LT(1)->getText(LT(1))->chars, "SKIP")) }? r=ID { $r->set_type($r, T_RESERVED); $r->user1 = T_RESERVED;  }  ;
+k_wait : 'WAIT' ; //{ !(strcasecmp((const char*)LT(1)->getText(LT(1))->chars, "WAIT")) }? r=ID { $r->set_type($r, T_RESERVED); $r->user1 = T_RESERVED;  }  ;
+
+ID /*options { testLiterals=true; }*/
+    :	'A' .. 'Z' ( 'A' .. 'Z' | '0' .. '9' | '_' | '$' | '#' )*
+    ;
+SEMI
+	:	';'
+	;
+COMMA
+	:	','
+	;
+LPAREN
+	:	'('
+	;
+RPAREN
+	:	')'
+	;       
+DOT
+	:	POINT
+	;
+fragment
+POINT
+	:	'.'
+	;
+NUMBER
+	: (	( NUM POINT NUM ) => NUM POINT NUM
+		|	POINT NUM
+		|	NUM
+		)
+    ;
+fragment
+NUM
+	: '0' .. '9' ( '0' .. '9' )*
+	;
+WS	:	(' '|'\r'|'\t'|'\n') {$channel=HIDDEN;}
+	;
+SL_COMMENT
+	:	'--' ~('\n'|'\r')* '\r'? '\n' {$channel=HIDDEN;}
+	;
+ML_COMMENT
+	:	'/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}
+	;
diff --git a/runtime/Cpp/tests/SQLPLUSParser.g b/runtime/Cpp/tests/SQLPLUSParser.g
new file mode 100644
index 000000000..5af21d551
--- /dev/null
+++ b/runtime/Cpp/tests/SQLPLUSParser.g
@@ -0,0 +1,46 @@
+/**
+ * Oracle(c) SQL*Plus 11g Parser
+ *
+ * Copyright (c) 2009-2011 Alexandre Porcelli <alexandre.porcelli@gmail.com>
+ *                         Tomi Pakarinen <tomi.pakarinen@iki.fi>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+parser grammar SQLPLUSParser;
+
+@includes
+{
+ 	#include "PTestTraits.hpp"
+}
+@namespace { Antlr3Test }
+
+sql_plus_command 
+    :    (SOLIDUS|whenever_command|exit_command|prompt_command|set_command) SEMICOLON?
+    ;
+
+whenever_command
+    :    whenever_key (sqlerror_key|oserror_key) (exit_key (success_key|failure_key|warning_key) (commit_key|rollback_key) | continue_key (commit_key|rollback_key|none_key))
+    ;
+
+set_command
+    :    set_key REGULAR_ID (CHAR_STRING|on_key|off_key|EXACT_NUM_LIT|REGULAR_ID)
+    ;
+
+exit_command
+    :    exit_key 
+    ;
+
+prompt_command
+    :    PROMPT
+    ;
+
diff --git a/runtime/Cpp/tests/UserMiniTraits.hpp b/runtime/Cpp/tests/UserMiniTraits.hpp
new file mode 100644
index 000000000..54dd50e2d
--- /dev/null
+++ b/runtime/Cpp/tests/UserMiniTraits.hpp
@@ -0,0 +1,38 @@
+/** \file
+ * This is the include file for the ANTLR3 sample project "dynamic-scope"
+ * which shows how to use a C grammar and call it from C code.
+ */
+#ifndef	_T_MINI_TRAITS_H
+#define	_T_MINI_TRAITS_H
+
+// First thing we always do is include the ANTLR3 generated files, which
+// will automatically include the antlr3 runtime header files.
+// The compiler must use -I (or set the project settings in VS2005)
+// to locate the antlr3 runtime files and -I. to find this file
+//
+#include <antlr3.hpp>
+
+namespace Antlr3Mini {
+	class SQLMiniLexer;
+	class SQLMiniParser;
+
+	class SQLMini2Lexer;
+	class SQLMini2Parser;
+};
+
+namespace Antlr3Mini {
+//code for overriding
+template<class ImplTraits>
+class UserTraits : public antlr3::CustomTraitsBase<ImplTraits>
+{
+public:
+};
+
+typedef antlr3::Traits<SQLMiniLexer, SQLMiniParser, UserTraits> SQLMiniLexerTraits;
+typedef SQLMiniLexerTraits SQLMiniParserTraits;
+
+typedef SQLMiniLexerTraits SQLMini2LexerTraits;	
+typedef SQLMiniLexerTraits SQLMini2ParserTraits;
+};
+
+#endif
diff --git a/runtime/Cpp/tests/UserTestTraits.hpp b/runtime/Cpp/tests/UserTestTraits.hpp
index 7189307dd..06565172f 100644
--- a/runtime/Cpp/tests/UserTestTraits.hpp
+++ b/runtime/Cpp/tests/UserTestTraits.hpp
@@ -13,8 +13,9 @@
 
 // Forward declaration for Lexer&Parser class(es)
 namespace Antlr3Test {
-	class S1Lexer;
-	class S1Parser;
+	class s001Lexer;	class s001Parser;
+	class s002Lexer;	class s002Parser;
+	class s003Lexer;	class s003Parser;
 
 	class t001lexer;
 	class t002lexer;
@@ -50,9 +51,13 @@ namespace Antlr3Test {
 	};
 		
 	// Instantiate the Traits class(will be used for Lexer/Parser template instantiations)
-	typedef antlr3::Traits<S1Lexer, S1Parser, UserTraits> S1LexerTraits;
-	typedef antlr3::Traits<S1Lexer, S1Parser, UserTraits> S1ParserTraits;
-
+	typedef antlr3::Traits<s001Lexer, s001Parser, UserTraits> s001LexerTraits;
+	typedef s001LexerTraits s001ParserTraits;
+  	typedef antlr3::Traits<s002Lexer, s002Parser, UserTraits> s002LexerTraits;
+	typedef s002LexerTraits s002ParserTraits;
+  	typedef antlr3::Traits<s003Lexer, s003Parser, UserTraits> s003LexerTraits;
+	typedef s003LexerTraits s003ParserTraits;
+  
 	typedef antlr3::Traits<t001lexer, NoParser, UserTraits> t001lexerTraits;
 	typedef antlr3::Traits<t002lexer, NoParser, UserTraits> t002lexerTraits;
 	typedef antlr3::Traits<t003lexer, NoParser, UserTraits> t003lexerTraits;
diff --git a/runtime/Cpp/tests/a001.cpp b/runtime/Cpp/tests/a001.cpp
new file mode 100644
index 000000000..98d996ba3
--- /dev/null
+++ b/runtime/Cpp/tests/a001.cpp
@@ -0,0 +1,93 @@
+#include "utils.hpp"
+#include "ATestTraits.hpp"
+#include "a001Lexer.hpp"
+#include "a001Parser.hpp"
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+using namespace Antlr3Test;
+using namespace std;
+
+void test1(const char* input);
+void test2(const char* input);
+void test3(const char* input);
+
+int 
+main	(int argc, char *argv[])
+{
+	test1("ABCDEFG");
+	test2("ABCDEFG");
+	test3("ABCDEFGH");
+
+	printf("finished parsing OK\n");	// Finnish parking is pretty good - I think it is all the snow
+
+	return 0;
+}
+
+void test1(const char* input)
+{
+	a001LexerTraits::InputStreamType* istream = new a001LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+											 , ANTLR_ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test1");
+	istream->setUcaseLA(true);
+	
+	a001Lexer* lxr = new a001Lexer(istream);
+	a001LexerTraits::TokenStreamType* tstream = new a001LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a001Parser* psr = new a001Parser(tstream);	
+	{
+		auto r1 = psr->test1();
+		std::cout << r1.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test2(const char* input)
+{
+	auto istream = new a001LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+							    , ANTLR_ENC_8BIT
+							    , strlen(input)
+							    , (ANTLR_UINT8*)"test2");
+	istream->setUcaseLA(true);
+	
+	auto lxr = new a001Lexer(istream);
+	auto tstream = new a001LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	auto psr = new a001Parser(tstream);	
+	{
+		auto r2 = psr->test2();
+		std::cout << r2.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test3(const char* input)
+{
+	auto istream = new a001LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+							    , ANTLR_ENC_8BIT
+							    , strlen(input)
+							    , (ANTLR_UINT8*)"test3");
+	istream->setUcaseLA(true);
+	
+	auto lxr = new a001Lexer(istream);       
+	auto tstream = new a001LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	auto psr = new a001Parser(tstream);
+	{
+		auto r3 = psr->test3();
+		std::cout << r3.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
diff --git a/runtime/Cpp/tests/a001.g b/runtime/Cpp/tests/a001.g
new file mode 100644
index 000000000..9b78f4b1e
--- /dev/null
+++ b/runtime/Cpp/tests/a001.g
@@ -0,0 +1,35 @@
+grammar a001;
+
+options {
+	language=Cpp;
+	output=AST;
+}
+
+@lexer::includes 
+{
+#include "ATestTraits.hpp"
+}
+@lexer::namespace 
+{ Antlr3Test }
+
+@parser::includes {
+#include "ATestTraits.hpp"
+#include "a001Lexer.hpp"
+}
+@parser::namespace 
+{ Antlr3Test }
+
+test1: A B C D E F G;
+
+test2: A bcd E F G;
+bcd: B C D;
+
+test3: A bcd E F G 'H';
+
+A: 'A';
+B: 'B';
+C: 'C';
+D: 'D';
+E: 'E';
+F: 'F';
+G: 'G';
diff --git a/runtime/Cpp/tests/a002.cpp b/runtime/Cpp/tests/a002.cpp
new file mode 100644
index 000000000..d0a144ea4
--- /dev/null
+++ b/runtime/Cpp/tests/a002.cpp
@@ -0,0 +1,141 @@
+#include "utils.hpp"
+#include "ATestTraits.hpp"
+#include "a002Lexer.hpp"
+#include "a002Parser.hpp"
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+using namespace Antlr3Test;
+using namespace std;
+
+void test1(const char* input);
+void test2(const char* input);
+void test3(const char* input);
+void test4(const char* input);
+void test5(const char* input);
+
+int 
+main	(int argc, char *argv[])
+{
+	test1("ABCDEFG");
+	test2("ABCDEFG");
+	test3("ABCDEFG");
+	test4("ABCDEFGH");
+	test5("ABCDEFGH");
+
+	printf("finished parsing OK\n");	// Finnish parking is pretty good - I think it is all the snow
+
+	return 0;
+}
+
+void test1(const char* input)
+{
+	a002LexerTraits::InputStreamType* istream = new a002LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+											 , ANTLR_ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test1");
+	istream->setUcaseLA(true);
+	
+	a002Lexer* lxr = new a002Lexer(istream);
+	a002LexerTraits::TokenStreamType* tstream = new a002LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a002Parser* psr = new a002Parser(tstream);	
+	{
+		auto r1 = psr->test1();
+		std::cout << r1.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test2(const char* input)
+{
+	auto istream = new a002LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+							    , ANTLR_ENC_8BIT
+							    , strlen(input)
+							    , (ANTLR_UINT8*)"test2");
+	istream->setUcaseLA(true);
+	
+	auto lxr = new a002Lexer(istream);
+	auto tstream = new a002LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	auto psr = new a002Parser(tstream);	
+	{
+		auto r = psr->test2();
+		std::cout << r.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test3(const char* input)
+{
+	auto istream = new a002LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+							    , ANTLR_ENC_8BIT
+							    , strlen(input)
+							    , (ANTLR_UINT8*)"test2");
+	istream->setUcaseLA(true);
+	
+	auto lxr = new a002Lexer(istream);
+	auto tstream = new a002LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	auto psr = new a002Parser(tstream);	
+	{
+		auto r = psr->test3();
+		std::cout << r.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test4(const char* input)
+{
+	auto istream = new a002LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+							    , ANTLR_ENC_8BIT
+							    , strlen(input)
+							    , (ANTLR_UINT8*)"test2");
+	istream->setUcaseLA(true);
+	
+	auto lxr = new a002Lexer(istream);
+	auto tstream = new a002LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	auto psr = new a002Parser(tstream);	
+	{
+		auto r = psr->test4();
+		std::cout << r.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test5(const char* input)
+{
+	auto istream = new a002LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+							    , ANTLR_ENC_8BIT
+							    , strlen(input)
+							    , (ANTLR_UINT8*)"test2");
+	istream->setUcaseLA(true);
+
+	auto lxr = new a002Lexer(istream);
+	auto tstream = new a002LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	auto psr = new a002Parser(tstream);
+	{
+		auto r = psr->test5();
+		std::cout << r.tree->toStringTree() << std::endl;
+	}
+
+	delete psr;
+	delete tstream;
+	delete lxr;
+	delete istream;
+}
diff --git a/runtime/Cpp/tests/a002.g b/runtime/Cpp/tests/a002.g
new file mode 100644
index 000000000..f8a4ef4dd
--- /dev/null
+++ b/runtime/Cpp/tests/a002.g
@@ -0,0 +1,40 @@
+grammar a002;
+
+options {
+	language=Cpp;
+	output=AST;
+}
+
+@lexer::includes 
+{
+#include "ATestTraits.hpp"
+}
+@lexer::namespace 
+{ Antlr3Test }
+
+@parser::includes {
+#include "ATestTraits.hpp"
+#include "a002Lexer.hpp"
+}
+@parser::namespace 
+{ Antlr3Test }
+
+test1: A^ B C D E F G;
+
+test2: A^ bcd2 E F G;
+bcd2: B C D;
+
+test3: A^ bcd3 E F G;
+bcd3: B C^ D;
+
+test4: A bcd2 E^ F G 'H';
+
+test5: A bcd3 E F G 'H'^;
+
+A: 'A';
+B: 'B';
+C: 'C';
+D: 'D';
+E: 'E';
+F: 'F';
+G: 'G';
diff --git a/runtime/Cpp/tests/a003.cpp b/runtime/Cpp/tests/a003.cpp
new file mode 100644
index 000000000..fd0630009
--- /dev/null
+++ b/runtime/Cpp/tests/a003.cpp
@@ -0,0 +1,146 @@
+#include "utils.hpp"
+#include "ATestTraits.hpp"
+#include "a003Lexer.hpp"
+#include "a003Parser.hpp"
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+using namespace Antlr3Test;
+using namespace std;
+
+void test1(const char* input);
+void test2(const char* input);
+void test3(const char* input);
+void test4(const char* input);
+void test5(const char* input);
+
+int 
+main	(int argc, char *argv[])
+{
+	test1("ABCDEFG");
+	test1("BCDEFG");
+	test2("ABCDEFG");
+	test2("BCDEFG");
+	test3("ABCDEFG");
+	test3("BCDEFG");
+	test4("ABCDEFGH");
+	test4("BCDEFGH");
+	test5("ABCDEFGH");
+	test5("BCDEFGH");
+
+	printf("finished parsing OK\n");	// Finnish parking is pretty good - I think it is all the snow
+
+	return 0;
+}
+
+void test1(const char* input)
+{
+	a003LexerTraits::InputStreamType* istream = new a003LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+											 , ANTLR_ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test1");
+	istream->setUcaseLA(true);
+	
+	a003Lexer* lxr = new a003Lexer(istream);
+	a003LexerTraits::TokenStreamType* tstream = new a003LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a003Parser* psr = new a003Parser(tstream);	
+	{
+		auto r1 = psr->test1();
+		std::cout << r1.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test2(const char* input)
+{
+	auto istream = new a003LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+							    , ANTLR_ENC_8BIT
+							    , strlen(input)
+							    , (ANTLR_UINT8*)"test2");
+	istream->setUcaseLA(true);
+	
+	auto lxr = new a003Lexer(istream);
+	auto tstream = new a003LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	auto psr = new a003Parser(tstream);	
+	{
+		auto r = psr->test2();
+		std::cout << r.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test3(const char* input)
+{
+	auto istream = new a003LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+							    , ANTLR_ENC_8BIT
+							    , strlen(input)
+							    , (ANTLR_UINT8*)"test2");
+	istream->setUcaseLA(true);
+	
+	auto lxr = new a003Lexer(istream);
+	auto tstream = new a003LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	auto psr = new a003Parser(tstream);	
+	{
+		auto r = psr->test3();
+		std::cout << r.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test4(const char* input)
+{
+	auto istream = new a003LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+							    , ANTLR_ENC_8BIT
+							    , strlen(input)
+							    , (ANTLR_UINT8*)"test2");
+	istream->setUcaseLA(true);
+	
+	auto lxr = new a003Lexer(istream);
+	auto tstream = new a003LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	auto psr = new a003Parser(tstream);	
+	{
+		auto r = psr->test4();
+		std::cout << r.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test5(const char* input)
+{
+	auto istream = new a003LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+							    , ANTLR_ENC_8BIT
+							    , strlen(input)
+							    , (ANTLR_UINT8*)"test2");
+	istream->setUcaseLA(true);
+
+	auto lxr = new a003Lexer(istream);
+	auto tstream = new a003LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	auto psr = new a003Parser(tstream);
+	{
+		auto r = psr->test5();
+		std::cout << r.tree->toStringTree() << std::endl;
+	}
+
+	delete psr;
+	delete tstream;
+	delete lxr;
+	delete istream;
+}
diff --git a/runtime/Cpp/tests/a003.g b/runtime/Cpp/tests/a003.g
new file mode 100644
index 000000000..bc4a2e46b
--- /dev/null
+++ b/runtime/Cpp/tests/a003.g
@@ -0,0 +1,55 @@
+grammar a003;
+
+options {
+	language=Cpp;
+	output=AST;
+}
+
+@lexer::includes 
+{
+#include "ATestTraits.hpp"
+}
+@lexer::namespace 
+{ Antlr3Test }
+
+@parser::includes {
+#include "ATestTraits.hpp"
+#include "a003Lexer.hpp"
+}
+@parser::namespace 
+{ Antlr3Test }
+
+test1
+    :	A^ B C D E F G
+    |	B^ C D E F G
+	;
+
+test2
+    : A^ bcd2 E F G
+	| bcd2 E F G
+	;
+bcd2: B C D;
+
+test3
+    : A^ bcd3 E F G
+	| bcd3 E F G
+    ;
+bcd3: B C^ D;
+
+test4
+    : A bcd2 E^ F G 'H'
+	| bcd2 E^ F G 'H'
+    ;
+
+test5
+    : A bcd3 E F G 'H'^
+    | bcd3 E F G 'H'^
+    ;
+
+A: 'A';
+B: 'B';
+C: 'C';
+D: 'D';
+E: 'E';
+F: 'F';
+G: 'G';
diff --git a/runtime/Cpp/tests/a004.cpp b/runtime/Cpp/tests/a004.cpp
new file mode 100644
index 000000000..d4715f61a
--- /dev/null
+++ b/runtime/Cpp/tests/a004.cpp
@@ -0,0 +1,165 @@
+#include "utils.hpp"
+#include "ATestTraits.hpp"
+#include "a004Lexer.hpp"
+#include "a004Parser.hpp"
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+using namespace Antlr3Test;
+using namespace std;
+
+void test1(const char* input);
+void test2(const char* input);
+void test3(const char* input);
+void test4(const char* input);
+void test5(const char* input);
+void test6(const char* input);
+
+int 
+main	(int argc, char *argv[])
+{
+	test1("ABCDEFG");
+	test2("ABCDEFG"); // NOTE this one leaks memory
+	test3("ABCDEFG");
+	test4("ABCDEFGH");
+	test5("ABCDEFGH");
+	test6("ABCDEFG");
+
+	printf("finished parsing OK\n");	// Finnish parking is pretty good - I think it is all the snow
+
+	return 0;
+}
+
+void test1(const char* input)
+{
+	a004LexerTraits::InputStreamType* istream = new a004LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+											 , ANTLR_ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test1");
+	istream->setUcaseLA(true);
+	
+	a004Lexer* lxr = new a004Lexer(istream);
+	a004LexerTraits::TokenStreamType* tstream = new a004LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a004Parser* psr = new a004Parser(tstream);	
+	{
+		auto r1 = psr->test1();
+		std::cout << r1.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test2(const char* input)
+{
+	auto istream = new a004LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+							    , ANTLR_ENC_8BIT
+							    , strlen(input)
+							    , (ANTLR_UINT8*)"test2");
+	istream->setUcaseLA(true);
+	
+	auto lxr = new a004Lexer(istream);
+	auto tstream = new a004LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	auto psr = new a004Parser(tstream);	
+	{
+		auto r = psr->test2();
+		std::cout << r.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test3(const char* input)
+{
+	auto istream = new a004LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+							    , ANTLR_ENC_8BIT
+							    , strlen(input)
+							    , (ANTLR_UINT8*)"test2");
+	istream->setUcaseLA(true);
+	
+	auto lxr = new a004Lexer(istream);
+	auto tstream = new a004LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	auto psr = new a004Parser(tstream);	
+	{
+		auto r = psr->test3();
+		std::cout << r.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test4(const char* input)
+{
+	auto istream = new a004LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+							    , ANTLR_ENC_8BIT
+							    , strlen(input)
+							    , (ANTLR_UINT8*)"test4");
+	istream->setUcaseLA(true);
+	
+	auto lxr = new a004Lexer(istream);
+	auto tstream = new a004LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	auto psr = new a004Parser(tstream);	
+	{
+		auto r = psr->test4();
+		std::cout << r.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test5(const char* input)
+{
+	auto istream = new a004LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+							    , ANTLR_ENC_8BIT
+							    , strlen(input)
+							    , (ANTLR_UINT8*)"test5");
+	istream->setUcaseLA(true);
+
+	auto lxr = new a004Lexer(istream);
+	auto tstream = new a004LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	auto psr = new a004Parser(tstream);
+	{
+		auto r = psr->test5();
+		std::cout << r.tree->toStringTree() << std::endl;
+	}
+
+	delete psr;
+	delete tstream;
+	delete lxr;
+	delete istream;
+}
+
+void test6(const char* input)
+{
+	auto istream = new a004LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+							    , ANTLR_ENC_8BIT
+							    , strlen(input)
+							    , (ANTLR_UINT8*)"test6");
+	istream->setUcaseLA(true);
+
+	auto lxr = new a004Lexer(istream);
+	auto tstream = new a004LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	auto psr = new a004Parser(tstream);
+	{
+		auto r = psr->test6();
+		std::cout << r.tree->toStringTree() << std::endl;
+	}
+
+	delete psr;
+	delete tstream;
+	delete lxr;
+	delete istream;
+}
diff --git a/runtime/Cpp/tests/a004.g b/runtime/Cpp/tests/a004.g
new file mode 100644
index 000000000..d383e62d8
--- /dev/null
+++ b/runtime/Cpp/tests/a004.g
@@ -0,0 +1,57 @@
+grammar a004;
+
+options {
+	language=Cpp;
+	output=AST;
+}
+
+@lexer::includes 
+{
+#include "ATestTraits.hpp"
+}
+@lexer::namespace 
+{ Antlr3Test }
+
+@parser::includes {
+#include "ATestTraits.hpp"
+#include "a004Lexer.hpp"
+}
+@parser::namespace 
+{ Antlr3Test }
+
+test1
+    :	A B C D E F G  -> ^(A B C D E F G)
+	;
+
+// TODO: the "D" letter here leaks memory
+test2
+    : A bcd2 E F G     -> ^(A bcd2 D E F G)
+	;
+bcd2: B C D;
+
+test3
+    : A bcd3 E F G     -> ^(A bcd3 E F G)
+    ;
+bcd3
+	: B C D            -> ^(C B D)
+	;        
+
+test4
+    : A bcd2 E F G 'H' -> ^('H' A bcd2 E F G)
+    ;
+
+test5
+    : A bcd3 E F G 'H' -> ^('H' A bcd3 E F G)
+    ;
+
+test6
+    : A B C D E F G    -> ^(A A B C D E F G A B C D E F G)
+    ;
+
+A: 'A';
+B: 'B';
+C: 'C';
+D: 'D';
+E: 'E';
+F: 'F';
+G: 'G';
diff --git a/runtime/Cpp/tests/a005.cpp b/runtime/Cpp/tests/a005.cpp
new file mode 100644
index 000000000..5efef3df8
--- /dev/null
+++ b/runtime/Cpp/tests/a005.cpp
@@ -0,0 +1,117 @@
+#include "utils.hpp"
+#include "ATestTraits.hpp"
+#include "a005Lexer.hpp"
+#include "a005Parser.hpp"
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+using namespace Antlr3Test;
+using namespace std;
+
+void test1(const char* input);
+void test2(const char* input);
+void test3(const char* input);
+void test4(const char* input);
+
+int 
+main	(int argc, char *argv[])
+{
+	test1("ABC");
+	test2("AABBCC");
+	test3("AABBCC");
+	test4("ABC"); // NOTE: this one leaks memory
+
+	printf("finished parsing OK\n");	// Finnish parking is pretty good - I think it is all the snow
+
+	return 0;
+}
+
+void test1(const char* input)
+{
+	a005LexerTraits::InputStreamType* istream = new a005LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+											 , ANTLR_ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test1");
+	istream->setUcaseLA(true);
+	
+	a005Lexer* lxr = new a005Lexer(istream);
+	a005LexerTraits::TokenStreamType* tstream = new a005LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a005Parser* psr = new a005Parser(tstream);	
+	{
+		auto r1 = psr->test1();
+		std::cout << r1.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test2(const char* input)
+{
+	a005LexerTraits::InputStreamType* istream = new a005LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+											 , ANTLR_ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test2");
+	istream->setUcaseLA(true);
+	
+	a005Lexer* lxr = new a005Lexer(istream);
+	a005LexerTraits::TokenStreamType* tstream = new a005LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a005Parser* psr = new a005Parser(tstream);	
+	{
+		auto r1 = psr->test2();
+		std::cout << r1.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test3(const char* input)
+{
+	a005LexerTraits::InputStreamType* istream = new a005LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+											 , ANTLR_ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test3");
+	istream->setUcaseLA(true);
+	
+	a005Lexer* lxr = new a005Lexer(istream);
+	a005LexerTraits::TokenStreamType* tstream = new a005LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a005Parser* psr = new a005Parser(tstream);	
+	{
+		auto r1 = psr->test3();
+		std::cout << r1.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test4(const char* input)
+{
+	a005LexerTraits::InputStreamType* istream = new a005LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+											 , ANTLR_ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test4");
+	istream->setUcaseLA(true);
+	
+	a005Lexer* lxr = new a005Lexer(istream);
+	a005LexerTraits::TokenStreamType* tstream = new a005LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a005Parser* psr = new a005Parser(tstream);	
+	{
+		auto r1 = psr->test4();
+		std::cout << r1.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
diff --git a/runtime/Cpp/tests/a005.g b/runtime/Cpp/tests/a005.g
new file mode 100644
index 000000000..1780b5c0b
--- /dev/null
+++ b/runtime/Cpp/tests/a005.g
@@ -0,0 +1,48 @@
+grammar a005;
+
+options {
+	language=Cpp;
+	output=AST;
+}
+
+tokens {
+    T_A = 'token A';
+}
+
+@lexer::includes 
+{
+#include "ATestTraits.hpp"
+}
+@lexer::namespace 
+{ Antlr3Test }
+
+@parser::includes {
+#include "ATestTraits.hpp"
+#include "a005Lexer.hpp"
+}
+@parser::namespace 
+{ Antlr3Test }
+
+test1
+    :	a=A b=B c=C -> ^($a $b $c)
+	;
+
+test2
+    :	a1=A a2=A b1=B b2=B c1=C c2=C -> ^($a1 $b1 $c1)
+	;
+
+test3
+    :	a1=A A b1=B B c1=C C -> ^($a1 $b1 $c1)
+	;
+
+test4
+    :	a1=A b1=B c1=C -> ^(T_A[$a1] $a1 $b1 $c1)
+	;
+
+A: 'A';
+B: 'B';
+C: 'C';
+D: 'D';
+E: 'E';
+F: 'F';
+G: 'G';
diff --git a/runtime/Cpp/tests/direntw.h b/runtime/Cpp/tests/direntw.h
new file mode 100644
index 000000000..445d040dc
--- /dev/null
+++ b/runtime/Cpp/tests/direntw.h
@@ -0,0 +1,372 @@
+/*****************************************************************************
+ * dirent.h - dirent API for Microsoft Visual Studio
+ *
+ * Copyright (C) 2006 Toni Ronkko
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * ``Software''), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL TONI RONKKO BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Mar 15, 2011, Toni Ronkko
+ * Defined FILE_ATTRIBUTE_DEVICE for MSVC 6.0.
+ *
+ * Aug 11, 2010, Toni Ronkko
+ * Added d_type and d_namlen fields to dirent structure.  The former is
+ * especially useful for determining whether directory entry represents a
+ * file or a directory.  For more information, see
+ * http://www.delorie.com/gnu/docs/glibc/libc_270.html
+ *
+ * Aug 11, 2010, Toni Ronkko
+ * Improved conformance to the standards.  For example, errno is now set
+ * properly on failure and assert() is never used.  Thanks to Peter Brockam
+ * for suggestions.
+ *
+ * Aug 11, 2010, Toni Ronkko
+ * Fixed a bug in rewinddir(): when using relative directory names, change
+ * of working directory no longer causes rewinddir() to fail.
+ *
+ * Dec 15, 2009, John Cunningham
+ * Added rewinddir member function
+ *
+ * Jan 18, 2008, Toni Ronkko
+ * Using FindFirstFileA and WIN32_FIND_DATAA to avoid converting string
+ * between multi-byte and unicode representations.  This makes the
+ * code simpler and also allows the code to be compiled under MingW.  Thanks
+ * to Azriel Fasten for the suggestion.
+ *
+ * Mar 4, 2007, Toni Ronkko
+ * Bug fix: due to the strncpy_s() function this file only compiled in
+ * Visual Studio 2005.  Using the new string functions only when the
+ * compiler version allows.
+ *
+ * Nov  2, 2006, Toni Ronkko
+ * Major update: removed support for Watcom C, MS-DOS and Turbo C to
+ * simplify the file, updated the code to compile cleanly on Visual
+ * Studio 2005 with both unicode and multi-byte character strings,
+ * removed rewinddir() as it had a bug.
+ *
+ * Aug 20, 2006, Toni Ronkko
+ * Removed all remarks about MSVC 1.0, which is antiqued now.  Simplified
+ * comments by removing SGML tags.
+ *
+ * May 14 2002, Toni Ronkko
+ * Embedded the function definitions directly to the header so that no
+ * source modules need to be included in the Visual Studio project.  Removed
+ * all the dependencies to other projects so that this very header can be
+ * used independently.
+ *
+ * May 28 1998, Toni Ronkko
+ * First version.
+ *****************************************************************************/
+#ifndef DIRENT_H
+#define DIRENT_H
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
+/* Entries missing from MSVC 6.0 */
+#if !defined(FILE_ATTRIBUTE_DEVICE)
+# define FILE_ATTRIBUTE_DEVICE 0x40
+#endif
+
+/* File type and permission flags for stat() */
+#if defined(_MSC_VER)  &&  !defined(S_IREAD)
+# define S_IFMT   _S_IFMT                      /* file type mask */
+# define S_IFDIR  _S_IFDIR                     /* directory */
+# define S_IFCHR  _S_IFCHR                     /* character device */
+# define S_IFFIFO _S_IFFIFO                    /* pipe */
+# define S_IFREG  _S_IFREG                     /* regular file */
+# define S_IREAD  _S_IREAD                     /* read permission */
+# define S_IWRITE _S_IWRITE                    /* write permission */
+# define S_IEXEC  _S_IEXEC                     /* execute permission */
+#endif
+#define S_IFBLK   0                            /* block device */
+#define S_IFLNK   0                            /* link */
+#define S_IFSOCK  0                            /* socket */
+
+#if defined(_MSC_VER)
+# define S_IRUSR  S_IREAD                      /* read, user */
+# define S_IWUSR  S_IWRITE                     /* write, user */
+# define S_IXUSR  0                            /* execute, user */
+# define S_IRGRP  0                            /* read, group */
+# define S_IWGRP  0                            /* write, group */
+# define S_IXGRP  0                            /* execute, group */
+# define S_IROTH  0                            /* read, others */
+# define S_IWOTH  0                            /* write, others */
+# define S_IXOTH  0                            /* execute, others */
+#endif
+
+/* Indicates that d_type field is available in dirent structure */
+#define _DIRENT_HAVE_D_TYPE
+
+/* File type flags for d_type */
+#define DT_UNKNOWN  0
+#define DT_REG      S_IFREG
+#define DT_DIR      S_IFDIR
+#define DT_FIFO     S_IFFIFO
+#define DT_SOCK     S_IFSOCK
+#define DT_CHR      S_IFCHR
+#define DT_BLK      S_IFBLK
+
+/* Macros for converting between st_mode and d_type */
+#define IFTODT(mode) ((mode) & S_IFMT)
+#define DTTOIF(type) (type)
+
+/*
+ * File type macros.  Note that block devices, sockets and links cannot be
+ * distinguished on Windows and the macros S_ISBLK, S_ISSOCK and S_ISLNK are
+ * only defined for compatibility.  These macros should always return false
+ * on Windows.
+ */
+#define	S_ISFIFO(mode) (((mode) & S_IFMT) == S_IFFIFO)
+#define	S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
+#define	S_ISREG(mode)  (((mode) & S_IFMT) == S_IFREG)
+#define	S_ISLNK(mode)  (((mode) & S_IFMT) == S_IFLNK)
+#define	S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)
+#define	S_ISCHR(mode)  (((mode) & S_IFMT) == S_IFCHR)
+#define	S_ISBLK(mode)  (((mode) & S_IFMT) == S_IFBLK)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+typedef struct dirent
+{
+   char d_name[MAX_PATH + 1];                  /* File name */
+   size_t d_namlen;                            /* Length of name without \0 */
+   int d_type;                                 /* File type */
+} dirent;
+
+
+typedef struct DIR
+{
+   dirent           curentry;                  /* Current directory entry */
+   WIN32_FIND_DATAA find_data;                 /* Private file data */
+   int              cached;                    /* True if data is valid */
+   HANDLE           search_handle;             /* Win32 search handle */
+   char             patt[MAX_PATH + 3];        /* Initial directory name */
+} DIR;
+
+
+/* Forward declarations */
+static DIR *opendir(const char *dirname);
+static struct dirent *readdir(DIR *dirp);
+static int closedir(DIR *dirp);
+static void rewinddir(DIR* dirp);
+
+
+/* Use the new safe string functions introduced in Visual Studio 2005 */
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+# define DIRENT_STRNCPY(dest,src,size) strncpy_s((dest),(size),(src),_TRUNCATE)
+#else
+# define DIRENT_STRNCPY(dest,src,size) strncpy((dest),(src),(size))
+#endif
+
+/* Set errno variable */
+#if defined(_MSC_VER)
+#define DIRENT_SET_ERRNO(x) _set_errno (x)
+#else
+#define DIRENT_SET_ERRNO(x) (errno = (x))
+#endif
+
+
+/*****************************************************************************
+ * Open directory stream DIRNAME for read and return a pointer to the
+ * internal working area that is used to retrieve individual directory
+ * entries.
+ */
+static DIR *opendir(const char *dirname)
+{
+   DIR *dirp;
+
+   /* ensure that the resulting search pattern will be a valid file name */
+   if (dirname == NULL) {
+      DIRENT_SET_ERRNO (ENOENT);
+      return NULL;
+   }
+   if (strlen (dirname) + 3 >= MAX_PATH) {
+      DIRENT_SET_ERRNO (ENAMETOOLONG);
+      return NULL;
+   }
+
+   /* construct new DIR structure */
+   dirp = (DIR*) malloc (sizeof (struct DIR));
+   if (dirp != NULL) {
+      int error;
+
+      /*
+       * Convert relative directory name to an absolute one.  This
+       * allows rewinddir() to function correctly when the current working
+       * directory is changed between opendir() and rewinddir().
+       */
+      if (GetFullPathNameA (dirname, MAX_PATH, dirp->patt, NULL)) {
+         char *p;
+
+         /* append the search pattern "\\*\0" to the directory name */
+         p = strchr (dirp->patt, '\0');
+         if (dirp->patt < p  &&  *(p-1) != '\\'  &&  *(p-1) != ':') {
+           *p++ = '\\';
+         }
+         *p++ = '*';
+         *p = '\0';
+
+         /* open directory stream and retrieve the first entry */
+         dirp->search_handle = FindFirstFileA (dirp->patt, &dirp->find_data);
+         if (dirp->search_handle != INVALID_HANDLE_VALUE) {
+            /* a directory entry is now waiting in memory */
+            dirp->cached = 1;
+            error = 0;
+         } else {
+            /* search pattern is not a directory name? */
+            DIRENT_SET_ERRNO (ENOENT);
+            error = 1;
+         }
+      } else {
+         /* buffer too small */
+         DIRENT_SET_ERRNO (ENOMEM);
+         error = 1;
+      }
+
+      if (error) {
+         free (dirp);
+         dirp = NULL;
+      }
+   }
+
+   return dirp;
+}
+
+
+/*****************************************************************************
+ * Read a directory entry, and return a pointer to a dirent structure
+ * containing the name of the entry in d_name field.  Individual directory
+ * entries returned by this very function include regular files,
+ * sub-directories, pseudo-directories "." and "..", but also volume labels,
+ * hidden files and system files may be returned.
+ */
+static struct dirent *readdir(DIR *dirp)
+{
+   DWORD attr;
+   if (dirp == NULL) {
+      /* directory stream did not open */
+      DIRENT_SET_ERRNO (EBADF);
+      return NULL;
+   }
+
+   /* get next directory entry */
+   if (dirp->cached != 0) {
+      /* a valid directory entry already in memory */
+      dirp->cached = 0;
+   } else {
+      /* get the next directory entry from stream */
+      if (dirp->search_handle == INVALID_HANDLE_VALUE) {
+         return NULL;
+      }
+      if (FindNextFileA (dirp->search_handle, &dirp->find_data) == FALSE) {
+         /* the very last entry has been processed or an error occured */
+         FindClose (dirp->search_handle);
+         dirp->search_handle = INVALID_HANDLE_VALUE;
+         return NULL;
+      }
+   }
+
+   /* copy as a multibyte character string */
+   DIRENT_STRNCPY ( dirp->curentry.d_name,
+             dirp->find_data.cFileName,
+             sizeof(dirp->curentry.d_name) );
+   dirp->curentry.d_name[MAX_PATH] = '\0';
+
+   /* compute the length of name */
+   dirp->curentry.d_namlen = strlen (dirp->curentry.d_name);
+
+   /* determine file type */
+   attr = dirp->find_data.dwFileAttributes;
+   if ((attr & FILE_ATTRIBUTE_DEVICE) != 0) {
+      dirp->curentry.d_type = DT_CHR;
+   } else if ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0) {
+      dirp->curentry.d_type = DT_DIR;
+   } else {
+      dirp->curentry.d_type = DT_REG;
+   }
+   return &dirp->curentry;
+}
+
+
+/*****************************************************************************
+ * Close directory stream opened by opendir() function.  Close of the
+ * directory stream invalidates the DIR structure as well as any previously
+ * read directory entry.
+ */
+static int closedir(DIR *dirp)
+{
+   if (dirp == NULL) {
+      /* invalid directory stream */
+      DIRENT_SET_ERRNO (EBADF);
+      return -1;
+   }
+
+   /* release search handle */
+   if (dirp->search_handle != INVALID_HANDLE_VALUE) {
+      FindClose (dirp->search_handle);
+      dirp->search_handle = INVALID_HANDLE_VALUE;
+   }
+
+   /* release directory structure */
+   free (dirp);
+   return 0;
+}
+
+
+/*****************************************************************************
+ * Resets the position of the directory stream to which dirp refers to the
+ * beginning of the directory.  It also causes the directory stream to refer
+ * to the current state of the corresponding directory, as a call to opendir()
+ * would have done.  If dirp does not refer to a directory stream, the effect
+ * is undefined.
+ */
+static void rewinddir(DIR* dirp)
+{
+   if (dirp != NULL) {
+      /* release search handle */
+      if (dirp->search_handle != INVALID_HANDLE_VALUE) {
+         FindClose (dirp->search_handle);
+      }
+
+      /* open new search handle and retrieve the first entry */
+      dirp->search_handle = FindFirstFileA (dirp->patt, &dirp->find_data);
+      if (dirp->search_handle != INVALID_HANDLE_VALUE) {
+         /* a directory entry is now waiting in memory */
+         dirp->cached = 1;
+      } else {
+         /* failed to re-open directory: no directory entry in memory */
+         dirp->cached = 0;
+      }
+   }
+}
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /*DIRENT_H*/
diff --git a/runtime/Cpp/tests/s001.cpp b/runtime/Cpp/tests/s001.cpp
new file mode 100644
index 000000000..81528f8fd
--- /dev/null
+++ b/runtime/Cpp/tests/s001.cpp
@@ -0,0 +1,92 @@
+#include "utils.hpp"
+#include "UserTestTraits.hpp"
+#include "s001Lexer.hpp"
+#include "s001Parser.hpp"
+
+#include <sys/types.h>
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+using namespace Antlr3Test;
+using namespace std;
+
+int 
+main	(int argc, char *argv[])
+{
+	// Create the input stream based upon the argument supplied to us on the command line
+	// for this example, the input will always default to ./input if there is no explicit
+	// argument, otherwise we are expecting potentially a whole list of 'em.
+	//
+	if (argc < 2 || argv[1] == NULL)
+	{
+		Utils::processDir("./s002.input"); // Note in VS2005 debug, working directory must be configured
+	}
+	else
+	{
+		int i;
+
+		for (i = 1; i < argc; i++)
+		{
+			Utils::processDir(argv[i]);
+		}
+	}
+
+	printf("finished parsing OK\n");	// Finnish parking is pretty good - I think it is all the snow
+
+	return 0;
+}
+
+void parseFile(const char* fName, int fd)
+{
+	s001LexerTraits::InputStreamType*    input;
+	s001LexerTraits::TokenStreamType*	tstream;
+	s001Parser*			psr;
+	
+#if defined __linux
+	string data = Utils::slurp(fd);
+#else
+	string data = Utils::slurp(fName);
+#endif
+	input	= new s001LexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str()
+						       , ANTLR_ENC_8BIT
+						       , data.length()
+						       , (ANTLR_UINT8*)fName);
+	input->setUcaseLA(true);
+
+	//  (file | memory | ?) --> inputstream -> lexer --> tokenstream --> parser ( --> treeparser )?
+	//
+	s001Lexer* lxr	    = new s001Lexer(input); 
+
+	tstream = new s001LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+
+	// Finally, now that we have our lexer constructed, we can create the parser
+	//
+	psr = new s001Parser(tstream);
+	
+	putc('L', stdout); fflush(stdout);
+	{
+		ANTLR_INT32 T = 0;
+		while	(T != s001Lexer::EOF_TOKEN)
+		{
+			T = tstream->_LA(1);
+			s001LexerTraits::CommonTokenType const* token = tstream->_LT(1);
+			ANTLR_UINT8 const *name = lxr->getTokenName(T);
+			  
+			printf("%d %s\t\"%s\"\n",
+			       T,
+			       name,
+			       tstream->_LT(1)->getText().c_str()
+			       );
+			tstream->consume();
+		}
+	}
+
+	tstream->_LT(1);	// Don't do this mormally, just causes lexer to run for timings here
+
+	delete psr;
+	delete tstream; 
+	delete lxr; lxr = NULL;
+	delete input; 
+}
diff --git a/runtime/Cpp/tests/s001.g b/runtime/Cpp/tests/s001.g
new file mode 100644
index 000000000..87908790e
--- /dev/null
+++ b/runtime/Cpp/tests/s001.g
@@ -0,0 +1,69 @@
+grammar s001;
+
+options {
+	language=Cpp;
+	//backtrack=true;
+	//memoize=true;
+	//output=AST;
+}
+
+tokens {
+    BLOCK = 'block';
+}
+
+@lexer::includes 
+{
+#include "UserTestTraits.hpp"
+}
+@lexer::namespace 
+{ Antlr3Test }
+
+@parser::includes {
+#include "UserTestTraits.hpp"
+#include "s001Lexer.hpp"
+}
+@parser::namespace 
+{ Antlr3Test }
+
+start_rule : if_statement;
+
+if_statement
+    : /*ifSt=*/IF LEFT_PAREN  /*cond=*/expression RIGHT_PAREN if_then if_else?
+      //->  ^(IF_ST[$ifSt] $cond if_then if_else?)
+    ;
+if_then
+    : th=LEFT_BRACE /*thexpr=*/script? RIGHT_BRACE //-> ^(BLOCK[$th] $thexpr?)
+    | /*cs=*/script //-> ^(BLOCK $cs)
+    ;
+
+if_else
+    : el=ELSE LEFT_BRACE elexpr=script? RIGHT_BRACE  //-> ^(BLOCK[$el] $elexpr?)
+    | el=ELSE /*cs=*/script//-> ^(BLOCK[$el] $cs)
+    ;
+
+script
+		: COMMAND SEMI 
+		; 
+
+expression
+		: EXPRESSION
+		;
+		
+COMMAND: 'COMMAND';
+
+EXPRESSION: 'EXPRESSION';
+
+SEMI: ';';
+
+ELSE: 'ELSE';
+
+IF: 'IF';
+
+LEFT_PAREN: '(';
+
+RIGHT_PAREN: ')';
+
+LEFT_BRACE: '{';
+
+RIGHT_BRACE: '}';
+
diff --git a/runtime/Cpp/tests/s002.cpp b/runtime/Cpp/tests/s002.cpp
new file mode 100644
index 000000000..a4523ac01
--- /dev/null
+++ b/runtime/Cpp/tests/s002.cpp
@@ -0,0 +1,93 @@
+#include "utils.hpp"
+#include "UserTestTraits.hpp"
+#include "s002Lexer.hpp"
+#include "s002Parser.hpp"
+
+#include <sys/types.h>
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+using namespace Antlr3Test;
+using namespace std;
+
+int 
+main	(int argc, char *argv[])
+{
+	if (argc < 2 || argv[1] == NULL)
+	{
+		Utils::processDir("./s002.input"); // Note in VS2005 debug, working directory must be configured
+	}
+	else
+	{
+		for (int i = 1; i < argc; i++)
+		{
+			Utils::processDir(argv[i]);
+		}
+	}
+
+	printf("finished parsing OK\n");	// Finnish parking is pretty good - I think it is all the snow
+
+	return 0;
+}
+
+void parseFile(const char* fName, int fd)
+{
+	s002LexerTraits::InputStreamType*    input;
+	s002LexerTraits::TokenStreamType*	tstream;
+	s002Parser*			psr;
+	
+#if defined __linux
+	string data = Utils::slurp(fd);
+#else
+	string data = Utils::slurp(fName);
+#endif
+	input	= new s002LexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str()
+						       , ANTLR_ENC_8BIT
+						       , data.length()
+						       , (ANTLR_UINT8*)fName);
+
+	input->setUcaseLA(true);
+
+	// Our input stream is now open and all set to go, so we can create a new instance of our
+	// lexer and set the lexer input to our input stream:
+	//  (file | memory | ?) --> inputstream -> lexer --> tokenstream --> parser ( --> treeparser )?
+	//
+	s002Lexer* lxr = new s002Lexer(input);
+
+	tstream = new s002LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+
+	// Finally, now that we have our lexer constructed, we can create the parser
+	//
+	psr = new s002Parser(tstream);
+	{
+		s002Parser::start_rule_return r = psr->start_rule();
+		std::cout << r.tree->toStringTree() << std::endl;
+	}
+
+	putc('L', stdout); fflush(stdout);
+	{
+		ANTLR_INT32 T = 0;
+		while	(T != s002Lexer::EOF_TOKEN)
+		{
+			T = tstream->_LA(1);
+			s002LexerTraits::CommonTokenType const* token = tstream->_LT(1);
+			ANTLR_UINT8 const *name = lxr->getTokenName(T);
+			  
+			printf("%d %s\t\"%s\"\n",
+			       T,
+			       name,
+			       tstream->_LT(1)->getText().c_str()
+			       );
+			tstream->consume();
+		}
+	}
+
+	tstream->_LT(1);	// Don't do this mormally, just causes lexer to run for timings here
+
+	delete psr;
+	delete tstream; 
+	delete lxr; lxr = NULL;
+	delete input; 
+}
diff --git a/runtime/Cpp/tests/s002.g b/runtime/Cpp/tests/s002.g
new file mode 100644
index 000000000..20947d228
--- /dev/null
+++ b/runtime/Cpp/tests/s002.g
@@ -0,0 +1,102 @@
+grammar s002;
+
+options {
+	language=Cpp;
+	//backtrack=true;
+	//memoize=true;
+	output=AST;
+}
+
+tokens {
+    BLOCK = 'block';
+    IF_ST = 'if_st';
+}
+
+scope GlobalOne {
+	std::string globalFoo;
+}
+
+@lexer::includes 
+{
+#include "UserTestTraits.hpp"
+}
+@lexer::namespace 
+{ Antlr3Test }
+
+@parser::includes {
+#include "UserTestTraits.hpp"
+#include "s002Lexer.hpp"
+#include <string>
+}
+@parser::namespace 
+{ Antlr3Test }
+
+
+start_rule
+scope {
+	std::string localFoo;
+}
+scope GlobalOne;
+@init {
+}
+: if_statement_alt1;
+
+if_statement_alt0
+    : ifSt=IF^ (LEFT_PAREN  cond=expression^ RIGHT_PAREN) if_then1 if_else?
+    ;
+
+if_statement_alt1
+    : ifSt=IF LEFT_PAREN  expression RIGHT_PAREN if_then1 if_else?
+        ->  ^(IF_ST[$ifSt] expression if_then1 if_else?)
+    ;
+
+if_statement_alt2
+    : ifSt=IF LEFT_PAREN cond=expression RIGHT_PAREN if_then2 if_else?
+	{
+		$GlobalOne::globalFoo.append(".").append($ifSt->getText());
+		$start_rule::localFoo.append(".").append($ifSt->getText());
+	} 
+        ->  ^(IF_ST[$ifSt] $cond if_then2 if_else?)
+    ;
+
+if_then1
+    : th=LEFT_BRACE script? RIGHT_BRACE -> ^(BLOCK[$th] $th script?)
+    | script -> ^(BLOCK script)
+    ;
+
+if_then2
+    : th=LEFT_BRACE thexpr=script? RIGHT_BRACE -> ^(BLOCK[$th] $th $thexpr?)
+    | cs=script -> ^(BLOCK $cs)
+    ;
+
+if_else
+    : el=ELSE LEFT_BRACE elexpr=script? RIGHT_BRACE -> ^(BLOCK[$el] $elexpr?)
+    | el=ELSE cs=script -> ^(BLOCK[$el] $cs)
+    ;
+
+script
+		: COMMAND SEMI 
+		; 
+
+expression
+		: EXPRESSION
+		;
+		
+COMMAND: 'COMMAND';
+
+EXPRESSION: 'EXPRESSION';
+
+SEMI: ';';
+
+ELSE: 'ELSE';
+
+IF: 'IF';
+
+LEFT_PAREN: '(';
+
+RIGHT_PAREN: ')';
+
+LEFT_BRACE: '{';
+
+RIGHT_BRACE: '}';
+
diff --git a/runtime/Cpp/tests/s002.input b/runtime/Cpp/tests/s002.input
new file mode 100644
index 000000000..fe2c7029d
--- /dev/null
+++ b/runtime/Cpp/tests/s002.input
@@ -0,0 +1 @@
+IF(EXPRESSION){COMMAND;}ELSE{}
\ No newline at end of file
diff --git a/runtime/Cpp/tests/s003.cpp b/runtime/Cpp/tests/s003.cpp
new file mode 100644
index 000000000..b39de2a5d
--- /dev/null
+++ b/runtime/Cpp/tests/s003.cpp
@@ -0,0 +1,113 @@
+#include "utils.hpp"
+#include "UserTestTraits.hpp"
+#include "s003Lexer.hpp"
+#include "s003Parser.hpp"
+
+#include <sys/types.h>
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+using namespace Antlr3Test;
+using namespace std;
+
+static    s003Lexer*		    lxr;
+
+// Main entry point for this example
+//
+int 
+main	(int argc, char *argv[])
+{
+	// Create the input stream based upon the argument supplied to us on the command line
+	// for this example, the input will always default to ./input if there is no explicit
+	// argument, otherwise we are expecting potentially a whole list of 'em.
+	//
+	if (argc < 2 || argv[1] == NULL)
+	{
+		Utils::processDir("./s003.input"); // Note in MSVC debug, working directory must be configured
+	}
+	else
+	{
+		int i;
+
+		for (i = 1; i < argc; i++)
+		{
+			Utils::processDir(argv[i]);
+		}
+	}
+
+	printf("finished parsing OK\n");	// Finnish parking is pretty good - I think it is all the snow
+
+	return 0;
+}
+
+void parseFile(const char* fName, int fd)
+{
+	s003LexerTraits::InputStreamType*    input;
+	s003LexerTraits::TokenStreamType*	tstream;
+	s003Parser*			psr;
+#if defined __linux
+	string data = Utils::slurp(fd);
+#else
+	string data = Utils::slurp(fName);
+#endif
+	input	= new s003LexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
+						   ANTLR_ENC_8BIT,
+						   data.length(), //strlen(data.c_str()),
+						   (ANTLR_UINT8*)fName);
+	// No case-sensitivity
+	input->setUcaseLA(true);
+
+	// Our input stream is now open and all set to go, so we can create a new instance of our
+	// lexer and set the lexer input to our input stream:
+	//  (file | memory | ?) --> inputstream -> lexer --> tokenstream --> parser ( --> treeparser )?
+	//
+	if (lxr == NULL)
+	{
+		lxr = new s003Lexer(input); 
+	}
+	else
+	{
+		lxr->setCharStream(input);
+	}
+
+	tstream = new s003LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+
+	// Finally, now that we have our lexer constructed, we can create the parser
+	//
+	psr = new s003Parser(tstream);  // javaParserNew is generated by ANTLR3
+	s003Parser::start_rule_return r = psr->start_rule();
+	///std::cout << r.getTree()->toStringTree() << std::endl;
+	std::cout << "Message: " << r.message << std::endl;
+	std::cout << "Evaluator.Message: " << (r.evaluator ? r.evaluator->toString() : "NULL") << std::endl;
+
+	putc('L', stdout); fflush(stdout);
+	{
+		ANTLR_INT32 T = 0;
+		while	(T != s003Lexer::EOF_TOKEN)
+		{
+			T = tstream->_LA(1);
+			s003LexerTraits::CommonTokenType const* token = tstream->_LT(1);
+			ANTLR_UINT8 const *name = lxr->getTokenName(T);
+			  
+			printf("%d %s\t\"%s\"\n",
+			       T,
+			       name,
+			       tstream->_LT(1)->getText().c_str()
+			       );
+			tstream->consume();
+		}
+	}
+
+	tstream->_LT(1);	// Don't do this mormally, just causes lexer to run for timings here
+
+	if(r.evaluator)
+	{
+		delete r.evaluator;
+	}
+	delete psr;
+	delete tstream; 
+	delete lxr; lxr = NULL;
+	delete input; 
+}
diff --git a/runtime/Cpp/tests/s003.g b/runtime/Cpp/tests/s003.g
new file mode 100644
index 000000000..f14514f80
--- /dev/null
+++ b/runtime/Cpp/tests/s003.g
@@ -0,0 +1,66 @@
+grammar s003;
+
+options {
+	language=Cpp;
+	//backtrack=true;
+	//memoize=true;
+	//output=AST;
+}
+
+tokens {
+    BLOCK = 'block';
+}
+
+@lexer::includes 
+{
+#include "UserTestTraits.hpp"
+}
+@lexer::namespace 
+{ Antlr3Test }
+
+@parser::includes {
+#include "UserTestTraits.hpp"
+#include "s003Lexer.hpp"
+}
+@parser::namespace 
+{ Antlr3Test }
+@parser::context {
+	class Evaluator {
+        public:
+        	Evaluator(const char*text) : m_text(text) {};
+        	Evaluator(std::string text) : m_text(text) {};
+        	std::string const& toString() { return m_text; };
+        private:
+            std::string m_text;
+    };
+}
+
+start_rule returns[s003Parser::Evaluator *evaluator, std::string message]
+	: r=parse
+        {
+            $evaluator = $r.evaluator;
+            $message = $r.message;
+        } 
+	;
+
+parse returns[s003Parser::Evaluator *evaluator, std::string message]
+  :  r=receive
+        {
+            s003Parser::Evaluator *e = $r.evaluator;
+            std::string m = $r.message;
+            $evaluator   = $r.evaluator;
+            $message = $r.message;
+        }
+  ;
+
+receive returns[s003Parser::Evaluator *evaluator, std::string message]
+  :  RECEIVE f=FILENAME
+        {
+            $evaluator = new s003Parser::Evaluator($f.text);
+            $message = "Some message here...";
+        }
+  ;
+
+RECEIVE: 'RECEIVE';
+FILENAME: 'FILENAME';
+		
diff --git a/runtime/Cpp/tests/s003.input b/runtime/Cpp/tests/s003.input
new file mode 100644
index 000000000..a204c934a
--- /dev/null
+++ b/runtime/Cpp/tests/s003.input
@@ -0,0 +1 @@
+RECEIVEFILENAME
\ No newline at end of file
diff --git a/runtime/Cpp/tests/s004.cpp b/runtime/Cpp/tests/s004.cpp
new file mode 100644
index 000000000..670c1f3b5
--- /dev/null
+++ b/runtime/Cpp/tests/s004.cpp
@@ -0,0 +1,143 @@
+#include "utils.hpp"
+#include "PTestTraits.hpp"
+#include "PLSQLLexer.hpp"
+#include "PLSQLParser.hpp"
+#include "PLSQLParser_PLSQLCommons.hpp"
+#include "PLSQLParser_PLSQL_DMLParser.hpp"
+#include "PLSQLParser_PLSQLKeys.hpp"
+#include "PLSQLParser_SQLPLUSParser.hpp"
+
+#include <sys/types.h>
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+#include <stdio.h>
+#include <time.h>
+
+using namespace Antlr3Test;
+using namespace std;
+
+static    PLSQLLexer*		    lxr;
+
+// Main entry point for this example
+//
+int 
+main	(int argc, char *argv[])
+{
+	if (argc < 2 || argv[1] == NULL)
+	{
+		Utils::processDir("./s004.input"); // Note in VS2005 debug, working directory must be configured
+	}
+	else
+	{
+		int i;
+
+		for (i = 1; i < argc; i++)
+		{
+			Utils::processDir(argv[i]);
+		}
+	}
+
+	printf("finished parsing OK\n");	// Finnish parking is pretty good - I think it is all the snow
+
+	return 0;
+}
+
+void parseFile(const char* fName, int fd)
+{
+	time_t rawtime;
+	struct tm * timeinfo;
+
+	time ( &rawtime );
+	std::cout<<ctime(&rawtime)<<": parsing started" << std::endl;
+
+	///byIvan input	= new PLSQLTraits::InputStreamType(fName, ANTLR_ENC_8BIT);
+#if defined __linux
+	string data = Utils::slurp(fd);
+#else
+	string data = Utils::slurp(fName);
+#endif
+	auto input = new PLSQLTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
+						      ANTLR_ENC_8BIT,
+						      data.length(), //strlen(data.c_str()),
+						      (ANTLR_UINT8*)fName);
+	input->setUcaseLA(true);
+    
+	// Our input stream is now open and all set to go, so we can create a new instance of our
+	// lexer and set the lexer input to our input stream:
+	//  (file | memory | ?) --> inputstream -> lexer --> tokenstream --> parser ( --> treeparser )?
+	//
+	if (lxr == NULL)
+	{
+		lxr	    = new PLSQLLexer(input);
+	}
+	else
+	{
+		lxr->setCharStream(input);
+	}
+
+	auto tstream = new PLSQLTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	auto psr = new PLSQLParser(tstream);
+
+	//putc('L', stdout); fflush(stdout);
+	//{
+	//	ANTLR3_INT32 T;
+
+	//	T = 0;
+	//	while	(T != ANTLR3_TOKEN_EOF)
+	//	{
+	//		T = tstream->tstream->istream->_LA(tstream->tstream->istream, 1);
+	//		tstream->tstream->istream->consume(tstream->tstream->istream);
+	//		printf("%d %s\n", T,  (psr->pParser->rec->state->tokenNames)[T]);
+	//	}
+	//}
+	{
+		//tstream->_LT(1);	// Don't do this mormally, just causes lexer to run for timings here
+		//putc('P', stdout); fflush(stdout);
+		auto ast = psr->seq_of_statements();
+		std::cout << ast.tree->toStringTree() << std::endl;
+		std::cout << "Root:" << ast.tree.get() << std::endl;
+		//putc('F', stdout); fflush(stdout);
+		//putc('*', stdout); fflush(stdout);
+	}
+	//ANTLR_BITWORD FOLLOW_truncate_key_in_synpred47_PLSQLParser6931_bits[]	= 
+	//	{ 
+	//		ANTLR_UINT64_LIT(0xFFFFFFFFFFFFFFF0), 
+	//		ANTLR_UINT64_LIT(0xFFFFFFFFFFFFDFFF), 
+	//		ANTLR_UINT64_LIT(0xFFFFFFFFFFFFFFFF), 
+	//		ANTLR_UINT64_LIT(0xFFFFFFFFFFFFFFFF), 
+	//		ANTLR_UINT64_LIT(0x0000000000001FFF) 
+	//};
+	//PLSQLParserImplTraits::BitsetListType FOLLOW_truncate_key_in_synpred47_PLSQLParser6931( FOLLOW_truncate_key_in_synpred47_PLSQLParser6931_bits, 5 );
+
+	//PLSQLParserImplTraits::BitsetType *d = FOLLOW_truncate_key_in_synpred47_PLSQLParser6931.bitsetLoad();
+	//PLSQLParserImplTraits::BitsetType *c = d->clone();
+
+	//ANTLR_BITWORD d0 = d->get_blist().get_bits()[0];
+	//ANTLR_BITWORD c0 = c->get_blist().get_bits()[0];
+
+	//ANTLR_BITWORD d1 = d->get_blist().get_bits()[1];
+	//ANTLR_BITWORD c1 = c->get_blist().get_bits()[1];
+
+	//ANTLR_BITWORD d2 = d->get_blist().get_bits()[2];
+	//ANTLR_BITWORD c2 = c->get_blist().get_bits()[2];
+
+	//ANTLR_BITWORD d3 = d->get_blist().get_bits()[3];
+	//ANTLR_BITWORD c3 = c->get_blist().get_bits()[3];
+
+	//ANTLR_BITWORD d4 = d->get_blist().get_bits()[4];
+	//ANTLR_BITWORD c4 = c->get_blist().get_bits()[4];
+
+	//ANTLR_BITWORD d5 = d->get_blist().get_bits()[5];
+	//ANTLR_BITWORD c5 = c->get_blist().get_bits()[5];
+
+	time ( &rawtime );
+	std::cout<<ctime(&rawtime)<<": parsing finished" << std::endl;
+
+	delete psr; 
+	delete tstream; 
+	delete lxr; lxr = NULL;
+	delete input; 
+}
diff --git a/runtime/Cpp/tests/s004.dual.input b/runtime/Cpp/tests/s004.dual.input
new file mode 100644
index 000000000..33c45a020
--- /dev/null
+++ b/runtime/Cpp/tests/s004.dual.input
@@ -0,0 +1 @@
+select * from dual
diff --git a/runtime/Cpp/tests/s004.input b/runtime/Cpp/tests/s004.input
new file mode 100644
index 000000000..5fcc7c9a4
--- /dev/null
+++ b/runtime/Cpp/tests/s004.input
@@ -0,0 +1,19 @@
+(SELECT STALENESS
+, OSIZE
+, OBJ#
+, TYPE#
+, CASE WHEN STALENESS > LOG(0.01, NVL(LOC_STALE_PCT, :B1 )/100) THEN 128 ELSE 0 END + AFLAGS AFLAGS
+, STATUS
+, SID
+, SERIAL#
+, PART#
+, BO# 
+FROM 
+( 
+  SELECT /*+ no_expand dynamic_sampling(4) dynamic_sampling_est_cdn */ DECODE(BITAND(T.FLAGS,16), 16, ROUND( LOG(0.01, NVL( LEAST( 100, GREATEST( 0.01, (DECODE(BITAND(M.FLAGS, 1), 1, GREATEST(T.ROWCNT, M.INSERTS), LEAST((M.INSERTS + M.DELETES + M.UPDATES), GREATEST(T.ROWCNT, (T.ROWCNT + M.INSERTS - M.DELETES)))) / (T.ROWCNT + 0.01)))), 0.01)), 1), -100.0) STALENESS, CASE WHEN T.FILE# = 0 THEN DBMS_STATS_INTERNAL.GET_TABLE_BLOCK_COUNT(U.NAME, O.NAME, NULL, NULL) WHEN S.TYPE# = 5 THEN DBMS_SPACE_ADMIN.SEGMENT_NUMBER_BLOCKS(T.TS#, T.FILE#, T.BLOCK#, S.TYPE#, S.CACHEHINT, NVL(S.SPARE1,0), O.DATAOBJ#, S.BLOCKS) ELSE NULL END * NVL(TS.BLOCKSIZE, :B6 ) OSIZE, O.OBJ# OBJ#, O.TYPE# TYPE#, 32 AFLAGS, 0 STATUS, :B5 SID, :B4 SERIAL#, NULL PART#, NULL BO#, TO_NUMBER(P.VALCHAR) LOC_STALE_PCT FROM SYS.SEG$ S, SYS.TS$ TS, SYS.USER$ U, SYS.OBJ$ O, SYS.TAB$ T, SYS.MON_MODS_ALL$ M, OPTSTAT_USER_PREFS$ P WHERE (BITAND(DBMS_STATS_INTERNAL.DECODE_GRANULARITY(T.OBJ#, :B3 ), :B2 ) <> 0) AND O.TYPE# = 2 AND T.OBJ# = O.OBJ# AND O.OWNER# = U.USER# AND M.OBJ#(+) = T.OBJ# AND T.FILE# = S.FILE#(+) AND T.BLOCK# = S.BLOCK#(+) AND T.TS# = S.TS#(+) AND TS.TS#(+) = S.TS# AND BITAND(T.TRIGFLAG,67108864) != 67108864 AND BITAND(T.PROPERTY,64+512) = 0 AND BITAND(T.FLAGS,536870912) != 536870912 AND BITAND(T.FLAGS,2097152) != 2097152 AND BITAND(O.FLAGS, 128) != 128 AND BITAND(T.PROPERTY,2147483648) = 0 AND (BITAND(T.PROPERTY,4194304) != 4194304 AND BITAND(T.PROPERTY,8388608) != 8388608) AND NOT (BITAND(O.FLAGS, 16) = 16 AND (O.NAME LIKE 'DR$%' OR O.NAME LIKE 'DR#%')) AND NOT (U.NAME = 'SYS' AND O.NAME = 'SUMDELTA$') AND O.OBJ# = P.OBJ#(+) AND P.PNAME(+) = 'STALE_PERCENT' AND (U.NAME,O.NAME) NOT IN (SELECT /*+ unnest */ * FROM (SELECT MOWNER,LOG FROM MLOG$ UNION ALL SELECT MOWNER,TEMP_LOG FROM MLOG$ WHERE TEMP_LOG IS NOT NULL)) AND ((BITAND(T.FLAGS,16) = 16 AND ((BITAND(M.FLAGS,5) != 0) OR ((M.INSERTS + M.UPDATES + M.DELETES) > NVL(TO_NUMBER(P.VALCHAR), :B1 )/100 * T.ROWCNT))) OR (BITAND(T.FLAGS,16) != 16)) UNION ALL SELECT STALENESS, OSIZE, OBJ#, TYPE#, CASE WHEN ROW_NUMBER() OVER (PARTITION BY BO# ORDER BY STALENESS, OSIZE, OBJ#) = 1 THEN 32 ELSE 0 END + 64 AFLAGS, 0 STATUS, :B5 SID, :B4 SERIAL#, PART#, BO#, LOC_STALE_PCT FROM ( SELECT /*+ no_expand dynamic_sampling(4) dynamic_sampling_est_cdn */ DECODE(BITAND(T.FLAGS,2), 2, ROUND( LOG(0.01, NVL( LEAST( 100, GREATEST( 0.01, (DECODE(BITAND(M.FLAGS, 1), 1, GREATEST(T.ROWCNT, M.INSERTS), LEAST((M.INSERTS + M.DELETES + M.UPDATES), GREATEST(T.ROWCNT, (T.ROWCNT + M.INSERTS - M.DELETES)))) / (T.ROWCNT + 0.01)))), 0.01)), 1), -100.0) STALENESS, DBMS_SPACE_ADMIN.SEGMENT_NUMBER_BLOCKS(T.TS#, T.FILE#, T.BLOCK#, S.TYPE#, S.CACHEHINT, NVL(S.SPARE1,0), O.DATAOBJ#, S.BLOCKS) * TS.BLOCKSIZE OSIZE, O.OBJ# OBJ#, O.TYPE# TYPE#, T.PART# PART#, T.BO# BO#, TO_NUMBER(P.VALCHAR) LOC_STALE_PCT FROM SYS.SEG$ S, SYS.TS$ TS, SYS.OBJ$ O, SYS.TABPART$ T, SYS.TAB$ TAB, SYS.OBJ$ OT, SYS.MON_MODS_ALL$ M, SYS.OPTSTAT_USER_PREFS$ P WHERE O.TYPE# = 19 AND S.TYPE# = 5 AND T.OBJ# = O.OBJ# AND TAB.OBJ# = T.BO# AND M.OBJ#(+) = T.OBJ# AND T.FILE# = S.FILE# AND T.BLOCK# = S.BLOCK# AND T.TS# = S.TS# AND TS.TS# = S.TS# AND BITAND(TAB.TRIGFLAG,67108864) != 67108864 AND BITAND(TAB.PROPERTY,512) != 512 AND BITAND(TAB.FLAGS,536870912) != 536870912 AND BITAND(T.FLAGS,2097152) != 2097152 AND BITAND(T.FLAGS, 32) != 32 AND TAB.OBJ# = OT.OBJ# AND BITAND(OT.FLAGS,128) != 128 AND NOT (BITAND(O.FLAGS, 16) = 16 AND (O.NAME LIKE 'DR$%' OR O.NAME LIKE 'DR#%')) AND O.OBJ# = P.OBJ#(+) AND P.PNAME(+) = 'STALE_PERCENT' AND ((BITAND(T.FLAGS,2) = 2 AND ((BITAND(M.FLAGS,5) != 0) OR ((M.INSERTS + M.UPDATES + M.DELETES) > NVL(TO_NUMBER(P.VALCHAR), :B1 )/100 * T.ROWCNT))) OR (BITAND(T.FLAGS,2) != 2)) UNION ALL SELECT /*+ no_expand dynamic_sampling(4) dynamic_sampling_est_cdn */ DECODE(BITAND(T.FLAGS,2), 2, ROUND( LOG(0.01, NVL( LEAST( 100, GREATEST( 0.01, (DECODE(BITAND(M.FLAGS, 1), 1, GREATEST(T.ROWCNT, M.INSERTS), LEAST((M.INSERTS + M.DELETES + M.UPDATES), GREATEST(T.ROWCNT, (T.ROWCNT + M.INSERTS - M.DELETES)))) / (T.ROWCNT + 0.01)))), 0.01)), 1), -100.0) STALENESS, DBMS_STATS_INTERNAL.GET_TABLE_BLOCK_COUNT(U.NAME,O.NAME, O.SUBNAME,NULL) * :B6 OSIZE, O.OBJ# OBJ#, O.TYPE# TYPE#, T.PART# PART#, T.BO# BO#, TO_NUMBER(P.VALCHAR) LOC_STALE_PCT FROM SYS.OBJ$ O, SYS.USER$ U, SYS.TABCOMPART$ T, SYS.TAB$ TAB, SYS.OBJ$ OT, SYS.MON_MODS_ALL$ M, SYS.OPTSTAT_USER_PREFS$ P WHERE O.TYPE# = 19 AND T.OBJ# = O.OBJ# AND O.OWNER# = U.USER# AND TAB.OBJ# = T.BO# AND M.OBJ#(+) = T.OBJ# AND BITAND(TAB.TRIGFLAG,67108864) != 67108864 AND BITAND(T.FLAGS, 32) != 32 AND TAB.OBJ# = OT.OBJ# AND BITAND(OT.FLAGS,128) != 128 AND NOT (BITAND(O.FLAGS, 16) = 16 AND (O.NAME LIKE 'DR$%' OR O.NAME LIKE 'DR#%')) AND O.OBJ# = P.OBJ#(+) AND P.PNAME(+) = 'STALE_PERCENT' AND ((BITAND(T.FLAGS,2) = 2 AND ((BITAND(M.FLAGS,5) != 0) OR ((M.INSERTS + M.UPDATES + M.DELETES) > NVL(TO_NUMBER(P.VALCHAR), :B1 )/100 * T.ROWCNT))) OR (BITAND(T.FLAGS,2) != 2)) ) WHERE BITAND(DBMS_STATS_INTERNAL.DECODE_GRANULARITY(BO#, :B3 ), :B7 ) <> 0 UNION ALL SELECT STALENESS, OSIZE, OBJ#, TYPE#, CASE WHEN ROW_NUMBER() OVER (PARTITION BY BO# ORDER BY STALENESS, OSIZE, OBJ#) = 1 THEN 64 ELSE 0 END + CASE WHEN ROW_NUMBER() 
+
+
+OVER (PARTITION BY (SELECT TCP0.BO# FROM TABCOMPART$ TCP0 WHERE TCP0.OBJ#=ST0.BO#) ORDER BY STALENESS, OSIZE, OBJ#) = 1 THEN 32 ELSE 0 END AFLAGS, 0 STATUS, :B5 SID, :B4 SERIAL#, PART#, BO#, LOC_STALE_PCT FROM (SELECT /*+ no_expand dynamic_sampling(4) dynamic_sampling_est_cdn */ DECODE(BITAND(T.FLAGS,2), 2, ROUND( LOG(0.01, NVL( LEAST( 100, GREATEST( 0.01, (DECODE(BITAND(M.FLAGS, 1), 1, GREATEST(T.ROWCNT, M.INSERTS), LEAST((M.INSERTS + M.DELETES + M.UPDATES), GREATEST(T.ROWCNT, (T.ROWCNT + M.INSERTS - M.DELETES)))) / (T.ROWCNT + 0.01)))), 0.01)), 1), -100.0) STALENESS, DBMS_SPACE_ADMIN.SEGMENT_NUMBER_BLOCKS(T.TS#, T.FILE#, T.BLOCK#, S.TYPE#, S.CACHEHINT, NVL(S.SPARE1,0), O.DATAOBJ#, S.BLOCKS) * TS.BLOCKSIZE OSIZE, O.OBJ# OBJ#, O.TYPE# TYPE#, T.SUBPART# PART#, T.POBJ# BO#, TO_NUMBER(P.VALCHAR) LOC_STALE_PCT FROM SYS.SEG$ S, SYS.TS$ TS, SYS.OBJ$ O, SYS.TABSUBPART$ T, SYS.TABCOMPART$ TCP, SYS.TAB$ TAB, SYS.OBJ$ OT, SYS.MON_MODS_ALL$ M, SYS.PARTOBJ$ PO, SYS.OPTSTAT_USER_PREFS$ P WHERE O.TYPE# = 34 AND S.TYPE# = 5 AND T.OBJ# = O.OBJ# AND M.OBJ#(+) = T.OBJ# AND T.FILE# = S.FILE# AND T.BLOCK# = S.BLOCK# AND T.TS# = S.TS# AND TS.TS# = S.TS# AND TCP.OBJ# = T.POBJ# AND TCP.BO# = TAB.OBJ# AND PO.OBJ# = TAB.OBJ# AND (((BITAND(DBMS_STATS_INTERNAL.DECODE_GRANULARITY(T.OBJ#, :B3 ), :B9 ) <> 0) AND BITAND(PO.SPARE2, 255) = 2) OR ((BITAND(DBMS_STATS_INTERNAL.DECODE_GRANULARITY(T.OBJ#, :B3 ), :B8 ) <> 0) AND BITAND(PO.SPARE2, 255) NOT IN (0, 2))) AND BITAND(TAB.TRIGFLAG,67108864) != 67108864 AND TAB.OBJ# = OT.OBJ# AND BITAND(OT.FLAGS,128) != 128 AND NOT (BITAND(O.FLAGS, 16) = 16 AND (O.NAME LIKE 'DR$%' OR O.NAME LIKE 'DR#%')) AND BITAND(TCP.FLAGS, 32) != 32 AND O.OBJ# = P.OBJ#(+) AND P.PNAME(+) = 'STALE_PERCENT' AND ((BITAND(T.FLAGS,2) = 2 AND ((BITAND(M.FLAGS,5) != 0) OR ((M.INSERTS + M.UPDATES + M.DELETES) > NVL(TO_NUMBER(P.VALCHAR), :B1 )/100 * T.ROWCNT))) OR (BITAND(T.FLAGS,2) != 2))) ST0 UNION ALL SELECT /*+ no_expand dynamic_sampling(4) dynamic_sampling_est_cdn */ DECODE(BITAND(I.FLAGS,2), 2, ROUND( LOG(0.01, NVL( LEAST( 100, GREATEST( 0.01, (DECODE(CM.TRUNC, 1, GREATEST(CM.ROWCNT, CM.INSERTS), CM.TOT_MODS/(CM.ROWCNT + 0.01))))), 0.01)), 1), -100.0) STALENESS, DBMS_SPACE_ADMIN.SEGMENT_NUMBER_BLOCKS(I.TS#, I.FILE#, I.BLOCK#, S.TYPE#, S.CACHEHINT, NVL(S.SPARE1,0), O.DATAOBJ#, S.BLOCKS) * TS.BLOCKSIZE OSIZE, O.OBJ# OBJ#, O.TYPE# TYPE#, 32 AFLAGS, 0 STATUS, :B5 SID, :B4 SERIAL#, NULL PART#, I.BO# BO#, TO_NUMBER(P.VALCHAR) LOC_STALE_PCT FROM SYS.SEG$ S, SYS.TS$ TS, SYS.OBJ$ O, SYS.IND$ I, SYS.OPTSTAT_USER_PREFS$ P, (SELECT BOBJ#, SUM(BITAND(T.TRIGFLAG, 67108864)/67108864) LOCKED, SUM(BITAND(M.FLAGS,1))/COUNT(M.FLAGS) TRUNC, SUM(M.INSERTS+M.DELETES) TOT_MODS, SUM(M.INSERTS) INSERTS, SUM(T.ROWCNT) ROWCNT FROM MON_MODS_ALL$ M, TAB$ T WHERE M.OBJ#(+) = T.OBJ# AND T.CLUCOLS IS NOT NULL GROUP BY BOBJ#) CM WHERE (DBMS_STATS_INTERNAL.GATHER_INDEX(CM.BOBJ#, :B10 ) IS NOT NULL) AND O.TYPE# = 1 AND S.TYPE# = 6 AND I.TYPE# = 3 AND I.OBJ# = O.OBJ# AND I.BO# = CM.BOBJ#(+) AND I.FILE# = S.FILE# AND I.BLOCK# = S.BLOCK# AND I.TS# = S.TS# AND TS.TS# = S.TS# AND BITAND(O.FLAGS, 128) != 128 AND O.OBJ# = P.OBJ#(+) AND P.PNAME(+) = 'STALE_PERCENT' AND (BITAND(I.FLAGS, 2) = 0 OR (BITAND(I.FLAGS, 2) != 0 AND (CM.TRUNC > 0 OR CM.TOT_MODS > NVL(TO_NUMBER(P.VALCHAR), :B1 )/100 * CM.ROWCNT))) AND CM.LOCKED = 0 AND BITAND(I.FLAGS,1+8+16+1024+4096) = 0 UNION ALL SELECT /*+ no_expand dynamic_sampling(4) dynamic_sampling_est_cdn */ DECODE(BITAND(T.FLAGS,16), 16, ROUND( LOG(0.01, NVL( LEAST( 100, GREATEST( 0.01, (DECODE(BITAND(M.FLAGS, 1), 1, GREATEST(T.ROWCNT, M.INSERTS), LEAST((M.INSERTS + M.DELETES + M.UPDATES), GREATEST(T.ROWCNT, (T.ROWCNT + M.INSERTS - M.DELETES)))) / (T.ROWCNT + 0.01)))), 0.01)), 1), -100.0) STALENESS, CASE WHEN I.FILE# = 0 THEN DBMS_STATS_INTERNAL.GET_INDEX_BLOCK_COUNT(U.NAME, OI.NAME, NULL, NULL) WHEN S.TYPE# = 6 THEN DBMS_SPACE_ADMIN.SEGMENT_NUMBER_BLOCKS(I.TS#, I.FILE#, I.BLOCK#, S.TYPE#, S.CACHEHINT, NVL(S.SPARE1,0), I.DATAOBJ#, S.BLOCKS) ELSE NULL END * NVL(TS.BLOCKSIZE, :B6 ) OSIZE, OT.OBJ# OBJ#, OT.TYPE# TYPE#, 32 AFLAGS, 0 STATUS, :B5 SID, :B4 SERIAL#, NULL PART#, NULL BO#, TO_NUMBER(P.VALCHAR) LOC_STALE_PCT FROM SYS.USER$ U, SYS.OBJ$ OT, SYS.IND$ I, SYS.SEG$ S, SYS.MON_MODS_ALL$ M, SYS.TS$ TS, SYS.TAB$ T, SYS.OBJ$ OI, OPTSTAT_USER_PREFS$ P WHERE (BITAND(DBMS_STATS_INTERNAL.DECODE_GRANULARITY(T.OBJ#, :B3 ), :B2 ) <> 0) AND I.TYPE# = 4 AND I.BO# = OT.OBJ# AND BITAND(OT.FLAGS,128) != 128 AND OT.OWNER# = U.USER# AND M.OBJ#(+) = OT.OBJ# AND I.FILE# = S.FILE#(+) AND I.BLOCK# = S.BLOCK#(+) AND I.TS# = S.TS#(+) AND TS.TS#(+) = S.TS# AND T.OBJ# = OT.OBJ# AND I.OBJ# = OI.OBJ# AND NOT (BITAND(OT.FLAGS, 16) = 16 AND (OT.NAME LIKE 'DR$%' OR OT.NAME LIKE 'DR#%')) AND BITAND(T.TRIGFLAG, 67108864) != 67108864 AND OT.OBJ# = P.OBJ#(+) AND P.PNAME(+) = 'STALE_PERCENT' AND ((BITAND(T.FLAGS,16) = 16 AND ((BITAND(M.FLAGS,1) = 1) OR ((M.INSERTS + M.UPDATES + M.DELETES) > NVL(TO_NUMBER(P.VALCHAR), :B1 )/100 * T.ROWCNT))) OR (BITAND(M.FLAGS, 4) = 4) OR (BITAND(T.FLAGS,16) != 16)) UNION ALL SELECT /*+ leading(i t) no_expand dynamic_sampling(4) dynamic_sampling_est_cdn */ STALENESS, OSIZE, OBJ#, TYPE#, CASE WHEN ROW_NUMBER() OVER (PARTITION BY BO# ORDER BY STALENESS, OSIZE, OBJ#) = 1 THEN 32 ELSE 0 END + 64 AFLAGS, 0 STATUS, :B5 SID, :B4 SERIAL#, PART#, BO#, LOC_STALE_PCT FROM (SELECT DECODE(BITAND(TP.FLAGS,2), 2, ROUND( LOG(0.01, NVL( LEAST( 100, GREATEST( 0.01, (DECODE(BITAND(M.FLAGS, 1), 1, GREATEST(TP.ROWCNT, M.INSERTS), LEAST((M.INSERTS + M.DELETES + M.UPDATES), GREATEST(TP.ROWCNT, (TP.ROWCNT + M.INSERTS - M.DELETES)))) / (TP.ROWCNT + 0.01)))), 0.01)), 1), -100.0) STALENESS, DBMS_SPACE_ADMIN.SEGMENT_NUMBER_BLOCKS(IP.TS#, IP.FILE#, IP.BLOCK#, S.TYPE#, S.CACHEHINT, NVL(S.SPARE1,0), IP.DATAOBJ#, S.BLOCKS) * TS.BLOCKSIZE OSIZE, OT.OBJ# OBJ#, OT.TYPE# TYPE#, TP.PART# PART#, TP.BO# BO#, TO_NUMBER(P.VALCHAR) LOC_STALE_PCT FROM SYS.USER$ U, SYS.OBJ$ OT, SYS.IND$ I, SYS.INDPART$ IP, SYS.TABPART$ TP, SYS.SEG$ S, SYS.MON_MODS_ALL$ M, SYS.TS$ TS, SYS.TAB$ T, SYS.OPTSTAT_USER_PREFS$ P WHERE I.TYPE# = 4 AND S.TYPE# = 6 AND OT.OWNER# = U.USER# AND I.OBJ# = IP.BO# AND IP.PART# = TP.PART# AND TP.OBJ# = OT.OBJ# AND I.BO# = TP.BO# AND BITAND(OT.FLAGS,128) != 128 AND M.OBJ#(+) = OT.OBJ# AND IP.FILE# = S.FILE# AND IP.BLOCK# = S.BLOCK# AND IP.TS# = S.TS# AND TS.TS# = S.TS# AND I.BO# = T.OBJ# AND NOT (BITAND(OT.FLAGS, 16) = 16 AND (OT.NAME LIKE 'DR$%' OR OT.NAME LIKE 'DR#%')) AND BITAND(T.TRIGFLAG,67108864) != 67108864 AND BITAND(TP.FLAGS, 32) != 32 AND OT.OBJ# = P.OBJ#(+) AND P.PNAME(+) = 'STALE_PERCENT' AND ((BITAND(TP.FLAGS,2) = 2 AND ((BITAND(M.FLAGS,1) = 1) OR ((M.INSERTS + M.UPDATES + M.DELETES) > NVL(TO_NUMBER(P.VALCHAR), :B1 )/100 * TP.ROWCNT))) OR (BITAND(M.FLAGS, 4) = 4) OR (BITAND(TP.FLAGS,2) != 2))) WHERE BITAND(DBMS_STATS_INTERNAL.DECODE_GRANULARITY(BO#, :B3 ), :B7 ) <> 0 UNION ALL SELECT /*+ ordered */ -99 STALENESS, 100*:B6 OSIZE, I.OBJ# OBJ#, 1 TYPE#, 32 AFLAGS, 0 STATUS, :B5 SID, :B4 SERIAL#, NULL PART#, I.BO# BO#, NULL LOC_STALE_PCT FROM SYS.IND$ I, SYS.TAB$ T, SYS.OBJ$ O, USER$ U WHERE (DBMS_STATS_INTERNAL.GATHER_INDEX(I.BO#, :B10 ) IS NOT NULL) AND (BITAND(DBMS_STATS_INTERNAL.DECODE_GRANULARITY(I.BO#, :B3 ), :B2 ) <> 0) AND BITAND(I.PROPERTY,32) != 32 AND BITAND(I.PROPERTY,64) != 64 AND BITAND(I.FLAGS,2) != 2 AND I.BO# = T.OBJ# AND BITAND(T.TRIGFLAG, 67108864) != 67108864 AND BITAND(T.FLAGS, 16) = 16 AND I.OBJ# = O.OBJ# AND I.TYPE# != 4 AND I.TYPE# != 8 AND BITAND(I.FLAGS,1+8+16+1024+4096) = 0 AND BITAND(O.FLAGS, 128) != 128 AND O.OWNER# = U.USER# AND NOT (U.NAME = 'SYS' AND O.NAME = 'I_SUMDELTA$') UNION ALL SELECT /*+ ordered */ -99 STALENESS, 100*:B6 OSIZE, I.OBJ# OBJ#, 20 TYPE#, 64 AFLAGS, 0 STATUS, :B5 SID, :B4 SERIAL#, I.PART# PART#, I.BO# BO#, NULL LOC_STALE_PCT FROM (SELECT OBJ#, BO#, PART#, FLAGS FROM SYS.INDPART$ WHERE BITAND(FLAGS,2) != 2 UNION ALL SELECT OBJ#, BO#, PART#, FLAGS FROM SYS.INDCOMPART$ WHERE BITAND(FLAGS,2) != 2 ) I, SYS.IND$ IND, SYS.TAB$ T, SYS.OBJ$ OI WHERE (DBMS_STATS_INTERNAL.GATHER_INDEX(I.BO#, :B10 ) IS NOT NULL) AND (BITAND(DBMS_STATS_INTERNAL.DECODE_GRANULARITY(I.BO#, :B3 ), :B7 ) <> 0) AND I.BO# = IND.OBJ# AND IND.TYPE# != 4 AND IND.TYPE# != 8 AND BITAND(IND.FLAGS,1+8+16+1024+4096) = 0 AND IND.BO# = T.OBJ# AND BITAND(T.TRIGFLAG, 67108864) != 67108864 AND IND.OBJ# = OI.OBJ# AND BITAND(OI.FLAGS, 128) != 128 UNION ALL SELECT /*+ ordered */ -99 STALENESS, 100*:B6 OSIZE, I.OBJ# OBJ#, 35 TYPE#, 0 AFLAGS, 0 STATUS, :B5 SID, :B4 SERIAL#, I.SUBPART# PART#, I.POBJ# BO#, NULL LOC_STALE_PCT FROM SYS.INDSUBPART$ I, SYS.INDCOMPART$ ICP, SYS.IND$ IND, SYS.TAB$ T, SYS.PARTOBJ$ PO, SYS.OBJ$ OI WHERE (DBMS_STATS_INTERNAL.GATHER_INDEX(IND.BO#, :B10 ) IS NOT NULL) AND BITAND(I.FLAGS,2) != 2 AND I.POBJ# = ICP.OBJ# AND ICP.BO# = IND.OBJ# AND IND.TYPE# != 4 AND IND.TYPE# != 8 AND BITAND(IND.FLAGS,1+8+16+1024+4096) = 0 AND IND.BO# = T.OBJ# AND BITAND(T.TRIGFLAG, 67108864) != 67108864 AND IND.OBJ# = PO.OBJ# AND (((BITAND(DBMS_STATS_INTERNAL.DECODE_GRANULARITY(IND.BO#, :B3 ), :B9 ) <> 0) AND BITAND(PO.SPARE2, 255) = 2) OR ((BITAND(DBMS_STATS_INTERNAL.DECODE_GRANULARITY(IND.BO#, :B3 ), :B8 ) <> 0) AND BITAND(PO.SPARE2, 255) NOT IN (0, 2))) AND IND.OBJ# = OI.OBJ# AND BITAND(OI.FLAGS, 128) != 128 
+) 
+WHERE OSIZE IS NOT NULL 
+) 
diff --git a/runtime/Cpp/tests/s005.cpp b/runtime/Cpp/tests/s005.cpp
new file mode 100644
index 000000000..30beca766
--- /dev/null
+++ b/runtime/Cpp/tests/s005.cpp
@@ -0,0 +1,204 @@
+// Example of a grammar for parsing Java sources,
+// Adapted from Java equivalent example, by Terence Parr
+// Author: Jim Idle - April 2007
+// Permission is granted to use this example code in any way you want, so long as
+// all the original authors are cited.
+//
+
+// set ts=4,sw=4
+// Tab size is 4 chars, indent is 4 chars
+
+// Notes: Although all the examples provided are configured to be built
+//        by Visual Studio 2005, based on the custom build rules
+//        provided in $(ANTLRSRC)/code/antlr/main/runtime/C/vs2005/rulefiles/antlr3.rules
+//        there is no reason that this MUST be the case. Provided that you know how
+//        to run the antlr tool, then just compile the resulting .c files and this
+//	  file together, using say gcc or whatever: gcc *.c -I. -o XXX
+//	  The C code is generic and will compile and run on all platforms (please
+//        report any warnings or errors to the antlr-interest newsgroup (see www.antlr.org)
+//        so that they may be corrected for any platofrm that I have not specifically tested.
+//
+//	  The project settings such as addinotal library paths and include paths have been set
+//        relative to the place where this source code sits on the ANTLR perforce system. You
+//        may well need to change the settings to locate the includes and the lib files. UNIX
+//        people need -L path/to/antlr/libs -lantlr3c (release mode) or -lantlr3cd (debug)
+//
+//        Jim Idle (jimi cut-this at idle ws)
+//
+
+// You may adopt your own practices by all means, but in general it is best
+// to create a single include for your project, that will include the ANTLR3 C
+// runtime header files, the generated header files (all of which are safe to include
+// multiple times) and your own project related header files. Use <> to include and
+// -I on the compile line (which vs2005 now handles, where vs2003 did not).
+//
+
+#include "utils.hpp"
+#include "UserMiniTraits.hpp"
+#include "SQLMiniLexer.hpp"
+#include "SQLMiniParser.hpp"
+
+#include <sys/types.h>
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+using namespace Antlr3Mini;
+using namespace std;
+
+// The lexer is of course generated by ANTLR, and so the lexer type is not upper case.
+// The lexer is supplied with a pANTLR3_INPUT_STREAM from whence it consumes its
+// input and generates a token stream as output.
+//
+static    SQLMiniLexer*		    lxr;
+
+// Main entry point for this example
+//
+int 
+main	(int argc, char *argv[])
+{
+    // Create the input stream based upon the argument supplied to us on the command line
+    // for this example, the input will always default to ./input if there is no explicit
+    // argument, otherwise we are expecting potentially a whole list of 'em.
+    //
+	if (argc < 2 || argv[1] == NULL)
+	{
+		Utils::processDir("./input"); // Note in VS2005 debug, working directory must be configured
+	}
+	else
+	{
+		int i;
+
+		for (i = 1; i < argc; i++)
+		{
+			Utils::processDir(argv[i]);
+		}
+	}
+
+	printf("finished parsing OK\n");	// Finnish parking is pretty good - I think it is all the snow
+
+	return 0;
+}
+
+void parseFile(const char* fName, int fd)
+{
+	// Now we declare the ANTLR related local variables we need.
+	// Note that unless you are convinced you will never need thread safe
+	// versions for your project, then you should always create such things
+	// as instance variables for each invocation.
+	// -------------------
+
+	// The ANTLR3 character input stream, which abstracts the input source such that
+	// it is easy to privide inpput from different sources such as files, or 
+	// memory strings.
+	//
+	// For an ASCII/latin-1 memory string use:
+	//	    input = antlr3NewAsciiStringInPlaceStream (stringtouse, (ANTLR3_UINT64) length, NULL);
+	//
+	// For a UCS2 (16 bit) memory string use:
+	//	    input = antlr3NewUCS2StringInPlaceStream (stringtouse, (ANTLR3_UINT64) length, NULL);
+	//
+	// For input from a file, see code below
+	//
+	// Note that this is essentially a pointer to a structure containing pointers to functions.
+	// You can create your own input stream type (copy one of the existing ones) and override any
+	// individual function by installing your own pointer after you have created the standard 
+	// version.
+	//
+	SQLMiniLexerTraits::InputStreamType*    input;
+
+
+	// The token stream is produced by the ANTLR3 generated lexer. Again it is a structure based
+	// API/Object, which you can customise and override methods of as you wish. a Token stream is
+	// supplied to the generated parser, and you can write your own token stream and pass this in
+	// if you wish.
+	//
+	SQLMiniLexerTraits::TokenStreamType*	tstream;
+
+	// The C parser is also generated by ANTLR and accepts a token stream as explained
+	// above. The token stream can be any source in fact, so long as it implements the 
+	// ANTLR3_TOKEN_SOURCE interface. In this case the parser does not return anything
+	// but it can of course specify any kind of return type from the rule you invoke
+	// when calling it.
+	//
+	SQLMiniParser*			psr;
+	
+	// Create the input stream using the supplied file name
+	// (Use antlr3AsciiFileStreamNew for UCS2/16bit input).
+	//
+	///byIvan input	= new PLSQLTraits::InputStreamType(fName, ANTLR_ENC_8BIT);
+#if defined __linux
+	string data = Utils::slurp(fd);
+#else
+	string data = Utils::slurp(fName);
+#endif
+	input	= new SQLMiniLexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
+						   ANTLR_ENC_8BIT,
+						   data.length(), //strlen(data.c_str()),
+						   (ANTLR_UINT8*)fName);
+
+	input->setUcaseLA(true);
+
+	// Our input stream is now open and all set to go, so we can create a new instance of our
+	// lexer and set the lexer input to our input stream:
+	//  (file | memory | ?) --> inputstream -> lexer --> tokenstream --> parser ( --> treeparser )?
+	//
+	if (lxr == NULL)
+	{
+		lxr	    = new SQLMiniLexer(input);	    // javaLexerNew is generated by ANTLR
+	}
+	else
+	{
+		lxr->setCharStream(input);
+	}
+
+	// Our lexer is in place, so we can create the token stream from it
+	// NB: Nothing happens yet other than the file has been read. We are just 
+	// connecting all these things together and they will be invoked when we
+	// call the parser rule. ANTLR3_SIZE_HINT can be left at the default usually
+	// unless you have a very large token stream/input. Each generated lexer
+	// provides a token source interface, which is the second argument to the
+	// token stream creator.
+	// Note tha even if you implement your own token structure, it will always
+	// contain a standard common token within it and this is the pointer that
+	// you pass around to everything else. A common token as a pointer within
+	// it that should point to your own outer token structure.
+	//
+	tstream = new SQLMiniLexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+
+	// Finally, now that we have our lexer constructed, we can create the parser
+	//
+	psr = new SQLMiniParser(tstream);  // javaParserNew is generated by ANTLR3
+	SQLMiniParser::start_rule_return r = psr->start_rule();
+	std::cout << r.tree->toStringTree() << std::endl;
+	
+	// Note that this means only that the methods are always called via the object
+	// pointer and the first argument to any method, is a pointer to the structure itself.
+	// It also has the side advantage, if you are using an IDE such as VS2005 that can do it
+	// that when you type ->, you will see a list of tall the methods the object supports.
+	//
+	putc('L', stdout); fflush(stdout);
+	{
+		ANTLR_INT32 T = 0;
+		while	(T != SQLMiniLexer::EOF_TOKEN)
+		{
+			T = tstream->_LA(1);
+			SQLMiniLexerTraits::CommonTokenType const* token = tstream->_LT(1);
+			ANTLR_UINT8 const *name = lxr->getTokenName(T);
+			  
+			printf("%d %s\t\"%s\"\n",
+			       T,
+			       name,
+			       tstream->_LT(1)->getText().c_str()
+			       );
+			tstream->consume();
+		}
+	}
+
+	tstream->_LT(1);	// Don't do this mormally, just causes lexer to run for timings here
+
+	delete tstream; 
+	delete lxr; lxr = NULL;
+	delete input; 
+}
diff --git a/runtime/Cpp/tests/s006.cpp b/runtime/Cpp/tests/s006.cpp
new file mode 100644
index 000000000..30beca766
--- /dev/null
+++ b/runtime/Cpp/tests/s006.cpp
@@ -0,0 +1,204 @@
+// Example of a grammar for parsing Java sources,
+// Adapted from Java equivalent example, by Terence Parr
+// Author: Jim Idle - April 2007
+// Permission is granted to use this example code in any way you want, so long as
+// all the original authors are cited.
+//
+
+// set ts=4,sw=4
+// Tab size is 4 chars, indent is 4 chars
+
+// Notes: Although all the examples provided are configured to be built
+//        by Visual Studio 2005, based on the custom build rules
+//        provided in $(ANTLRSRC)/code/antlr/main/runtime/C/vs2005/rulefiles/antlr3.rules
+//        there is no reason that this MUST be the case. Provided that you know how
+//        to run the antlr tool, then just compile the resulting .c files and this
+//	  file together, using say gcc or whatever: gcc *.c -I. -o XXX
+//	  The C code is generic and will compile and run on all platforms (please
+//        report any warnings or errors to the antlr-interest newsgroup (see www.antlr.org)
+//        so that they may be corrected for any platofrm that I have not specifically tested.
+//
+//	  The project settings such as addinotal library paths and include paths have been set
+//        relative to the place where this source code sits on the ANTLR perforce system. You
+//        may well need to change the settings to locate the includes and the lib files. UNIX
+//        people need -L path/to/antlr/libs -lantlr3c (release mode) or -lantlr3cd (debug)
+//
+//        Jim Idle (jimi cut-this at idle ws)
+//
+
+// You may adopt your own practices by all means, but in general it is best
+// to create a single include for your project, that will include the ANTLR3 C
+// runtime header files, the generated header files (all of which are safe to include
+// multiple times) and your own project related header files. Use <> to include and
+// -I on the compile line (which vs2005 now handles, where vs2003 did not).
+//
+
+#include "utils.hpp"
+#include "UserMiniTraits.hpp"
+#include "SQLMiniLexer.hpp"
+#include "SQLMiniParser.hpp"
+
+#include <sys/types.h>
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+using namespace Antlr3Mini;
+using namespace std;
+
+// The lexer is of course generated by ANTLR, and so the lexer type is not upper case.
+// The lexer is supplied with a pANTLR3_INPUT_STREAM from whence it consumes its
+// input and generates a token stream as output.
+//
+static    SQLMiniLexer*		    lxr;
+
+// Main entry point for this example
+//
+int 
+main	(int argc, char *argv[])
+{
+    // Create the input stream based upon the argument supplied to us on the command line
+    // for this example, the input will always default to ./input if there is no explicit
+    // argument, otherwise we are expecting potentially a whole list of 'em.
+    //
+	if (argc < 2 || argv[1] == NULL)
+	{
+		Utils::processDir("./input"); // Note in VS2005 debug, working directory must be configured
+	}
+	else
+	{
+		int i;
+
+		for (i = 1; i < argc; i++)
+		{
+			Utils::processDir(argv[i]);
+		}
+	}
+
+	printf("finished parsing OK\n");	// Finnish parking is pretty good - I think it is all the snow
+
+	return 0;
+}
+
+void parseFile(const char* fName, int fd)
+{
+	// Now we declare the ANTLR related local variables we need.
+	// Note that unless you are convinced you will never need thread safe
+	// versions for your project, then you should always create such things
+	// as instance variables for each invocation.
+	// -------------------
+
+	// The ANTLR3 character input stream, which abstracts the input source such that
+	// it is easy to privide inpput from different sources such as files, or 
+	// memory strings.
+	//
+	// For an ASCII/latin-1 memory string use:
+	//	    input = antlr3NewAsciiStringInPlaceStream (stringtouse, (ANTLR3_UINT64) length, NULL);
+	//
+	// For a UCS2 (16 bit) memory string use:
+	//	    input = antlr3NewUCS2StringInPlaceStream (stringtouse, (ANTLR3_UINT64) length, NULL);
+	//
+	// For input from a file, see code below
+	//
+	// Note that this is essentially a pointer to a structure containing pointers to functions.
+	// You can create your own input stream type (copy one of the existing ones) and override any
+	// individual function by installing your own pointer after you have created the standard 
+	// version.
+	//
+	SQLMiniLexerTraits::InputStreamType*    input;
+
+
+	// The token stream is produced by the ANTLR3 generated lexer. Again it is a structure based
+	// API/Object, which you can customise and override methods of as you wish. a Token stream is
+	// supplied to the generated parser, and you can write your own token stream and pass this in
+	// if you wish.
+	//
+	SQLMiniLexerTraits::TokenStreamType*	tstream;
+
+	// The C parser is also generated by ANTLR and accepts a token stream as explained
+	// above. The token stream can be any source in fact, so long as it implements the 
+	// ANTLR3_TOKEN_SOURCE interface. In this case the parser does not return anything
+	// but it can of course specify any kind of return type from the rule you invoke
+	// when calling it.
+	//
+	SQLMiniParser*			psr;
+	
+	// Create the input stream using the supplied file name
+	// (Use antlr3AsciiFileStreamNew for UCS2/16bit input).
+	//
+	///byIvan input	= new PLSQLTraits::InputStreamType(fName, ANTLR_ENC_8BIT);
+#if defined __linux
+	string data = Utils::slurp(fd);
+#else
+	string data = Utils::slurp(fName);
+#endif
+	input	= new SQLMiniLexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
+						   ANTLR_ENC_8BIT,
+						   data.length(), //strlen(data.c_str()),
+						   (ANTLR_UINT8*)fName);
+
+	input->setUcaseLA(true);
+
+	// Our input stream is now open and all set to go, so we can create a new instance of our
+	// lexer and set the lexer input to our input stream:
+	//  (file | memory | ?) --> inputstream -> lexer --> tokenstream --> parser ( --> treeparser )?
+	//
+	if (lxr == NULL)
+	{
+		lxr	    = new SQLMiniLexer(input);	    // javaLexerNew is generated by ANTLR
+	}
+	else
+	{
+		lxr->setCharStream(input);
+	}
+
+	// Our lexer is in place, so we can create the token stream from it
+	// NB: Nothing happens yet other than the file has been read. We are just 
+	// connecting all these things together and they will be invoked when we
+	// call the parser rule. ANTLR3_SIZE_HINT can be left at the default usually
+	// unless you have a very large token stream/input. Each generated lexer
+	// provides a token source interface, which is the second argument to the
+	// token stream creator.
+	// Note tha even if you implement your own token structure, it will always
+	// contain a standard common token within it and this is the pointer that
+	// you pass around to everything else. A common token as a pointer within
+	// it that should point to your own outer token structure.
+	//
+	tstream = new SQLMiniLexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+
+	// Finally, now that we have our lexer constructed, we can create the parser
+	//
+	psr = new SQLMiniParser(tstream);  // javaParserNew is generated by ANTLR3
+	SQLMiniParser::start_rule_return r = psr->start_rule();
+	std::cout << r.tree->toStringTree() << std::endl;
+	
+	// Note that this means only that the methods are always called via the object
+	// pointer and the first argument to any method, is a pointer to the structure itself.
+	// It also has the side advantage, if you are using an IDE such as VS2005 that can do it
+	// that when you type ->, you will see a list of tall the methods the object supports.
+	//
+	putc('L', stdout); fflush(stdout);
+	{
+		ANTLR_INT32 T = 0;
+		while	(T != SQLMiniLexer::EOF_TOKEN)
+		{
+			T = tstream->_LA(1);
+			SQLMiniLexerTraits::CommonTokenType const* token = tstream->_LT(1);
+			ANTLR_UINT8 const *name = lxr->getTokenName(T);
+			  
+			printf("%d %s\t\"%s\"\n",
+			       T,
+			       name,
+			       tstream->_LT(1)->getText().c_str()
+			       );
+			tstream->consume();
+		}
+	}
+
+	tstream->_LT(1);	// Don't do this mormally, just causes lexer to run for timings here
+
+	delete tstream; 
+	delete lxr; lxr = NULL;
+	delete input; 
+}
diff --git a/runtime/Cpp/tests/utils.cpp b/runtime/Cpp/tests/utils.cpp
new file mode 100644
index 000000000..13c30bb8e
--- /dev/null
+++ b/runtime/Cpp/tests/utils.cpp
@@ -0,0 +1,164 @@
+#include "utils.hpp"
+#include <stdio.h>
+
+#if defined __linux
+#  include <sys/mman.h>
+#  define DIRDELIM '/'
+#  include <dirent.h>
+#elif __MINGW32__
+#  include <iostream>
+#  include <fstream>
+#  include <sstream>
+#elif __CYGWIN__
+#  include <iostream>
+#  include <fstream>
+#  include <sstream>
+#  include <dirent.h>
+#  include <unistd.h>
+#  define DIRDELIM '\\'
+#elif _MSC_VER
+#  include <iostream>
+#  include <fstream>
+#  include <sstream>
+#  include <io.h> //_open
+#  define open _open 
+#  define close _close
+#  define strerror _strerror
+#  define O_RDONLY _O_RDONLY 
+#  define DIRDELIM '\\'
+#  include "direntw.h"
+#endif
+
+extern void parseFile(const char* fName, int fd);
+
+namespace Utils
+{
+	void processDir(const char* directory, int fd);
+
+	string slurp(int fd);
+	string slurp(string const& fileName)
+	{
+#if defined __linux
+		int fd;
+		fd = open( fileName.c_str(), O_RDONLY);
+		return slurp(fd);
+#else
+		ifstream ifs(fileName.c_str(), ios::in | ios::binary | ios::ate);
+		ifstream::pos_type fileSize = ifs.tellg();
+		ifs.seekg(0, ios::beg);
+
+		stringstream sstr;
+		sstr << ifs.rdbuf();
+		return sstr.str();
+#endif
+	}
+
+	string slurp(int fd)
+	{		
+#if defined __linux
+		struct stat sb;
+		const char *txt;
+		
+		fstat( fd, &sb);
+		txt = (const char*)mmap( 0, sb.st_size, PROT_READ, MAP_POPULATE | MAP_PRIVATE, fd, 0 );
+		string retval(txt);
+		munmap( (void*)txt, sb.st_size);
+		return retval;
+#else
+		return "";
+#endif
+	}
+
+
+	void processDir(const char * directory)
+	{
+		int fd;
+		fd = open( directory, O_RDONLY);
+		//if ( fd == -1)
+		//{
+		//	fprintf( stderr, _strerror(NULL) );
+		//	exit(-1);
+		//}
+		processDir(directory, fd);
+		if ( fd != -1)
+			close(fd);
+	}
+
+	void processDir(const char * directory, int fd)
+	{
+		struct stat sb;
+		char buf[2048];
+		struct dirent   * dirfil;
+
+		if ( fd != -1)
+			fstat( fd, &sb);
+		if( isDirectory(directory, sb))
+		{
+#if defined __linux || defined __CYGWIN__
+			DIR *Hdir = fdopendir(fd);
+#else
+			DIR *Hdir = opendir(directory);
+#endif
+			do
+			{
+				int fds;
+				struct stat sbs;
+				// We successfully opened a directory, we iterate all
+				// subdirectories and find all files within all directories
+				//
+				dirfil	= readdir(Hdir);
+
+				if	( dirfil != NULL	// Out of entries in this directory
+					  && dirfil->d_name[0] != '.' // Current or prior directory, or hidden file
+					)
+				{
+					int buflen;
+
+					// We found a new entry in this directory, we need to know
+					// if it is a sub directory of course.
+					//
+					buflen = sprintf( (char *)buf, "%s%c%s", directory, DIRDELIM, dirfil->d_name);
+					fds = open( buf, O_RDONLY);
+					fstat( fds, &sbs);
+					
+					if ( isDirectory(buf, sbs))
+					{
+						// This was a directory too, close the reference here, and call
+						// ourselves recursively, to process this subdirectory
+						//
+						processDir(buf, fds);
+						printf(" %s\n", buf);
+					}
+					else
+					{
+						printf("  - %s\n", dirfil->d_name); fflush(stdout);
+						//printf(" S"); fflush(stdout);
+						parseFile(buf, fds);
+						// putc('E', stdout); fflush(stdout);
+						
+					}
+					close(fds);
+				}				
+			} while (dirfil != NULL);
+			closedir(Hdir);
+		} else {
+			printf("  - %s\n", directory); fflush(stdout);			
+			parseFile(directory, fd);
+		}
+	}
+
+	bool isDirectory(const char * directory, struct stat const& sb)
+	{
+#if defined __linux
+		return S_ISDIR(sb.st_mode);
+#else
+		DIR* dir = opendir(directory);
+		if (dir == NULL) {
+			return false;
+		} else {
+			closedir(dir);
+			return true;
+		}
+#endif
+	}
+}
diff --git a/runtime/Cpp/tests/utils.hpp b/runtime/Cpp/tests/utils.hpp
new file mode 100644
index 000000000..6436483b9
--- /dev/null
+++ b/runtime/Cpp/tests/utils.hpp
@@ -0,0 +1,26 @@
+#ifndef __PLSQLPARSER_UTILS__
+#define __PLSQLPARSER_UTILS__
+
+#if _MSC_VER
+#  define _CRT_SECURE_NO_WARNINGS 1
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include <string>
+
+using namespace std;
+
+namespace Utils
+{
+	string slurp(int fd);
+	string slurp(string const& fileName);
+
+	void processDir(const char * directory);
+		
+	bool isDirectory(const char * director, struct stat const& sb);
+};
+
+#endif

From 0b4952b0ef947bd765e3654ab6dd009412673143 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Sun, 27 Jul 2014 18:25:29 +0200
Subject: [PATCH 17/53] Memory leak fix.

Allocate tree storage only withing context of the root grammar.
---
 tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
index ff8262526..ee202fe3c 100644
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
@@ -828,7 +828,7 @@ void <name>::init(StreamType* instream<grammar.delegators:{g|, <g.recognizerName
 {
 	/* Allocate TreeAdaptorType 
 	 */
-	<if(buildAST)>this->get_psrstate()->set_treeAdaptor( new TreeAdaptorType() );<endif>
+	<if(grammar.grammarIsRoot)><if(buildAST)>this->get_psrstate()->set_treeAdaptor( new TreeAdaptorType() );<endif><endif>
     <actions.parser.apifuncs>
 <if(memoize)>
 <if(grammar.grammarIsRoot)>

From 508797d2d8cb27778f6e3b3a50916977c6842540 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Sun, 27 Jul 2014 20:06:35 +0200
Subject: [PATCH 18/53] avoid compiler warning

---
 runtime/Cpp/include/antlr3commontreeadaptor.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.hpp b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
index 7aa60a2aa..9e742e4ca 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.hpp
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
@@ -62,7 +62,7 @@ class CommonResourcePoolManager
 };
 
 template <class ImplTraits>
-class CommonTreeStore : public ImplTraits::AllocPolicyType
+class CommonTreeStore
 {
 public:
 	typedef typename ImplTraits::TreeType TreeType;

From 44ffe2755a22ee4b70561aa7a0cd43fbdde1dc2a Mon Sep 17 00:00:00 2001
From: ibre5041 <ibre5041@ibrezina.net>
Date: Mon, 28 Jul 2014 17:59:23 +0200
Subject: [PATCH 19/53] Fix dirty flag setting

SEGFAULT fix - m_dirty flag (align with Java target)
---
 runtime/Cpp/include/antlr3rewriterulesubtreestream.inl | 4 +---
 runtime/Cpp/include/antlr3rewriteruletokenstream.inl   | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl b/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
index b13b7e8dd..5ba2a3581 100644
--- a/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
+++ b/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
@@ -60,11 +60,10 @@ RewriteRuleSubtreeStream<ImplTraits>::_next()
 	{
 		// This means that the stream is empty
 		// Caller must cope with this (TODO throw RewriteEmptyStreamException)
-		m_dirty = true;
 		return m_elements.end();
 	}
 
-	if (m_dirty && m_cursor == m_elements.end())
+	if (m_dirty || m_cursor == m_elements.end())
 	{
 		if( m_elements.size() == 1)
 		{
@@ -81,7 +80,6 @@ RewriteRuleSubtreeStream<ImplTraits>::_next()
 
 	// More than just a single element so we extract it from the
 	// vector.
-	m_dirty = true;
 	return m_cursor++;
 }
 
diff --git a/runtime/Cpp/include/antlr3rewriteruletokenstream.inl b/runtime/Cpp/include/antlr3rewriteruletokenstream.inl
index 69bea763a..393a3d928 100644
--- a/runtime/Cpp/include/antlr3rewriteruletokenstream.inl
+++ b/runtime/Cpp/include/antlr3rewriteruletokenstream.inl
@@ -57,11 +57,10 @@ RewriteRuleTokenStream<ImplTraits>::_next()
 	{
 		// This means that the stream is empty
 		// Caller must cope with this (TODO throw RewriteEmptyStreamException)
-		m_dirty = true;
 		return m_elements.end();
 	}
 
-	if (m_dirty && m_cursor == m_elements.end())
+	if (m_dirty || m_cursor == m_elements.end())
 	{
 		if( m_elements.size() == 1)
 		{
@@ -79,7 +78,6 @@ RewriteRuleTokenStream<ImplTraits>::_next()
 
 	// More than just a single element so we extract it from the
 	// vector.
-	m_dirty = true;
 	return m_cursor++;
 }
 

From 0626d13974d69d5716285651d9aa4940bf28b715 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Tue, 29 Jul 2014 03:35:56 +0200
Subject: [PATCH 20/53] REWRITE_EARLY_EXCEPTION aka RewriteEarlyExitException

---
 .../src/main/resources/org/antlr/codegen/templates/Cpp/AST.stg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/AST.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/AST.stg
index a78e485c2..4b7cf2931 100644
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/AST.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/AST.stg
@@ -285,7 +285,8 @@ rewritePositiveClosureBlock(
 	description) ::=
 <<
 if ( !(<referencedElements:{el | stream_<el>.hasNext()}; separator="||">) ) {
-	throw new RewriteEarlyExitException();
+	ExceptionBaseType* ex = new ANTLR_Exception\< <name>ImplTraits, REWRITE_EARLY_EXCEPTION, StreamType>( this->get_rec(), "<referencedElements> empty" );
+	goto rule<ruleDescriptor.name>Ex;
 }
 while ( <referencedElements:{el | stream_<el>.hasNext()}; separator="||"> ) {
 	<alt>

From 7f32b85be38e9fd2a9112c31b8351a65a11abbfd Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Tue, 5 Aug 2014 01:00:04 +0200
Subject: [PATCH 21/53] Performance improvement - do not alloc new instances of
 std::string in CommonToken::getText()

---
 runtime/Cpp/include/antlr3commontoken.hpp |  2 +-
 runtime/Cpp/include/antlr3commontoken.inl | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/runtime/Cpp/include/antlr3commontoken.hpp b/runtime/Cpp/include/antlr3commontoken.hpp
index e163e6a3d..e3635811f 100644
--- a/runtime/Cpp/include/antlr3commontoken.hpp
+++ b/runtime/Cpp/include/antlr3commontoken.hpp
@@ -156,7 +156,7 @@ class CommonToken : public ImplTraits::AllocPolicyType
     /** Function that returns the text pointer of a token, use
      *  toString() if you want a pANTLR3_STRING version of the token.
      */
-    StringType  getText() const;
+    StringType const & getText() const;
 	
     /** Pointer to a function that 'might' be able to set the text associated
      *  with a token. Imaginary tokens such as an ANTLR3_CLASSIC_TOKEN may actually
diff --git a/runtime/Cpp/include/antlr3commontoken.inl b/runtime/Cpp/include/antlr3commontoken.inl
index b0ceac3de..7eba008a6 100644
--- a/runtime/Cpp/include/antlr3commontoken.inl
+++ b/runtime/Cpp/include/antlr3commontoken.inl
@@ -119,8 +119,12 @@ void CommonToken<ImplTraits>::set_input( InputStreamType* input )
 }
 
 template<class ImplTraits>
-typename CommonToken<ImplTraits>::StringType  CommonToken<ImplTraits>::getText() const
+typename CommonToken<ImplTraits>::StringType const &
+CommonToken<ImplTraits>::getText() const
 {
+	static const StringType EOF_STRING("<EOF>");
+	static const StringType EMPTY_STRING("");
+
 	if ( !m_tokText.empty() )
 		return m_tokText;
 
@@ -128,19 +132,19 @@ typename CommonToken<ImplTraits>::StringType  CommonToken<ImplTraits>::getText()
 	//
 	if ( m_type == TOKEN_EOF)
 	{
-		m_tokText	= "<EOF>";
-		return m_tokText;
+		return EOF_STRING;
 	}
 
 	// We had nothing installed in the token, create a new string
 	// from the input stream
 	//
-	if	(m_input != NULL)
-		return	m_input->substr(	this->get_startIndex(), this->get_stopIndex() );
-
+	if ( m_input != NULL)
+	{
+		return m_tokText = m_input->substr( this->get_startIndex(), this->get_stopIndex() );
+	}
 	// Nothing to return, there is no input stream
 	//
-	return "";
+	return EMPTY_STRING;
 }
 
 template<class ImplTraits>

From 17dcc842cecb3fcf9200502381c472448f4d6368 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Sun, 27 Jul 2014 22:19:42 +0200
Subject: [PATCH 22/53] Debug print

---
 runtime/Cpp/include/antlr3commontreeadaptor.inl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.inl b/runtime/Cpp/include/antlr3commontreeadaptor.inl
index 370d1df97..2f465b1da 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.inl
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.inl
@@ -551,6 +551,7 @@ void CommonTreeAdaptor<ImplTraits>::replaceChildren( TreeTypePtr parent, ANTLR_I
 template<class ImplTraits>
 CommonTreeAdaptor<ImplTraits>::~CommonTreeAdaptor()
 {
+#ifdef ANTLR3_DEBUG
 	std::cout << "SZ" << TreeStoreType::size() << std::endl;
 	std::cout << "RZ" << TreeStoreType::m_recycleBin.size() << std::endl;
 
@@ -571,6 +572,7 @@ CommonTreeAdaptor<ImplTraits>::~CommonTreeAdaptor()
 			<< (*i)->toStringTree() << '\t'
 			<< std::endl;
 	}
+#endif
 }
 
 template<class ImplTraits>

From 3c713e30deff4c10534f95582bde93a11edd6e94 Mon Sep 17 00:00:00 2001
From: ibre5041 <ibre5041@ibrezina.net>
Date: Mon, 28 Jul 2014 21:55:19 +0200
Subject: [PATCH 23/53] nextNode nextTree fix

---
 runtime/Cpp/include/antlr3commontree.inl      |  6 +--
 .../antlr3rewriterulesubtreestream.hpp        |  3 +-
 .../antlr3rewriterulesubtreestream.inl        | 50 ++++++++-----------
 .../include/antlr3rewriteruletokenstream.inl  |  9 +---
 4 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/runtime/Cpp/include/antlr3commontree.inl b/runtime/Cpp/include/antlr3commontree.inl
index b82d0dd97..f1b7fef0f 100644
--- a/runtime/Cpp/include/antlr3commontree.inl
+++ b/runtime/Cpp/include/antlr3commontree.inl
@@ -244,10 +244,10 @@ CommonTree<ImplTraits>*	CommonTree<ImplTraits>::dupNode(void *p) const
 template<class ImplTraits>
 ANTLR_UINT32	CommonTree<ImplTraits>::getCharPositionInLine()
 {
-	if(m_token == NULL || (m_token->get_charPositionInLine() == -1) )
+	if(m_token == NULL || (m_token->get_charPositionInLine() == 0) )
 	{
-		if(this->getChildCount() > 0)
-			return this->getChild(0)->get_charPositionInLine();
+		if(!m_children.empty() && m_children.front())
+			return m_children.front()->get_charPositionInLine();
 		return 0;
 	}
 	return m_token->get_charPositionInLine();
diff --git a/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp b/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp
index 910184381..26d95c91e 100644
--- a/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp
+++ b/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp
@@ -62,7 +62,7 @@ class RewriteRuleSubtreeStream
     ///
     void	reset();
 
-	TreeTypePtr nextNode(TreeTypePtr);
+	TreeTypePtr nextNode();
 
 	/// TODO copied from RewriteRuleElementStreamType
     /// Add a new pANTLR3_BASE_TREE to this stream
@@ -84,6 +84,7 @@ class RewriteRuleSubtreeStream
 protected:
 	TreeTypePtr dup(const TreeTypePtr& el );
 
+	TreeTypePtr& leftestNode(TreeTypePtr& node) const;
 private:
 	/// Pointer to the tree adaptor in use for this stream
 	///
diff --git a/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl b/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
index 5ba2a3581..92def8523 100644
--- a/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
+++ b/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
@@ -174,46 +174,40 @@ template<class ImplTraits>
 RewriteRuleSubtreeStream<ImplTraits>::~RewriteRuleSubtreeStream()
 {
     // Before placing the stream back in the pool, we
-	// need to clear any vector it has. This is so any
-	// free pointers that are associated with the
-	// entries are called. However, if this particular function is called
-    // then we know that the entries in the stream are definitely
-    // tree nodes. Hence we check to see if any of them were nilNodes as
-    // if they were, we can reuse them.
-	//
-	// We have some elements to traverse
-	//
-	for (ANTLR_UINT32 i = 0; i < m_elements.size(); i++)
-	{
-		TreeTypePtr tree(std::move(m_elements.at(i)));
-		//if  ( (tree != NULL) && tree->isNilNode() )
-		{
-			// Had to remove this for now, check is not comprehensive enough
-			// tree->reuse(tree);
-		}
-	}
+	// need to clear any vector it has.
 	m_elements.clear();
 }
 
 template<class ImplTraits>
 typename RewriteRuleSubtreeStream<ImplTraits>::TreeTypePtr
-RewriteRuleSubtreeStream<ImplTraits>::nextNode(TreeTypePtr element)
+RewriteRuleSubtreeStream<ImplTraits>::nextNode()
 {
 	//System.out.println("nextNode: elements="+elements+", singleElement="+((Tree)singleElement).toStringTree());
 	ANTLR_UINT32 n = this->size();
-	if ( m_dirty || (m_cursor>=n && n==1) ) {
+	if (m_dirty || (m_cursor == m_elements.end() && m_elements.size() == 1)) {
 		// if out of elements and size is 1, dup (at most a single node
 		// since this is for making root nodes).
-		TreeTypePtr el = this->_next();
-		return m_adaptor->dupNode(el);
+		typename ElementsType::iterator el = this->_next();
+		return m_adaptor->dupNode(*el);
 	}
-	// test size above then fetch
-	TreeType *tree = this->_next();
-	while (m_adaptor->isNil(tree) && m_adaptor->getChildCount(tree) == 1)
-		tree = m_adaptor->getChild(tree, 0);
+
+	typename ElementsType::iterator el = this->_next();
+	//while (m_adaptor->isNilNode(el) && m_adaptor->getChildCount(el) == 1)
+	//	tree = m_adaptor->getChild(tree, 0);
+	TreeTypePtr& node = leftestNode(*el);
 	//System.out.println("_next="+((Tree)tree).toStringTree());
-	TreeType *el = m_adaptor->dupNode(tree); // dup just the root (want node here)
-	return el;
+	return m_adaptor->dupNode(node); // dup just the root (want node here)
+}
+
+template<class ImplTraits>
+ANTLR_INLINE
+typename RewriteRuleSubtreeStream<ImplTraits>::TreeTypePtr&
+RewriteRuleSubtreeStream<ImplTraits>::leftestNode(TreeTypePtr& node) const
+{
+	if(m_adaptor->isNilNode(node) && m_adaptor->getChildCount(node) == 1)
+		return leftestNode(node->getChild(0));
+	else
+		return node;
 }
 
 ANTLR_END_NAMESPACE()
diff --git a/runtime/Cpp/include/antlr3rewriteruletokenstream.inl b/runtime/Cpp/include/antlr3rewriteruletokenstream.inl
index 393a3d928..ac6692ffa 100644
--- a/runtime/Cpp/include/antlr3rewriteruletokenstream.inl
+++ b/runtime/Cpp/include/antlr3rewriteruletokenstream.inl
@@ -155,14 +155,7 @@ template<class ImplTraits>
 bool
 RewriteRuleTokenStream<ImplTraits>::hasNext()
 {
-	if ( !m_elements.empty() && m_cursor < m_elements.size())
-	{
-		return true;
-	}
-	else
-	{
-		return false;
-	}
+	return m_cursor != m_elements.end();
 }
 
 template<class ImplTraits >

From 3b7cc8d37c225423d86a1f5bb87f4456b364daf2 Mon Sep 17 00:00:00 2001
From: ibre5041 <ibre5041@ibrezina.net>
Date: Mon, 4 Aug 2014 20:28:34 +0200
Subject: [PATCH 24/53] Segfault fix

Explanation:
For code(using labels e1, e2) like this:

sample_clause
    :    sample_key block_key?
        LEFT_PAREN e1=expression (COMMA e2=expression)? RIGHT_PAREN
        seed_part?
        -> ^(sample_key block_key? ^(EXPR $e1) ^(EXPR $e2)? seed_part?)
    ;

ANTLR generates code like this:
	e1=expression();
	...
	if ( this->get_backtracking()==0 ) stream_expression.add(e1.tree);
	...
	...
        // AST REWRITE
        // elements: e1, e2, block_key, sample_key, seed_part
        // token labels:
        // rule labels: retval, e1, e2
        // token list labels:
        // rule list labels:
        // wildcard labels:
        if ( this->get_backtracking()==0 ) {
            retval.tree = std::move(root_0);
            RewriteRuleSubtreeStream<ImplTraits> stream_retval(get_psrstate()->get_treeAdaptor(), "rule retval",retval.tree); // retval
            RewriteRuleSubtreeStream<ImplTraits> stream_e1(get_psrstate()->get_treeAdaptor(), "rule e1",e1.tree); // rewrite alias
            RewriteRuleSubtreeStream<ImplTraits> stream_e2(get_psrstate()->get_treeAdaptor(), "rule e2",e2.tree); // rewrite alias
	...

The variable e1 of type expression_return is assigned into two different SubTreeStreams.
Since destructive copying is used(unique_ptr) the second assignment inserts NULL ptr into stream_e1.

A new variable of type TreeType* (pure pointer) is added. A value of this pointer is used ONLY when
inserting a tree into alias'es RewriteRuleSubtreeStream. When there are no aliases declared in the rule the "last pointer" remains unused.
When inserting TreeTypePtr into a stream value is moved. When inserting a pure pointer into the aliases stream the whole tree is deeply dupped
(assuming that the original tree was already moved into some other RewriteRuleSubtreeStream).

New result:
        if ( this->get_backtracking()==0 ) {
            retval.tree = std::move(root_0);
            RewriteRuleSubtreeStream<ImplTraits> stream_retval(get_psrstate()->get_treeAdaptor(), "rule retval",retval.tree); // retval
            RewriteRuleSubtreeStream<ImplTraits> stream_e1(get_psrstate()->get_treeAdaptor(), "rule e1",e1_last); // rewrite alias
            RewriteRuleSubtreeStream<ImplTraits> stream_e2(get_psrstate()->get_treeAdaptor(), "rule e2",e2_last); // rewrite alias

Note: we have also deal with this situation.

unpivot_in_elements
    :   (    column_name
        |    LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN
        )
        (     as_key
         (    constant
         |    (LEFT_PAREN)=> LEFT_PAREN constant (COMMA constant)* RIGHT_PAREN
         )
        )?
        -> column_name+ ^(PIVOT_ALIAS constant+)?
    ;

The AST tree contains multiple instances of "column_name".
RewriteRuleSubtreeStream can not contain reference(pointer) into matched tree as it would get overwritten
in every "loop". It really needs to be moved.
---
 runtime/Cpp/include/antlr3commontree.hpp      |  2 +
 runtime/Cpp/include/antlr3commontree.inl      |  8 +--
 .../Cpp/include/antlr3commontreeadaptor.hpp   | 15 ++--
 .../Cpp/include/antlr3commontreeadaptor.inl   | 70 ++++++++++++++-----
 .../antlr3rewriterulesubtreestream.hpp        |  3 +
 .../antlr3rewriterulesubtreestream.inl        | 33 ++++++++-
 .../org/antlr/codegen/templates/Cpp/AST.stg   |  8 ++-
 .../org/antlr/codegen/templates/Cpp/Cpp.stg   |  1 +
 8 files changed, 108 insertions(+), 32 deletions(-)

diff --git a/runtime/Cpp/include/antlr3commontree.hpp b/runtime/Cpp/include/antlr3commontree.hpp
index b3c9ba6a8..516dd0355 100644
--- a/runtime/Cpp/include/antlr3commontree.hpp
+++ b/runtime/Cpp/include/antlr3commontree.hpp
@@ -116,7 +116,9 @@ class CommonTree : public ImplTraits::AllocPolicyType
 	///
 	void	replaceChildren(ANTLR_INT32 startChildIndex, ANTLR_INT32 stopChildIndex, TreeTypePtr t);
 
+	// clone itself
 	CommonTree*	dupNode() const;
+	// clone itself in pre-allocated storage
 	CommonTree*	dupNode(void *) const;
 
 
diff --git a/runtime/Cpp/include/antlr3commontree.inl b/runtime/Cpp/include/antlr3commontree.inl
index f1b7fef0f..3ea15b01e 100644
--- a/runtime/Cpp/include/antlr3commontree.inl
+++ b/runtime/Cpp/include/antlr3commontree.inl
@@ -34,8 +34,8 @@ CommonTree<ImplTraits>::CommonTree( const CommonTokenType* token )
 template<class ImplTraits>
 CommonTree<ImplTraits>::CommonTree( const CommonTree* tree )
 {
-	m_startIndex = -1;
-	m_stopIndex  = -1;
+	m_startIndex = tree->get_startIndex();
+	m_stopIndex  = tree->get_stopIndex();
 	m_childIndex = -1;
 	m_token		 = tree->get_token();
 	m_parent     = NULL;
@@ -228,16 +228,12 @@ void	CommonTree<ImplTraits>::replaceChildren(ANTLR_INT32 startChildIndex, ANTLR_
 template<class ImplTraits>
 CommonTree<ImplTraits>*	CommonTree<ImplTraits>::dupNode() const
 {
-	// The node we are duplicating is in fact the common tree (that's why we are here)
-	// so we use the super pointer to duplicate.
 	return new CommonTree<ImplTraits>(this);
 }
 
 template<class ImplTraits>
 CommonTree<ImplTraits>*	CommonTree<ImplTraits>::dupNode(void *p) const
 {
-	// The node we are duplicating is in fact the common tree (that's why we are here)
-	// so we use the super pointer to duplicate.
 	return new (p) CommonTree<ImplTraits>(this);
 }
 
diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.hpp b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
index 9e742e4ca..9be3ffc71 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.hpp
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
@@ -116,6 +116,7 @@ class CommonTreeAdaptor
 	typedef typename ImplTraits::StringType StringType;
 	typedef typename ImplTraits::TreeType TreeType;
 	typedef typename ImplTraits::TreeTypePtr TreeTypePtr;
+	typedef typename TreeType::ChildrenType ChildrenType;
 
 	typedef	TreeType TokenType;
 	typedef typename ImplTraits::CommonTokenType CommonTokenType;
@@ -126,9 +127,13 @@ class CommonTreeAdaptor
 public:
 	//The parameter is there only to provide uniform constructor interface
 	CommonTreeAdaptor(DebuggerType* dbg = nullptr);
+
 	TreeTypePtr	nilNode();
-	TreeTypePtr	dupTree( TreeTypePtr& tree);
-	TreeTypePtr	dupTreeTT( TreeTypePtr t, TreeTypePtr tree);
+	TreeTypePtr	dupTree( const TreeTypePtr& tree);
+	TreeTypePtr	dupTree( const TreeType* tree);
+
+	TreeTypePtr	dupNode(const TreeTypePtr& treeNode);
+	TreeTypePtr	dupNode(const TreeType* treeNode);
 
 	void	addChild( TreeTypePtr& t, TreeTypePtr& child);
 	void	addChild( TreeTypePtr& t, TreeTypePtr&& child);
@@ -152,7 +157,6 @@ class CommonTreeAdaptor
 	CommonTokenType* createToken( ANTLR_UINT32 tokenType, const char* text);
 	CommonTokenType* createToken( const CommonTokenType* fromToken);
 
-	TreeTypePtr	dupNode(const TreeTypePtr& treeNode);
 	ANTLR_UINT32	getType( TreeTypePtr& t);
 	StringType	getText( TreeTypePtr& t);
         
@@ -188,6 +192,8 @@ class CommonTreeAdaptor
 	~CommonTreeAdaptor();
 
 protected:
+	TreeTypePtr	dupTreeImpl( const TreeTypePtr& root, TreeType* parent);
+
 	void defineDotNodes(TreeTypePtr t, const StringType& dotSpec);
 	void defineDotEdges(TreeTypePtr t, const StringType& dotSpec);
 };
@@ -229,7 +235,8 @@ class DebugTreeAdaptor : public ImplTraits::CommonTreeAdaptorType
 	TreeTypePtr createTypeTokenText(ANTLR_UINT32 tokenType, CommonTokenType* fromToken, ANTLR_UINT8* text);
 	TreeTypePtr createTypeText( ANTLR_UINT32 tokenType, ANTLR_UINT8* text);
 
-	TreeTypePtr dupTree( TreeTypePtr& tree);
+	TreeTypePtr dupTree( const TreeTypePtr& tree);
+	TreeTypePtr dupTree( const TreeType* tree);
 
 	/// Sends the required debugging events for duplicating a tree
 	/// to the debugger.
diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.inl b/runtime/Cpp/include/antlr3commontreeadaptor.inl
index 2f465b1da..27fbe35ab 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.inl
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.inl
@@ -86,38 +86,40 @@ CommonTreeAdaptor<ImplTraits>::nilNode()
 
 template<class ImplTraits>
 typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
-CommonTreeAdaptor<ImplTraits>::dupTree( TreeTypePtr& tree)
+CommonTreeAdaptor<ImplTraits>::dupTree( const TreeType* tree)
 {
-	return this->dupTreeTT(tree, NULL);
+	if (tree == NULL)
+		return NULL;
+	return std::move(this->dupTreeImpl(tree, NULL));
 }
 
 template<class ImplTraits>
 typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
-CommonTreeAdaptor<ImplTraits>::dupTreeTT( TreeTypePtr t, TreeTypePtr parent)
+CommonTreeAdaptor<ImplTraits>::dupTree( const TreeTypePtr& tree)
 {
-	TreeTypePtr	newTree;
-	TreeTypePtr	child;
-	TreeTypePtr	newSubTree;
-	ANTLR_UINT32		n;
-	ANTLR_UINT32		i;
-
-	if	(t == NULL)
+	if (tree == NULL)
 		return NULL;
+	return std::move(this->dupTreeImpl(tree, NULL));
+}
 
-	newTree = t->dupNode();
+template<class ImplTraits>
+typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
+CommonTreeAdaptor<ImplTraits>::dupTreeImpl( const TreeTypePtr& root, TreeType* parent)
+{
+	TreeTypePtr newTree(this->dupNode(root));
 
 	// Ensure new subtree root has parent/child index set
 	//
-	this->setChildIndex( newTree, t->get_childIndex() );
+	this->setChildIndex( newTree, root->get_childIndex() );
 	this->setParent(newTree, parent);
-	n = this->getChildCount(t);
 
-	for	(i=0; i < n; i++)
+	ChildrenType& r_children = root->get_children();
+	for (auto i = r_children.begin(); i != r_children.end(); ++i)
 	{
-		child = this->getChild(t, i);
-		newSubTree = this->dupTreeTT(child, t);
-		this->addChild(newTree, newSubTree);
+		// add child's clone
+		this->addChild(newTree, this->dupTreeImpl(*i, newTree.get()));
 	}
+
 	return	newTree;
 }
 
@@ -342,6 +344,17 @@ CommonTreeAdaptor<ImplTraits>::create( ANTLR_UINT32 tokenType, const char* text)
 	return	this->create(fromToken);
 }
 
+template<class ImplTraits>
+typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
+CommonTreeAdaptor<ImplTraits>::dupNode(const TreeType* treeNode)
+{
+	if (treeNode == NULL)
+		return TreeStoreType::null();
+	TreeTypePtr retval(TreeStoreType::create());
+	treeNode->dupNode(retval.get());
+	return retval;
+}
+
 template<class ImplTraits>
 typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
 CommonTreeAdaptor<ImplTraits>::dupNode(const TreeTypePtr& treeNode)
@@ -865,13 +878,32 @@ typename DebugTreeAdaptor<ImplTraits>::TreeTypePtr DebugTreeAdaptor<ImplTraits>:
 }
 
 template<class ImplTraits>
-typename DebugTreeAdaptor<ImplTraits>::TreeTypePtr DebugTreeAdaptor<ImplTraits>::dupTree( TreeTypePtr& tree)
+typename DebugTreeAdaptor<ImplTraits>::TreeTypePtr DebugTreeAdaptor<ImplTraits>::dupTree( const TreeTypePtr& tree)
+{
+	TreeTypePtr t;
+
+	// Call the normal dup tree mechanism first
+	//
+	t = this->dupTreeImpl(tree, NULL);
+
+	// In order to tell the debugger what we have just done, we now
+	// simulate the tree building mechanism. THis will fire
+	// lots of debugging events to the client and look like we
+	// duped the tree..
+	//
+	this->simulateTreeConstruction( t);
+
+	return t;
+}
+
+template<class ImplTraits>
+typename DebugTreeAdaptor<ImplTraits>::TreeTypePtr DebugTreeAdaptor<ImplTraits>::dupTree( const TreeType* tree)
 {
 	TreeTypePtr t;
 
 	// Call the normal dup tree mechanism first
 	//
-	t = this->dupTreeTT(tree, NULL);
+	t = this->dupTreeImpl(tree, NULL);
 
 	// In order to tell the debugger what we have just done, we now
 	// simulate the tree building mechanism. THis will fire
diff --git a/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp b/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp
index 26d95c91e..4f3de8dee 100644
--- a/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp
+++ b/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp
@@ -53,6 +53,7 @@ class RewriteRuleSubtreeStream
 	typedef typename ImplTraits::TreeType ElementType;
 
 	RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description);
+	RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description, TreeType* oneElement);
 	RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description, TreeTypePtr& oneElement);
 	RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description, const ElementsType& elements);
 	~RewriteRuleSubtreeStream();
@@ -83,6 +84,7 @@ class RewriteRuleSubtreeStream
 
 protected:
 	TreeTypePtr dup(const TreeTypePtr& el );
+	TreeTypePtr dup(const TreeType* el );
 
 	TreeTypePtr& leftestNode(TreeTypePtr& node) const;
 private:
@@ -106,6 +108,7 @@ class RewriteRuleSubtreeStream
     ElementsType		m_elements;
 
 	TreeTypePtr dupTree(const TreeTypePtr& el );
+	TreeTypePtr dupTree(const TreeType* el );
 
 	/// Once a node / subtree has been used in a stream, it must be dup'ed
 	/// from then on.  Streams are reset after sub rules so that the streams
diff --git a/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl b/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
index 92def8523..961b5658c 100644
--- a/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
+++ b/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
@@ -9,6 +9,22 @@ RewriteRuleSubtreeStream<ImplTraits>::RewriteRuleSubtreeStream(TreeAdaptorType*
 	m_cursor = m_elements.begin();
 }
 
+template<class ImplTraits>
+RewriteRuleSubtreeStream<ImplTraits>::RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description,
+	TreeType* oneElement
+	)
+	: m_adaptor(adaptor)
+	, m_elementDescription(description)
+	, m_dirty(false)
+{
+	if( oneElement != NULL )
+	{
+		auto tree_clone = this->dup(oneElement);
+		this->add( tree_clone );
+	}
+	m_cursor = m_elements.begin();
+}
+
 template<class ImplTraits>
 RewriteRuleSubtreeStream<ImplTraits>::RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description,
 	TreeTypePtr& oneElement
@@ -48,6 +64,7 @@ RewriteRuleSubtreeStream<ImplTraits>::add(TreeTypePtr& el)
 {
 	if ( el == NULL )
 		return;
+
 	m_elements.push_back(std::move(el));
 	m_cursor = m_elements.begin();
 }
@@ -125,8 +142,15 @@ RewriteRuleSubtreeStream<ImplTraits, SuperType>::next()
 */
 
 template<class ImplTraits>
-typename RewriteRuleSubtreeStream<ImplTraits>::TreeTypePtr	
+typename RewriteRuleSubtreeStream<ImplTraits>::TreeTypePtr
 RewriteRuleSubtreeStream<ImplTraits>::dup(const TreeTypePtr& element)
+{
+	return this->dupTree(element);
+}
+
+template<class ImplTraits>
+typename RewriteRuleSubtreeStream<ImplTraits>::TreeTypePtr
+RewriteRuleSubtreeStream<ImplTraits>::dup(const TreeType* element)
 {
 	return std::move(this->dupTree(element));
 }
@@ -138,6 +162,13 @@ RewriteRuleSubtreeStream<ImplTraits>::dupTree(const TreeTypePtr& element)
 	return std::move(m_adaptor->dupNode(element));
 }
 
+template<class ImplTraits>
+typename RewriteRuleSubtreeStream<ImplTraits>::TreeTypePtr
+RewriteRuleSubtreeStream<ImplTraits>::dupTree(const TreeType* element)
+{
+	return std::move(m_adaptor->dupNode(element));
+}
+
 template<class ImplTraits>
 typename RewriteRuleSubtreeStream<ImplTraits>::ElementType*
 RewriteRuleSubtreeStream<ImplTraits>::toTree( ElementType* element)
diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/AST.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/AST.stg
index 4b7cf2931..f6e0f9c26 100644
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/AST.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/AST.stg
@@ -146,7 +146,11 @@ tokenRefRuleRootTrackAndListLabel(token,label,elementIndex,terminalOptions={}) :
 /** rule when output=AST and tracking for rewrite */
 ruleRefTrack(rule,label,elementIndex,args,scope) ::= <<
 <super.ruleRef(...)>
-<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>stream_<rule.name>.add(<label>.tree);
+<if(backtracking)>if ( <actions.(actionScope).synpredgate> ) <endif>
+{
+    <label>_last = <label>.tree.get();
+    stream_<rule.name>.add(<label>.tree);
+}
 >>
 
 /** x+=rule when output=AST and tracking for rewrite */
@@ -240,7 +244,7 @@ rewriteCodeLabels() ::= <<
 	separator="\n"
 >
 <rest(referencedRuleLabels)
-	:{it | RewriteRuleSubtreeStream\<ImplTraits> stream_<it>(get_psrstate()->get_treeAdaptor(), "rule <it>",<it>.tree); // rewrite alias};
+	:{it | RewriteRuleSubtreeStream\<ImplTraits> stream_<it>(get_psrstate()->get_treeAdaptor(), "rule <it>",<it>_last); // rewrite alias};
 	separator="\n"
 >
 <referencedRuleListLabels
diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
index ee202fe3c..02c37273e 100644
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
@@ -2300,6 +2300,7 @@ initValue(typeName) ::= <<
 /** Define a rule label  */
 ruleLabelDef(label) ::= <<
 <ruleLabelType(referencedRule=label.referencedRule)> <label.label.text>;
+<ASTLabelType>::pointer <label.label.text>_last = NULL;
 >>
 /**  Rule label default value */
 ruleLabelInitVal(label) ::= <<

From 470eff57896a576269e80efd414041c88e0d2a6e Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Wed, 13 Aug 2014 05:45:36 +0200
Subject: [PATCH 25/53] memory leak fix

---
 runtime/Cpp/include/antlr3commontree.inl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/runtime/Cpp/include/antlr3commontree.inl b/runtime/Cpp/include/antlr3commontree.inl
index 3ea15b01e..44a040666 100644
--- a/runtime/Cpp/include/antlr3commontree.inl
+++ b/runtime/Cpp/include/antlr3commontree.inl
@@ -495,7 +495,9 @@ void	CommonTree<ImplTraits>::reuse()
 	m_childIndex = -1;
 	m_token		 = NULL;
 	m_parent     = NULL;
-	m_children.clear();
+
+	ChildrenType empty;
+	m_children.swap(empty);
 }
 
 template<class ImplTraits>

From c29d4485aedabd6dcdd14d2edcf5dfce566dea86 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Thu, 14 Aug 2014 03:38:58 +0200
Subject: [PATCH 26/53] fix memory leaks when parse
 error-recovering/error-reporting

---
 runtime/Cpp/include/antlr3exception.inl | 15 ++++++++-----
 runtime/Cpp/include/antlr3parser.inl    | 30 ++++++++++---------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/runtime/Cpp/include/antlr3exception.inl b/runtime/Cpp/include/antlr3exception.inl
index b73f1aaa3..6b9fd1b5f 100644
--- a/runtime/Cpp/include/antlr3exception.inl
+++ b/runtime/Cpp/include/antlr3exception.inl
@@ -111,6 +111,8 @@ ANTLR_INLINE void ANTLR_ExceptionBase<ImplTraits, StreamType>::set_index( ANTLR_
 template<class ImplTraits, class StreamType>
 ANTLR_INLINE void ANTLR_ExceptionBase<ImplTraits, StreamType>::set_token( const TokenType* token )
 {
+	if (m_token)
+		delete m_token;
 	m_token = token;
 }
 template<class ImplTraits, class StreamType>
@@ -341,6 +343,7 @@ void ANTLR_Exception<ImplTraits, Ex, StreamType>::displayRecognitionError( ANTLR
 				str_stream << "Actually dude, we didn't seem to be expecting anything here, or at least\n";
 				str_stream << "I could not work out what I was expecting, like so many of us these days!\n";
 			}
+			delete errBits;
 		}
 		break;
 	case EARLY_EXIT_EXCEPTION:
@@ -358,10 +361,10 @@ ANTLR_ExceptionBase<ImplTraits,StreamType>::~ANTLR_ExceptionBase()
 	ANTLR_ExceptionBase<ImplTraits,StreamType>* next;
 	ANTLR_ExceptionBase<ImplTraits,StreamType>* ex = m_nextException;
 
-    /* Ensure valid pointer
-     */
-    while   (ex != NULL)
-    {
+	/* Ensure valid pointer
+	 */
+	while   (ex != NULL)
+	{
 		/* Pick up anythign following now, before we free the
 		 * current memory block.
 		 */
@@ -373,7 +376,9 @@ ANTLR_ExceptionBase<ImplTraits,StreamType>::~ANTLR_ExceptionBase()
 		delete ex;
 
 		ex = next;
-    }
+	}
+	if ( m_token)
+		delete m_token;
 }
 
 ANTLR_END_NAMESPACE()
diff --git a/runtime/Cpp/include/antlr3parser.inl b/runtime/Cpp/include/antlr3parser.inl
index f75cb1cc5..66d5717b4 100644
--- a/runtime/Cpp/include/antlr3parser.inl
+++ b/runtime/Cpp/include/antlr3parser.inl
@@ -52,7 +52,7 @@ ANTLR_INLINE typename Parser<ImplTraits>::TokenStreamType* Parser<ImplTraits>::g
 template< class ImplTraits >
 void Parser<ImplTraits>::fillExceptionData( ExceptionBaseType* ex )
 {
-	ex->set_token( m_tstream->_LT(1) );	    /* Current input token			    */
+	ex->set_token( new CommonTokenType(*(m_tstream->_LT(1))) ); /* Current input token (clonned) - held by the exception */
 	ex->set_line( ex->get_token()->get_line() );
 	ex->set_charPositionInLine( ex->get_token()->get_charPositionInLine() );
 	ex->set_index( this->get_istream()->index() );
@@ -99,7 +99,7 @@ void Parser<ImplTraits>::displayRecognitionError( ANTLR_UINT8** tokenNames, Exce
 	// Prepare the knowledge we know we have
 	//
 	const CommonTokenType* theToken   = this->get_rec()->get_state()->get_exception()->get_token();
-	StringType ttext			= theToken->toString();
+	StringType ttext = theToken->toString();
 
 	errtext << ", at offset , "
 			<< this->get_rec()->get_state()->get_exception()->get_charPositionInLine();
@@ -193,25 +193,20 @@ typename Parser<ImplTraits>::TokenType*	Parser<ImplTraits>::getMissingSymbol( In
 										  ANTLR_UINT32			expectedTokenType,
 										  BitsetListType*	)
 {
-	TokenStreamType*		cts;
-	CommonTokenType*		token;
-	const CommonTokenType*		current;
-	StringType				text;
-
 	// Dereference the standard pointers
 	//
-	cts		= static_cast<TokenStreamType*>(istream);
+	TokenStreamType *cts = static_cast<TokenStreamType*>(istream);
 
 	// Work out what to use as the current symbol to make a line and offset etc
 	// If we are at EOF, we use the token before EOF
 	//
-	current	= cts->_LT(1);
+	const CommonTokenType* current = cts->_LT(1);
 	if	(current->get_type() == CommonTokenType::TOKEN_EOF)
 	{
 		current = cts->_LT(-1);
 	}
 
-	token	= new CommonTokenType;
+	CommonTokenType* token = new CommonTokenType;
 
 	// Set some of the token properties based on the current token
 	//
@@ -220,18 +215,17 @@ typename Parser<ImplTraits>::TokenType*	Parser<ImplTraits>::getMissingSymbol( In
 	token->set_channel( TOKEN_DEFAULT_CHANNEL );
 	token->set_type(expectedTokenType);
 	token->set_lineStart( current->get_lineStart() );
-
+	
 	// Create the token text that shows it has been inserted
 	//
-	token->setText("<missing ");
-	text = token->getText();
-
-	if	(!text.empty())
+	if ( expectedTokenType == CommonTokenType::TOKEN_EOF )
 	{
-		text.append((const char *) this->get_rec()->get_state()->get_tokenName(expectedTokenType) );
-		text.append(">");
+		token->setText( "<missing EOF>" );
+	} else {
+		typename ImplTraits::StringStreamType text;
+		text << "<missing " << this->get_rec()->get_state()->get_tokenName(expectedTokenType) << ">";
+		token->setText( text.str().c_str() );
 	}
-
 	// Finally return the pointer to our new token
 	//
 	return	token;

From 9ba24c57bdd226ad362d12cb4ebefb1a32a3af2c Mon Sep 17 00:00:00 2001
From: ibre5041 <ibre5041@ibrezina.net>
Date: Thu, 14 Aug 2014 21:04:22 +0200
Subject: [PATCH 27/53] remove preprecessor macros
 ANTLR_BEGIN_NAMESPACE/ANTLR_END_NAMESPACE

---
 runtime/Cpp/include/antlr3.inl                         | 4 ++--
 runtime/Cpp/include/antlr3baserecognizer.hpp           | 4 ++--
 runtime/Cpp/include/antlr3baserecognizer.inl           | 4 ++--
 runtime/Cpp/include/antlr3bitset.hpp                   | 4 ++--
 runtime/Cpp/include/antlr3bitset.inl                   | 4 ++--
 runtime/Cpp/include/antlr3collections.hpp              | 4 ++--
 runtime/Cpp/include/antlr3collections.inl              | 4 ++--
 runtime/Cpp/include/antlr3commontoken.hpp              | 4 ++--
 runtime/Cpp/include/antlr3commontoken.inl              | 4 ++--
 runtime/Cpp/include/antlr3commontree.hpp               | 4 ++--
 runtime/Cpp/include/antlr3commontree.inl               | 4 ++--
 runtime/Cpp/include/antlr3commontreeadaptor.hpp        | 4 ++--
 runtime/Cpp/include/antlr3commontreeadaptor.inl        | 4 ++--
 runtime/Cpp/include/antlr3commontreenodestream.hpp     | 4 ++--
 runtime/Cpp/include/antlr3commontreenodestream.inl     | 4 ++--
 runtime/Cpp/include/antlr3convertutf.hpp               | 4 ++--
 runtime/Cpp/include/antlr3cyclicdfa.hpp                | 4 ++--
 runtime/Cpp/include/antlr3cyclicdfa.inl                | 4 ++--
 runtime/Cpp/include/antlr3debugeventlistener.hpp       | 4 ++--
 runtime/Cpp/include/antlr3defs.hpp                     | 3 ---
 runtime/Cpp/include/antlr3exception.hpp                | 4 ++--
 runtime/Cpp/include/antlr3exception.inl                | 4 ++--
 runtime/Cpp/include/antlr3filestream.hpp               | 4 ++--
 runtime/Cpp/include/antlr3filestream.inl               | 4 ++--
 runtime/Cpp/include/antlr3input.hpp                    | 4 ++--
 runtime/Cpp/include/antlr3input.inl                    | 4 ++--
 runtime/Cpp/include/antlr3interfaces.hpp               | 4 ++--
 runtime/Cpp/include/antlr3intstream.hpp                | 4 ++--
 runtime/Cpp/include/antlr3intstream.inl                | 4 ++--
 runtime/Cpp/include/antlr3lexer.hpp                    | 4 ++--
 runtime/Cpp/include/antlr3lexer.inl                    | 4 ++--
 runtime/Cpp/include/antlr3memory.hpp                   | 4 ++--
 runtime/Cpp/include/antlr3parser.hpp                   | 4 ++--
 runtime/Cpp/include/antlr3parser.inl                   | 4 ++--
 runtime/Cpp/include/antlr3recognizersharedstate.hpp    | 4 ++--
 runtime/Cpp/include/antlr3recognizersharedstate.inl    | 4 ++--
 runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp | 4 ++--
 runtime/Cpp/include/antlr3rewriterulesubtreestream.inl | 4 ++--
 runtime/Cpp/include/antlr3rewriteruletokenstream.hpp   | 4 ++--
 runtime/Cpp/include/antlr3rewriteruletokenstream.inl   | 4 ++--
 runtime/Cpp/include/antlr3rewritestreams.hpp           | 4 ++--
 runtime/Cpp/include/antlr3rewritestreams.inl           | 4 ++--
 runtime/Cpp/include/antlr3tokenstream.hpp              | 4 ++--
 runtime/Cpp/include/antlr3tokenstream.inl              | 4 ++--
 runtime/Cpp/include/antlr3traits.hpp                   | 4 ++--
 runtime/Cpp/include/antlr3treeparser.hpp               | 4 ++--
 runtime/Cpp/include/antlr3treeparser.inl               | 4 ++--
 47 files changed, 92 insertions(+), 95 deletions(-)

diff --git a/runtime/Cpp/include/antlr3.inl b/runtime/Cpp/include/antlr3.inl
index 79974afc1..b2d223398 100644
--- a/runtime/Cpp/include/antlr3.inl
+++ b/runtime/Cpp/include/antlr3.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 //static 
 ANTLR_INLINE void GenericStream::displayRecognitionError( const StringType& str )
@@ -6,4 +6,4 @@ ANTLR_INLINE void GenericStream::displayRecognitionError( const StringType& str
 	fprintf(stderr, str.c_str() );
 }
 
-ANTLR_END_NAMESPACE()
\ No newline at end of file
+}
diff --git a/runtime/Cpp/include/antlr3baserecognizer.hpp b/runtime/Cpp/include/antlr3baserecognizer.hpp
index f125400b9..bc0315116 100644
--- a/runtime/Cpp/include/antlr3baserecognizer.hpp
+++ b/runtime/Cpp/include/antlr3baserecognizer.hpp
@@ -38,7 +38,7 @@
 #include    "antlr3defs.hpp"
 #include    "antlr3collections.hpp"
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 /** \brief Base tracking context structure for all types of
  * recognizers.
@@ -501,7 +501,7 @@ class BaseRecognizer : public ImplTraits::AllocPolicyType
 
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3baserecognizer.inl"
 
diff --git a/runtime/Cpp/include/antlr3baserecognizer.inl b/runtime/Cpp/include/antlr3baserecognizer.inl
index 0132c1d4b..bd7cc5319 100644
--- a/runtime/Cpp/include/antlr3baserecognizer.inl
+++ b/runtime/Cpp/include/antlr3baserecognizer.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template< class ImplTraits, class StreamType >
 BaseRecognizer<ImplTraits, StreamType>::BaseRecognizer(ANTLR_UINT32 sizeHint,
@@ -917,4 +917,4 @@ BaseRecognizer<ImplTraits, StreamType>::~BaseRecognizer()
 
 
 
-ANTLR_END_NAMESPACE()
+}
diff --git a/runtime/Cpp/include/antlr3bitset.hpp b/runtime/Cpp/include/antlr3bitset.hpp
index a711b8a48..6b174e2a5 100644
--- a/runtime/Cpp/include/antlr3bitset.hpp
+++ b/runtime/Cpp/include/antlr3bitset.hpp
@@ -38,7 +38,7 @@
 
 #include    "antlr3defs.hpp"
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 /** How many bits in the elements
  */
@@ -216,7 +216,7 @@ class Bitset : public ImplTraits::AllocPolicyType
 	
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3bitset.inl"
 
diff --git a/runtime/Cpp/include/antlr3bitset.inl b/runtime/Cpp/include/antlr3bitset.inl
index ad2f62050..64318ea0e 100644
--- a/runtime/Cpp/include/antlr3bitset.inl
+++ b/runtime/Cpp/include/antlr3bitset.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template <class ImplTraits>
 ANTLR_INLINE BitsetList<ImplTraits>::BitsetList()
@@ -489,4 +489,4 @@ Bitset<ImplTraits>* Bitset<ImplTraits>::BitsetFromList(const IntListType& list)
 	return bitset;
 }
 
-ANTLR_END_NAMESPACE()
+}
diff --git a/runtime/Cpp/include/antlr3collections.hpp b/runtime/Cpp/include/antlr3collections.hpp
index 21114039b..48f27561a 100644
--- a/runtime/Cpp/include/antlr3collections.hpp
+++ b/runtime/Cpp/include/antlr3collections.hpp
@@ -31,7 +31,7 @@
 
 #include    "antlr3defs.hpp"
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 /* -------------- TRIE Interfaces ---------------- */
 
@@ -276,7 +276,7 @@ class Topo : public ImplTraits::AllocPolicyType
 	~Topo();
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3collections.inl"
     
diff --git a/runtime/Cpp/include/antlr3collections.inl b/runtime/Cpp/include/antlr3collections.inl
index fb713c217..15cf9f179 100644
--- a/runtime/Cpp/include/antlr3collections.inl
+++ b/runtime/Cpp/include/antlr3collections.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template< class ImplTraits, class DataType >
 ANTLR_INLINE TrieEntry<ImplTraits, DataType>::TrieEntry(const DataType& data, TrieEntry* next)
@@ -992,4 +992,4 @@ Topo<ImplTraits>::~Topo()
 }
 
 
-ANTLR_END_NAMESPACE()
+}
diff --git a/runtime/Cpp/include/antlr3commontoken.hpp b/runtime/Cpp/include/antlr3commontoken.hpp
index e3635811f..e17d4f8bf 100644
--- a/runtime/Cpp/include/antlr3commontoken.hpp
+++ b/runtime/Cpp/include/antlr3commontoken.hpp
@@ -43,7 +43,7 @@
 #include    <limits>
 #include    "antlr3defs.hpp"
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 /** The definition of an ANTLR3 common token structure, which all implementations
  * of a token stream should provide, installing any further structures in the
@@ -249,7 +249,7 @@ class CommonToken : public ImplTraits::AllocPolicyType
 
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3commontoken.inl"
 
diff --git a/runtime/Cpp/include/antlr3commontoken.inl b/runtime/Cpp/include/antlr3commontoken.inl
index 7eba008a6..0b9d2ae00 100644
--- a/runtime/Cpp/include/antlr3commontoken.inl
+++ b/runtime/Cpp/include/antlr3commontoken.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits>
 CommonToken<ImplTraits>::CommonToken()
@@ -323,4 +323,4 @@ typename CommonToken<ImplTraits>::StringType  CommonToken<ImplTraits>::toString(
     return  outtext.str();
 }
 
-ANTLR_END_NAMESPACE()
+}
diff --git a/runtime/Cpp/include/antlr3commontree.hpp b/runtime/Cpp/include/antlr3commontree.hpp
index 516dd0355..0d10fc6c8 100644
--- a/runtime/Cpp/include/antlr3commontree.hpp
+++ b/runtime/Cpp/include/antlr3commontree.hpp
@@ -35,7 +35,7 @@
 
 #include    "antlr3defs.hpp"
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits>
 class CommonTree : public ImplTraits::AllocPolicyType				   
@@ -142,7 +142,7 @@ class CommonTree : public ImplTraits::AllocPolicyType
 	void	reuse();
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3commontree.inl"
 
diff --git a/runtime/Cpp/include/antlr3commontree.inl b/runtime/Cpp/include/antlr3commontree.inl
index 44a040666..57634f49f 100644
--- a/runtime/Cpp/include/antlr3commontree.inl
+++ b/runtime/Cpp/include/antlr3commontree.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits>
 CommonTree<ImplTraits>::CommonTree()
@@ -505,4 +505,4 @@ CommonTree<ImplTraits>::~CommonTree()
 {
 }
 
-ANTLR_END_NAMESPACE()
+}
diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.hpp b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
index 9be3ffc71..f11f4cd57 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.hpp
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
@@ -39,7 +39,7 @@
 #include <iostream>
 #include <algorithm>
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template <typename ImplTraits> class CommonTreeStore;
 
@@ -244,7 +244,7 @@ class DebugTreeAdaptor : public ImplTraits::CommonTreeAdaptorType
 	void simulateTreeConstruction(TreeTypePtr& tree);
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3commontreeadaptor.inl"
 
diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.inl b/runtime/Cpp/include/antlr3commontreeadaptor.inl
index 27fbe35ab..2d64a5a09 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.inl
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template <typename ImplTraits>
 CommonResourcePoolManager<ImplTraits>::CommonResourcePoolManager(CommonTreeStore<ImplTraits> * pool)
@@ -935,4 +935,4 @@ void DebugTreeAdaptor<ImplTraits>::simulateTreeConstruction(TreeTypePtr& tree)
 	}
 }
 
-ANTLR_END_NAMESPACE()
+}
diff --git a/runtime/Cpp/include/antlr3commontreenodestream.hpp b/runtime/Cpp/include/antlr3commontreenodestream.hpp
index ae6054d88..3e8ac8699 100644
--- a/runtime/Cpp/include/antlr3commontreenodestream.hpp
+++ b/runtime/Cpp/include/antlr3commontreenodestream.hpp
@@ -35,7 +35,7 @@
 
 #include    "antlr3defs.hpp"
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits>
 class CommonTreeNodeStream : public ImplTraits::TreeNodeIntStreamType
@@ -312,7 +312,7 @@ class TreeWalkState : public ImplTraits::AllocPolicyType
 
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3commontreenodestream.inl"
 
diff --git a/runtime/Cpp/include/antlr3commontreenodestream.inl b/runtime/Cpp/include/antlr3commontreenodestream.inl
index c9af8412c..096e15db1 100644
--- a/runtime/Cpp/include/antlr3commontreenodestream.inl
+++ b/runtime/Cpp/include/antlr3commontreenodestream.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits>
 CommonTreeNodeStream<ImplTraits>::CommonTreeNodeStream(ANTLR_UINT32 hint)
@@ -418,5 +418,5 @@ void CommonTreeNodeStream<ImplTraits>::fillBuffer(TreeTypePtr t)
 
 
 
-ANTLR_END_NAMESPACE()
+}
 
diff --git a/runtime/Cpp/include/antlr3convertutf.hpp b/runtime/Cpp/include/antlr3convertutf.hpp
index 8085c2977..7f4b7e0d2 100644
--- a/runtime/Cpp/include/antlr3convertutf.hpp
+++ b/runtime/Cpp/include/antlr3convertutf.hpp
@@ -101,7 +101,7 @@
 #ifndef	_ANTLR3_CONVERTUTF_H
 #define	_ANTLR3_CONVERTUTF_H
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 typedef ANTLR_UINT32	UTF32;	/* at least 32 bits */
 typedef ANTLR_UINT16	UTF16;	/* at least 16 bits */
@@ -136,7 +136,7 @@ enum ConversionFlags {
 
 
 
-ANTLR_END_NAMESPACE()
+}
 
 #endif
 
diff --git a/runtime/Cpp/include/antlr3cyclicdfa.hpp b/runtime/Cpp/include/antlr3cyclicdfa.hpp
index a0d66b925..c2e8c143e 100644
--- a/runtime/Cpp/include/antlr3cyclicdfa.hpp
+++ b/runtime/Cpp/include/antlr3cyclicdfa.hpp
@@ -43,7 +43,7 @@
 #pragma warning (disable : 4610)
 #endif
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits, class CtxType>
 class CyclicDFA : public ImplTraits::AllocPolicyType
@@ -97,7 +97,7 @@ class CyclicDFA : public ImplTraits::AllocPolicyType
 	void noViableAlt(RecognizerType* rec, ANTLR_UINT32	s);
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #ifdef ANTLR3_WINDOWS
 #pragma warning	(pop)
diff --git a/runtime/Cpp/include/antlr3cyclicdfa.inl b/runtime/Cpp/include/antlr3cyclicdfa.inl
index b7b526f6d..c25c7c0aa 100644
--- a/runtime/Cpp/include/antlr3cyclicdfa.inl
+++ b/runtime/Cpp/include/antlr3cyclicdfa.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits, class CtxType>
 CyclicDFA<ImplTraits, CtxType>::CyclicDFA( ANTLR_INT32	decisionNumber
@@ -201,4 +201,4 @@ void CyclicDFA<ImplTraits, CtxType>::noViableAlt(RecognizerType* rec, ANTLR_UINT
 	}
 }
 
-ANTLR_END_NAMESPACE()
+}
diff --git a/runtime/Cpp/include/antlr3debugeventlistener.hpp b/runtime/Cpp/include/antlr3debugeventlistener.hpp
index 922115b48..35bae9b84 100644
--- a/runtime/Cpp/include/antlr3debugeventlistener.hpp
+++ b/runtime/Cpp/include/antlr3debugeventlistener.hpp
@@ -45,7 +45,7 @@
 
 #include    "antlr3defs.hpp"
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 /// Default debugging port
 ///
@@ -395,7 +395,7 @@ class DebugEventListener  : public ImplTraits::AllocPolicyType
 	virtual ~DebugEventListener();
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #endif
 
diff --git a/runtime/Cpp/include/antlr3defs.hpp b/runtime/Cpp/include/antlr3defs.hpp
index 5175cd18a..ba22c4f84 100644
--- a/runtime/Cpp/include/antlr3defs.hpp
+++ b/runtime/Cpp/include/antlr3defs.hpp
@@ -95,9 +95,6 @@
 ///
 #define ANTLR_ENC_EBCDIC       64
 
-#define ANTLR_BEGIN_NAMESPACE() namespace antlr3 {
-#define ANTLR_END_NAMESPACE() }
-
 /* Common definitions come first
  */
 #include    <antlr3errors.hpp>
diff --git a/runtime/Cpp/include/antlr3exception.hpp b/runtime/Cpp/include/antlr3exception.hpp
index beca1fc5e..4c40a0afa 100644
--- a/runtime/Cpp/include/antlr3exception.hpp
+++ b/runtime/Cpp/include/antlr3exception.hpp
@@ -45,7 +45,7 @@
 
 #include    "antlr3defs.hpp"
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 /** Base structure for an ANTLR3 exception tracker
  */
@@ -202,7 +202,7 @@ class ANTLR_Exception  :  public ImplTraits::template ExceptionBaseType<StreamTy
 	virtual void displayRecognitionError( ANTLR_UINT8** tokenNames, StringStreamType& str_stream) const;
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3exception.inl"
 
diff --git a/runtime/Cpp/include/antlr3exception.inl b/runtime/Cpp/include/antlr3exception.inl
index 6b9fd1b5f..1029630ba 100644
--- a/runtime/Cpp/include/antlr3exception.inl
+++ b/runtime/Cpp/include/antlr3exception.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits, class StreamType>
 ANTLR_ExceptionBase<ImplTraits, StreamType>::ANTLR_ExceptionBase(const StringType& message)
@@ -381,4 +381,4 @@ ANTLR_ExceptionBase<ImplTraits,StreamType>::~ANTLR_ExceptionBase()
 		delete m_token;
 }
 
-ANTLR_END_NAMESPACE()
+}
diff --git a/runtime/Cpp/include/antlr3filestream.hpp b/runtime/Cpp/include/antlr3filestream.hpp
index 9a46d3582..24bf3a6d9 100644
--- a/runtime/Cpp/include/antlr3filestream.hpp
+++ b/runtime/Cpp/include/antlr3filestream.hpp
@@ -34,7 +34,7 @@
 
 #include    "antlr3defs.hpp"
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits>
 class FileUtils
@@ -68,7 +68,7 @@ class ParseFileAbsentException : public std::exception
 	}
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3filestream.inl"
 
diff --git a/runtime/Cpp/include/antlr3filestream.inl b/runtime/Cpp/include/antlr3filestream.inl
index 59b4f0658..b67804adf 100644
--- a/runtime/Cpp/include/antlr3filestream.inl
+++ b/runtime/Cpp/include/antlr3filestream.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits>
 ANTLR_FDSC	FileUtils<ImplTraits>::AntlrFopen(const ANTLR_UINT8* filename, const char * mode)
@@ -71,4 +71,4 @@ ANTLR_UINT32	FileUtils<ImplTraits>::AntlrRead8Bit(InputStreamType* input, const
 	return  ANTLR_SUCCESS;
 }
 
-ANTLR_END_NAMESPACE()
+}
diff --git a/runtime/Cpp/include/antlr3input.hpp b/runtime/Cpp/include/antlr3input.hpp
index 175a5da6e..9885ea4f3 100644
--- a/runtime/Cpp/include/antlr3input.hpp
+++ b/runtime/Cpp/include/antlr3input.hpp
@@ -38,7 +38,7 @@
 
 #include    "antlr3defs.hpp"
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 /// Master context structure for an ANTLR3 C runtime based input stream.
 /// \ingroup apistructures. Calling _LT on this doesn't seem right. You would
@@ -320,7 +320,7 @@ class ParseNullStringException : public std::exception
 	}
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3input.inl"
 
diff --git a/runtime/Cpp/include/antlr3input.inl b/runtime/Cpp/include/antlr3input.inl
index f3362cded..024e36943 100644
--- a/runtime/Cpp/include/antlr3input.inl
+++ b/runtime/Cpp/include/antlr3input.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits>
 InputStream<ImplTraits>::InputStream(const ANTLR_UINT8* fileName, ANTLR_UINT32 encoding)
@@ -616,4 +616,4 @@ void InputStream<ImplTraits>::setupInputStream()
     }    
 }
 
-ANTLR_END_NAMESPACE()
+}
diff --git a/runtime/Cpp/include/antlr3interfaces.hpp b/runtime/Cpp/include/antlr3interfaces.hpp
index 3103d2413..566b535b0 100644
--- a/runtime/Cpp/include/antlr3interfaces.hpp
+++ b/runtime/Cpp/include/antlr3interfaces.hpp
@@ -34,7 +34,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits, class SuperType>
 class IntStream;
@@ -295,6 +295,6 @@ class ComponentTypeFinder< ImplTraits, typename ImplTraits::TreeNodeStreamType>
 	typedef typename ImplTraits::TreeParserType ComponentType;
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #endif
diff --git a/runtime/Cpp/include/antlr3intstream.hpp b/runtime/Cpp/include/antlr3intstream.hpp
index b7e9ea52f..02068a1e3 100644
--- a/runtime/Cpp/include/antlr3intstream.hpp
+++ b/runtime/Cpp/include/antlr3intstream.hpp
@@ -63,7 +63,7 @@
 
 #include    "antlr3defs.hpp"
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 enum STREAM_TYPE
 {
@@ -397,7 +397,7 @@ class TreeNodeIntStream : public IntStream<ImplTraits, typename ImplTraits::Tree
 	ANTLR_UINT32		size();
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3intstream.inl"
 
diff --git a/runtime/Cpp/include/antlr3intstream.inl b/runtime/Cpp/include/antlr3intstream.inl
index f8d8b5a0c..17dc100fa 100644
--- a/runtime/Cpp/include/antlr3intstream.inl
+++ b/runtime/Cpp/include/antlr3intstream.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits, class SuperType>
 ANTLR_INLINE IntStream<ImplTraits, SuperType>::IntStream()
@@ -1658,4 +1658,4 @@ ANTLR_UINT32	TreeNodeIntStream<ImplTraits>::size()
 }
 
 
-ANTLR_END_NAMESPACE()
+}
diff --git a/runtime/Cpp/include/antlr3lexer.hpp b/runtime/Cpp/include/antlr3lexer.hpp
index cfff29f9e..0c441f204 100644
--- a/runtime/Cpp/include/antlr3lexer.hpp
+++ b/runtime/Cpp/include/antlr3lexer.hpp
@@ -62,7 +62,7 @@
  */
 #include    "antlr3defs.hpp"
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 static const ANTLR_UINT32	ANTLR_STRING_TERMINATOR	= 0xFFFFFFFF;
 
@@ -241,7 +241,7 @@ class  Lexer : public ImplTraits::template RecognizerType< typename ImplTraits::
 	~Lexer();
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3lexer.inl"
 
diff --git a/runtime/Cpp/include/antlr3lexer.inl b/runtime/Cpp/include/antlr3lexer.inl
index c8ccbd864..578510c62 100644
--- a/runtime/Cpp/include/antlr3lexer.inl
+++ b/runtime/Cpp/include/antlr3lexer.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits>
 Lexer<ImplTraits>::Lexer(ANTLR_UINT32 sizeHint, RecognizerSharedStateType* state)
@@ -588,5 +588,5 @@ ANTLR_INLINE void Lexer<ImplTraits>::consume()
 	return this->get_istream()->consume();
 }
 
-ANTLR_END_NAMESPACE()
+}
 
diff --git a/runtime/Cpp/include/antlr3memory.hpp b/runtime/Cpp/include/antlr3memory.hpp
index f09f2ed64..9baef3dcb 100644
--- a/runtime/Cpp/include/antlr3memory.hpp
+++ b/runtime/Cpp/include/antlr3memory.hpp
@@ -40,7 +40,7 @@
 
 #include   "antlr3defs.hpp"
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 class DefaultAllocPolicy
 {
@@ -180,6 +180,6 @@ class DefaultAllocPolicy
 	}
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #endif	/* _ANTLR3MEMORY_H */
diff --git a/runtime/Cpp/include/antlr3parser.hpp b/runtime/Cpp/include/antlr3parser.hpp
index cc9b47388..ee14073e6 100644
--- a/runtime/Cpp/include/antlr3parser.hpp
+++ b/runtime/Cpp/include/antlr3parser.hpp
@@ -36,7 +36,7 @@
 
 #include    "antlr3defs.hpp"
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 /** This is the main interface for an ANTLR3 parser.
  */
@@ -193,7 +193,7 @@ class RuleReturnValue_1 : public RuleReturnValue<ImplTraits>
 	~RuleReturnValue_1();
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3parser.inl"
 
diff --git a/runtime/Cpp/include/antlr3parser.inl b/runtime/Cpp/include/antlr3parser.inl
index 66d5717b4..6b72ae398 100644
--- a/runtime/Cpp/include/antlr3parser.inl
+++ b/runtime/Cpp/include/antlr3parser.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template< class ImplTraits >
 Parser<ImplTraits>::Parser( ANTLR_UINT32 sizeHint, RecognizerSharedStateType* state )
@@ -576,4 +576,4 @@ RuleReturnValue_1<ImplTraits>::~RuleReturnValue_1()
 	}
 }
 
-ANTLR_END_NAMESPACE()
+}
diff --git a/runtime/Cpp/include/antlr3recognizersharedstate.hpp b/runtime/Cpp/include/antlr3recognizersharedstate.hpp
index 8d00b1e8b..e9c38b5f9 100644
--- a/runtime/Cpp/include/antlr3recognizersharedstate.hpp
+++ b/runtime/Cpp/include/antlr3recognizersharedstate.hpp
@@ -44,7 +44,7 @@
 
 #include "antlr3defs.hpp"
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 /** All the data elements required to track the current state
  *  of any recognizer (lexer, parser, tree parser).
@@ -265,7 +265,7 @@ class RecognizerSharedState  : public ImplTraits::AllocPolicyType
 	void dec_backtracking();
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3recognizersharedstate.inl"
 
diff --git a/runtime/Cpp/include/antlr3recognizersharedstate.inl b/runtime/Cpp/include/antlr3recognizersharedstate.inl
index 1dc5c9424..2357420cb 100644
--- a/runtime/Cpp/include/antlr3recognizersharedstate.inl
+++ b/runtime/Cpp/include/antlr3recognizersharedstate.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits, class StreamType>
 RecognizerSharedState<ImplTraits, StreamType>::RecognizerSharedState()
@@ -276,4 +276,4 @@ ANTLR_INLINE void RecognizerSharedState<ImplTraits, StreamType>::dec_backtrackin
 	--m_backtracking;
 }
 
-ANTLR_END_NAMESPACE()
+}
diff --git a/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp b/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp
index 4f3de8dee..8075959e1 100644
--- a/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp
+++ b/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp
@@ -31,7 +31,7 @@
 
 #include    "antlr3defs.hpp"
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 /// This is an implementation of a subtree stream which is a set of trees
 ///  modeled as an element stream.
@@ -118,7 +118,7 @@ class RewriteRuleSubtreeStream
 	bool m_dirty;
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3rewriterulesubtreestream.inl"
 
diff --git a/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl b/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
index 961b5658c..bc93d7132 100644
--- a/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
+++ b/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits>
 RewriteRuleSubtreeStream<ImplTraits>::RewriteRuleSubtreeStream(TreeAdaptorType* adaptor, const char* description)
@@ -241,4 +241,4 @@ RewriteRuleSubtreeStream<ImplTraits>::leftestNode(TreeTypePtr& node) const
 		return node;
 }
 
-ANTLR_END_NAMESPACE()
+}
diff --git a/runtime/Cpp/include/antlr3rewriteruletokenstream.hpp b/runtime/Cpp/include/antlr3rewriteruletokenstream.hpp
index f4ea718a0..22cb8d147 100644
--- a/runtime/Cpp/include/antlr3rewriteruletokenstream.hpp
+++ b/runtime/Cpp/include/antlr3rewriteruletokenstream.hpp
@@ -31,7 +31,7 @@
 
 #include    "antlr3defs.hpp"
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 /// This is an implementation of a token stream, which is basically an element
 ///  stream that deals with tokens only.
@@ -126,7 +126,7 @@ class RewriteRuleTokenStream
 	bool m_dirty;
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3rewriteruletokenstream.inl"
 
diff --git a/runtime/Cpp/include/antlr3rewriteruletokenstream.inl b/runtime/Cpp/include/antlr3rewriteruletokenstream.inl
index ac6692ffa..b8d48a889 100644
--- a/runtime/Cpp/include/antlr3rewriteruletokenstream.inl
+++ b/runtime/Cpp/include/antlr3rewriteruletokenstream.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits>
 RewriteRuleTokenStream<ImplTraits>::RewriteRuleTokenStream(TreeAdaptorType* adaptor, const char* description)
@@ -221,4 +221,4 @@ RewriteRuleTokenStream<ImplTraits>::nextToken()
 		return *retval;
 }
 
-ANTLR_END_NAMESPACE()
+}
diff --git a/runtime/Cpp/include/antlr3rewritestreams.hpp b/runtime/Cpp/include/antlr3rewritestreams.hpp
index 5d2dd36ac..1610ff592 100644
--- a/runtime/Cpp/include/antlr3rewritestreams.hpp
+++ b/runtime/Cpp/include/antlr3rewritestreams.hpp
@@ -51,7 +51,7 @@
 ///
 /// TODO: add mechanism to detect/puke on modification after reading from stream
 ///
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits, class ElementType>
 //template<class ImplTraits>
@@ -294,7 +294,7 @@ class RewriteRuleNodeStream : public ImplTraits::template RewriteStreamType< typ
 	TreeTypePtr	toTreeNode(TreeTypePtr element);
 };
 */
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3rewritestreams.inl"
 
diff --git a/runtime/Cpp/include/antlr3rewritestreams.inl b/runtime/Cpp/include/antlr3rewritestreams.inl
index c05e22f7d..47568da64 100644
--- a/runtime/Cpp/include/antlr3rewritestreams.inl
+++ b/runtime/Cpp/include/antlr3rewritestreams.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits, class ElementType>
 RewriteRuleElementStream<ImplTraits, ElementType>::RewriteRuleElementStream(TreeAdaptorType* adaptor,
@@ -360,4 +360,4 @@ RewriteRuleSubtreeStream<ImplTraits>::nextNode(TreeTypePtr element)
 	return el;
 }
 
-ANTLR_END_NAMESPACE()
+}
diff --git a/runtime/Cpp/include/antlr3tokenstream.hpp b/runtime/Cpp/include/antlr3tokenstream.hpp
index fb3d41008..71b857c8a 100644
--- a/runtime/Cpp/include/antlr3tokenstream.hpp
+++ b/runtime/Cpp/include/antlr3tokenstream.hpp
@@ -43,7 +43,7 @@
  *  multiple interfaces without defining them in the interface structure
  *  or casting (void *), which is too convoluted.
  */
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 //We are not making it subclass AllocPolicy, as this will always be a base class
 template<class ImplTraits>
@@ -401,7 +401,7 @@ class TokenAccessException : public std::exception
 	}
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3tokenstream.inl"
 
diff --git a/runtime/Cpp/include/antlr3tokenstream.inl b/runtime/Cpp/include/antlr3tokenstream.inl
index 9c1c5a92a..4f6851a62 100644
--- a/runtime/Cpp/include/antlr3tokenstream.inl
+++ b/runtime/Cpp/include/antlr3tokenstream.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits>
 TokenSource<ImplTraits>::TokenSource()
@@ -934,4 +934,4 @@ CommonTokenStream<ImplTraits>::~CommonTokenStream()
 	m_tokens.clear();
 }
 
-ANTLR_END_NAMESPACE()
+}
diff --git a/runtime/Cpp/include/antlr3traits.hpp b/runtime/Cpp/include/antlr3traits.hpp
index 1578ee84b..1630b1aa4 100644
--- a/runtime/Cpp/include/antlr3traits.hpp
+++ b/runtime/Cpp/include/antlr3traits.hpp
@@ -4,7 +4,7 @@
 #include	"antlr3defs.hpp"
 
 
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 /**
  * Users implementing overrides should inherit from this
@@ -369,6 +369,6 @@ class Traits : public TraitsBase<UserTraits>
 					 >::selected RuleReturnValueType;
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #endif //_ANTLR3_TRAITS_HPP
diff --git a/runtime/Cpp/include/antlr3treeparser.hpp b/runtime/Cpp/include/antlr3treeparser.hpp
index 9de5f795e..e254a5df2 100644
--- a/runtime/Cpp/include/antlr3treeparser.hpp
+++ b/runtime/Cpp/include/antlr3treeparser.hpp
@@ -36,7 +36,7 @@
  *  if necessary, and contains function can be supported If the hash key
  *  could be unique I would have invented the perfect compression algorithm ;-)
  */
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template<class ImplTraits>
 class  TreeParser : public ImplTraits::template RecognizerType< typename ImplTraits::TreeNodeStreamType >
@@ -95,7 +95,7 @@ class  TreeParser : public ImplTraits::template RecognizerType< typename ImplTra
 	void mismatch(ANTLR_UINT32 ttype, BitsetListType* follow);
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3treeparser.inl"
 
diff --git a/runtime/Cpp/include/antlr3treeparser.inl b/runtime/Cpp/include/antlr3treeparser.inl
index 066b9e80c..a6b105a18 100644
--- a/runtime/Cpp/include/antlr3treeparser.inl
+++ b/runtime/Cpp/include/antlr3treeparser.inl
@@ -1,4 +1,4 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 template< class ImplTraits >
 TreeParser<ImplTraits>::TreeParser( ANTLR_UINT32 sizeHint, TreeNodeStreamType* ctnstream,
@@ -195,4 +195,4 @@ TreeParser<ImplTraits>::getMissingSymbol( IntStreamType* istream, ExceptionBaseT
 }
 
 
-ANTLR_END_NAMESPACE()
+}

From 52eac3d0c7b02eb5c8f5f6176352d0e2f6866617 Mon Sep 17 00:00:00 2001
From: ibre5041 <ibre5041@ibrezina.net>
Date: Fri, 15 Aug 2014 18:34:40 +0200
Subject: [PATCH 28/53] Cleanup

- unused #define macros removed
- unused class templates removed
- unused #include-s removed
---
 runtime/Cpp/include/antlr3.hpp                |  82 ++++--
 runtime/Cpp/include/antlr3baserecognizer.hpp  |   3 -
 runtime/Cpp/include/antlr3bitset.hpp          |   2 -
 runtime/Cpp/include/antlr3collections.hpp     |   2 -
 runtime/Cpp/include/antlr3commontoken.hpp     |   4 -
 runtime/Cpp/include/antlr3commontree.hpp      |   2 -
 .../Cpp/include/antlr3commontreeadaptor.hpp   |   6 -
 .../Cpp/include/antlr3commontreeadaptor.inl   |   6 +-
 .../include/antlr3commontreenodestream.hpp    |   2 -
 runtime/Cpp/include/antlr3cyclicdfa.hpp       |  13 -
 .../Cpp/include/antlr3debugeventlistener.hpp  |   2 -
 runtime/Cpp/include/antlr3defs.hpp            | 247 ++----------------
 runtime/Cpp/include/antlr3errors.hpp          |   6 -
 runtime/Cpp/include/antlr3exception.hpp       |   2 -
 runtime/Cpp/include/antlr3filestream.hpp      |   5 -
 runtime/Cpp/include/antlr3input.hpp           |   2 -
 runtime/Cpp/include/antlr3input.inl           |  18 +-
 runtime/Cpp/include/antlr3interfaces.hpp      |  97 ++++---
 runtime/Cpp/include/antlr3intstream.hpp       |   4 -
 runtime/Cpp/include/antlr3lexer.hpp           |   1 -
 runtime/Cpp/include/antlr3memory.hpp          |  15 +-
 runtime/Cpp/include/antlr3parser.hpp          |   2 -
 .../include/antlr3recognizersharedstate.hpp   |   2 -
 .../antlr3rewriterulesubtreestream.hpp        |   2 -
 .../include/antlr3rewriteruletokenstream.hpp  |   2 -
 runtime/Cpp/include/antlr3rewritestreams.hpp  |   2 -
 runtime/Cpp/include/antlr3tokenstream.hpp     |   2 -
 runtime/Cpp/include/antlr3traits.hpp          |   3 -
 runtime/Cpp/include/antlr3treeparser.hpp      |   2 -
 29 files changed, 134 insertions(+), 404 deletions(-)

diff --git a/runtime/Cpp/include/antlr3.hpp b/runtime/Cpp/include/antlr3.hpp
index 6349aeba9..4b0367205 100644
--- a/runtime/Cpp/include/antlr3.hpp
+++ b/runtime/Cpp/include/antlr3.hpp
@@ -28,35 +28,61 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <string>
+#include <cassert>
+#include <cstdint> // uint32_t, ...
+#include <cstdio>  // stderr (TODO remove fprintf(stderr)
+#include <cstdlib> // malloc, calloc
+#include <cstring>
+
+#include <algorithm>
+#include <deque>
+#include <exception>
+#include <iostream>
+#include <limits>
+#include <map>
+#include <memory>
+#include <new>
+#include <set>
 #include <sstream>
+#include <string>
+#include <vector>
+
+#include "antlr3defs.hpp"
+
+/* Pre declare the typedefs for all the interfaces, then
+ * they can be inter-dependant and we will let the linker
+ * sort it out for us.
+ */
+#include "antlr3interfaces.hpp"
+
+// Include the unicode.org conversion library header.
+//
+#include "antlr3convertutf.hpp"
+
+#include "antlr3errors.hpp"
+#include "antlr3memory.hpp"
 
-#include    "antlr3defs.hpp"
-
-#include    "antlr3errors.hpp"
-#include    "antlr3memory.hpp"
-
-#include	"antlr3recognizersharedstate.hpp"
-#include    "antlr3baserecognizer.hpp"
-#include    "antlr3bitset.hpp"
-#include    "antlr3collections.hpp"
-#include    "antlr3commontoken.hpp"
-#include	"antlr3commontree.hpp"
-#include    "antlr3commontreeadaptor.hpp"
-#include    "antlr3cyclicdfa.hpp"
-#include	"antlr3debugeventlistener.hpp"
-#include    "antlr3exception.hpp"
-#include    "antlr3filestream.hpp"
-#include    "antlr3intstream.hpp"
-#include    "antlr3input.hpp"
-#include    "antlr3tokenstream.hpp"
-#include	"antlr3commontreenodestream.hpp"
-#include    "antlr3lexer.hpp"
-#include    "antlr3parser.hpp"
-//#include    "antlr3rewritestreams.hpp"
-#include    "antlr3rewriteruletokenstream.hpp"
-#include    "antlr3rewriterulesubtreestream.hpp"
-#include	"antlr3traits.hpp"
-#include    "antlr3treeparser.hpp"
+#include "antlr3collections.hpp"
+#include "antlr3recognizersharedstate.hpp"
+#include "antlr3baserecognizer.hpp"
+#include "antlr3bitset.hpp"
+#include "antlr3commontoken.hpp"
+#include "antlr3commontree.hpp"
+#include "antlr3commontreeadaptor.hpp"
+#include "antlr3cyclicdfa.hpp"
+#include "antlr3debugeventlistener.hpp"
+#include "antlr3exception.hpp"
+#include "antlr3filestream.hpp"
+#include "antlr3intstream.hpp"
+#include "antlr3input.hpp"
+#include "antlr3tokenstream.hpp"
+#include "antlr3commontreenodestream.hpp"
+#include "antlr3lexer.hpp"
+#include "antlr3parser.hpp"
+//#include "antlr3rewritestreams.hpp"
+#include "antlr3rewriteruletokenstream.hpp"
+#include "antlr3rewriterulesubtreestream.hpp"
+#include "antlr3traits.hpp"
+#include "antlr3treeparser.hpp"
 
 #endif
diff --git a/runtime/Cpp/include/antlr3baserecognizer.hpp b/runtime/Cpp/include/antlr3baserecognizer.hpp
index bc0315116..0374b3a1e 100644
--- a/runtime/Cpp/include/antlr3baserecognizer.hpp
+++ b/runtime/Cpp/include/antlr3baserecognizer.hpp
@@ -35,9 +35,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include    "antlr3defs.hpp"
-#include    "antlr3collections.hpp"
-
 namespace antlr3 {
 
 /** \brief Base tracking context structure for all types of
diff --git a/runtime/Cpp/include/antlr3bitset.hpp b/runtime/Cpp/include/antlr3bitset.hpp
index 6b174e2a5..68eab6956 100644
--- a/runtime/Cpp/include/antlr3bitset.hpp
+++ b/runtime/Cpp/include/antlr3bitset.hpp
@@ -36,8 +36,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include    "antlr3defs.hpp"
-
 namespace antlr3 {
 
 /** How many bits in the elements
diff --git a/runtime/Cpp/include/antlr3collections.hpp b/runtime/Cpp/include/antlr3collections.hpp
index 48f27561a..7551c243d 100644
--- a/runtime/Cpp/include/antlr3collections.hpp
+++ b/runtime/Cpp/include/antlr3collections.hpp
@@ -29,8 +29,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include    "antlr3defs.hpp"
-
 namespace antlr3 {
 
 /* -------------- TRIE Interfaces ---------------- */
diff --git a/runtime/Cpp/include/antlr3commontoken.hpp b/runtime/Cpp/include/antlr3commontoken.hpp
index e17d4f8bf..a52f6954c 100644
--- a/runtime/Cpp/include/antlr3commontoken.hpp
+++ b/runtime/Cpp/include/antlr3commontoken.hpp
@@ -39,10 +39,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include    <stdlib.h>
-#include    <limits>
-#include    "antlr3defs.hpp"
-
 namespace antlr3 {
 
 /** The definition of an ANTLR3 common token structure, which all implementations
diff --git a/runtime/Cpp/include/antlr3commontree.hpp b/runtime/Cpp/include/antlr3commontree.hpp
index 0d10fc6c8..3aa7177a2 100644
--- a/runtime/Cpp/include/antlr3commontree.hpp
+++ b/runtime/Cpp/include/antlr3commontree.hpp
@@ -33,8 +33,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include    "antlr3defs.hpp"
-
 namespace antlr3 {
 
 template<class ImplTraits>
diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.hpp b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
index f11f4cd57..03b409ed5 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.hpp
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
@@ -33,12 +33,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include    "antlr3defs.hpp"
-
-#include <memory>
-#include <iostream>
-#include <algorithm>
-
 namespace antlr3 {
 
 template <typename ImplTraits> class CommonTreeStore;
diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.inl b/runtime/Cpp/include/antlr3commontreeadaptor.inl
index 2d64a5a09..6cc8a4bad 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.inl
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.inl
@@ -167,9 +167,9 @@ CommonTreeAdaptor<ImplTraits>::getParent( TreeTypePtr& child)
 
 template<class ImplTraits>
 typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
-CommonTreeAdaptor<ImplTraits>::errorNode( CommonTokenType* tnstream,
-											const CommonTokenType* startToken,
-											const CommonTokenType* stopToken)
+CommonTreeAdaptor<ImplTraits>::errorNode( CommonTokenType*,
+											const CommonTokenType*,
+											const CommonTokenType*)
 {
 	// Use the supplied common tree node stream to get another tree from the factory
 	// TODO: Look at creating the erronode as in Java, but this is complicated by the
diff --git a/runtime/Cpp/include/antlr3commontreenodestream.hpp b/runtime/Cpp/include/antlr3commontreenodestream.hpp
index 3e8ac8699..3adf02e93 100644
--- a/runtime/Cpp/include/antlr3commontreenodestream.hpp
+++ b/runtime/Cpp/include/antlr3commontreenodestream.hpp
@@ -33,8 +33,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include    "antlr3defs.hpp"
-
 namespace antlr3 {
 
 template<class ImplTraits>
diff --git a/runtime/Cpp/include/antlr3cyclicdfa.hpp b/runtime/Cpp/include/antlr3cyclicdfa.hpp
index c2e8c143e..2129552f1 100644
--- a/runtime/Cpp/include/antlr3cyclicdfa.hpp
+++ b/runtime/Cpp/include/antlr3cyclicdfa.hpp
@@ -34,15 +34,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include   "antlr3defs.hpp"
-
-#ifdef ANTLR3_WINDOWS
-#pragma warning	(push)
-#pragma warning (disable : 4510)
-#pragma warning (disable : 4512)
-#pragma warning (disable : 4610)
-#endif
-
 namespace antlr3 {
 
 template<class ImplTraits, class CtxType>
@@ -99,10 +90,6 @@ class CyclicDFA : public ImplTraits::AllocPolicyType
 
 }
 
-#ifdef ANTLR3_WINDOWS
-#pragma warning	(pop)
-#endif
-
 #include "antlr3cyclicdfa.inl"
 
 #endif
diff --git a/runtime/Cpp/include/antlr3debugeventlistener.hpp b/runtime/Cpp/include/antlr3debugeventlistener.hpp
index 35bae9b84..bc5ea00a3 100644
--- a/runtime/Cpp/include/antlr3debugeventlistener.hpp
+++ b/runtime/Cpp/include/antlr3debugeventlistener.hpp
@@ -43,8 +43,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include    "antlr3defs.hpp"
-
 namespace antlr3 {
 
 /// Default debugging port
diff --git a/runtime/Cpp/include/antlr3defs.hpp b/runtime/Cpp/include/antlr3defs.hpp
index ba22c4f84..e3ccfe0f2 100644
--- a/runtime/Cpp/include/antlr3defs.hpp
+++ b/runtime/Cpp/include/antlr3defs.hpp
@@ -32,97 +32,17 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-/* Following are for generated code, they are not referenced internally!!!
- */
-#if !defined(ANTLR_HUGE) && !defined(ANTLR_AVERAGE) && !defined(ANTLR_SMALL)
-#define	ANTLR_AVERAGE
-#endif
-
-#ifdef	ANTLR_HUGE
-#ifndef	ANTLR_SIZE_HINT
-#define	ANTLR_SIZE_HINT        2049
-#endif
-#ifndef	ANTLR_LIST_SIZE_HINT
-#define	ANTLR_LIST_SIZE_HINT   127
-#endif
-#endif
-
-#ifdef	ANTLR_AVERAGE
-#ifndef	ANTLR_SIZE_HINT
-#define	ANTLR_SIZE_HINT        1025
-#define	ANTLR_LIST_SIZE_HINT   63
-#endif
-#endif
-
-#ifdef	ANTLR_SMALL
-#ifndef	ANTLR_SIZE_HINT
-#define	ANTLR_SIZE_HINT        211
-#define	ANTLR_LIST_SIZE_HINT   31
-#endif
-#endif
-
-// Definitions that indicate the encoding scheme character streams and strings etc
-//
-/// Indicates Big Endian for encodings where this makes sense
-///
-#define ANTLR_BE           1
-
-/// Indicates Little Endian for encoidngs where this makes sense
-///
-#define ANTLR_LE           2
-
-/// General latin-1 or other 8 bit encoding scheme such as straight ASCII
-///
-#define ANTLR_ENC_8BIT     4
-
-/// UTF-8 encoding scheme
-///
-#define ANTLR_ENC_UTF8     8
-
-/// UTF-16 encoding scheme (which also covers UCS2 as that does not have surrogates)
-///
-#define ANTLR_ENC_UTF16        16
-#define ANTLR_ENC_UTF16BE      16 + ANTLR_BE
-#define ANTLR_ENC_UTF16LE      16 + ANTLR_LE
-
-/// UTF-32 encoding scheme (basically straight 32 bit)
-///
-#define ANTLR_ENC_UTF32        32
-#define ANTLR_ENC_UTF32BE      32 + ANTLR_BE
-#define ANTLR_ENC_UTF32LE      32 + ANTLR_LE
-
-/// Input is 8 bit EBCDIC (which we convert to 8 bit ASCII on the fly
-///
-#define ANTLR_ENC_EBCDIC       64
-
-/* Common definitions come first
- */
-#include    <antlr3errors.hpp>
+// not used in C++ target (kept for "historical" reasons, the generated code still uses this)
+#define	ANTLR_SIZE_HINT 0U
 
 /* Work out what operating system/compiler this is. We just do this once
  * here and use an internal symbol after this.
  */
 #ifdef	_WIN64
-
-# ifndef	ANTLR_WINDOWS
-#   define	ANTLR_WINDOWS
-# endif
-# define	ANTLR_WIN64
 # define	ANTLR_USE_64BIT
-
-#else
-
-#ifdef	_WIN32
-# ifndef	ANTLR_WINDOWS
-#  define	ANTLR_WINDOWS
-# endif
-
-#define	ANTLR_WIN32
 #endif
 
-#endif
-
-#ifdef	ANTLR_WINDOWS 
+#ifdef	_WIN32
 
 #ifndef WIN32_LEAN_AND_MEAN
 #define	WIN32_LEAN_AND_MEAN
@@ -134,183 +54,58 @@
 #define	_CRT_SECURE_NO_DEPRECATE 
 #endif
 
-#include    <stdlib.h>
 #include    <winsock2.h>
-#include    <sys/types.h>
-#include    <sys/stat.h>
-#include    <stdarg.h>
-
-#define	ANTLR_API      __declspec(dllexport)
-#define	ANTLR_CDECL    __cdecl
-#define ANTLR_FASTCALL __fastcall
-
-
-#ifndef __MINGW32__
-// Standard Windows types
-//
-typedef	INT32	ANTLR_CHAR;
-typedef	UINT32	ANTLR_UCHAR;
-
-typedef	INT8	ANTLR_INT8;
-typedef	INT16	ANTLR_INT16;
-typedef	INT32	ANTLR_INT32;
-typedef	INT64	ANTLR_INT64;
-typedef	UINT8	ANTLR_UINT8;
-typedef	UINT16	ANTLR_UINT16;
-typedef	UINT32	ANTLR_UINT32;
-typedef	UINT64	ANTLR_UINT64;
-typedef UINT64  ANTLR_BITWORD;
-
-#else
-// Mingw uses stdint.h and fails to define standard Microsoft typedefs
-// such as UINT16, hence we must use stdint.h for Mingw.
-//
-#include <stdint.h>
-typedef int32_t     ANTLR_CHAR;
-typedef uint32_t    ANTLR_UCHAR;
-
-typedef int8_t	    ANTLR_INT8;
-typedef int16_t	    ANTLR_INT16;
-typedef int32_t	    ANTLR_INT32;
-typedef int64_t	    ANTLR_INT64;
-
-typedef uint8_t	    ANTLR_UINT8;
-typedef uint16_t    ANTLR_UINT16;
-typedef uint32_t    ANTLR_UINT32;
-typedef uint64_t    ANTLR_UINT64;
-typedef uint64_t    ANTLR_BITWORD;
-
-#endif
-
-
-
-#define	ANTLR_UINT64_LIT(lit)  lit##ULL
 
 #define	ANTLR_INLINE	        __inline
 
 typedef FILE *	    ANTLR_FDSC;
-typedef	struct stat ANTLR_FSTAT_STRUCT;
-
-
 
-#ifdef	ANTLR_USE_64BIT
-#define ANTLR_UINT64_CAST(ptr) ((ANTLR_UINT64)(ptr))
-#define	ANTLR_UINT32_CAST(ptr)	(ANTLR_UINT32)((ANTLR_UINT64)(ptr))
-typedef ANTLR_INT64		ANTLR_MARKER;			
-typedef ANTLR_UINT64		ANTLR_INTKEY;
-#else
-#define ANTLR_UINT64_CAST(ptr) (ANTLR_UINT64)((ANTLR_UINT32)(ptr))
-#define	ANTLR_UINT32_CAST(ptr)	(ANTLR_UINT32)(ptr)
-typedef	ANTLR_INT32		ANTLR_MARKER;
-typedef ANTLR_UINT32	ANTLR_INTKEY;
-#endif
-
-#ifdef	ANTLR_WIN32
-#endif
-
-#ifdef	ANTLR_WIN64
-#endif
-
-
-typedef	int			ANTLR_SALENT;								// Type used for size of accept structure
 typedef struct sockaddr_in	ANTLR_SOCKADDRT, * pANTLR_SOCKADDRT;	// Type used for socket address declaration
 typedef struct sockaddr		ANTLR_SOCKADDRC, * pANTLR_SOCKADDRC;	// Type used for cast on accept()
 
 #define	ANTLR_CLOSESOCKET	closesocket
 
-/* Warnings that are over-zealous such as complaining about strdup, we
- * can turn off.
- */
-
-/* Don't complain about "deprecated" functions such as strdup
- */
-#pragma warning( disable : 4996 )
-
-#else
+#else // Un*x
 
 #ifdef __LP64__
 #define ANTLR_USE_64BIT
 #endif
 
-#include <stdio.h>
-#include <stdint.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <inttypes.h>
-#include <unistd.h>
-
-#define _stat stat
+#define ANTLR_INLINE   inline
 
 typedef int SOCKET;
+typedef FILE *	    ANTLR_FDSC;
 
-/* Inherit type definitions for autoconf
- */
-typedef int32_t	    ANTLR_CHAR;
-typedef uint32_t    ANTLR_UCHAR;
+#endif
 
-typedef int8_t	    ANTLR_INT8;
-typedef int16_t	    ANTLR_INT16;
-typedef int32_t	    ANTLR_INT32;
-typedef int64_t	    ANTLR_INT64;
+// Standard integer types (since C++11)  (should work with MSVC 2010/2013, gcc, clang)
+//
+typedef std::int32_t     ANTLR_CHAR;
+typedef std::uint32_t    ANTLR_UCHAR;
 
-typedef uint8_t	    ANTLR_UINT8;
-typedef uint16_t    ANTLR_UINT16;
-typedef uint32_t    ANTLR_UINT32;
-typedef uint64_t    ANTLR_UINT64;
-typedef uint64_t    ANTLR_BITWORD;
+typedef std::int8_t	     ANTLR_INT8;
+typedef std::int16_t	 ANTLR_INT16;
+typedef std::int32_t	 ANTLR_INT32;
+typedef std::int64_t	 ANTLR_INT64;
 
-#define ANTLR_INLINE   inline
-#define	ANTLR_API
-
-typedef FILE *	    ANTLR_FDSC;
-typedef	struct stat ANTLR_FSTAT_STRUCT;
+typedef std::uint8_t     ANTLR_UINT8;
+typedef std::uint16_t    ANTLR_UINT16;
+typedef std::uint32_t    ANTLR_UINT32;
+typedef std::uint64_t    ANTLR_UINT64;
+typedef std::uint64_t    ANTLR_BITWORD;
 
 #ifdef	ANTLR_USE_64BIT
-#define	ANTLR_FUNC_PTR(ptr)    (void *)((ANTLR_UINT64)(ptr))
 #define ANTLR_UINT64_CAST(ptr)	(ANTLR_UINT64)(ptr))
 #define	ANTLR_UINT32_CAST(ptr) (ANTLR_UINT32)((ANTLR_UINT64)(ptr))
 typedef ANTLR_INT64		ANTLR_MARKER;
 typedef ANTLR_UINT64		ANTLR_INTKEY;
 #else
-#define	ANTLR_FUNC_PTR(ptr)	(void *)((ANTLR_UINT32)(ptr))
 #define ANTLR_UINT64_CAST(ptr) (ANTLR_UINT64)((ANTLR_UINT32)(ptr))
 #define	ANTLR_UINT32_CAST(ptr)	(ANTLR_UINT32)(ptr)
 typedef	ANTLR_INT32		ANTLR_MARKER;
 typedef ANTLR_UINT32		ANTLR_INTKEY;
 #endif
-#define	ANTLR_UINT64_LIT(lit)	lit##ULL
-
-#endif
-
-#ifdef ANTLR_USE_64BIT
-#define ANTLR_TRIE_DEPTH 63
-#else
-#define ANTLR_TRIE_DEPTH 31
-#endif
-/* Pre declare the typedefs for all the interfaces, then 
- * they can be inter-dependant and we will let the linker
- * sort it out for us.
- */
-#include    <antlr3interfaces.hpp>
 
-// Include the unicode.org conversion library header.
-//
-#include    <antlr3convertutf.hpp>
-
-enum ChannelType
-{
-	/** Default channel for a token
-	*/
-	TOKEN_DEFAULT_CHANNEL	 = 0
-	/** Reserved channel number for a HIDDEN token - a token that
-		*  is hidden from the parser.
-		*/
-	,	HIDDEN		=		99
-};
+#define	ANTLR_UINT64_LIT(lit)  lit##ULL
 
 #endif	/* _ANTLR3DEFS_H	*/
diff --git a/runtime/Cpp/include/antlr3errors.hpp b/runtime/Cpp/include/antlr3errors.hpp
index 876df4f4f..0413d87e3 100644
--- a/runtime/Cpp/include/antlr3errors.hpp
+++ b/runtime/Cpp/include/antlr3errors.hpp
@@ -40,10 +40,4 @@
 #define	MEMO_RULE_FAILED	0xFFFFFFFE
 #define	MEMO_RULE_UNKNOWN	0xFFFFFFFF
 
-
-#define	ANTLR_ERR_BASE	    0
-#define	ANTLR_ERR_NOMEM    (ANTLR_ERR_BASE + 1)
-#define	ANTLR_ERR_NOFILE   (ANTLR_ERR_BASE + 2)
-#define	ANTLR_ERR_HASHDUP  (ANTLR_ERR_BASE + 3)
-
 #endif	/* _ANTLR3ERRORS_H */
diff --git a/runtime/Cpp/include/antlr3exception.hpp b/runtime/Cpp/include/antlr3exception.hpp
index 4c40a0afa..9bc18a043 100644
--- a/runtime/Cpp/include/antlr3exception.hpp
+++ b/runtime/Cpp/include/antlr3exception.hpp
@@ -43,8 +43,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include    "antlr3defs.hpp"
-
 namespace antlr3 {
 
 /** Base structure for an ANTLR3 exception tracker
diff --git a/runtime/Cpp/include/antlr3filestream.hpp b/runtime/Cpp/include/antlr3filestream.hpp
index 24bf3a6d9..b93de6d29 100644
--- a/runtime/Cpp/include/antlr3filestream.hpp
+++ b/runtime/Cpp/include/antlr3filestream.hpp
@@ -29,11 +29,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include	<exception>
-#include	<string>
-
-#include    "antlr3defs.hpp"
-
 namespace antlr3 {
 
 template<class ImplTraits>
diff --git a/runtime/Cpp/include/antlr3input.hpp b/runtime/Cpp/include/antlr3input.hpp
index 9885ea4f3..681615304 100644
--- a/runtime/Cpp/include/antlr3input.hpp
+++ b/runtime/Cpp/include/antlr3input.hpp
@@ -36,8 +36,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include    "antlr3defs.hpp"
-
 namespace antlr3 {
 
 /// Master context structure for an ANTLR3 C runtime based input stream.
diff --git a/runtime/Cpp/include/antlr3input.inl b/runtime/Cpp/include/antlr3input.inl
index 024e36943..f64867c8f 100644
--- a/runtime/Cpp/include/antlr3input.inl
+++ b/runtime/Cpp/include/antlr3input.inl
@@ -465,7 +465,7 @@ void InputStream<ImplTraits>::setupInputStream()
     //
     switch  (m_encoding)
     {
-        case    ANTLR_ENC_UTF8:
+        case    ENC_UTF8:
 
             // See if there is a BOM at the start of this UTF-8 sequence
             // and just eat it if there is. Windows .TXT files have this for instance
@@ -488,7 +488,7 @@ void InputStream<ImplTraits>::setupInputStream()
 			this->set_charByteSize(0);
             break;
 
-        case    ANTLR_ENC_UTF16:
+        case    ENC_UTF16:
 
             // See if there is a BOM at the start of the input. If not then
             // we assume that the byte order is the natural order of this
@@ -524,7 +524,7 @@ void InputStream<ImplTraits>::setupInputStream()
 			this->set_charByteSize(2);
             break;
 
-        case    ANTLR_ENC_UTF32:
+        case    ENC_UTF32:
 
             // See if there is a BOM at the start of the input. If not then
             // we assume that the byte order is the natural order of this
@@ -564,7 +564,7 @@ void InputStream<ImplTraits>::setupInputStream()
 			this->set_charByteSize(4);
             break;
 
-        case    ANTLR_ENC_UTF16BE:
+        case    ENC_UTF16BE:
 
             // Encoding is definately Big Endian with no BOM
             //
@@ -572,7 +572,7 @@ void InputStream<ImplTraits>::setupInputStream()
 			this->set_charByteSize(2);
             break;
 
-        case    ANTLR_ENC_UTF16LE:
+        case    ENC_UTF16LE:
 
             // Encoding is definately Little Endian with no BOM
             //
@@ -580,7 +580,7 @@ void InputStream<ImplTraits>::setupInputStream()
 			this->set_charByteSize(2);
             break;
 
-        case    ANTLR_ENC_UTF32BE:
+        case    ENC_UTF32BE:
 
             // Encoding is definately Big Endian with no BOM
             //
@@ -588,7 +588,7 @@ void InputStream<ImplTraits>::setupInputStream()
 			this->set_charByteSize(4);
             break;
 
-        case    ANTLR_ENC_UTF32LE:
+        case    ENC_UTF32LE:
 
             // Encoding is definately Little Endian with no BOM
             //
@@ -596,7 +596,7 @@ void InputStream<ImplTraits>::setupInputStream()
 			this->set_charByteSize(4);
             break;
 
-        case    ANTLR_ENC_EBCDIC:
+        case    ENC_EBCDIC:
 
             // EBCDIC is basically the same as ASCII but with an on the
             // fly translation to ASCII
@@ -605,7 +605,7 @@ void InputStream<ImplTraits>::setupInputStream()
 			this->set_charByteSize(1);
             break;
 
-        case    ANTLR_ENC_8BIT:
+        case    ENC_8BIT:
         default:
 
             // Standard 8bit/ASCII
diff --git a/runtime/Cpp/include/antlr3interfaces.hpp b/runtime/Cpp/include/antlr3interfaces.hpp
index 566b535b0..5f04b40c4 100644
--- a/runtime/Cpp/include/antlr3interfaces.hpp
+++ b/runtime/Cpp/include/antlr3interfaces.hpp
@@ -36,35 +36,25 @@
 
 namespace antlr3 {
 
-template<class ImplTraits, class SuperType>
-class IntStream;
-
-/// Pointer to an instantiation of 'class' #ANTLR3_RECOGNIZER_SHARED_STATE
-/// \ingroup ANTLR3_RECOGNIZER_SHARED_STATE
-///
-template<class ImplTraits, class SuperType>
-class RecognizerSharedState;
-
-/// Pointer to an instantiation of 'class' #ANTLR3_BITSET_LIST
-/// \ingroup ANTLR3_BITSET_LIST
-///
-template<class AllocatorType>
-class BitsetList;
-
-/// Pointer to an instantiation of 'class' #ANTLR3_BITSET
-/// \ingroup ANTLR3_BITSET
-///
-template<class AllocatorType>
-class Bitset;
-
-/// Pointer to an instantiation of 'class' #ANTLR3_COMMON_TOKEN
-/// \ingroup ANTLR3_COMMON_TOKEN
-///
-template<class ImplTraits>
-class CommonToken;
+// Definitions that indicate the encoding scheme character streams and strings etc
+enum Encoding
+{
+	ENC_8BIT      = 4               /// General latin-1 or other 8 bit encoding scheme such as straight ASCII
+	, ENC_UTF8    = 8               /// UTF-8 encoding scheme
+	, ENC_UTF16   = 16              /// UTF-16 encoding scheme (which also covers UCS2 as that does not have surrogates)
+	, ENC_UTF16BE
+	, ENC_UTF16LE
+	, ENC_UTF32   = 32              /// UTF-32 encoding scheme (basically straight 32 bit)
+	, ENC_UTF32BE
+	, ENC_UTF32LE
+	, ENC_EBCDIC  = 64              /// Input is 8 bit EBCDIC (which we convert to 8 bit ASCII on the fly
+};
 
-template<class ImplTraits>
-class CommonTokenFunctions;
+enum ChannelType
+{
+	TOKEN_DEFAULT_CHANNEL = 0           /// Default channel for a token
+	, HIDDEN	= 99                    /// Reserved channel number for a HIDDEN token - a token that is hidden from the parser
+};
 
 /// Pointer to an instantiation of 'class' #ANTLR3_EXCEPTION
 /// \ingroup ANTLR3_EXCEPTION
@@ -104,6 +94,33 @@ enum ExceptionType
 	, MISSING_TOKEN_EXCEPTION
 };
 
+template<class ImplTraits, class SuperType>
+class IntStream;
+
+/// Pointer to an instantiation of 'class' #ANTLR3_RECOGNIZER_SHARED_STATE
+/// \ingroup ANTLR3_RECOGNIZER_SHARED_STATE
+///
+template<class ImplTraits, class SuperType>
+class RecognizerSharedState;
+
+/// Pointer to an instantiation of 'class' #ANTLR3_BITSET_LIST
+/// \ingroup ANTLR3_BITSET_LIST
+///
+template<class AllocatorType>
+class BitsetList;
+
+/// Pointer to an instantiation of 'class' #ANTLR3_BITSET
+/// \ingroup ANTLR3_BITSET
+///
+template<class AllocatorType>
+class Bitset;
+
+/// Pointer to an instantiation of 'class' #ANTLR3_COMMON_TOKEN
+/// \ingroup ANTLR3_COMMON_TOKEN
+///
+template<class ImplTraits>
+class CommonToken;
+
 template<class ImplTraits, ExceptionType Ex, class StreamType>
 class ANTLR_Exception;
 
@@ -130,25 +147,18 @@ class LexState;
 ///
 template<class ImplTraits>
 class TokenSource;
-template<class ImplTraits, class SuperType>
-class TokenSourceFunctions;
 
 /// Pointer to an instantiation of 'class' #ANTLR3_TOKEN_STREAM
 /// \ingroup ANTLR3_TOKEN_STREAM
 ///
 template<class ImplTraits>
 class TokenStream;
-template<class ImplTraits>
-class TokenStreamFunctions;
 
 /// Pointer to an instantiation of 'class' #ANTLR3_COMMON_TOKEN_STREAM
 /// \ingroup ANTLR3_COMMON_TOKEN_STREAM
 ///
 template<class ImplTraits>
 class CommonTokenStream;
-template<class ImplTraits>
-class CommonTokenStreamFunctions;
-
 
 /// Pointer to an instantiation of 'class' #ANTLR3_CYCLIC_DFA
 /// \ingroup ANTLR3_CYCLIC_DFA
@@ -173,17 +183,12 @@ class Parser;
 ///
 template<class ImplTraits>
 class BaseTree;
-template<class ImplTraits>
-class BaseTreeFunctions;
-
 
 /// Pointer to an instantiation of 'class' #ANTLR3_COMMON_TREE
 /// \ingroup ANTLR3_COMMON_TREE
 ///
 template<class ImplTraits>
 class CommonTree;
-template<class ImplTraits>
-class CommonTreeFunctions;
 
 /// Pointer to an instantiation of 'class' #ANTLR3_PARSE_TREE
 /// \ingroup ANTLR3_PARSE_TREE
@@ -209,23 +214,11 @@ class CommonTreeNodeStream;
 template<class ImplTraits>
 class TreeWalkState;
 
-/// Pointer to an instantiation of 'class' #ANTLR3_BASE_TREE_ADAPTOR
-/// \ingroup ANTLR3_BASE_TREE_ADAPTOR
-///
-template<class ImplTraits>
-class BaseTreeAdaptor;
-template<class ImplTraits>
-class BaseTreeAdaptorFunctions;
-
-
 /// Pointer to an instantiation of 'class' #ANTLR3_COMMON_TREE_ADAPTOR
 /// \ingroup ANTLR3_COMMON_TREE_ADAPTOR
 ///
 template<class ImplTraits>
 class CommonTreeAdaptor;
-template<class ImplTraits>
-class CommonTreeAdaptorFunctions;
-
 
 /// Pointer to an instantiation of 'class' #ANTLR3_TREE_PARSER
 /// \ingroup ANTLR3_TREE_PARSER
diff --git a/runtime/Cpp/include/antlr3intstream.hpp b/runtime/Cpp/include/antlr3intstream.hpp
index 02068a1e3..7249f9312 100644
--- a/runtime/Cpp/include/antlr3intstream.hpp
+++ b/runtime/Cpp/include/antlr3intstream.hpp
@@ -59,10 +59,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include  <cassert>
-
-#include    "antlr3defs.hpp"
-
 namespace antlr3 {
 
 enum STREAM_TYPE
diff --git a/runtime/Cpp/include/antlr3lexer.hpp b/runtime/Cpp/include/antlr3lexer.hpp
index 0c441f204..d23e65dea 100644
--- a/runtime/Cpp/include/antlr3lexer.hpp
+++ b/runtime/Cpp/include/antlr3lexer.hpp
@@ -60,7 +60,6 @@
 
 /* Definitions
  */
-#include    "antlr3defs.hpp"
 
 namespace antlr3 {
 
diff --git a/runtime/Cpp/include/antlr3memory.hpp b/runtime/Cpp/include/antlr3memory.hpp
index 9baef3dcb..f188d3175 100644
--- a/runtime/Cpp/include/antlr3memory.hpp
+++ b/runtime/Cpp/include/antlr3memory.hpp
@@ -29,17 +29,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <string.h>
-
-#include <deque>
-#include <map>
-#include <new>
-#include <set>
-#include <vector>
-#include <memory>
-
-#include   "antlr3defs.hpp"
-
 namespace antlr3 {
 
 class DefaultAllocPolicy
@@ -62,8 +51,8 @@ class DefaultAllocPolicy
 		};
 
 		AllocatorType() throw() {}
-		AllocatorType( const AllocatorType& alloc ) throw() {}
-		template<typename U> AllocatorType(const AllocatorType<U>& alloc) throw(){}
+		AllocatorType( const AllocatorType& ) throw() {}
+		template<typename U> AllocatorType(const AllocatorType<U>& ) throw(){}
 	};
 
 	template<class TYPE>
diff --git a/runtime/Cpp/include/antlr3parser.hpp b/runtime/Cpp/include/antlr3parser.hpp
index ee14073e6..57a8ba769 100644
--- a/runtime/Cpp/include/antlr3parser.hpp
+++ b/runtime/Cpp/include/antlr3parser.hpp
@@ -34,8 +34,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include    "antlr3defs.hpp"
-
 namespace antlr3 {
 
 /** This is the main interface for an ANTLR3 parser.
diff --git a/runtime/Cpp/include/antlr3recognizersharedstate.hpp b/runtime/Cpp/include/antlr3recognizersharedstate.hpp
index e9c38b5f9..fc25d696e 100644
--- a/runtime/Cpp/include/antlr3recognizersharedstate.hpp
+++ b/runtime/Cpp/include/antlr3recognizersharedstate.hpp
@@ -42,8 +42,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "antlr3defs.hpp"
-
 namespace antlr3 {
 
 /** All the data elements required to track the current state
diff --git a/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp b/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp
index 8075959e1..db92ee0db 100644
--- a/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp
+++ b/runtime/Cpp/include/antlr3rewriterulesubtreestream.hpp
@@ -29,8 +29,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include    "antlr3defs.hpp"
-
 namespace antlr3 {
 
 /// This is an implementation of a subtree stream which is a set of trees
diff --git a/runtime/Cpp/include/antlr3rewriteruletokenstream.hpp b/runtime/Cpp/include/antlr3rewriteruletokenstream.hpp
index 22cb8d147..c982b0a2f 100644
--- a/runtime/Cpp/include/antlr3rewriteruletokenstream.hpp
+++ b/runtime/Cpp/include/antlr3rewriteruletokenstream.hpp
@@ -29,8 +29,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include    "antlr3defs.hpp"
-
 namespace antlr3 {
 
 /// This is an implementation of a token stream, which is basically an element
diff --git a/runtime/Cpp/include/antlr3rewritestreams.hpp b/runtime/Cpp/include/antlr3rewritestreams.hpp
index 1610ff592..a8d739664 100644
--- a/runtime/Cpp/include/antlr3rewritestreams.hpp
+++ b/runtime/Cpp/include/antlr3rewritestreams.hpp
@@ -29,8 +29,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include    "antlr3defs.hpp"
-
 /// A generic list of elements tracked in an alternative to be used in
 /// a -> rewrite rule.  
 ///
diff --git a/runtime/Cpp/include/antlr3tokenstream.hpp b/runtime/Cpp/include/antlr3tokenstream.hpp
index 71b857c8a..669965809 100644
--- a/runtime/Cpp/include/antlr3tokenstream.hpp
+++ b/runtime/Cpp/include/antlr3tokenstream.hpp
@@ -34,8 +34,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include    "antlr3defs.hpp"
-
 /** Definition of a token source, which has a pointer to a function that
  *  returns the next token (using a token factory if it is going to be
  *  efficient) and a pointer to an ANTLR3_INPUT_STREAM. This is slightly
diff --git a/runtime/Cpp/include/antlr3traits.hpp b/runtime/Cpp/include/antlr3traits.hpp
index 1630b1aa4..37b61bf2b 100644
--- a/runtime/Cpp/include/antlr3traits.hpp
+++ b/runtime/Cpp/include/antlr3traits.hpp
@@ -1,9 +1,6 @@
 #ifndef _ANTLR3_TRAITS_HPP
 #define _ANTLR3_TRAITS_HPP
 
-#include	"antlr3defs.hpp"
-
-
 namespace antlr3 {
 
 /**
diff --git a/runtime/Cpp/include/antlr3treeparser.hpp b/runtime/Cpp/include/antlr3treeparser.hpp
index e254a5df2..c1395382b 100644
--- a/runtime/Cpp/include/antlr3treeparser.hpp
+++ b/runtime/Cpp/include/antlr3treeparser.hpp
@@ -29,8 +29,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include    "antlr3defs.hpp"
-
 /** Internal structure representing an element in a hash bucket.
  *  Stores the original key so that duplicate keys can be rejected
  *  if necessary, and contains function can be supported If the hash key

From 11b73bf16156a75b8470c5522e260d8b3d62a9c1 Mon Sep 17 00:00:00 2001
From: ibre5041 <ibre5041@ibrezina.net>
Date: Fri, 15 Aug 2014 21:10:58 +0200
Subject: [PATCH 29/53] avoid various compiler warnings on various platforms

---
 runtime/Cpp/include/antlr3compilerwarning.hpp | 63 +++++++++++++++++++
 .../org/antlr/codegen/templates/Cpp/Cpp.stg   | 22 +------
 2 files changed, 65 insertions(+), 20 deletions(-)
 create mode 100644 runtime/Cpp/include/antlr3compilerwarning.hpp

diff --git a/runtime/Cpp/include/antlr3compilerwarning.hpp b/runtime/Cpp/include/antlr3compilerwarning.hpp
new file mode 100644
index 000000000..2f7fad5cd
--- /dev/null
+++ b/runtime/Cpp/include/antlr3compilerwarning.hpp
@@ -0,0 +1,63 @@
+#ifndef _ANTLR3_WARNIN_PUSH
+#define _ANTLR3_WARNIN_PUSH
+
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+// 3. The name of the author may not be used to endorse or promote products
+//    derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+// NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifdef _MSC_VER
+//#pragma warning (push)
+#pragma warning( disable: 4189 )    // local variable is initialized but not referenced
+#pragma warning( disable: 4296 )    // expression is always true
+#pragma warning( disable: 4625 )    // copy constructor could not be generated
+#pragma warning( disable: 4626 )    // assignment operator could not be generated
+#pragma warning( disable: 4640 )    // a local static object is not thread-safe
+#pragma warning( disable: 4710 )    // call was not inlined
+#pragma warning( disable: 4711 )    // call was inlined
+#pragma warning( disable: 4820 )    // some padding was added
+#pragma warning( disable: 4127 )    // conditional expression is constant
+// These are only really displayed at warning level /W4 but that is the code ideal I am aiming at
+// and the codegen must generate some of these warnings by necessity, apart from 4100, which is
+// usually generated when a parser rule is given a parameter that it does not use. Mostly though
+// this is a matter of orthogonality hence I disable that one.
+#pragma warning( disable : 4100 )  // unreferenced parameter
+#pragma warning( disable : 4101 )  // unreferenced local variable
+#endif  
+
+#if defined(__GNUC__) && !defined(__clang__)
+//#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#endif
+
+#ifdef __clang__
+//#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wparentheses-equality"
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+#endif
+
+#endif
diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
index 02c37273e..693d36b93 100644
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
@@ -142,7 +142,9 @@ outputFile( LEXER,
 /* -----------------------------------------
  * Include the ANTLR3 generated header file.
  */
+#include "antlr3compilerwarning.hpp"
 #include "<name>.hpp"
+
 <if(trace)>
 #include \<iostream>
 <endif>
@@ -324,26 +326,6 @@ headerFile( LEXER,
 
 <actions.(actionScope).header>
 
-#ifdef	WIN32
-// Disable: Unreferenced parameter,							- Rules with parameters that are not used
-//          constant conditional,							- ANTLR realizes that a prediction is always true (synpred usually)
-//          initialized but unused variable					- tree rewrite variables declared but not needed
-//          Unreferenced local variable						- lexer rule declares but does not always use _type
-//          potentially unitialized variable used			- retval always returned from a rule
-//			unreferenced local function has been removed	- susually getTokenNames or freeScope, they can go without warnigns
-//
-// These are only really displayed at warning level /W4 but that is the code ideal I am aiming at
-// and the codegen must generate some of these warnings by necessity, apart from 4100, which is
-// usually generated when a parser rule is given a parameter that it does not use. Mostly though
-// this is a matter of orthogonality hence I disable that one.
-//
-#pragma warning( disable : 4100 )
-#pragma warning( disable : 4101 )
-#pragma warning( disable : 4127 )
-#pragma warning( disable : 4189 )
-#pragma warning( disable : 4505 )
-#pragma warning( disable : 4701 )
-#endif
 <if(backtracking)>
 
 /* ========================

From c28a3ef4b5c82f2af02d812cffd356e5c2277cfd Mon Sep 17 00:00:00 2001
From: ibre5041 <ibre5041@ibrezina.net>
Date: Fri, 15 Aug 2014 21:57:55 +0200
Subject: [PATCH 30/53] Sync tests with latest changes

= note: macros ANTLR_ENC_* are no more used
=       use enums antlr3::ENC_* instead
---
 runtime/Cpp/tests/Makefile          |  16 +-
 runtime/Cpp/tests/PLSQLKeys.g       | 948 ++++++++++++++--------------
 runtime/Cpp/tests/PLSQLLexer.g      | 148 +++++
 runtime/Cpp/tests/PLSQLParser.g     |   2 +-
 runtime/Cpp/tests/PLSQL_DMLParser.g | 547 ++++++++++------
 runtime/Cpp/tests/PTestTraits.hpp   | 273 +++++---
 runtime/Cpp/tests/a001.cpp          |   6 +-
 runtime/Cpp/tests/a002.cpp          |  10 +-
 runtime/Cpp/tests/a003.cpp          |  10 +-
 runtime/Cpp/tests/a004.cpp          |  12 +-
 runtime/Cpp/tests/a005.cpp          |   8 +-
 runtime/Cpp/tests/s001.cpp          |   2 +-
 runtime/Cpp/tests/s002.cpp          |   2 +-
 runtime/Cpp/tests/s003.cpp          |   2 +-
 runtime/Cpp/tests/s004.cpp          |   4 +-
 runtime/Cpp/tests/s005.cpp          |   4 +-
 runtime/Cpp/tests/s006.cpp          |   4 +-
 runtime/Cpp/tests/t001.cpp          |   6 +-
 runtime/Cpp/tests/t002.cpp          |   6 +-
 runtime/Cpp/tests/t003.cpp          |   6 +-
 runtime/Cpp/tests/t004.cpp          |   4 +-
 runtime/Cpp/tests/t005.cpp          |   6 +-
 runtime/Cpp/tests/t006.cpp          |   4 +-
 runtime/Cpp/tests/t007.cpp          |   4 +-
 runtime/Cpp/tests/t008.cpp          |   4 +-
 runtime/Cpp/tests/t009.cpp          |   4 +-
 runtime/Cpp/tests/t010.cpp          |   4 +-
 runtime/Cpp/tests/t011.cpp          |   4 +-
 runtime/Cpp/tests/t012.cpp          |   8 +-
 runtime/Cpp/tests/t020.cpp          |   2 +-
 runtime/Cpp/tests/t039.cpp          |   2 +-
 runtime/Cpp/tests/t051.cpp          |   2 +-
 32 files changed, 1206 insertions(+), 858 deletions(-)

diff --git a/runtime/Cpp/tests/Makefile b/runtime/Cpp/tests/Makefile
index 8687887a5..ae06444ed 100644
--- a/runtime/Cpp/tests/Makefile
+++ b/runtime/Cpp/tests/Makefile
@@ -8,15 +8,15 @@ POBJS = $(PSOURCES:.cpp=.o)
 TOKENS = $(ANTLRGRAMMARS:.g=.tokens)
 
 GRAMMAROPTIONS= #-report -Xconversiontimeout 1500000 -Xmultithreaded -Xwatchconversion
-ANTLR = ../../../antlr-complete/target/antlr-complete-3.5.2-SNAPSHOT.jar
+ANTLR = ../../../antlr-complete/target/antlr-complete-3.5.3-SNAPSHOT.jar
 STGS  = $(wildcard ../../../tool/src/main/resources/org/antlr/codegen/templates/Cpp/*.stg)
 
 .SUFFIXES:
 
-INCLUDES= -I. -I../include/ -I../../../../boost_1_46_1/ -I/usr/lib/gcc/x86_64-pc-cygwin/4.8.3/include/c++/ -I/usr/lib/gcc/x86_64-pc-cygwin/4.8.3/include/c++/i686-pc-cygwin/
+INCLUDES= -I. -I../include/
 
-CXX=clang++
-CFLAGS=-ggdb3 -O0 -fno-inline -Wall -Wno-unused-variable -Wno-unused-local-typedefs -Wno-parentheses-equality -Wno-tautological-compare -std=c++0x
+#CXX=/usr/bin/clang++
+CFLAGS=-ggdb3 -O0 -fno-inline -Wall -std=c++0x
 #CFLAGS=-ggdb3 -O3 -std=c++0x
 
 TOBJS= utils.o
@@ -101,14 +101,14 @@ t039:	t039.cpp t039labels.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_
 t051:	t051.cpp t051lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
-s004:   s004.cpp PLSQLLexer.tokens PLSQLParser.tokens PTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL -Wno-unused-but-set-variable $(INCLUDES) $< PLSQLLexer*.cpp PLSQLParser*.cpp utils.cpp -o $@
+s004:   s004.cpp PLSQLLexer.tokens PLSQLParser.tokens PLSQL_DMLParser.g PTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< PLSQLLexer*.cpp PLSQLParser*.cpp utils.cpp -o $@
 
 s005:   s005.cpp SQLMini.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL -Wno-parentheses-equality -Wno-unused-but-set-variable $(INCLUDES) $< SQLMiniLexer.cpp SQLMiniParser.cpp utils.cpp -o $@
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< SQLMiniLexer.cpp SQLMiniParser.cpp utils.cpp -o $@
 
 s006:   s006.cpp SQLMini2.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL -Wno-parentheses-equality -Wno-unused-but-set-variable $(INCLUDES) $< SQLMiniLexer.cpp SQLMiniParser.cpp utils.cpp -o $@
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< SQLMiniLexer.cpp SQLMiniParser.cpp utils.cpp -o $@
 
 # AST commented out
 #
diff --git a/runtime/Cpp/tests/PLSQLKeys.g b/runtime/Cpp/tests/PLSQLKeys.g
index c13764807..652218421 100644
--- a/runtime/Cpp/tests/PLSQLKeys.g
+++ b/runtime/Cpp/tests/PLSQLKeys.g
@@ -26,7 +26,7 @@ parser grammar PLSQLKeys;
 
         
 // @members{
-//     // int equalsIgnoreCase(pANTLR3_COMMON_TOKEN s1, const char* s2)        
+//     // int  (pANTLR3_COMMON_TOKEN s1, const char* s2)        
 //     // {
 //     //     return !strcasecmp(s1->getText(s1)->chars, s2);
 //     // }
@@ -37,16 +37,16 @@ create_key
     ;
     
 replace_key
-//  :    {input.LT(1).getText().equalsIgnoreCase("REPLACE")}?=> REGULAR_ID
-    :    {equalsIgnoreCase(LT(1)->getText(), "REPLACE" )}?  => REGULAR_ID
+//  :    {input.LT(1).getText(). ("REPLACE" }?=> REGULAR_ID
+    :    { LT(1)->getText() == "REPLACE" }?  => REGULAR_ID
     ;
 
 package_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "PACKAGE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "PACKAGE" }?=> REGULAR_ID
     ;
 
 body_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BODY")}? REGULAR_ID
+    :    { LT(1)->getText() == "BODY" }? REGULAR_ID
     ;
 
 begin_key
@@ -54,7 +54,7 @@ begin_key
     ;
 
 exit_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "EXIT")}? REGULAR_ID
+    :    { LT(1)->getText() == "EXIT" }? REGULAR_ID
     ;
 
 declare_key
@@ -66,27 +66,27 @@ exception_key
     ;
 
 serveroutput_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SERVEROUTPUT")}? REGULAR_ID
+    :    { LT(1)->getText() == "SERVEROUTPUT" }? REGULAR_ID
     ;
 
 off_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "OFF")}? REGULAR_ID
+    :    { LT(1)->getText() == "OFF" }? REGULAR_ID
     ;
 
 constant_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CONSTANT")}? REGULAR_ID
+    :    { LT(1)->getText() == "CONSTANT" }? REGULAR_ID
     ;
 
 subtype_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SUBTYPE")}? REGULAR_ID
+    :    { LT(1)->getText() == "SUBTYPE" }? REGULAR_ID
     ;
 
-cursor_key//{equalsIgnoreCase(LT(1)->getText(), "CURSOR")}? REGULAR_ID
+cursor_key//{ LT(1)->getText() == "CURSOR" }? REGULAR_ID
     :    SQL92_RESERVED_CURSOR
     ;
 
 nextval_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NEXTVAL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NEXTVAL" }?=> REGULAR_ID
     ;
 
 goto_key
@@ -94,15 +94,15 @@ goto_key
     ;
 
 execute_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "EXECUTE")}? REGULAR_ID
+    :    { LT(1)->getText() == "EXECUTE" }? REGULAR_ID
     ;
 
 immediate_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "IMMEDIATE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "IMMEDIATE" }?=> REGULAR_ID
     ;
 
 return_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "RETURN")}? REGULAR_ID
+    :    { LT(1)->getText() == "RETURN" }? REGULAR_ID
     ;
 
 procedure_key
@@ -110,27 +110,27 @@ procedure_key
     ;
 
 function_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "FUNCTION")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "FUNCTION" }?=> REGULAR_ID
     ;
 
 pragma_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "PRAGMA")}? REGULAR_ID
+    :    { LT(1)->getText() == "PRAGMA" }? REGULAR_ID
     ;
 
 exception_init_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "EXCEPTION_INIT")}? REGULAR_ID
+    :    { LT(1)->getText() == "EXCEPTION_INIT" }? REGULAR_ID
     ;
 
 type_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TYPE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "TYPE" }?=> REGULAR_ID
     ;
 
 record_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "RECORD")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "RECORD" }?=> REGULAR_ID
     ;
 
 indexed_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INDEXED")}? REGULAR_ID
+    :    { LT(1)->getText() == "INDEXED" }? REGULAR_ID
     ;
 
 index_key
@@ -138,59 +138,59 @@ index_key
     ;
 
 percent_notfound_key
-    :    {equalsIgnoreCase(LT(2)->getText(), "NOTFOUND")}?=> PERCENT REGULAR_ID
+    :    { LT(2)->getText() == "NOTFOUND" }?=> PERCENT REGULAR_ID
     ;
 
 percent_found_key
-    :    {equalsIgnoreCase(LT(2)->getText(), "FOUND")}?=> PERCENT REGULAR_ID
+    :    { LT(2)->getText() == "FOUND" }?=> PERCENT REGULAR_ID
     ;
 
 percent_isopen_key
-    :    {equalsIgnoreCase(LT(2)->getText(), "ISOPEN")}?=> PERCENT REGULAR_ID
+    :    { LT(2)->getText() == "ISOPEN" }?=> PERCENT REGULAR_ID
     ;
 
 percent_rowcount_key
-    :    {equalsIgnoreCase(LT(2)->getText(), "ROWCOUNT")}?=> PERCENT REGULAR_ID
+    :    { LT(2)->getText() == "ROWCOUNT" }?=> PERCENT REGULAR_ID
     ;
 
 percent_rowtype_key
-    :    {equalsIgnoreCase(LT(2)->getText(), "ROWTYPE")}?=> PERCENT REGULAR_ID 
+    :    { LT(2)->getText() == "ROWTYPE" }?=> PERCENT REGULAR_ID 
     ;
 
 percent_type_key
-    :    {equalsIgnoreCase(LT(2)->getText(), "TYPE")}?=> PERCENT REGULAR_ID
+    :    { LT(2)->getText() == "TYPE" }?=> PERCENT REGULAR_ID
     ;
 
 out_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "OUT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "OUT" }?=> REGULAR_ID
     ;
 
 inout_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INOUT")}? REGULAR_ID
+    :    { LT(1)->getText() == "INOUT" }? REGULAR_ID
     ;
 
 extend_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "EXTEND")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "EXTEND" }?=> REGULAR_ID
     ;
 
 raise_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "RAISE")}? REGULAR_ID
+    :    { LT(1)->getText() == "RAISE" }? REGULAR_ID
     ;
 
 while_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "WHILE")}? REGULAR_ID
+    :    { LT(1)->getText() == "WHILE" }? REGULAR_ID
     ;
 
 loop_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LOOP")}? REGULAR_ID
+    :    { LT(1)->getText() == "LOOP" }? REGULAR_ID
     ;
 
 commit_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "COMMIT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "COMMIT" }?=> REGULAR_ID
     ;
 
 work_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "WORK")}? REGULAR_ID
+    :    { LT(1)->getText() == "WORK" }? REGULAR_ID
     ;
 
 if_key
@@ -202,47 +202,47 @@ elsif_key
     ;
 
 authid_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "AUTHID")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "AUTHID" }?=> REGULAR_ID
     ;
 
 definer_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DEFINER")}? REGULAR_ID
+    :    { LT(1)->getText() == "DEFINER" }? REGULAR_ID
     ;
 
 external_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "EXTERNAL")}? REGULAR_ID
+    :    { LT(1)->getText() == "EXTERNAL" }? REGULAR_ID
     ;
 
 language_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LANGUAGE")}? REGULAR_ID
+    :    { LT(1)->getText() == "LANGUAGE" }? REGULAR_ID
     ;
 
 java_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "JAVA")}? REGULAR_ID
+    :    { LT(1)->getText() == "JAVA" }? REGULAR_ID
     ;
 
 name_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NAME")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NAME" }?=> REGULAR_ID
     ;
 
 deterministic_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DETERMINISTIC")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DETERMINISTIC" }?=> REGULAR_ID
     ;
 
 parallel_enable_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "PARALLEL_ENABLE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "PARALLEL_ENABLE" }?=> REGULAR_ID
     ;
 
 result_cache_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "RESULT_CACHE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "RESULT_CACHE" }?=> REGULAR_ID
     ;
 
 pipelined_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "PIPELINED")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "PIPELINED" }?=> REGULAR_ID
     ;
 
 aggregate_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "AGGREGATE")}? REGULAR_ID
+    :    { LT(1)->getText() == "AGGREGATE" }? REGULAR_ID
     ;
 
 alter_key
@@ -250,23 +250,23 @@ alter_key
     ;
 
 compile_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "COMPILE")}? REGULAR_ID
+    :    { LT(1)->getText() == "COMPILE" }? REGULAR_ID
     ; 
 
 debug_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DEBUG")}? REGULAR_ID
+    :    { LT(1)->getText() == "DEBUG" }? REGULAR_ID
     ;
 
 reuse_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "REUSE")}? REGULAR_ID
+    :    { LT(1)->getText() == "REUSE" }? REGULAR_ID
     ;
 
 settings_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SETTINGS")}? REGULAR_ID
+    :    { LT(1)->getText() == "SETTINGS" }? REGULAR_ID
     ;
 
 specification_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SPECIFICATION")}? REGULAR_ID
+    :    { LT(1)->getText() == "SPECIFICATION" }? REGULAR_ID
     ;
 
 drop_key
@@ -274,67 +274,67 @@ drop_key
     ;
 
 trigger_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TRIGGER")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "TRIGGER" }?=> REGULAR_ID
     ;
 
 force_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "FORCE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "FORCE" }?=> REGULAR_ID
     ;
 
 validate_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "VALIDATE")}? REGULAR_ID
+    :    { LT(1)->getText() == "VALIDATE" }? REGULAR_ID
     ;
 
 ref_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "REF")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "REF" }?=> REGULAR_ID
     ;
 
 array_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ARRAY")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ARRAY" }?=> REGULAR_ID
     ;
 
 varray_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "VARRAY")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "VARRAY" }?=> REGULAR_ID
     ;
 
 pls_integer_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "PLS_INTEGER")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "PLS_INTEGER" }?=> REGULAR_ID
     ;
 
 serially_reusable_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SERIALLY_REUSABLE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SERIALLY_REUSABLE" }?=> REGULAR_ID
     ;
 
 autonomous_transaction_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "AUTONOMOUS_TRANSACTION")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "AUTONOMOUS_TRANSACTION" }?=> REGULAR_ID
     ;
 
 inline_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INLINE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "INLINE" }?=> REGULAR_ID
     ;
 
 restrict_references_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "RESTRICT_REFERENCES")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "RESTRICT_REFERENCES" }?=> REGULAR_ID
     ;
 
 exceptions_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "EXCEPTIONS")}?=> REGULAR_ID 
+    :    { LT(1)->getText() == "EXCEPTIONS" }?=> REGULAR_ID 
     ;
 
 save_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SAVE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SAVE" }?=> REGULAR_ID
     ;
 
 forall_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "FORALL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "FORALL" }?=> REGULAR_ID
     ;
 
 continue_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CONTINUE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CONTINUE" }?=> REGULAR_ID
     ;
 
 indices_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INDICES")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "INDICES" }?=> REGULAR_ID
     ;
 
 values_key
@@ -346,359 +346,359 @@ case_key
     ;
 
 bulk_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BULK")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BULK" }?=> REGULAR_ID
     ;
 
 collect_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "COLLECT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "COLLECT" }?=> REGULAR_ID
     ;
 
 committed_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "COMMITTED")}? REGULAR_ID
+    :    { LT(1)->getText() == "COMMITTED" }? REGULAR_ID
     ;
 
 use_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "USE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "USE" }?=> REGULAR_ID
     ;
 
 level_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LEVEL")}? REGULAR_ID
+    :    { LT(1)->getText() == "LEVEL" }? REGULAR_ID
     ;
 
 isolation_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ISOLATION")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ISOLATION" }?=> REGULAR_ID
     ;
 
 serializable_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SERIALIZABLE")}? REGULAR_ID
+    :    { LT(1)->getText() == "SERIALIZABLE" }? REGULAR_ID
     ;
 
 segment_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SEGMENT")}? REGULAR_ID
+    :    { LT(1)->getText() == "SEGMENT" }? REGULAR_ID
     ;
 
 write_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "WRITE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "WRITE" }?=> REGULAR_ID
     ;
 
 wait_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "WAIT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "WAIT" }?=> REGULAR_ID
     ;
 
 corrupt_xid_all_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CORRUPT_XID_ALL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CORRUPT_XID_ALL" }?=> REGULAR_ID
     ;
 
 corrupt_xid_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CORRUPT_XID")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CORRUPT_XID" }?=> REGULAR_ID
     ;
 
 batch_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BATCH")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BATCH" }?=> REGULAR_ID
     ;
 
 session_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SESSION")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SESSION" }?=> REGULAR_ID
     ;
 
 role_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ROLE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ROLE" }?=> REGULAR_ID
     ;
 
 constraint_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CONSTRAINT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CONSTRAINT" }?=> REGULAR_ID
     ;
 
 constraints_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CONSTRAINTS")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CONSTRAINTS" }?=> REGULAR_ID
     ;
 
 call_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CALL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CALL" }?=> REGULAR_ID
     ;
 
 explain_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "EXPLAIN")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "EXPLAIN" }?=> REGULAR_ID
     ;
 
 merge_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "MERGE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "MERGE" }?=> REGULAR_ID
     ;
 
 plan_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "PLAN")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "PLAN" }?=> REGULAR_ID
     ;
 
 system_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SYSTEM")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SYSTEM" }?=> REGULAR_ID
     ;
 
 subpartition_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SUBPARTITION")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SUBPARTITION" }?=> REGULAR_ID
     ;
 
 partition_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "PARTITION")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "PARTITION" }?=> REGULAR_ID
     ;
 
 matched_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "MATCHED")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "MATCHED" }?=> REGULAR_ID
     ;
 
 reject_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "REJECT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "REJECT" }?=> REGULAR_ID
     ;
 
 log_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LOG")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "LOG" }?=> REGULAR_ID
     ;
 
 unlimited_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "UNLIMITED")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "UNLIMITED" }?=> REGULAR_ID
     ;
 
 limit_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LIMIT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "LIMIT" }?=> REGULAR_ID
     ;
 
 errors_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ERRORS")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ERRORS" }?=> REGULAR_ID
     ;
 
 timestamp_tz_unconstrained_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TIMESTAMP_TZ_UNCONSTRAINED")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "TIMESTAMP_TZ_UNCONSTRAINED" }?=> REGULAR_ID
     ;
 
 urowid_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "UROWID")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "UROWID" }?=> REGULAR_ID
     ;
 
 binary_float_min_subnormal_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_FLOAT_MIN_SUBNORMAL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BINARY_FLOAT_MIN_SUBNORMAL" }?=> REGULAR_ID
     ;
 
 binary_double_min_normal_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_DOUBLE_MIN_NORMAL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BINARY_DOUBLE_MIN_NORMAL" }?=> REGULAR_ID
     ;
 
 binary_float_max_normal_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_FLOAT_MAX_NORMAL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BINARY_FLOAT_MAX_NORMAL" }?=> REGULAR_ID
     ;
 
 positiven_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "POSITIVEN")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "POSITIVEN" }?=> REGULAR_ID
     ;
 
 timezone_abbr_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TIMEZONE_ABBR")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "TIMEZONE_ABBR" }?=> REGULAR_ID
     ;
 
 binary_double_min_subnormal_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_DOUBLE_MIN_SUBNORMAL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BINARY_DOUBLE_MIN_SUBNORMAL" }?=> REGULAR_ID
     ;
 
 binary_float_max_subnormal_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_FLOAT_MAX_SUBNORMAL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BINARY_FLOAT_MAX_SUBNORMAL" }?=> REGULAR_ID
     ;
 
 binary_double_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_DOUBLE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BINARY_DOUBLE" }?=> REGULAR_ID
     ;
 
 bfile_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BFILE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BFILE" }?=> REGULAR_ID
     ;
 
 binary_double_infinity_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_DOUBLE_INFINITY")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BINARY_DOUBLE_INFINITY" }?=> REGULAR_ID
     ;
 
 timezone_region_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TIMEZONE_REGION")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "TIMEZONE_REGION" }?=> REGULAR_ID
     ;
 
 timestamp_ltz_unconstrained_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TIMESTAMP_LTZ_UNCONSTRAINED")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "TIMESTAMP_LTZ_UNCONSTRAINED" }?=> REGULAR_ID
     ;
 
 naturaln_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NATURALN")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NATURALN" }?=> REGULAR_ID
     ;
 
 simple_integer_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SIMPLE_INTEGER")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SIMPLE_INTEGER" }?=> REGULAR_ID
     ;
 
 binary_double_max_subnormal_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_DOUBLE_MAX_SUBNORMAL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BINARY_DOUBLE_MAX_SUBNORMAL" }?=> REGULAR_ID
     ;
 
 byte_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BYTE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BYTE" }?=> REGULAR_ID
     ;
 
 binary_float_infinity_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_FLOAT_INFINITY")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BINARY_FLOAT_INFINITY" }?=> REGULAR_ID
     ;
 
 binary_float_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_FLOAT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BINARY_FLOAT" }?=> REGULAR_ID
     ;
 
 range_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "RANGE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "RANGE" }?=> REGULAR_ID
     ;
 
 nclob_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NCLOB")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NCLOB" }?=> REGULAR_ID
     ;
 
 clob_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CLOB")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CLOB" }?=> REGULAR_ID
     ;
 
 dsinterval_unconstrained_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DSINTERVAL_UNCONSTRAINED")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DSINTERVAL_UNCONSTRAINED" }?=> REGULAR_ID
     ;
 
 yminterval_unconstrained_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "YMINTERVAL_UNCONSTRAINED")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "YMINTERVAL_UNCONSTRAINED" }?=> REGULAR_ID
     ;
 
 rowid_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ROWID")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ROWID" }?=> REGULAR_ID
     ;
 
 binary_double_nan_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_DOUBLE_NAN")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BINARY_DOUBLE_NAN" }?=> REGULAR_ID
     ;
 
 timestamp_unconstrained_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TIMESTAMP_UNCONSTRAINED")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "TIMESTAMP_UNCONSTRAINED" }?=> REGULAR_ID
     ;
 
 binary_float_min_normal_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_FLOAT_MIN_NORMAL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BINARY_FLOAT_MIN_NORMAL" }?=> REGULAR_ID
     ;
 
 signtype_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SIGNTYPE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SIGNTYPE" }?=> REGULAR_ID
     ;
 
 blob_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BLOB")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BLOB" }?=> REGULAR_ID
     ;
 
 nvarchar2_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NVARCHAR2")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NVARCHAR2" }?=> REGULAR_ID
     ;
 
 binary_double_max_normal_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_DOUBLE_MAX_NORMAL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BINARY_DOUBLE_MAX_NORMAL" }?=> REGULAR_ID
     ;
 
 binary_float_nan_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_FLOAT_NAN")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BINARY_FLOAT_NAN" }?=> REGULAR_ID
     ;
 
 string_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "STRING")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "STRING" }?=> REGULAR_ID
     ;
 
 c_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "C")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "C" }?=> REGULAR_ID
     ;
 
 library_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LIBRARY")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "LIBRARY" }?=> REGULAR_ID
     ;
 
 context_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CONTEXT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CONTEXT" }?=> REGULAR_ID
     ;
 
 parameters_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "PARAMETERS")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "PARAMETERS" }?=> REGULAR_ID
     ;
 
 agent_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "AGENT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "AGENT" }?=> REGULAR_ID
     ;
 
 cluster_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CLUSTER")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CLUSTER" }?=> REGULAR_ID
     ;
 
 hash_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "HASH")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "HASH" }?=> REGULAR_ID
     ;
 
 relies_on_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "RELIES_ON")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "RELIES_ON" }?=> REGULAR_ID
     ;
 
 returning_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "RETURNING")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "RETURNING" }?=> REGULAR_ID
     ;    
 
 statement_id_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "STATEMENT_ID")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "STATEMENT_ID" }?=> REGULAR_ID
     ;
 
 deferred_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DEFERRED")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DEFERRED" }?=> REGULAR_ID
     ;
 
 advise_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ADVISE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ADVISE" }?=> REGULAR_ID
     ;
 
 resumable_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "RESUMABLE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "RESUMABLE" }?=> REGULAR_ID
     ;
 
 timeout_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TIMEOUT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "TIMEOUT" }?=> REGULAR_ID
     ;
 
 parallel_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "PARALLEL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "PARALLEL" }?=> REGULAR_ID
     ;
 
 ddl_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DDL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DDL" }?=> REGULAR_ID
     ;
 
 query_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "QUERY")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "QUERY" }?=> REGULAR_ID
     ;
 
 dml_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DML")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DML" }?=> REGULAR_ID
     ;
 
 guard_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "GUARD")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "GUARD" }?=> REGULAR_ID
     ;
 
 nothing_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NOTHING")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NOTHING" }?=> REGULAR_ID
     ;
 
 enable_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ENABLE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ENABLE" }?=> REGULAR_ID
     ;
 
 database_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DATABASE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DATABASE" }?=> REGULAR_ID
     ;
 
 disable_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DISABLE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DISABLE" }?=> REGULAR_ID
     ;
 
 link_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LINK")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "LINK" }?=> REGULAR_ID
     ;
 
 identified_key
@@ -706,27 +706,27 @@ identified_key
     ;
 
 none_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NONE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NONE" }?=> REGULAR_ID
     ;
 
 before_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BEFORE")}?=> REGULAR_ID 
+    :    { LT(1)->getText() == "BEFORE" }?=> REGULAR_ID 
     ;
 
 referencing_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "REFERENCING")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "REFERENCING" }?=> REGULAR_ID
     ;
 
 logon_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LOGON")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "LOGON" }?=> REGULAR_ID
     ;
 
 after_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "AFTER")}? REGULAR_ID
+    :    { LT(1)->getText() == "AFTER" }? REGULAR_ID
     ;
 
 schema_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SCHEMA")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SCHEMA" }?=> REGULAR_ID
     ;
 
 grant_key
@@ -734,91 +734,91 @@ grant_key
     ;
 
 truncate_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TRUNCATE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "TRUNCATE" }?=> REGULAR_ID
     ;
 
 startup_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "STARTUP")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "STARTUP" }?=> REGULAR_ID
     ;
 
 statistics_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "STATISTICS")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "STATISTICS" }?=> REGULAR_ID
     ;
 
 noaudit_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NOAUDIT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NOAUDIT" }?=> REGULAR_ID
     ;
 
 suspend_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SUSPEND")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SUSPEND" }?=> REGULAR_ID
     ;
 
 audit_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "AUDIT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "AUDIT" }?=> REGULAR_ID
     ;
 
 disassociate_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DISASSOCIATE")}?=> REGULAR_ID 
+    :    { LT(1)->getText() == "DISASSOCIATE" }?=> REGULAR_ID 
     ;
 
 shutdown_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SHUTDOWN")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SHUTDOWN" }?=> REGULAR_ID
     ;
 
 compound_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "COMPOUND")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "COMPOUND" }?=> REGULAR_ID
     ;
 
 servererror_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SERVERERROR")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SERVERERROR" }?=> REGULAR_ID
     ;
 
 parent_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "PARENT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "PARENT" }?=> REGULAR_ID
     ;
 
 follows_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "FOLLOWS")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "FOLLOWS" }?=> REGULAR_ID
     ;
 
 nested_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NESTED")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NESTED" }?=> REGULAR_ID
     ;
 
 old_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "OLD")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "OLD" }?=> REGULAR_ID
     ;
 
 statement_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "STATEMENT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "STATEMENT" }?=> REGULAR_ID
     ;
 
 db_role_change_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DB_ROLE_CHANGE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DB_ROLE_CHANGE" }?=> REGULAR_ID
     ;
 
 each_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "EACH")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "EACH" }?=> REGULAR_ID
     ;
 
 logoff_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LOGOFF")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "LOGOFF" }?=> REGULAR_ID
     ;
 
 analyze_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ANALYZE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ANALYZE" }?=> REGULAR_ID
     ;
 
 instead_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INSTEAD")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "INSTEAD" }?=> REGULAR_ID
     ;
 
 associate_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ASSOCIATE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ASSOCIATE" }?=> REGULAR_ID
     ;
 
 new_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NEW")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NEW" }?=> REGULAR_ID
     ;
 
 revoke_key
@@ -826,111 +826,111 @@ revoke_key
     ;
 
 rename_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "RENAME")}?=> REGULAR_ID 
+    :    { LT(1)->getText() == "RENAME" }?=> REGULAR_ID 
     ;
 
 customdatum_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CUSTOMDATUM")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CUSTOMDATUM" }?=> REGULAR_ID
     ;
 
 oradata_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ORADATA")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ORADATA" }?=> REGULAR_ID
     ;
 
 constructor_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CONSTRUCTOR")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CONSTRUCTOR" }?=> REGULAR_ID
     ;
 
 sqldata_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SQLDATA")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SQLDATA" }?=> REGULAR_ID
     ;
 
 member_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "MEMBER")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "MEMBER" }?=> REGULAR_ID
     ;
 
 self_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SELF")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SELF" }?=> REGULAR_ID
     ;
 
 object_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "OBJECT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "OBJECT" }?=> REGULAR_ID
     ;
 
 variable_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "VARIABLE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "VARIABLE" }?=> REGULAR_ID
     ;
 
 instantiable_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INSTANTIABLE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "INSTANTIABLE" }?=> REGULAR_ID
     ;
 
 final_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "FINAL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "FINAL" }?=> REGULAR_ID
     ;
 
 static_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "STATIC")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "STATIC" }?=> REGULAR_ID
     ;
 
 oid_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "OID")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "OID" }?=> REGULAR_ID
     ;
 
 result_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "RESULT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "RESULT" }?=> REGULAR_ID
     ;
 
 under_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "UNDER")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "UNDER" }?=> REGULAR_ID
     ;
 
 map_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "MAP")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "MAP" }?=> REGULAR_ID
     ;
 
 overriding_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "OVERRIDING")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "OVERRIDING" }?=> REGULAR_ID
     ;
 
 add_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ADD")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ADD" }?=> REGULAR_ID
     ;
 
 modify_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "MODIFY")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "MODIFY" }?=> REGULAR_ID
     ;
 
 including_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INCLUDING")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "INCLUDING" }?=> REGULAR_ID
     ;
 
 substitutable_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SUBSTITUTABLE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SUBSTITUTABLE" }?=> REGULAR_ID
     ;
 
 attribute_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ATTRIBUTE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ATTRIBUTE" }?=> REGULAR_ID
     ;
 
 cascade_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CASCADE")}?=> REGULAR_ID 
+    :    { LT(1)->getText() == "CASCADE" }?=> REGULAR_ID 
     ;
 
 data_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DATA")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DATA" }?=> REGULAR_ID
     ;
 
 invalidate_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INVALIDATE")}? REGULAR_ID
+    :    { LT(1)->getText() == "INVALIDATE" }? REGULAR_ID
     ;
 
 element_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ELEMENT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ELEMENT" }?=> REGULAR_ID
     ;
 
 first_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "FIRST")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "FIRST" }?=> REGULAR_ID
     ;
 
 check_key
@@ -942,22 +942,22 @@ option_key
     ;
 
 nocycle_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NOCYCLE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NOCYCLE" }?=> REGULAR_ID
     ;
 
 locked_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LOCKED")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "LOCKED" }?=> REGULAR_ID
     ;
 
 block_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BLOCK")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BLOCK" }?=> REGULAR_ID
     ;
 
 xml_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "XML")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "XML" }?=> REGULAR_ID
     ;
 
-pivot_key//:    {(input.LT(1).getText().equalsIgnoreCase("PIVOT"))}?=> REGULAR_ID
+pivot_key//:    {(input.LT(1).getText(). ("PIVOT") }?=> REGULAR_ID
     :     PLSQL_NON_RESERVED_PIVOT
     ;
 
@@ -966,156 +966,156 @@ prior_key
     ;
 
 sequential_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SEQUENTIAL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SEQUENTIAL" }?=> REGULAR_ID
     ;
 
 single_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SINGLE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SINGLE" }?=> REGULAR_ID
     ;
 
 skip_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SKIP")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SKIP" }?=> REGULAR_ID
     ;
 
 model_key
-    :    //{input.LT(1).getText().equalsIgnoreCase("MODEL")}?=> REGULAR_ID
+    :    //{input.LT(1).getText(). ("MODEL" }?=> REGULAR_ID
         PLSQL_NON_RESERVED_MODEL
     ;
 
 updated_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "UPDATED")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "UPDATED" }?=> REGULAR_ID
     ;
 
 increment_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INCREMENT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "INCREMENT" }?=> REGULAR_ID
     ;
 
 exclude_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "EXCLUDE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "EXCLUDE" }?=> REGULAR_ID
     ;
 
 reference_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "REFERENCE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "REFERENCE" }?=> REGULAR_ID
     ;
 
 sets_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SETS")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SETS" }?=> REGULAR_ID
     ;
 
 until_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "UNTIL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "UNTIL" }?=> REGULAR_ID
     ;
 
 seed_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SEED")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SEED" }?=> REGULAR_ID
     ;
 
 maxvalue_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "MAXVALUE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "MAXVALUE" }?=> REGULAR_ID
     ;
 
 siblings_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SIBLINGS")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SIBLINGS" }?=> REGULAR_ID
     ;
 
 cube_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CUBE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CUBE" }?=> REGULAR_ID
     ;
 
 nulls_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NULLS")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NULLS" }?=> REGULAR_ID
     ;
 
 dimension_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DIMENSION")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DIMENSION" }?=> REGULAR_ID
     ;
 
 scn_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SCN")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SCN" }?=> REGULAR_ID
     ;
 
 snapshot_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SNAPSHOT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SNAPSHOT" }?=> REGULAR_ID
     ;
 
 decrement_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DECREMENT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DECREMENT" }?=> REGULAR_ID
     ;
 
-unpivot_key//:    {(input.LT(1).getText().equalsIgnoreCase("UNPIVOT"))}?=> REGULAR_ID
+unpivot_key//:    {(input.LT(1).getText(). ("UNPIVOT") }?=> REGULAR_ID
     :    PLSQL_NON_RESERVED_UNPIVOT
     ;
 
 keep_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "KEEP")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "KEEP" }?=> REGULAR_ID
     ;
 
 measures_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "MEASURES")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "MEASURES" }?=> REGULAR_ID
     ;
 
 rows_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ROWS")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ROWS" }?=> REGULAR_ID
     ;
 
 sample_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SAMPLE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SAMPLE" }?=> REGULAR_ID
     ;
 
 upsert_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "UPSERT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "UPSERT" }?=> REGULAR_ID
     ;
 
 versions_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "VERSIONS")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "VERSIONS" }?=> REGULAR_ID
     ;
 
 rules_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "RULES")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "RULES" }?=> REGULAR_ID
     ;
 
 iterate_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ITERATE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ITERATE" }?=> REGULAR_ID
     ;
 
 minvalue_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "MINVALUE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "MINVALUE" }?=> REGULAR_ID
     ;
 
 rollup_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ROLLUP")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ROLLUP" }?=> REGULAR_ID
     ;
 
 nav_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NAV")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NAV" }?=> REGULAR_ID
     ;
 
 automatic_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "AUTOMATIC")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "AUTOMATIC" }?=> REGULAR_ID
     ;
 
 last_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LAST")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "LAST" }?=> REGULAR_ID
     ;
 
 main_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "MAIN")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "MAIN" }?=> REGULAR_ID
     ;
 
 grouping_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "GROUPING")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "GROUPING" }?=> REGULAR_ID
     ;
 
 include_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INCLUDE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "INCLUDE" }?=> REGULAR_ID
     ;
 
 ignore_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "IGNORE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "IGNORE" }?=> REGULAR_ID
     ;
 
 respect_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "RESPECT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "RESPECT" }?=> REGULAR_ID
     ;
 
 unique_key
@@ -1123,92 +1123,92 @@ unique_key
     ;
 
 submultiset_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SUBMULTISET")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SUBMULTISET" }?=> REGULAR_ID
     ;
 
 at_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "AT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "AT" }?=> REGULAR_ID
 //    :    SQL92_RESERVED_AT
     ;
 
 a_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "A")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "A" }?=> REGULAR_ID
     ;
 
 empty_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "EMPTY")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "EMPTY" }?=> REGULAR_ID
     ;
 
 likec_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LIKEC")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "LIKEC" }?=> REGULAR_ID
     ;
 
 nan_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NAN")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NAN" }?=> REGULAR_ID
     ;
 
 infinite_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INFINITE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "INFINITE" }?=> REGULAR_ID
     ;
 
 like2_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LIKE2")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "LIKE2" }?=> REGULAR_ID
     ;
 
 like4_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LIKE4")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "LIKE4" }?=> REGULAR_ID
     ;
 
 present_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "PRESENT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "PRESENT" }?=> REGULAR_ID
     ;
 
 dbtimezone_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DBTIMEZONE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DBTIMEZONE" }?=> REGULAR_ID
     ;
 
 sessiontimezone_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SESSIONTIMEZONE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SESSIONTIMEZONE" }?=> REGULAR_ID
     ;
 
 nchar_cs_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NCHAR_CS")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NCHAR_CS" }?=> REGULAR_ID
     ;
 
 decompose_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DECOMPOSE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DECOMPOSE" }?=> REGULAR_ID
     ;
 
 following_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "FOLLOWING")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "FOLLOWING" }?=> REGULAR_ID
     ;
 
 first_value_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "FIRST_VALUE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "FIRST_VALUE" }?=> REGULAR_ID
     ;
 
 preceding_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "PRECEDING")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "PRECEDING" }?=> REGULAR_ID
     ;
 
 within_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "WITHIN")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "WITHIN" }?=> REGULAR_ID
     ;
 
 canonical_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CANONICAL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CANONICAL" }?=> REGULAR_ID
     ;
 
 compatibility_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "COMPATIBILITY")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "COMPATIBILITY" }?=> REGULAR_ID
     ;
 
 over_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "OVER")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "OVER" }?=> REGULAR_ID
     ;
 
 multiset_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "MULTISET")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "MULTISET" }?=> REGULAR_ID
     ;
 
 connect_by_root_key
@@ -1216,7 +1216,7 @@ connect_by_root_key
     ;
 
 last_value_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LAST_VALUE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "LAST_VALUE" }?=> REGULAR_ID
     ;
 
 current_key
@@ -1224,119 +1224,119 @@ current_key
     ;
 
 unbounded_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "UNBOUNDED")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "UNBOUNDED" }?=> REGULAR_ID
     ;
 
 dense_rank_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DENSE_RANK")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DENSE_RANK" }?=> REGULAR_ID
     ;
 
 cost_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "COST")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "COST" }?=> REGULAR_ID
     ;
 
 char_cs_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CHAR_CS")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CHAR_CS" }?=> REGULAR_ID
     ;
 
 auto_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "AUTO")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "AUTO" }?=> REGULAR_ID
     ;
 
 treat_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TREAT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "TREAT" }?=> REGULAR_ID
     ;
 
 content_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CONTENT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CONTENT" }?=> REGULAR_ID
     ;
 
 xmlparse_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "XMLPARSE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "XMLPARSE" }?=> REGULAR_ID
     ;
 
 xmlelement_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "XMLELEMENT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "XMLELEMENT" }?=> REGULAR_ID
     ;
 
 entityescaping_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ENTITYESCAPING")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ENTITYESCAPING" }?=> REGULAR_ID
     ;
 
 standalone_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "STANDALONE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "STANDALONE" }?=> REGULAR_ID
     ;
 
 wellformed_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "WELLFORMED")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "WELLFORMED" }?=> REGULAR_ID
     ;
 
 xmlexists_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "XMLEXISTS")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "XMLEXISTS" }?=> REGULAR_ID
     ;
 
 version_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "VERSION")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "VERSION" }?=> REGULAR_ID
     ;
 
 xmlcast_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "XMLCAST")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "XMLCAST" }?=> REGULAR_ID
     ;
 
 yes_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "YES")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "YES" }?=> REGULAR_ID
     ;
 
 no_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NO")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NO" }?=> REGULAR_ID
     ;
 
 evalname_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "EVALNAME")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "EVALNAME" }?=> REGULAR_ID
     ;
 
 xmlpi_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "XMLPI")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "XMLPI" }?=> REGULAR_ID
     ;
 
 xmlcolattval_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "XMLCOLATTVAL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "XMLCOLATTVAL" }?=> REGULAR_ID
     ;
 
 document_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DOCUMENT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DOCUMENT" }?=> REGULAR_ID
     ;
 
 xmlforest_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "XMLFOREST")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "XMLFOREST" }?=> REGULAR_ID
     ;
 
 passing_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "PASSING")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "PASSING" }?=> REGULAR_ID
     ;
 
 columns_key //: PLSQL_RESERVED_COLUMNS
-    :    {equalsIgnoreCase(LT(1)->getText(), "COLUMNS")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "COLUMNS" }?=> REGULAR_ID
     ;
 
 indent_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INDENT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "INDENT" }?=> REGULAR_ID
     ;
 
 hide_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "HIDE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "HIDE" }?=> REGULAR_ID
     ;
 
 xmlagg_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "XMLAGG")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "XMLAGG" }?=> REGULAR_ID
     ;
 
 path_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "PATH")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "PATH" }?=> REGULAR_ID
     ;
 
 xmlnamespaces_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "XMLNAMESPACES")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "XMLNAMESPACES" }?=> REGULAR_ID
     ;
 
 size_key
@@ -1344,71 +1344,71 @@ size_key
     ;
 
 noschemacheck_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NOSCHEMACHECK")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NOSCHEMACHECK" }?=> REGULAR_ID
     ;
 
 noentityescaping_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NOENTITYESCAPING")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NOENTITYESCAPING" }?=> REGULAR_ID
     ;
 
 xmlquery_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "XMLQUERY")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "XMLQUERY" }?=> REGULAR_ID
     ;
 
 xmltable_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "XMLTABLE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "XMLTABLE" }?=> REGULAR_ID
     ;
 
 xmlroot_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "XMLROOT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "XMLROOT" }?=> REGULAR_ID
     ;
 
 schemacheck_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SCHEMACHECK")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SCHEMACHECK" }?=> REGULAR_ID
     ;
 
 xmlattributes_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "XMLATTRIBUTES")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "XMLATTRIBUTES" }?=> REGULAR_ID
     ;
 
 encoding_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ENCODING")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ENCODING" }?=> REGULAR_ID
     ;
 
 show_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SHOW")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SHOW" }?=> REGULAR_ID
     ;
 
 xmlserialize_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "XMLSERIALIZE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "XMLSERIALIZE" }?=> REGULAR_ID
     ;
 
 ordinality_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ORDINALITY")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ORDINALITY" }?=> REGULAR_ID
     ;
 
 defaults_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DEFAULTS")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DEFAULTS" }?=> REGULAR_ID
     ;
 
 sqlerror_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SQLERROR")}? REGULAR_ID 
+    :    { LT(1)->getText() == "SQLERROR" }? REGULAR_ID 
     ;
 	
 oserror_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "OSERROR")}? REGULAR_ID 
+    :    { LT(1)->getText() == "OSERROR" }? REGULAR_ID 
     ;
 
 success_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SUCCESS")}? REGULAR_ID 
+    :    { LT(1)->getText() == "SUCCESS" }? REGULAR_ID 
     ;
 
 warning_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "WARNING")}? REGULAR_ID 
+    :    { LT(1)->getText() == "WARNING" }? REGULAR_ID 
     ;
 
 failure_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "FAILURE")}? REGULAR_ID 
+    :    { LT(1)->getText() == "FAILURE" }? REGULAR_ID 
     ;
 
 insert_key
@@ -1424,19 +1424,19 @@ minus_key
     ;
 
 row_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ROW")}? REGULAR_ID
+    :    { LT(1)->getText() == "ROW" }? REGULAR_ID
     ;
 
 mod_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "MOD")}? REGULAR_ID
+    :    { LT(1)->getText() == "MOD" }? REGULAR_ID
     ;
 
 raw_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "RAW")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "RAW" }?=> REGULAR_ID
     ;
 
 power_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "POWER")}? REGULAR_ID
+    :    { LT(1)->getText() == "POWER" }? REGULAR_ID
     ;
 
 lock_key
@@ -1460,19 +1460,19 @@ with_key
     ;
 
 transaction_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TRANSACTION")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "TRANSACTION" }?=> REGULAR_ID
     ;
 
 rawtohex_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "RAWTOHEX")}? REGULAR_ID
+    :    { LT(1)->getText() == "RAWTOHEX" }? REGULAR_ID
     ;
 
 number_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NUMBER")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NUMBER" }?=> REGULAR_ID
     ;
 
 nocopy_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NOCOPY")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NOCOPY" }?=> REGULAR_ID
     ;
 
 to_key
@@ -1480,11 +1480,11 @@ to_key
     ;
 
 abs_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ABS")}? REGULAR_ID
+    :    { LT(1)->getText() == "ABS" }? REGULAR_ID
     ;
 
 rollback_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ROLLBACK")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "ROLLBACK" }?=> REGULAR_ID
     ;
 
 share_key
@@ -1492,11 +1492,11 @@ share_key
     ;
 
 greatest_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "GREATEST")}? REGULAR_ID
+    :    { LT(1)->getText() == "GREATEST" }? REGULAR_ID
     ;
 
 vsize_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "VSIZE")}? REGULAR_ID
+    :    { LT(1)->getText() == "VSIZE" }? REGULAR_ID
     ;
 
 exclusive_key
@@ -1504,27 +1504,27 @@ exclusive_key
     ;
 
 varchar2_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "VARCHAR2")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "VARCHAR2" }?=> REGULAR_ID
     ;
 
 rowidtochar_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ROWIDTOCHAR")}? REGULAR_ID
+    :    { LT(1)->getText() == "ROWIDTOCHAR" }? REGULAR_ID
     ;
 
 open_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "OPEN")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "OPEN" }?=> REGULAR_ID
     ;
 
 comment_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "COMMENT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "COMMENT" }?=> REGULAR_ID
     ;
 
 sqrt_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SQRT")}? REGULAR_ID
+    :    { LT(1)->getText() == "SQRT" }? REGULAR_ID
     ;
 
 instr_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INSTR")}? REGULAR_ID
+    :    { LT(1)->getText() == "INSTR" }? REGULAR_ID
     ;
 
 nowait_key
@@ -1532,39 +1532,39 @@ nowait_key
     ;
 
 lpad_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LPAD")}? REGULAR_ID
+    :    { LT(1)->getText() == "LPAD" }? REGULAR_ID
     ;
 
 boolean_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BOOLEAN")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BOOLEAN" }?=> REGULAR_ID
     ;
 
 rpad_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "RPAD")}? REGULAR_ID
+    :    { LT(1)->getText() == "RPAD" }? REGULAR_ID
     ;
 
 savepoint_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SAVEPOINT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SAVEPOINT" }?=> REGULAR_ID
     ;
 
 decode_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DECODE")}? REGULAR_ID
+    :    { LT(1)->getText() == "DECODE" }? REGULAR_ID
     ;
 
 reverse_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "REVERSE")}? REGULAR_ID
+    :    { LT(1)->getText() == "REVERSE" }? REGULAR_ID
     ;
 
 least_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LEAST")}? REGULAR_ID
+    :    { LT(1)->getText() == "LEAST" }? REGULAR_ID
     ;
 
 nvl_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NVL")}? REGULAR_ID
+    :    { LT(1)->getText() == "NVL" }? REGULAR_ID
     ;
 
 variance_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "VARIANCE")}? REGULAR_ID
+    :    { LT(1)->getText() == "VARIANCE" }? REGULAR_ID
     ;
 
 start_key
@@ -1576,19 +1576,19 @@ desc_key
     ;
 
 concat_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CONCAT")}? REGULAR_ID
+    :    { LT(1)->getText() == "CONCAT" }? REGULAR_ID
     ;
 
 dump_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DUMP")}? REGULAR_ID
+    :    { LT(1)->getText() == "DUMP" }? REGULAR_ID
     ;
 
 soundex_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SOUNDEX")}? REGULAR_ID
+    :    { LT(1)->getText() == "SOUNDEX" }? REGULAR_ID
     ;
 
 positive_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "POSITIVE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "POSITIVE" }?=> REGULAR_ID
     ;
 
 union_key
@@ -1596,7 +1596,7 @@ union_key
     ;
 
 ascii_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ASCII")}? REGULAR_ID
+    :    { LT(1)->getText() == "ASCII" }? REGULAR_ID
     ;
 
 connect_key
@@ -1608,19 +1608,19 @@ asc_key
     ;
 
 hextoraw_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "HEXTORAW")}? REGULAR_ID
+    :    { LT(1)->getText() == "HEXTORAW" }? REGULAR_ID
     ;
 
 to_date_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TO_DATE")}? REGULAR_ID
+    :    { LT(1)->getText() == "TO_DATE" }? REGULAR_ID
     ;
 
 floor_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "FLOOR")}? REGULAR_ID
+    :    { LT(1)->getText() == "FLOOR" }? REGULAR_ID
     ;
 
 sign_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SIGN")}? REGULAR_ID
+    :    { LT(1)->getText() == "SIGN" }? REGULAR_ID
     ;
 
 update_key
@@ -1628,23 +1628,23 @@ update_key
     ;
 
 trunc_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TRUNC")}? REGULAR_ID
+    :    { LT(1)->getText() == "TRUNC" }? REGULAR_ID
     ;
 
 rtrim_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "RTRIM")}? REGULAR_ID
+    :    { LT(1)->getText() == "RTRIM" }? REGULAR_ID
     ;
 
 close_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CLOSE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CLOSE" }?=> REGULAR_ID
     ;
 
 to_char_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TO_CHAR")}? REGULAR_ID
+    :    { LT(1)->getText() == "TO_CHAR" }? REGULAR_ID
     ;
 
 ltrim_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LTRIM")}? REGULAR_ID
+    :    { LT(1)->getText() == "LTRIM" }? REGULAR_ID
     ;
 
 mode_key
@@ -1652,11 +1652,11 @@ mode_key
     ;
 
 uid_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "UID")}? REGULAR_ID
+    :    { LT(1)->getText() == "UID" }? REGULAR_ID
     ;
 
 chr_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CHR")}? REGULAR_ID
+    :    { LT(1)->getText() == "CHR" }? REGULAR_ID
     ;
 
 intersect_key
@@ -1664,23 +1664,23 @@ intersect_key
     ;
 
 chartorowid_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CHARTOROWID")}? REGULAR_ID
+    :    { LT(1)->getText() == "CHARTOROWID" }? REGULAR_ID
     ;
 
 mlslabel_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "MLSLABEL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "MLSLABEL" }?=> REGULAR_ID
     ;
 
 userenv_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "USERENV")}? REGULAR_ID
+    :    { LT(1)->getText() == "USERENV" }? REGULAR_ID
     ;
 
 stddev_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "STDDEV")}? REGULAR_ID
+    :    { LT(1)->getText() == "STDDEV" }? REGULAR_ID
     ;
 
 length_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LENGTH")}? REGULAR_ID
+    :    { LT(1)->getText() == "LENGTH" }? REGULAR_ID
     ;
 
 fetch_key
@@ -1692,222 +1692,222 @@ group_key
     ;
 
 sysdate_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SYSDATE")}? REGULAR_ID
+    :    { LT(1)->getText() == "SYSDATE" }? REGULAR_ID
     ;
 
 binary_integer_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BINARY_INTEGER")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "BINARY_INTEGER" }?=> REGULAR_ID
     ;
 
 to_number_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TO_NUMBER")}? REGULAR_ID
+    :    { LT(1)->getText() == "TO_NUMBER" }? REGULAR_ID
     ;
 
 substr_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SUBSTR")}? REGULAR_ID
+    :    { LT(1)->getText() == "SUBSTR" }? REGULAR_ID
     ;
 
 ceil_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CEIL")}? REGULAR_ID
+    :    { LT(1)->getText() == "CEIL" }? REGULAR_ID
     ;
 
 initcap_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INITCAP")}? REGULAR_ID
+    :    { LT(1)->getText() == "INITCAP" }? REGULAR_ID
     ;
 
 round_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ROUND")}? REGULAR_ID
+    :    { LT(1)->getText() == "ROUND" }? REGULAR_ID
     ;
 
 long_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LONG")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "LONG" }?=> REGULAR_ID
     ;
 
 read_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "READ")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "READ" }?=> REGULAR_ID
     ;
 
 only_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ONLY")}? REGULAR_ID
+    :    { LT(1)->getText() == "ONLY" }? REGULAR_ID
     ;
 
 set_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SET")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SET" }?=> REGULAR_ID
     ;
 
 nullif_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NULLIF")}? REGULAR_ID
+    :    { LT(1)->getText() == "NULLIF" }? REGULAR_ID
     ;
 
 coalesce_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "COALESCE")}? REGULAR_ID
+    :    { LT(1)->getText() == "COALESCE" }? REGULAR_ID
     ;
 
 count_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "COUNT")}? REGULAR_ID
+    :    { LT(1)->getText() == "COUNT" }? REGULAR_ID
     ;
 
-avg_key    :    {equalsIgnoreCase(LT(1)->getText(), "AVG")}? REGULAR_ID
+avg_key    :    { LT(1)->getText() == "AVG" }? REGULAR_ID
     ;
 
-max_key    :    {equalsIgnoreCase(LT(1)->getText(), "MAX")}? REGULAR_ID
+max_key    :    { LT(1)->getText() == "MAX" }? REGULAR_ID
     ;
 
-min_key    :    {equalsIgnoreCase(LT(1)->getText(), "MIN")}? REGULAR_ID
+min_key    :    { LT(1)->getText() == "MIN" }? REGULAR_ID
     ;
 
-sum_key    :    {equalsIgnoreCase(LT(1)->getText(), "SUM")}? REGULAR_ID
+sum_key    :    { LT(1)->getText() == "SUM" }? REGULAR_ID
     ;
 
 unknown_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "UNKNOWN")}? REGULAR_ID
+    :    { LT(1)->getText() == "UNKNOWN" }? REGULAR_ID
     ;
 
 escape_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ESCAPE")}? REGULAR_ID
+    :    { LT(1)->getText() == "ESCAPE" }? REGULAR_ID
     ;
 
 some_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SOME")}? REGULAR_ID
+    :    { LT(1)->getText() == "SOME" }? REGULAR_ID
     ;
 
 match_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "MATCH")}? REGULAR_ID
+    :    { LT(1)->getText() == "MATCH" }? REGULAR_ID
     ;
 
 cast_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CAST")}? REGULAR_ID
+    :    { LT(1)->getText() == "CAST" }? REGULAR_ID
     ;
 
 full_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "FULL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "FULL" }?=> REGULAR_ID
     ;
 
 partial_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "PARTIAL")}? REGULAR_ID
+    :    { LT(1)->getText() == "PARTIAL" }? REGULAR_ID
     ;
 
 character_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CHARACTER")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CHARACTER" }?=> REGULAR_ID
     ;
 
 except_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "EXCEPT")}? REGULAR_ID
+    :    { LT(1)->getText() == "EXCEPT" }? REGULAR_ID
     ;
 
 char_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CHAR")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CHAR" }?=> REGULAR_ID
     ;
 
 varying_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "VARYING")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "VARYING" }?=> REGULAR_ID
     ;
 
 varchar_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "VARCHAR")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "VARCHAR" }?=> REGULAR_ID
     ;
 
 national_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NATIONAL")}? REGULAR_ID
+    :    { LT(1)->getText() == "NATIONAL" }? REGULAR_ID
     ;
 
 nchar_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NCHAR")}? REGULAR_ID
+    :    { LT(1)->getText() == "NCHAR" }? REGULAR_ID
     ;
 
-bit_key    :    {equalsIgnoreCase(LT(1)->getText(), "BIT")}? REGULAR_ID
+bit_key    :    { LT(1)->getText() == "BIT" }? REGULAR_ID
     ;
 
 float_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "FLOAT")}? REGULAR_ID
+    :    { LT(1)->getText() == "FLOAT" }? REGULAR_ID
     ;
     
 real_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "REAL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "REAL" }?=> REGULAR_ID
     ;
 
 double_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DOUBLE")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DOUBLE" }?=> REGULAR_ID
     ;
 
 precision_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "PRECISION")}? REGULAR_ID
+    :    { LT(1)->getText() == "PRECISION" }? REGULAR_ID
     ;
 
 interval_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INTERVAL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "INTERVAL" }?=> REGULAR_ID
     ;
 
 time_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TIME")}? REGULAR_ID
+    :    { LT(1)->getText() == "TIME" }? REGULAR_ID
     ;
  
 zone_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "ZONE")}? REGULAR_ID
+    :    { LT(1)->getText() == "ZONE" }? REGULAR_ID
     ;
 
 timestamp_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TIMESTAMP")}? REGULAR_ID
+    :    { LT(1)->getText() == "TIMESTAMP" }? REGULAR_ID
     ;
 
-date_key//:    {input.LT(1).getText().equalsIgnoreCase("DATE")}?=> REGULAR_ID
+date_key//:    {input.LT(1).getText(). ("DATE" }?=> REGULAR_ID
     :    SQL92_RESERVED_DATE
     ;
 
 numeric_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NUMERIC")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NUMERIC" }?=> REGULAR_ID
     ;
 
 decimal_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DECIMAL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DECIMAL" }?=> REGULAR_ID
     ;
 
 dec_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DEC")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DEC" }?=> REGULAR_ID
     ;
 
 integer_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INTEGER")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "INTEGER" }?=> REGULAR_ID
     ;
 
 int_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "INT" }?=> REGULAR_ID
     ;
 
 smallint_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SMALLINT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SMALLINT" }?=> REGULAR_ID
     ;
 
 corresponding_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CORRESPONDING")}? REGULAR_ID
+    :    { LT(1)->getText() == "CORRESPONDING" }? REGULAR_ID
     ;
 
 cross_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CROSS")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "CROSS" }?=> REGULAR_ID
     ;
 
 join_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "JOIN")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "JOIN" }?=> REGULAR_ID
     ;
 
 left_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LEFT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "LEFT" }?=> REGULAR_ID
     ;
 
 right_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "RIGHT")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "RIGHT" }?=> REGULAR_ID
     ;
 
 inner_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INNER")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "INNER" }?=> REGULAR_ID
     ;
 
 natural_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NATURAL")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "NATURAL" }?=> REGULAR_ID
     ;
 
 outer_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "OUTER")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "OUTER" }?=> REGULAR_ID
     ;
 
 using_key
@@ -1915,151 +1915,151 @@ using_key
     ;
 
 indicator_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "INDICATOR")}? REGULAR_ID
+    :    { LT(1)->getText() == "INDICATOR" }? REGULAR_ID
     ;
 
 user_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "USER")}? REGULAR_ID
+    :    { LT(1)->getText() == "USER" }? REGULAR_ID
     ;
 
 current_user_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CURRENT_USER")}? REGULAR_ID
+    :    { LT(1)->getText() == "CURRENT_USER" }? REGULAR_ID
     ;
 
 session_user_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SESSION_USER")}? REGULAR_ID
+    :    { LT(1)->getText() == "SESSION_USER" }? REGULAR_ID
     ;
 
 system_user_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SYSTEM_USER")}? REGULAR_ID
+    :    { LT(1)->getText() == "SYSTEM_USER" }? REGULAR_ID
     ;
 
 value_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "VALUE")}? REGULAR_ID
+    :    { LT(1)->getText() == "VALUE" }? REGULAR_ID
     ;
 
 substring_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SUBSTRING")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "SUBSTRING" }?=> REGULAR_ID
     ;
 
 upper_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "UPPER")}? REGULAR_ID
+    :    { LT(1)->getText() == "UPPER" }? REGULAR_ID
     ;
 
 lower_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LOWER")}? REGULAR_ID
+    :    { LT(1)->getText() == "LOWER" }? REGULAR_ID
     ;
 
 convert_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CONVERT")}? REGULAR_ID
+    :    { LT(1)->getText() == "CONVERT" }? REGULAR_ID
     ;
 
 translate_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TRANSLATE")}? REGULAR_ID
+    :    { LT(1)->getText() == "TRANSLATE" }? REGULAR_ID
     ;
 
 trim_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TRIM")}? REGULAR_ID
+    :    { LT(1)->getText() == "TRIM" }? REGULAR_ID
     ;
 
 leading_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LEADING")}? REGULAR_ID
+    :    { LT(1)->getText() == "LEADING" }? REGULAR_ID
     ;
 
 trailing_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TRAILING")}? REGULAR_ID
+    :    { LT(1)->getText() == "TRAILING" }? REGULAR_ID
     ;
 
 both_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BOTH")}? REGULAR_ID
+    :    { LT(1)->getText() == "BOTH" }? REGULAR_ID
     ;
 
 collate_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "COLLATE")}? REGULAR_ID
+    :    { LT(1)->getText() == "COLLATE" }? REGULAR_ID
     ;
 
 position_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "POSITION")}? REGULAR_ID
+    :    { LT(1)->getText() == "POSITION" }? REGULAR_ID
     ;
 
 extract_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "EXTRACT")}? REGULAR_ID
+    :    { LT(1)->getText() == "EXTRACT" }? REGULAR_ID
     ;
 
 second_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SECOND")}? REGULAR_ID
+    :    { LT(1)->getText() == "SECOND" }? REGULAR_ID
     ;
 
 timezone_hour_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TIMEZONE_HOUR")}? REGULAR_ID
+    :    { LT(1)->getText() == "TIMEZONE_HOUR" }? REGULAR_ID
     ;
 
 timezone_minute_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "TIMEZONE_MINUTE")}? REGULAR_ID
+    :    { LT(1)->getText() == "TIMEZONE_MINUTE" }? REGULAR_ID
     ;
 
 char_length_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CHAR_LENGTH")}? REGULAR_ID
+    :    { LT(1)->getText() == "CHAR_LENGTH" }? REGULAR_ID
     ;
 
 octet_length_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "OCTET_LENGTH")}? REGULAR_ID
+    :    { LT(1)->getText() == "OCTET_LENGTH" }? REGULAR_ID
     ;
 
 character_length_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CHARACTER_LENGTH")}? REGULAR_ID
+    :    { LT(1)->getText() == "CHARACTER_LENGTH" }? REGULAR_ID
     ;
 
 bit_length_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BIT_LENGTH")}? REGULAR_ID
+    :    { LT(1)->getText() == "BIT_LENGTH" }? REGULAR_ID
     ;
 
 local_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "LOCAL")}? REGULAR_ID
+    :    { LT(1)->getText() == "LOCAL" }? REGULAR_ID
     ;
 
 current_timestamp_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CURRENT_TIMESTAMP")}? REGULAR_ID
+    :    { LT(1)->getText() == "CURRENT_TIMESTAMP" }? REGULAR_ID
     ;
 
 current_date_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CURRENT_DATE")}? REGULAR_ID
+    :    { LT(1)->getText() == "CURRENT_DATE" }? REGULAR_ID
     ;
 
 current_time_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CURRENT_TIME")}? REGULAR_ID
+    :    { LT(1)->getText() == "CURRENT_TIME" }? REGULAR_ID
     ;
 
 module_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "MODULE")}? REGULAR_ID
+    :    { LT(1)->getText() == "MODULE" }? REGULAR_ID
     ;
 
 global_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "GLOBAL")}? REGULAR_ID
+    :    { LT(1)->getText() == "GLOBAL" }? REGULAR_ID
     ;
 
 year_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "YEAR")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "YEAR" }?=> REGULAR_ID
     ;
 
 month_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "MONTH")}? REGULAR_ID
+    :    { LT(1)->getText() == "MONTH" }? REGULAR_ID
     ;
 
 day_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DAY")}?=> REGULAR_ID
+    :    { LT(1)->getText() == "DAY" }?=> REGULAR_ID
     ;
 
 hour_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "HOUR")}? REGULAR_ID
+    :    { LT(1)->getText() == "HOUR" }? REGULAR_ID
     ;
 
 minute_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "MINUTE")}? REGULAR_ID
+    :    { LT(1)->getText() == "MINUTE" }? REGULAR_ID
     ;
 
 whenever_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "WHENEVER")}? REGULAR_ID
+    :    { LT(1)->getText() == "WHENEVER" }? REGULAR_ID
     ;
 
 is_key
@@ -2179,41 +2179,41 @@ where_key
     ;
 
 sequence_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SEQUENCE")}? REGULAR_ID
+    :    { LT(1)->getText() == "SEQUENCE" }? REGULAR_ID
     ;
 
 noorder_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NOORDER")}? REGULAR_ID
+    :    { LT(1)->getText() == "NOORDER" }? REGULAR_ID
     ;
 
 cycle_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CYCLE")}? REGULAR_ID
+    :    { LT(1)->getText() == "CYCLE" }? REGULAR_ID
     ;
 
 cache_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "CACHE")}? REGULAR_ID
+    :    { LT(1)->getText() == "CACHE" }? REGULAR_ID
     ;
 
 nocache_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NOCACHE")}? REGULAR_ID
+    :    { LT(1)->getText() == "NOCACHE" }? REGULAR_ID
     ;
 
 nomaxvalue_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NOMAXVALUE")}? REGULAR_ID
+    :    { LT(1)->getText() == "NOMAXVALUE" }? REGULAR_ID
     ;
 
 nominvalue_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "NOMINVALUE")}? REGULAR_ID
+    :    { LT(1)->getText() == "NOMINVALUE" }? REGULAR_ID
     ;
 
 search_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "SEARCH")}? REGULAR_ID
+    :    { LT(1)->getText() == "SEARCH" }? REGULAR_ID
     ;
 
 depth_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "DEPTH")}? REGULAR_ID
+    :    { LT(1)->getText() == "DEPTH" }? REGULAR_ID
     ;
 
 breadth_key
-    :    {equalsIgnoreCase(LT(1)->getText(), "BREADTH")}? REGULAR_ID
+    :    { LT(1)->getText() == "BREADTH" }? REGULAR_ID
     ;
diff --git a/runtime/Cpp/tests/PLSQLLexer.g b/runtime/Cpp/tests/PLSQLLexer.g
index f261b7ffe..9dbe451bc 100644
--- a/runtime/Cpp/tests/PLSQLLexer.g
+++ b/runtime/Cpp/tests/PLSQLLexer.g
@@ -29,6 +29,154 @@ tokens { // moved to the import vocabulary
     MINUS_SIGN; // Imaginary token based on subtoken typecasting - see the rule <SEPARATOR>
     DOUBLE_PERIOD;
     UNDERSCORE; // Imaginary token based on subtoken typecasting - see the rule <INTRODUCER>
+
+    //TORA TOKENS
+    T_UNKNOWN;
+    T_RESERVED;
+    // Identifier subtypes AST leafs
+    T_TABLE_ALIAS;
+    T_COLUMN_ALIAS;
+    T_COLUMN_NAME;
+    T_TABLE_NAME;
+    T_SCHEMA_NAME;
+    T_FUNCTION_NAME;
+    T_PACKAGE_NAME;
+    T_DBLINK_NAME;
+    T_BINDVAR_NAME;
+
+    //Alias type(declaration, usage)
+    T_DECL;
+    T_USE ;
+    
+    //Tree nodes
+    T_IDENTIFIER;
+    T_TABLE_REF;
+    T_WITH;
+    T_SELECT;
+    T_SUBQUERY;
+    T_TABLE_CAST;
+    T_COLUMN_LIST;
+    T_SELECT_COLUMN;
+    T_FROM;
+    //T_SELECTED_TABLE;
+    T_WHERE;
+    T_HIERARCHICAL;
+    T_GROUP_BY;
+    T_MODEL;
+    T_UNION;
+    T_ORDER_BY_CLAUSE;
+    T_FOR_UPDATE_CLAUSE;
+    T_JOINING_CLAUSE;
+
+    T_OPERATOR_UNARY;
+    T_OPERATOR_BINARY;
+    T_OPERATOR_PART;
+    T_COND_OR;
+    T_COND_OR_SEQ;
+    T_COND_AND;
+    T_COND_AND_SEQ;
+    T_COND_NOT;
+    T_COND_EXISTS;
+    T_COND_IS;
+    T_COND_COMPARISON;
+    T_COND_GROUP_COMPARISON;
+    T_COND_IN;
+    T_COND_IS_A_SET;
+    T_COND_IS_ANY;
+    T_COND_IS_EMPTY;
+    T_COND_IS_OF_TYPE;
+    T_COND_IS_PRESENT;
+    T_COND_LIKE;
+    T_COND_MEMEBER;
+    T_COND_BETWEEN;
+    T_COND_REGEXP_LIKE;
+    T_COND_SUBMULTISET;
+    T_COND_EQUALS_PATH;
+    T_COND_UNDER_PATH;
+    T_COND_PAREN;
+
+    EXPLAIN_STATEMENT;
+    SELECT_STATEMENT;
+    FACTORING;
+    SUBQUERY;
+    SELECT_LIST;
+    SELECT_ITEM;
+    DOT_ASTERISK;
+    TABLE_REF;
+    TABLE_REF_ELEMENT;
+    JOIN_DEF;
+    LOGIC_EXPR;
+    SELECTED_TABLEVIEW;
+    TABLE_EXPRESSION;
+    COLLECTION_MODE;
+    SELECT_MODE;
+    DIRECT_MODE;
+    PIVOT_ELEMENT;
+    ANY_MODE;
+    ELEMENTS_MODE;
+    PIVOT_IN_ELEMENT;
+    UNPIVOT_IN_ELEMENT;
+    HIERARCHICAL;
+    GROUP_BY_CLAUSE;
+    GROUP_BY_ELEMENT;
+    GROUPIN_SET;
+    MAIN_MODEL;
+    MODEL_COLUMN;
+    MODEL_COLUMNS;
+    MODEL_RULES;
+    MODEL_RULE;
+    ASSIGN;
+    ORDER_BY_ELEMENTS;
+    ORDER_BY_ELEMENT;
+    SINGLE_TABLE_MODE;
+    MULTI_TABLE_MODE;
+    TABLE_ELEMENT;
+    CONDITIONAL_INSERT;
+    COLUMNS;
+    MERGE_UPDATE;
+    MERGE_INSERT;
+    LOCK_TABLE_ELEMENT;
+    STATIC_RETURNING;
+    EXPR_LIST;
+    IS_NOT_NULL;
+    IS_NULL;
+    IS_NOT_NAN;
+    IS_NAN;
+    IS_NOT_PRESENT;
+    IS_PRESENT;
+    IS_NOT_INFINITE;
+    IS_INFINITE;
+    IS_NOT_A_SET;
+    IS_A_SET;
+    IS_NOT_EMPTY;
+    IS_EMPTY;
+    IS_NOT_OF_TYPE;
+    IS_OF_TYPE;
+    NOT_IN;
+    NOT_BETWEEN;
+    NOT_LIKE;
+    UNARY_OPERATOR;
+    STANDARD_FUNCTION;
+    MODEL_EXPRESSION;
+    FOR_SINGLE_COLUMN;
+    FOR_MULTI_COLUMN;
+    SIMPLE_CASE;
+    SEARCHED_CASE;
+    VECTOR_EXPR;
+    FUNCTION_ENABLING_OVER;
+    FUNCTION_ENABLING_USING;
+    FUNCTION_ENABLING_WITHIN_OR_OVER;
+    PREDICTION_FUNCTION;
+    ELEMENT;
+    XML_COLUMN;
+    XML_ALIAS;
+    PIVOT_ALIAS;
+    DATETIME_OP;
+    XML_ELEMENT;
+    EXPR;
+    ROUTINE_CALL;
+    ARGUMENTS;
+    ARGUMENT;
 }
 
 @lexer::includes
diff --git a/runtime/Cpp/tests/PLSQLParser.g b/runtime/Cpp/tests/PLSQLParser.g
index cb6b0e2a7..7b4d813d7 100644
--- a/runtime/Cpp/tests/PLSQLParser.g
+++ b/runtime/Cpp/tests/PLSQLParser.g
@@ -403,7 +403,7 @@ alter_type
     :    alter_key type_key type_name
     (    compile_type_clause
     |    replace_type_clause
-    |    {equalsIgnoreCase(LT(2)->getText(), "ATTRIBUTE")}? alter_attribute_definition
+    |    { LT(2)->getText() == "ATTRIBUTE" }? alter_attribute_definition
     |    alter_method_spec
     |    alter_collection_clauses
     |    modifier_clause
diff --git a/runtime/Cpp/tests/PLSQL_DMLParser.g b/runtime/Cpp/tests/PLSQL_DMLParser.g
index 0646fd4a3..0c1c77266 100644
--- a/runtime/Cpp/tests/PLSQL_DMLParser.g
+++ b/runtime/Cpp/tests/PLSQL_DMLParser.g
@@ -61,23 +61,26 @@ explain_statement
          | insert_statement
          | merge_statement
          )
+         -> ^(EXPLAIN_STATEMENT select_statement? update_statement? delete_statement? insert_statement? merge_statement?)        
     ;
 
 select_statement
     :    subquery_factoring_clause?
         subquery
         (for_update_clause|(order_key siblings_key? by_key)=> order_by_clause)*
+        -> ^(SELECT_STATEMENT subquery_factoring_clause? subquery for_update_clause* order_by_clause*)        
     ;
 
 // $<Select - Specific Clauses
 subquery_factoring_clause
-    :    with_key factoring_element (COMMA factoring_element)*
+    :    with_key^ factoring_element (COMMA! factoring_element)*
     ;
 
 factoring_element
     :    query_name (LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN)? as_key LEFT_PAREN subquery order_by_clause? RIGHT_PAREN
          search_clause?
          cycle_clause?
+        -> ^(FACTORING query_name subquery search_clause? cycle_clause?)        
     ;
 
 search_clause
@@ -93,44 +96,51 @@ cycle_clause
 
 subquery
     :    subquery_basic_elements subquery_operation_part*
+        -> ^(SUBQUERY subquery_basic_elements subquery_operation_part*)        
     ;
 
 subquery_operation_part
-    :    (union_key all_key?|intersect_key|minus_key) subquery_basic_elements
+    :    (union_key^ all_key?|intersect_key^|minus_key^) subquery_basic_elements
     ;
 
 subquery_basic_elements
     :    query_block
-    |    LEFT_PAREN subquery RIGHT_PAREN
+    |    LEFT_PAREN! subquery RIGHT_PAREN!
     ;
 
 query_block
+@init    {    int mode = 0;    }
     :    select_key
         ((distinct_key|unique_key|all_key)=> (distinct_key|unique_key|all_key))?
-        (ASTERISK | selected_element (COMMA selected_element)*)
+        (ASTERISK {mode = 1;}| selected_element (COMMA selected_element)*)
         into_clause?
         from_clause 
         where_clause? 
         hierarchical_query_clause? 
         group_by_clause?
         model_clause?
+        -> {mode == 1}? ^(select_key distinct_key? unique_key? all_key? ASTERISK
+                into_clause? from_clause where_clause? hierarchical_query_clause? group_by_clause? model_clause?)
+        -> ^(select_key distinct_key? unique_key? all_key? ^(SELECT_LIST selected_element+)
+                into_clause? from_clause where_clause? hierarchical_query_clause? group_by_clause? model_clause?)
     ;
 
 selected_element
     :    select_list_elements column_alias?
+        -> ^(SELECT_ITEM select_list_elements column_alias?)        
     ;
 
 from_clause
-    :    from_key table_ref_list
+    :    from_key^ table_ref_list
     ;
 
 select_list_elements
-    :    (tableview_name PERIOD ASTERISK)=> tableview_name PERIOD ASTERISK
-    |    expression
+    :    (tableview_name PERIOD ASTERISK)=> tableview_name PERIOD ASTERISK -> ^(EXPR ^(DOT_ASTERISK[$ASTERISK] tableview_name))
+    |    expression -> ^(EXPR expression)
     ;
 
 table_ref_list
-    :    table_ref (COMMA table_ref)*
+    :    table_ref (COMMA! table_ref)*
     ;
 
 // NOTE to PIVOT clause
@@ -139,6 +149,7 @@ table_ref_list
 // eventhough it is not enclosed in parenthesis. See pivot examples 09,10,11
 table_ref
     :    table_ref_aux join_clause* (pivot_clause|unpivot_clause)?
+        -> ^(TABLE_REF table_ref_aux join_clause* pivot_clause? unpivot_clause?)        
     ;
 
 table_ref_aux
@@ -150,6 +161,7 @@ table_ref_aux
     )
         flashback_query_clause*
         ({isTableAlias(LT(1), LT(2))}? table_alias)?
+        -> ^(TABLE_REF_ELEMENT table_alias? dml_table_expression_clause? table_ref? subquery_operation_part* only_key? pivot_clause? unpivot_clause? flashback_query_clause*)
     ;
 
 join_clause
@@ -160,14 +172,16 @@ join_clause
     (    join_on_part
     |    join_using_part
     )*
+        -> ^(JOIN_DEF[$join_key.start] cross_key? natural_key? inner_key? outer_join_type? table_ref_aux query_partition_clause* join_on_part* join_using_part*)
     ;
 
 join_on_part
     :    on_key condition
+        -> ^(on_key ^(LOGIC_EXPR condition))
     ;
 
 join_using_part
-    :    using_key LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN
+    :    using_key^ LEFT_PAREN! column_name (COMMA! column_name)* RIGHT_PAREN!
     ;
 
 outer_join_type
@@ -176,7 +190,7 @@ outer_join_type
     |    left_key
     |    right_key
     )
-        outer_key?
+        outer_key!?
     ;
 
 query_partition_clause
@@ -185,11 +199,12 @@ query_partition_clause
     |    (LEFT_PAREN)=> expression_list
     |    expression (COMMA expression)*
     )
+        -> ^(partition_key expression_list? (EXPR expression)*)
     ;
 
 flashback_query_clause
-    :    versions_key between_key (scn_key|timestamp_key) expression
-    |    as_key of_key (scn_key|timestamp_key|snapshot_key) expression
+    :    versions_key between_key (scn_key|timestamp_key) expression -> ^(versions_key scn_key? timestamp_key? ^(EXPR expression)) 
+    |    as_key of_key (scn_key|timestamp_key|snapshot_key) expression -> ^(as_key scn_key? timestamp_key? snapshot_key? ^(EXPR expression))
     ;
 
 pivot_clause
@@ -199,10 +214,12 @@ pivot_clause
             pivot_for_clause
             pivot_in_clause  
         RIGHT_PAREN
+        -> ^(pivot_key xml_key? pivot_element+ pivot_for_clause pivot_in_clause)
     ;
 
 pivot_element
     :    aggregate_function_name LEFT_PAREN expression RIGHT_PAREN column_alias?
+        -> ^(PIVOT_ELEMENT column_alias? ^(EXPR ^(ROUTINE_CALL aggregate_function_name ^(ARGUMENTS ^(ARGUMENT ^(EXPR expression))))))
     ;
 
 pivot_for_clause
@@ -210,24 +227,30 @@ pivot_for_clause
     (    column_name
     |    LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN
     )
+        -> ^(for_key column_name+)
     ;
 
 pivot_in_clause
+@init    {    int mode = 0;    }
     :    in_key
         LEFT_PAREN
-            (    (select_key)=> subquery 
-            |    (any_key)=> any_key (COMMA any_key)*
+            (    (select_key)=> subquery {mode = 1;}
+            |    (any_key)=> any_key (COMMA any_key)* {mode = 2;}
             |    pivot_in_clause_element (COMMA pivot_in_clause_element)*
             )
         RIGHT_PAREN
+        ->{mode == 1}? ^(in_key subquery)
+        ->{mode == 2}? ^(in_key ^(ANY_MODE any_key+))
+        -> ^(in_key ^(ELEMENTS_MODE pivot_in_clause_element+))        
     ;
 
 pivot_in_clause_element
     :    pivot_in_clause_elements column_alias?
+        -> ^(PIVOT_IN_ELEMENT column_alias? pivot_in_clause_elements)        
     ;
 
 pivot_in_clause_elements
-    :    expression
+    :    expression -> ^(EXPR expression)
     |    (LEFT_PAREN)=> expression_list
     ;
 
@@ -241,6 +264,7 @@ unpivot_clause
             pivot_for_clause
             unpivot_in_clause
         RIGHT_PAREN
+        -> ^(unpivot_key include_key? exclude_key? nulls_key? column_name+ pivot_for_clause unpivot_in_clause)        
     ;
 
 unpivot_in_clause
@@ -248,6 +272,7 @@ unpivot_in_clause
         LEFT_PAREN
             unpivot_in_elements (COMMA unpivot_in_elements)*
         RIGHT_PAREN
+        -> ^(in_key ^(UNPIVOT_IN_ELEMENT unpivot_in_elements)+)
     ;
 
 unpivot_in_elements
@@ -259,97 +284,117 @@ unpivot_in_elements
          |    (LEFT_PAREN)=> LEFT_PAREN constant (COMMA constant)* RIGHT_PAREN
          )
         )?
+        -> column_name+ ^(PIVOT_ALIAS constant+)?
     ;
 
 hierarchical_query_clause
     :    connect_key by_key nocycle_key? condition start_part?
+        -> ^(HIERARCHICAL start_part? ^(connect_key nocycle_key? ^(LOGIC_EXPR condition)))
     |    start_part connect_key by_key nocycle_key? condition
+        -> ^(HIERARCHICAL start_part ^(connect_key nocycle_key? ^(LOGIC_EXPR condition)))
     ;
 
 start_part
     :    start_key with_key condition
+        -> ^(start_key ^(LOGIC_EXPR condition))
     ;
 
 group_by_clause
-    :   (group_key) => group_key by_key group_by_elements
-            ((COMMA group_by_elements)=> COMMA group_by_elements)*
-            having_clause?
+    :   (group_key) => group_key by_key
+			(LEFT_PAREN RIGHT_PAREN
+			| group_by_elements ((COMMA group_by_elements)=> COMMA group_by_elements)*
+			)
+		having_clause?
+		-> ^(GROUP_BY_CLAUSE[$group_key.start] ^(group_key ^(GROUP_BY_ELEMENT group_by_elements)*) having_clause?)
     |   (having_key) => having_clause
-            (group_key by_key group_by_elements
-            ((COMMA group_by_elements)=> COMMA group_by_elements)*)?
+		(group_key by_key
+			(LEFT_PAREN RIGHT_PAREN
+			| group_by_elements ((COMMA group_by_elements)=> COMMA group_by_elements)*
+			)
+		)?
+		-> ^(GROUP_BY_CLAUSE[$having_clause.start] having_clause ^(group_key ^(GROUP_BY_ELEMENT group_by_elements)*)?)
     ;
 
 group_by_elements
     :    grouping_sets_clause
-    |    rollup_cube_clause 
-    |    expression
+    |    rollup_cube_clause
+    |    expression -> ^(EXPR expression)
     ;
 
 rollup_cube_clause
-    :    (rollup_key|cube_key) LEFT_PAREN grouping_sets_elements (COMMA grouping_sets_elements)* RIGHT_PAREN 
+    :    (rollup_key^|cube_key^) LEFT_PAREN! grouping_sets_elements (COMMA! grouping_sets_elements)* RIGHT_PAREN!
     ;
 
 grouping_sets_clause
     :    grouping_key sets_key 
         LEFT_PAREN grouping_sets_elements (COMMA grouping_sets_elements)* RIGHT_PAREN
+        -> ^(grouping_key ^(GROUPIN_SET grouping_sets_elements)+)
     ;
 
 grouping_sets_elements
     :    (rollup_key|cube_key)=> rollup_cube_clause
     |    (LEFT_PAREN)=> expression_list
-    |    expression
+    |    expression -> ^(EXPR expression)
     ;
 
 having_clause
     :    having_key condition
+        -> ^(having_key ^(LOGIC_EXPR condition))
     ;
 
 model_clause
     :    model_key cell_reference_options* return_rows_clause? reference_model* main_model
+        -> ^(model_key main_model cell_reference_options* return_rows_clause? reference_model*)
     ;
 
 cell_reference_options
-    :    (ignore_key|keep_key) nav_key
-    |    unique_key (dimension_key|single_key reference_key) 
+    :    (ignore_key^|keep_key^) nav_key
+    |    unique_key^ (dimension_key|single_key reference_key!) 
     ;
 
 return_rows_clause
-    :    return_key (updated_key|all_key) rows_key
+    :    return_key^ (updated_key|all_key) rows_key!
     ;
 
 reference_model
-    :    reference_key reference_model_name on_key 
-            LEFT_PAREN subquery RIGHT_PAREN model_column_clauses 
+    :    reference_key^ reference_model_name on_key!
+            LEFT_PAREN! subquery RIGHT_PAREN! model_column_clauses 
             cell_reference_options*
     ;
 
 main_model
     :    (main_key main_model_name)? model_column_clauses cell_reference_options* model_rules_clause
+        -> ^(MAIN_MODEL main_model_name? model_column_clauses model_rules_clause cell_reference_options*)
     ;
 
 model_column_clauses
     :    model_column_partition_part?
         dimension_key by_key model_column_list measures_key model_column_list
+        -> ^(MODEL_COLUMN ^(dimension_key model_column_list) ^(measures_key model_column_list) model_column_partition_part?)
     ;
 
 model_column_partition_part
-    :    partition_key by_key model_column_list
+    :    partition_key^ by_key! model_column_list
     ;
 
 model_column_list
     :    LEFT_PAREN model_column (COMMA model_column)*  RIGHT_PAREN
+        -> ^(MODEL_COLUMNS model_column+)
     ;
 
 model_column
-    :    expression table_alias?
+    :    expression column_alias?
+        -> ^(MODEL_COLUMN column_alias? ^(EXPR expression))
     ;
 
 model_rules_clause
-    :    model_rules_part? LEFT_PAREN model_rules_element (COMMA model_rules_element)* RIGHT_PAREN
+    :    model_rules_part? LEFT_PAREN (model_rules_element (COMMA model_rules_element)*)? RIGHT_PAREN
+        -> ^(MODEL_RULES model_rules_element* model_rules_part?)
     ;
 
 model_rules_part
     :    rules_key (update_key|upsert_key all_key?)? ((automatic_key|sequential_key) order_key)? model_iterate_clause?
+        -> ^(rules_key update_key? upsert_key? all_key? automatic_key? sequential_key? model_iterate_clause?)
     ;
 
 model_rules_element
@@ -357,6 +402,7 @@ model_rules_element
         cell_assignment
                 order_by_clause?
             EQUALS_OP expression
+        -> ^(MODEL_RULE ^(ASSIGN[$EQUALS_OP] cell_assignment ^(EXPR expression)) update_key? upsert_key? all_key? order_by_clause?)        
     ;
 
 cell_assignment
@@ -365,65 +411,73 @@ cell_assignment
 
 model_iterate_clause
     :    iterate_key LEFT_PAREN expression RIGHT_PAREN until_part?
+        ->^(iterate_key ^(EXPR expression) until_part?)
     ;
 
 until_part
     :    until_key LEFT_PAREN condition RIGHT_PAREN
+        -> ^(until_key ^(LOGIC_EXPR condition))
     ;
 
 order_by_clause
     :    order_key siblings_key? by_key order_by_elements (COMMA order_by_elements)*
+        -> ^(order_key siblings_key? ^(ORDER_BY_ELEMENTS order_by_elements+))
     ;
 
 order_by_elements
     :    expression (asc_key|desc_key)? (nulls_key (first_key|last_key))?
+        -> ^(ORDER_BY_ELEMENT ^(EXPR expression) asc_key? desc_key? nulls_key? first_key? last_key?)
     ;
 
 for_update_clause
     :    for_key update_key for_update_of_part? for_update_options?
+        -> ^(for_key for_update_of_part? for_update_options?)
     ;
 
 for_update_of_part
-    :    of_key column_name (COMMA column_name)*
+    :    of_key^ column_name (COMMA! column_name)*
     ;
 
 for_update_options
-    :    skip_key locked_key
+    :    skip_key locked_key!
     |    nowait_key
-    |    wait_key expression
+    |    wait_key expression -> ^(wait_key ^(EXPR expression))
     ;
 
 // $>
 
 update_statement
-    :    update_key general_table_ref
+    :    update_key^ general_table_ref
         update_set_clause
         where_clause? static_returning_clause? error_logging_clause?
     ;
 
 // $<Update - Specific Clauses
 update_set_clause
+@init    {    int mode = 1;    }
     :    set_key
     (    column_based_update_set_clause (COMMA column_based_update_set_clause)*
-    |    value_key LEFT_PAREN id RIGHT_PAREN EQUALS_OP expression
+    |    value_key LEFT_PAREN id RIGHT_PAREN EQUALS_OP expression {mode = 0;}
     )
+        ->{mode == 1}? ^(set_key column_based_update_set_clause+)
+        -> ^(set_key ^(value_key id ^(EXPR expression)))
     ;
 
 column_based_update_set_clause
-    :    column_name EQUALS_OP expression
-    |    LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN EQUALS_OP subquery
+    :    column_name EQUALS_OP expression -> ^(ASSIGN[$EQUALS_OP] column_name ^(EXPR expression))
+    |    LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN EQUALS_OP subquery -> ^(ASSIGN[$EQUALS_OP] column_name+ subquery)
     ;
 
 // $>
 
 delete_statement
-    :    delete_key from_key?
+    :    delete_key^ from_key!?
         general_table_ref
         where_clause? static_returning_clause? error_logging_clause?
     ;
 
 insert_statement
-    :    insert_key
+    :    insert_key^
     (    single_table_insert
     |    multi_table_insert
     )
@@ -437,6 +491,7 @@ single_table_insert
     |    select_statement
     )
         error_logging_clause?
+        -> ^(SINGLE_TABLE_MODE insert_into_clause values_clause? static_returning_clause? select_statement? error_logging_clause?)        
     ;
 
 multi_table_insert
@@ -445,32 +500,37 @@ multi_table_insert
     |    conditional_insert_clause
     )
         select_statement
+        -> ^(MULTI_TABLE_MODE select_statement multi_table_element* conditional_insert_clause?)
     ;
 
 multi_table_element
     :    insert_into_clause values_clause? error_logging_clause?
+        -> ^(TABLE_ELEMENT insert_into_clause values_clause? error_logging_clause?)
     ;
 
 conditional_insert_clause
     :    (all_key|first_key)?
         conditional_insert_when_part+ conditional_insert_else_part?
+        -> ^(CONDITIONAL_INSERT all_key? first_key? conditional_insert_when_part+ conditional_insert_else_part?) 
     ;
 
 conditional_insert_when_part
     :    when_key condition then_key multi_table_element+
+        -> ^(when_key ^(LOGIC_EXPR condition) multi_table_element+)
     ;
 
 conditional_insert_else_part
-    :    else_key multi_table_element+
+    :    else_key^ multi_table_element+
     ;
 
 insert_into_clause
     :    into_key general_table_ref 
         (LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN)?
+        -> ^(into_key general_table_ref ^(COLUMNS column_name*))
     ;
 
 values_clause
-    :    values_key expression_list
+    :    values_key^ (expression_list | record_name)
     ;
 
 // $>
@@ -483,6 +543,8 @@ merge_statement
             (when_key not_key matched_key) => merge_insert_clause merge_update_clause?
         )?
         error_logging_clause?
+        -> ^(merge_key table_alias? tableview_name ^(using_key selected_tableview ^(LOGIC_EXPR condition))
+                 merge_update_clause? merge_insert_clause? error_logging_clause?)
     ;
 
 // $<Merge - Specific Clauses
@@ -491,24 +553,28 @@ merge_update_clause
     :    when_key matched_key then_key update_key set_key 
         merge_element (COMMA merge_element)*
         where_clause? merge_update_delete_part?
+        ->^(MERGE_UPDATE merge_element+ where_clause? merge_update_delete_part?)
     ;
 
 merge_element
     :    column_name EQUALS_OP expression
+        -> ^(ASSIGN[$EQUALS_OP] column_name ^(EXPR expression))
     ;
 
 merge_update_delete_part
-    :    delete_key where_clause
+    :    delete_key^ where_clause
     ;
 
 merge_insert_clause
     :    when_key not_key matched_key then_key insert_key 
         (LEFT_PAREN column_name (COMMA column_name)* RIGHT_PAREN)?
         values_key expression_list where_clause?
+        -> ^(MERGE_INSERT ^(COLUMNS column_name*) expression_list where_clause?)
     ;
 
 selected_tableview
     :    ( tableview_name | LEFT_PAREN select_statement RIGHT_PAREN ) table_alias?
+        -> ^(SELECTED_TABLEVIEW table_alias? tableview_name? select_statement?)
     ;
 
 // $>
@@ -517,10 +583,11 @@ lock_table_statement
     :    lock_key table_key 
         lock_table_element (COMMA lock_table_element)* 
         in_key lock_mode mode_key wait_nowait_part?
+        -> ^(lock_key lock_table_element+ lock_mode wait_nowait_part?)
     ;
 
 wait_nowait_part
-    :    wait_key expression
+    :    wait_key expression -> ^(wait_key ^(EXPR expression))
     |    nowait_key
     ;
 
@@ -528,6 +595,7 @@ wait_nowait_part
 
 lock_table_element
     :    tableview_name partition_extension_clause?
+        -> ^(LOCK_TABLE_ELEMENT tableview_name partition_extension_clause?)
     ;
 
 lock_mode
@@ -545,11 +613,13 @@ general_table_ref
     :    (    dml_table_expression_clause
         |    only_key LEFT_PAREN dml_table_expression_clause RIGHT_PAREN
         )    table_alias?
+        -> ^(TABLE_REF table_alias? dml_table_expression_clause only_key?)
     ;
 
 static_returning_clause
     :    (returning_key|return_key) expression (COMMA expression)* 
         into_clause
+        -> ^(STATIC_RETURNING ^(EXPR expression)+ into_clause)
     ;
 
 error_logging_clause
@@ -557,20 +627,21 @@ error_logging_clause
         error_logging_into_part?
         ((LEFT_PAREN)=> expression_wrapper)?
         error_logging_reject_part?
+        -> ^(log_key error_logging_into_part? expression_wrapper? error_logging_reject_part?)
     ;
 
 error_logging_into_part
-    :    into_key tableview_name
+    :    into_key^ tableview_name
     ;
 
 error_logging_reject_part
-    :    reject_key limit_key ((unlimited_key)=>unlimited_key|expression_wrapper)
+    :    reject_key^ limit_key! ((unlimited_key)=>unlimited_key|expression_wrapper)
     ;
 
 dml_table_expression_clause
-    :    table_collection_expression
-    |    LEFT_PAREN select_statement subquery_restriction_clause? RIGHT_PAREN
-    |    tableview_name sample_clause?
+    :    table_collection_expression -> ^(TABLE_EXPRESSION ^(COLLECTION_MODE table_collection_expression))
+    |    LEFT_PAREN select_statement subquery_restriction_clause? RIGHT_PAREN -> ^(TABLE_EXPRESSION ^(SELECT_MODE select_statement subquery_restriction_clause?))
+    |    tableview_name sample_clause? -> ^(TABLE_EXPRESSION ^(DIRECT_MODE tableview_name sample_clause?))
     ;
 
 table_collection_expression
@@ -578,6 +649,7 @@ table_collection_expression
          ( (LEFT_PAREN (select_key | with_key)) => LEFT_PAREN subquery RIGHT_PAREN
          | LEFT_PAREN expression RIGHT_PAREN //(LEFT_PAREN PLUS_SIGN RIGHT_PAREN)?
          )
+        -> ^(EXPR subquery? expression?) //PLUS_SIGN?
     ;
 
 subquery_restriction_clause
@@ -585,16 +657,19 @@ subquery_restriction_clause
     (    read_key only_key
     |    check_key option_key (constraint_key constraint_name)?
     )
+        -> ^(with_key read_key? check_key? constraint_name?)
     ;
 
 sample_clause
     :    sample_key block_key? 
-        LEFT_PAREN expression (COMMA expression)? RIGHT_PAREN
+        LEFT_PAREN e1=expression (COMMA e2=expression)? RIGHT_PAREN        
         seed_part?
+        -> ^(sample_key block_key? ^(EXPR $e1) ^(EXPR $e2)? seed_part?)        
     ;
 
 seed_part
     :    seed_key LEFT_PAREN expression RIGHT_PAREN
+        -> ^(seed_key ^(EXPR expression))        
     ;
 
 // $>
@@ -606,6 +681,7 @@ cursor_expression
 
 expression_list
     :    LEFT_PAREN expression? (COMMA expression)* RIGHT_PAREN
+        -> ^(EXPR_LIST ^(EXPR expression)*)
     ;
 
 condition
@@ -614,44 +690,62 @@ condition
 
 condition_wrapper
     :    expression
+        -> ^(LOGIC_EXPR expression)
     ;
 
 expression
     :    (cursor_key LEFT_PAREN (select_key|with_key)) => cursor_expression
-    |    logical_and_expression ( or_key logical_and_expression )*
+    |    logical_and_expression ( or_key^ logical_and_expression )*
     ;
 
 expression_wrapper
     :    expression
+        -> ^(EXPR expression)
     ;
 
 logical_and_expression
-    :    negated_expression ( and_key negated_expression )*
+    :    negated_expression ( and_key^ negated_expression )*
     ;
 
 negated_expression
-    :    not_key negated_expression
+    :    not_key^ negated_expression
     |    equality_expression
     ;
 
 equality_expression
-    :    multiset_comparsion
-    (    is_key not_key?
+@init    {    int isNegated = false;    }
+    :    (multiset_comparsion -> multiset_comparsion)
+    (    is_key (not_key {isNegated = true;})?
         (    null_key
+                -> {isNegated}? ^(IS_NOT_NULL $equality_expression)
+                -> ^(IS_NULL $equality_expression)
         |    nan_key
+                -> {isNegated}? ^(IS_NOT_NAN $equality_expression)
+                -> ^(IS_NAN $equality_expression)
         |    present_key
+                -> {isNegated}? ^(IS_NOT_PRESENT $equality_expression)
+                -> ^(IS_PRESENT $equality_expression)
         |    infinite_key
+                -> {isNegated}? ^(IS_NOT_INFINITE $equality_expression)
+                -> ^(IS_INFINITE $equality_expression)
         |    a_key set_key
+                -> {isNegated}? ^(IS_NOT_A_SET $equality_expression)
+                -> ^(IS_A_SET $equality_expression)
         |    empty_key
+                -> {isNegated}? ^(IS_NOT_EMPTY $equality_expression)
+                -> ^(IS_EMPTY $equality_expression)
         |    of_key type_key? LEFT_PAREN only_key? type_spec (COMMA type_spec)* RIGHT_PAREN
+                -> {isNegated}? ^(IS_NOT_OF_TYPE $equality_expression type_spec+)
+                -> ^(IS_OF_TYPE $equality_expression type_spec+)
         )
     )?
     ;
 
 
 multiset_comparsion
-    :    relational_expression
-    (    multiset_type of_key? concatenation)?
+    :    (relational_expression -> relational_expression)
+    (    multiset_type of_key? concatenation
+        -> ^(multiset_type $multiset_comparsion ^(EXPR concatenation)))?
     ;
 
 multiset_type
@@ -661,15 +755,22 @@ multiset_type
 
 relational_expression
     :    compound_expression
-    ( ( EQUALS_OP | not_equal_op | LESS_THAN_OP | GREATER_THAN_OP | less_than_or_equals_op | greater_than_or_equals_op ) compound_expression)*
+    ( ( EQUALS_OP^ | not_equal_op^ | LESS_THAN_OP^ | GREATER_THAN_OP^ | less_than_or_equals_op^ | greater_than_or_equals_op^ ) compound_expression)*
     ;
 
 compound_expression
-    :    concatenation
-    (    not_key?
+@init    {    int isNegated = false;    }
+    :    (concatenation -> concatenation)
+    (    (not_key {isNegated = true;} )?
         (    in_key in_elements
+                -> {isNegated}? ^(NOT_IN $compound_expression in_elements)
+                -> ^(in_key $compound_expression in_elements)
         |    between_key between_elements
+                -> {isNegated}? ^(NOT_BETWEEN $compound_expression between_elements)
+                -> ^(between_key $compound_expression between_elements)
         |    like_type concatenation like_escape_part?
+                -> {isNegated}? ^(NOT_LIKE $compound_expression ^(EXPR concatenation) like_escape_part?)
+                -> ^(like_type $compound_expression  ^(EXPR concatenation) like_escape_part?)
         )
     )?
     ;
@@ -683,69 +784,87 @@ like_type
 
 like_escape_part
     :    escape_key concatenation
+        -> ^(EXPR concatenation)        
     ;
 
 in_elements
+@init    {    int mode = 0;    }
     :    (LEFT_PAREN+ (select_key|with_key)) => LEFT_PAREN subquery RIGHT_PAREN
+         -> subquery
     |    LEFT_PAREN concatenation_wrapper (COMMA concatenation_wrapper)* RIGHT_PAREN
+         -> ^(EXPR_LIST concatenation_wrapper+)
     |    constant
+         -> ^(EXPR_LIST constant)
     |    bind_variable
+         -> ^(EXPR_LIST bind_variable)
     |    general_element
+         -> ^(EXPR_LIST general_element)
     ;
 
 between_elements
-    :    concatenation and_key concatenation
+    :    cn1=concatenation and_key cn2=concatenation
+        -> ^(EXPR $cn1) ^(EXPR $cn2)
     ;
 
 concatenation
-    :    additive_expression (concatenation_op additive_expression)*
+    :    additive_expression (concatenation_op^ additive_expression)*
     ;
 
 concatenation_wrapper
     :    concatenation
+        -> ^(EXPR concatenation)
     ;
 
 additive_expression
-    :    multiply_expression ( ( PLUS_SIGN | MINUS_SIGN ) multiply_expression)*
+    :    multiply_expression ( ( PLUS_SIGN^ | MINUS_SIGN^ ) multiply_expression)*
     ;
 
 multiply_expression
-    :    datetime_expression ( ( ASTERISK | SOLIDUS ) datetime_expression)*
+    :    datetime_expression ( ( ASTERISK^ | SOLIDUS^ ) datetime_expression)*
     ;
 
 datetime_expression
-    :    model_expression
+    :    (model_expression -> model_expression)
     (    at_key (local_key|time_key zone_key concatenation_wrapper)
+            -> ^(DATETIME_OP $datetime_expression ^(at_key local_key? time_key? concatenation_wrapper))
     |    (interval_expression)=> interval_expression
+            -> ^(DATETIME_OP $datetime_expression interval_expression)
     )?
     ;
 
 interval_expression
-    :    day_key    (LEFT_PAREN concatenation_wrapper RIGHT_PAREN)? to_key second_key (LEFT_PAREN concatenation_wrapper RIGHT_PAREN)?
+    :    day_key    (LEFT_PAREN cn1=concatenation_wrapper RIGHT_PAREN)? to_key second_key (LEFT_PAREN cn2=concatenation_wrapper RIGHT_PAREN)?        
+        -> ^(day_key second_key $cn1? $cn2?)        
     |    year_key (LEFT_PAREN concatenation_wrapper RIGHT_PAREN)? to_key month_key
+        -> ^(year_key month_key concatenation_wrapper)        
     ;
 
 model_expression
-    :    multiset_expression
-        (LEFT_BRACKET model_expression_element RIGHT_BRACKET)?
+    :    (multiset_expression -> multiset_expression)
+        (LEFT_BRACKET model_expression_element RIGHT_BRACKET
+            -> ^(MODEL_EXPRESSION[$LEFT_BRACKET] $model_expression model_expression_element))?
     ;
 
 model_expression_element
-    :    ((any_key)=> any_key|condition_wrapper) (COMMA ((any_key)=> any_key|condition_wrapper))*
-    |    single_column_for_loop (COMMA single_column_for_loop)*
+    :    ((any_key)=> any_key|condition_wrapper) (COMMA! ((any_key)=> any_key|condition_wrapper))*
+    |    single_column_for_loop (COMMA! single_column_for_loop)*
     |    multi_column_for_loop
     ;
 
 single_column_for_loop
+@init    {    int mode = 0;    }
     :    for_key column_name 
-    (    in_key expression_list
+    (    in_key expression_list {mode = 1;}            
     |    for_like_part? from_key ex1=expression
             to_key ex2=expression for_increment_decrement_type ex3=expression     
     )
+        ->{mode == 1}? ^(FOR_SINGLE_COLUMN[$for_key.start] column_name ^(in_key expression_list))
+        -> ^(FOR_SINGLE_COLUMN[$for_key.start] column_name ^(from_key ^(EXPR $ex1)) ^(to_key ^(EXPR $ex2)) ^(for_increment_decrement_type ^(EXPR $ex3)) for_like_part?)
     ;
 
 for_like_part
     :    like_key expression
+        -> ^(like_key ^(EXPR expression))
     ;
 
 for_increment_decrement_type
@@ -760,11 +879,12 @@ multi_column_for_loop
             |    (LEFT_PAREN)=> LEFT_PAREN expression_list (COMMA expression_list)* RIGHT_PAREN
             )
         RIGHT_PAREN
+        -> ^(FOR_MULTI_COLUMN[$for_key.start] column_name+ ^(in_key subquery? expression_list*))
     ;
 
 multiset_expression
 	:	unary_expression
-		( multiset_op unary_expression )*
+               ( multiset_op^ unary_expression )*        
 	;
 
 unary_expression
@@ -772,18 +892,16 @@ options
 {
 backtrack=true;
 }
-    :    MINUS_SIGN unary_expression
-    |    PLUS_SIGN unary_expression
-    |    prior_key unary_expression
-    |    connect_by_root_key unary_expression
-    |    { // input.LT(1).getText().equalsIgnoreCase("new") && !input.LT(2).getText().equals(".")}?
-            equalsIgnoreCase(LT(1)->getText(), "NEW") && !equalsIgnoreCase(LT(2)->getText(), "." )
-         }? => new_key unary_expression
-    |    distinct_key unary_expression
-    |    all_key unary_expression
-    |    { LA(1) == SQL92_RESERVED_CASE || LA(2) == SQL92_RESERVED_CASE }? case_statement[false]
+    :    MINUS_SIGN unary_expression -> ^(UNARY_OPERATOR[$MINUS_SIGN] unary_expression)
+    |    PLUS_SIGN unary_expression -> ^(UNARY_OPERATOR[$PLUS_SIGN] unary_expression)
+    |    prior_key^ unary_expression
+    |    connect_by_root_key^ unary_expression
+    |    { LT(1)->getText() == "NEW" && LT(2)->getText() != "." }? => new_key^ unary_expression
+    |    distinct_key^ unary_expression
+    |    all_key^ unary_expression
+    |    {LA(1) == SQL92_RESERVED_CASE || LA(2) == SQL92_RESERVED_CASE }? case_statement[false]
     |    quantified_expression
-    |    standard_function
+    |    standard_function -> ^(STANDARD_FUNCTION standard_function)
     |    atom
     ;
 
@@ -803,10 +921,11 @@ simple_case_statement
         simple_case_when_part+ 
         case_else_part?
         end_key case_key? label_name?
+        -> ^(SIMPLE_CASE[$ck1.start] label_name* ^(EXPR atom) simple_case_when_part+ case_else_part?)
     ;
 
 simple_case_when_part
-    :    when_key expression_wrapper then_key ({$case_statement::isStatement}? seq_of_statements | expression_wrapper)
+    :    when_key^ ew1=expression_wrapper then_key! ({$case_statement::isStatement}? seq_of_statements | ew2=expression_wrapper)
     ;
 
 searched_case_statement
@@ -814,14 +933,15 @@ searched_case_statement
         searched_case_when_part+
         case_else_part?
         end_key case_key? label_name?
+        -> ^(SEARCHED_CASE[$ck1.start] label_name* searched_case_when_part+ case_else_part?) 
     ;
 
 searched_case_when_part
-    :    when_key condition_wrapper then_key ({$case_statement::isStatement}? seq_of_statements | expression_wrapper)
+    :    when_key^ condition_wrapper then_key! ({$case_statement::isStatement}? seq_of_statements | expression_wrapper)
     ;
 
 case_else_part
-    :    else_key ({$case_statement::isStatement}? seq_of_statements | expression_wrapper)
+    :    else_key^ ({$case_statement::isStatement}? seq_of_statements | expression_wrapper)
     ;
 // $>
 
@@ -834,177 +954,184 @@ backtrack=true;
     |    bind_variable
     |    constant
     |    general_element
-    |    LEFT_PAREN
+    |    LEFT_PAREN!
          (
-              ( select_key | with_key)=> subquery RIGHT_PAREN subquery_operation_part*
-              | expression_or_vector RIGHT_PAREN
+              ( select_key | with_key)=> subquery RIGHT_PAREN! subquery_operation_part*
+              | expression_or_vector RIGHT_PAREN!
          )
     ;
 
 expression_or_vector
-    :    expression (vector_expr)?
+@init    {    int mode = 0;    }
+    :    expression (vector_expr {mode = 1;})?
+        -> {mode == 1}? ^(VECTOR_EXPR ^(EXPR expression) vector_expr)
+        -> expression
     ;
 
 vector_expr
     :    COMMA expression (COMMA expression)*
+        -> ^(EXPR expression)+
     ;
 
 quantified_expression
-    :    ( some_key | exists_key | all_key | any_key )
-         ( (LEFT_PAREN (select_key|with_key)) => LEFT_PAREN subquery RIGHT_PAREN
-           | LEFT_PAREN expression_wrapper RIGHT_PAREN
+    :    ( some_key^ | exists_key^ | all_key^ | any_key^ )
+         ( (LEFT_PAREN (select_key|with_key)) => LEFT_PAREN! subquery RIGHT_PAREN!
+           | LEFT_PAREN! expression_wrapper RIGHT_PAREN!
          )
     ;
 
 standard_function
-    :    stantard_function_enabling_over function_argument_analytic over_clause?
-    |    stantard_function_enabling_using function_argument_modeling using_clause?
-    |    count_key
-            LEFT_PAREN
+    :    stantard_function_enabling_over^ function_argument_analytic over_clause?
+    |    stantard_function_enabling_using^ function_argument_modeling using_clause?
+    |    count_key^
+            LEFT_PAREN!
                 ( ASTERISK | (distinct_key|unique_key|all_key)? concatenation_wrapper )
-            RIGHT_PAREN over_clause?
-    |    (cast_key|xmlcast_key) 
-            LEFT_PAREN
-         ( (multiset_key LEFT_PAREN+ (select_key|with_key)) => multiset_key LEFT_PAREN subquery order_by_clause? RIGHT_PAREN
-           (as_key type_spec)?
-                | concatenation_wrapper as_key type_spec
+            RIGHT_PAREN! over_clause?
+    |    (cast_key^|xmlcast_key^)
+            LEFT_PAREN!
+         ( (multiset_key LEFT_PAREN+ (select_key|with_key)) => (multiset_key! LEFT_PAREN! subquery order_by_clause? RIGHT_PAREN!)
+           (as_key! type_spec)?
+                | concatenation_wrapper as_key! type_spec
                 )
-            RIGHT_PAREN
-    |    chr_key
-            LEFT_PAREN 
-                concatenation_wrapper using_key nchar_cs_key 
-            RIGHT_PAREN
-    |    collect_key
-            LEFT_PAREN 
+            RIGHT_PAREN!
+    |    chr_key^
+            LEFT_PAREN! 
+                concatenation_wrapper using_key! nchar_cs_key 
+            RIGHT_PAREN!
+    |    collect_key^
+            LEFT_PAREN! 
                 (distinct_key|unique_key)? concatenation_wrapper collect_order_by_part?
-            RIGHT_PAREN
-    |    stantard_function_enabling_within_or_over 
+            RIGHT_PAREN!
+    |    stantard_function_enabling_within_or_over^
             function_argument within_or_over_part+
-    |    decompose_key
-            LEFT_PAREN 
+    |    decompose_key^
+            LEFT_PAREN! 
                 concatenation_wrapper (canonical_key|compatibility_key)? 
-            RIGHT_PAREN
-    |    extract_key
-            LEFT_PAREN
-                REGULAR_ID from_key concatenation_wrapper 
-            RIGHT_PAREN
-    |    (first_value_key|last_value_key) function_argument_analytic
+            RIGHT_PAREN!
+    |    extract_key^
+            LEFT_PAREN!
+                REGULAR_ID from_key! concatenation_wrapper 
+            RIGHT_PAREN!
+    |    (first_value_key^|last_value_key^) function_argument_analytic
              respect_or_ignore_nulls? over_clause
-    |    stantard_function_pedictions
-            LEFT_PAREN
+    |    stantard_function_pedictions^
+            LEFT_PAREN!
                 expression_wrapper (COMMA expression_wrapper)* cost_matrix_clause? using_clause? 
-            RIGHT_PAREN
-    |    translate_key
-            LEFT_PAREN 
-                expression_wrapper (using_key (char_cs_key|nchar_cs_key))? 
+            RIGHT_PAREN!
+    |    translate_key^
+            LEFT_PAREN! 
+                expression_wrapper (using_key! (char_cs_key|nchar_cs_key))? 
                     (COMMA expression_wrapper)* 
-            RIGHT_PAREN
-    |    treat_key
-            LEFT_PAREN
-                expression_wrapper as_key ref_key? type_spec 
-            RIGHT_PAREN
-    |    trim_key
-            LEFT_PAREN 
+            RIGHT_PAREN!
+    |    treat_key^
+            LEFT_PAREN!
+                expression_wrapper as_key! ref_key? type_spec 
+            RIGHT_PAREN!
+    |    trim_key^
+            LEFT_PAREN! 
                 ((leading_key|trailing_key|both_key)? quoted_string? from_key)?
                 concatenation_wrapper
-            RIGHT_PAREN
-    |    xmlagg_key
-            LEFT_PAREN 
+            RIGHT_PAREN!
+    |    xmlagg_key^
+            LEFT_PAREN! 
                 expression_wrapper order_by_clause? 
-            RIGHT_PAREN
+            RIGHT_PAREN!
             (PERIOD general_element_part)?
-    |    (xmlcolattval_key|xmlforest_key) 
-            LEFT_PAREN
-                xml_multiuse_expression_element (COMMA xml_multiuse_expression_element)*
-            RIGHT_PAREN
+    |    (xmlcolattval_key^|xmlforest_key^) 
+            LEFT_PAREN!
+                xml_multiuse_expression_element (COMMA! xml_multiuse_expression_element)*
+            RIGHT_PAREN!
             (PERIOD general_element_part)?
-    |    xmlelement_key
-            LEFT_PAREN
+    |    xmlelement_key^
+            LEFT_PAREN!
                 (entityescaping_key|noentityescaping_key)?
                 (name_key|evalname_key)? expression_wrapper
-                ({equalsIgnoreCase(LT(2)->getText(), "XMLATTRIBUTES")}? COMMA xml_attributes_clause)?
-                (COMMA expression_wrapper column_alias?)*
-            RIGHT_PAREN
+                ({ LT(2)->getText() == "XMLATTRIBUTES" }? COMMA! xml_attributes_clause)?
+                (COMMA! expression_wrapper column_alias?)*
+            RIGHT_PAREN!
             (PERIOD general_element_part)?
-    |    xmlexists_key
-            LEFT_PAREN
+    |    xmlexists_key^
+            LEFT_PAREN!
                 expression_wrapper
                 xml_passing_clause?
-            RIGHT_PAREN
-    |    xmlparse_key
-            LEFT_PAREN 
+            RIGHT_PAREN!
+    |    xmlparse_key^
+            LEFT_PAREN! 
                 (document_key|content_key) concatenation_wrapper wellformed_key?
-            RIGHT_PAREN
+            RIGHT_PAREN!
             (PERIOD general_element_part)?
-    |    xmlpi_key
-            LEFT_PAREN 
+    |    xmlpi_key^
+            LEFT_PAREN! 
                 (    name_key id
                 |    evalname_key concatenation_wrapper
                 )
-                (COMMA concatenation_wrapper)?
-            RIGHT_PAREN
+                (COMMA! concatenation_wrapper)?
+            RIGHT_PAREN!
             (PERIOD general_element_part)?
-    |    xmlquery_key
-            LEFT_PAREN 
+    |    xmlquery_key^
+            LEFT_PAREN! 
                 concatenation_wrapper xml_passing_clause?
-                returning_key content_key (null_key on_key empty_key)?
-            RIGHT_PAREN
+                returning_key! content_key! (null_key on_key! empty_key!)?
+            RIGHT_PAREN!
             (PERIOD general_element_part)?
-    |    xmlroot_key
-            LEFT_PAREN
+    |    xmlroot_key^
+            LEFT_PAREN!
                 concatenation_wrapper
                     xmlroot_param_version_part
-                    (COMMA xmlroot_param_standalone_part)?
-            RIGHT_PAREN
+                    (COMMA! xmlroot_param_standalone_part)?
+            RIGHT_PAREN!
             (PERIOD general_element_part)?
-    |    xmlserialize_key
-            LEFT_PAREN
+    |    xmlserialize_key^
+            LEFT_PAREN!
                 (document_key|content_key)
-                concatenation_wrapper (as_key type_spec)?
+                concatenation_wrapper (as_key! type_spec)?
                 xmlserialize_param_enconding_part?
                 xmlserialize_param_version_part?
                 xmlserialize_param_ident_part?
                 ((hide_key|show_key) defaults_key)?
-            RIGHT_PAREN
+            RIGHT_PAREN!
             (PERIOD general_element_part)?
-    |    xmltable_key
-            LEFT_PAREN
+    |    xmltable_key^
+            LEFT_PAREN!
                 xml_namespaces_clause?
                 concatenation_wrapper
                 xml_passing_clause?
-                (columns_key xml_table_column (COMMA xml_table_column))?
-            RIGHT_PAREN
+                (columns_key! xml_table_column (COMMA! xml_table_column))?
+            RIGHT_PAREN!
             (PERIOD general_element_part)?
     ;
 
 stantard_function_enabling_over
-    :    {enablesOverClause(LT(1)->getText())}?=> REGULAR_ID
+    :    {enablesOverClause(LT(1)->getText())}?=> REGULAR_ID -> FUNCTION_ENABLING_OVER[$REGULAR_ID]
     ;
 
 stantard_function_enabling_using
-    :    {enablesUsingClause(LT(1)->getText())}?=> REGULAR_ID
+    :    {enablesUsingClause(LT(1)->getText())}?=> REGULAR_ID -> FUNCTION_ENABLING_USING[$REGULAR_ID]
     ;
 
 stantard_function_enabling_within_or_over
-    :    {enablesWithinOrOverClause(LT(1)->getText())}?=> REGULAR_ID
+    :    {enablesWithinOrOverClause(LT(1)->getText())}?=> REGULAR_ID -> FUNCTION_ENABLING_WITHIN_OR_OVER[$REGULAR_ID]
     ;
 
 stantard_function_pedictions
-    :    {isStandardPredictionFunction(LT(1)->getText())}?=> REGULAR_ID
+    :    {isStandardPredictionFunction(LT(1)->getText())}?=> REGULAR_ID -> PREDICTION_FUNCTION[$REGULAR_ID]
     ;
 
 over_clause
-    :    over_key
-        LEFT_PAREN
+    :    over_key^
+        LEFT_PAREN!
             query_partition_clause?
             (order_by_clause windowing_clause?)?
-        RIGHT_PAREN
+        RIGHT_PAREN!
     ;
 
 windowing_clause
+@init    {    int mode = 0;    }
     :    windowing_type
-    (    between_key windowing_elements and_key windowing_elements
+    (    between_key windowing_elements and_key windowing_elements {mode = 1;}
     |    windowing_elements    )
+    ->{mode == 1}? ^(windowing_type ^(between_key windowing_elements+))
+    -> ^(windowing_type windowing_elements+)   
     ;
 
 windowing_type
@@ -1013,60 +1140,61 @@ windowing_type
     ;
 
 windowing_elements
-    :    unbounded_key preceding_key
-    |    current_key row_key
-    |    concatenation_wrapper (preceding_key|following_key)
+    :    unbounded_key^ preceding_key
+    |    current_key^ row_key
+    |    concatenation_wrapper (preceding_key^|following_key^)
     ;
 
 using_clause
-    :    using_key
+    :    using_key^
     (    ASTERISK
-    |    using_element (COMMA using_element)*
+    |    using_element (COMMA! using_element)*
     )
     ;
 
 using_element
     :    (in_key out_key?|out_key)? select_list_elements column_alias?
+        -> ^(ELEMENT in_key? out_key? select_list_elements column_alias?)
     ;
 
 collect_order_by_part
-    :    order_key by_key concatenation_wrapper
+    :    order_key^ by_key! concatenation_wrapper
     ;
 
 within_or_over_part
-    :    within_key group_key LEFT_PAREN order_by_clause RIGHT_PAREN
+    :    within_key^ group_key! LEFT_PAREN! order_by_clause RIGHT_PAREN!
     |    over_clause
     ;
 
 cost_matrix_clause
-    :    cost_key
+    :    cost_key^
     (    model_key auto_key?
-    |    LEFT_PAREN cost_class_name (COMMA cost_class_name)* RIGHT_PAREN values_key 
+    |    LEFT_PAREN! cost_class_name (COMMA! cost_class_name)* RIGHT_PAREN! values_key!
             expression_list
     )
     ;
 
 xml_passing_clause
-    :    passing_key (by_key value_key)?
-            expression_wrapper column_alias? (COMMA expression_wrapper column_alias?)
+    :    passing_key^ (by_key! value_key)?
+            expression_wrapper column_alias? (COMMA! expression_wrapper column_alias?)
     ;
 
 xml_attributes_clause
-    :    xmlattributes_key
-        LEFT_PAREN
+    :    xmlattributes_key^
+        LEFT_PAREN!
             (entityescaping_key|noentityescaping_key)?
             (schemacheck_key|noschemacheck_key)?
-            xml_multiuse_expression_element (COMMA xml_multiuse_expression_element)*
-        RIGHT_PAREN
+            xml_multiuse_expression_element (COMMA! xml_multiuse_expression_element)*
+        RIGHT_PAREN!
     ;
 
 xml_namespaces_clause
-    :    xmlnamespaces_key
-        LEFT_PAREN
+    :    xmlnamespaces_key^
+        LEFT_PAREN!
             (concatenation_wrapper column_alias)?
-                (COMMA concatenation_wrapper column_alias)*
+                (COMMA! concatenation_wrapper column_alias)*
             ((default_key)=> xml_general_default_part)?
-        RIGHT_PAREN
+        RIGHT_PAREN!
     ;
 
 xml_table_column
@@ -1074,35 +1202,40 @@ xml_table_column
     (    for_key ordinality_key
     |    type_spec (path_key concatenation_wrapper)? ((default_key)=> xml_general_default_part)?
     )
+        -> ^(XML_COLUMN xml_column_name ordinality_key? type_spec? concatenation_wrapper? xml_general_default_part?)        
     ;
 
 xml_general_default_part
-    :    default_key concatenation_wrapper
+    :    default_key^ concatenation_wrapper
     ;
 
 xml_multiuse_expression_element
-    :    expression (as_key (id_expression |evalname_key concatenation ))?
+@init    {    int mode = 0;    }
+    :    expression (as_key (id_expression {mode = 1;}|evalname_key concatenation {mode = 2;}))?
+        -> {mode == 1}? ^(XML_ELEMENT ^(EXPR expression) ^(XML_ALIAS[$as_key.start] id_expression))
+        -> {mode == 2}? ^(XML_ELEMENT ^(EXPR expression) ^(XML_ALIAS[$as_key.start] ^(evalname_key ^(EXPR concatenation))))
+        -> ^(XML_ELEMENT ^(EXPR expression))        
     ;
 
 xmlroot_param_version_part
-    :    version_key (no_key value_key|expression_wrapper)
+    :    version_key^ (no_key value_key|expression_wrapper)
     ;
 
 xmlroot_param_standalone_part
-    :    standalone_key (yes_key|no_key value_key?)
+    :    standalone_key^ (yes_key|no_key value_key?)
     ;
 
 xmlserialize_param_enconding_part
-    :    encoding_key concatenation_wrapper
+    :    encoding_key^ concatenation_wrapper
     ;
 
 xmlserialize_param_version_part
-    :    version_key concatenation_wrapper
+    :    version_key^ concatenation_wrapper
     ;
 
 xmlserialize_param_ident_part
     :    no_key indent_key
-    |    indent_key (size_key EQUALS_OP concatenation_wrapper)?
+    |    indent_key^ (size_key! EQUALS_OP! concatenation_wrapper)?
     ;
 
 // $>
diff --git a/runtime/Cpp/tests/PTestTraits.hpp b/runtime/Cpp/tests/PTestTraits.hpp
index bdf5bc3c7..3d9a7e484 100644
--- a/runtime/Cpp/tests/PTestTraits.hpp
+++ b/runtime/Cpp/tests/PTestTraits.hpp
@@ -6,18 +6,86 @@
 // The compiler must use -I (or set the project settings in VS2005)
 // to locate the antlr3 runtime files and -I. to find this file
 #include <antlr3.hpp>
-#include <boost/algorithm/string/predicate.hpp>
 
 #include <fstream>
 #include <iostream>
 #include <sstream>
+#include <cctype>
+#include <locale>
+#include <cwchar>
 
 // Forward declaration for Lexer&Parser class(es)
 namespace Antlr3Test {
 	class PLSQLLexer;
 	class PLSQLParser;
 
-	typedef antlr3::Traits<PLSQLLexer, PLSQLParser> PLSQLTraits;
+	template<class ImplTraits>
+	class UserTraits : public antlr3::CustomTraitsBase<ImplTraits>
+	{
+	public:
+		struct ci_char_traits : public std::char_traits<char>
+		// just inherit all the other functions
+		//  that we don't need to override
+		{			
+			static bool eq( char c1, char c2 )
+			{ return toupper(c1) == std::toupper(c2); }
+			
+			static bool ne( char c1, char c2 )
+			{ return toupper(c1) != std::toupper(c2); }
+
+			static bool lt( char c1, char c2 )
+			{ return toupper(c1) <  std::toupper(c2); }
+
+			static int compare( const char* s1, const char* s2, size_t n )
+			{
+				for (std::size_t i=0; i<n; ++i)
+				{
+					if (!eq(s1[i],s2[i]))
+					{
+						return lt(s1[i],s2[i])?-1:1;
+					}
+				}
+				return 0;
+			}
+
+			static const char* find( const char* s, int n, char a )
+			{
+				a = toupper(a);				
+				while( n-- > 0 && toupper(*s) != a )
+				{
+					++s;
+				}
+				return s;
+			}
+
+		private:
+			static inline int toupper(int C)
+			{
+				//static const std::ctype<typename StringType::value_type>& f = std::use_facet<std::ctype<typename StringType::value_type>>(std::locale(std::locale::classic(), new codecvt_byname(".C")))
+				//static std::locale loc(std::locale::classic(), new std::codecvt_byname<char, char, std::mbstate_t>(".C"));
+				static std::locale loc(std::locale::classic());
+				static const std::ctype<typename ImplTraits::StringType::value_type>& f = std::use_facet<std::ctype<typename ImplTraits::StringType::value_type>>(loc);
+				int i = f.toupper((char)C);
+				return i;
+			}
+		};
+
+		typedef std::basic_string<char,ci_char_traits> StringType;
+		typedef std:: basic_stringstream<char, ci_char_traits> StringStreamType;
+
+		static void displayRecognitionError(const StringType& str)
+		{
+			printf("%s", str.c_str());
+		}
+		//static void displayRecognitionError(const std::string& str)
+		//{
+		//printf("%s", str.c_str());
+		//}		
+		//static const bool TOKENS_ACCESSED_FROM_OWNING_RULE = true;
+		//static const int  TOKEN_FILL_BUFFER_INCREMENT = 2;
+	};
+
+	typedef antlr3::Traits<PLSQLLexer, PLSQLParser, UserTraits> PLSQLTraits;
 	typedef PLSQLTraits PLSQLLexerTraits;
 	typedef PLSQLTraits PLSQLParserTraits;
 	typedef PLSQLTraits PLSQLParser_PLSQLKeysTraits;
@@ -26,47 +94,44 @@ namespace Antlr3Test {
 	typedef PLSQLTraits PLSQLParser_SQLPLUSParserTraits;
 	typedef PLSQLTraits PLSQLParser_PLSQL_DMLParser_PLSQLKeysTraits;
 	typedef PLSQLTraits PLSQLParser_PLSQL_DMLParser_PLSQLCommonsTraits;
-
-	//template<class StringType>
-	inline bool equalsIgnoreCase(PLSQLTraits::StringType const& s1, const char* s2)
+	
+	/* define an output operator
+	 * because the traits type is different than that for std::ostream
+	 */
+	inline
+	std::ostream& operator << (std::ostream& strm, const PLSQLTraits::StringType& s)
 	{
-		// return !strcasecmp(s1.c_str(), s2);
-		// StringType s1U(s1);
-		// std::transform(s1U.begin(), s1U.end(), s1U.begin(), ::toupper);
-		// return s1U == s2;
-		PLSQLTraits::StringType ST2(s2);
-		return boost::iequals(s1, ST2);
+		// simply convert the icstring into a normal string
+		return strm << std::string(s.data(),s.length());
 	}
 
   	template<class CommonTokenType>
 	inline bool isTableAlias(CommonTokenType *LT1, CommonTokenType *LT2) {
-		static const std::string wPARTITION("PARTITION");
-		static const std::string wBY("BY");
-		static const std::string wCROSS("CROSS");
-		static const std::string wNATURAL("NATURAL");
-		static const std::string wINNER("INNER");
-		static const std::string wJOIN("JOIN");
-		static const std::string wFULL("FULL");
-		static const std::string wLEFT("LEFT");
-		static const std::string wRIGHT("RIGHT");
-		static const std::string wOUTER("OUTER");
-
-		PLSQLTraits::StringType lt1 = LT1->getText();
-		PLSQLTraits::StringType lt2 = "";
-		//std::transform(lt1.begin(), lt1.end(), lt1.begin(), ::toupper);
-        
-		if ( LT2 && LT2->getText() != ""){
+		static const char* wPARTITION("PARTITION");
+		static const char* wBY("BY");
+		static const char* wCROSS("CROSS");
+		static const char* wNATURAL("NATURAL");
+		static const char* wINNER("INNER");
+		static const char* wJOIN("JOIN");
+		static const char* wFULL("FULL");
+		static const char* wLEFT("LEFT");
+		static const char* wRIGHT("RIGHT");
+		static const char* wOUTER("OUTER");
+
+		PLSQLTraits::StringType const& lt1 = LT1->getText();
+		PLSQLTraits::StringType lt2;
+		
+		if ( LT2 )
 			lt2 = LT2->getText();
-			std::transform(lt2.begin(), lt2.end(), lt2.begin(), ::toupper); 
-		}
+
 		
-		if ( (boost::iequals(lt1, wPARTITION) && boost::iequals(lt2, wBY))
-		     || boost::iequals(lt1, wCROSS)
-		     || boost::iequals(lt1, wNATURAL)
-		     || boost::iequals(lt1, wINNER)
-		     || boost::iequals(lt1, wJOIN)
-		     || ( ( boost::iequals(lt1, wFULL) || boost::iequals(lt1, wLEFT) || boost::iequals(lt1, wRIGHT) ) && ( boost::iequals(lt2, wOUTER) || boost::iequals(lt2, wJOIN) ) )
-		     )
+		if ( ( lt1 == wPARTITION && lt2 == wBY)
+		     || lt1 == wCROSS
+		     || lt1 == wNATURAL
+		     || lt1 == wINNER
+		     || lt1 == wJOIN
+		     || ( ( lt1 == wFULL || lt1 == wLEFT || lt1 == wRIGHT ) && ( lt2 == wOUTER || lt2 == wJOIN ))
+			)
 		{
 			return false;
 		}
@@ -75,21 +140,21 @@ namespace Antlr3Test {
 
   	template<class StringType>
 	inline bool isStandardPredictionFunction(StringType const& originalFunctionName) {
-		static const std::string wPREDICTION("PREDICTION");
-		static const std::string wPREDICTION_BOUNDS("PREDICTION_BOUNDS");
-		static const std::string wPREDICTION_COST("PREDICTION_COST");
-		static const std::string wPREDICTION_DETAILS("PREDICTION_DETAILS");
-		static const std::string wPREDICTION_PROBABILITY("PREDICTION_PROBABILITY");
-		static const std::string wPREDICTION_SET("PREDICTION_SET");		
+		static const char* wPREDICTION("PREDICTION");
+		static const char* wPREDICTION_BOUNDS("PREDICTION_BOUNDS");
+		static const char* wPREDICTION_COST("PREDICTION_COST");
+		static const char* wPREDICTION_DETAILS("PREDICTION_DETAILS");
+		static const char* wPREDICTION_PROBABILITY("PREDICTION_PROBABILITY");
+		static const char* wPREDICTION_SET("PREDICTION_SET");		
 		// StringType  functionName = originalFunctionName;
 		// std::transform(functionName.begin(), functionName.end(), functionName.begin(), ::toupper);
 		
-		if ( boost::iequals(originalFunctionName, wPREDICTION)
-		     || boost::iequals(originalFunctionName, wPREDICTION_BOUNDS)
-		     || boost::iequals(originalFunctionName, wPREDICTION_COST)
-		     || boost::iequals(originalFunctionName, wPREDICTION_DETAILS)
-		     || boost::iequals(originalFunctionName, wPREDICTION_PROBABILITY)
-		     || boost::iequals(originalFunctionName, wPREDICTION_SET)
+		if ( (originalFunctionName == wPREDICTION)
+		     || (originalFunctionName == wPREDICTION_BOUNDS)
+		     || (originalFunctionName == wPREDICTION_COST)
+		     || (originalFunctionName == wPREDICTION_DETAILS)
+		     || (originalFunctionName == wPREDICTION_PROBABILITY)
+		     || (originalFunctionName == wPREDICTION_SET)
 			)
 		{
 			return true;
@@ -97,25 +162,30 @@ namespace Antlr3Test {
 		return false;
 	}
 
+	inline bool starts_with(PLSQLTraits::StringType const& A, const char*B)
+	{
+		return A.length() >= strlen(B) && A.compare(0, strlen(B), B) == 0;
+	}
+		
 	template<class StringType>     
 	inline bool enablesWithinOrOverClause(StringType const& originalFunctionName) {
-		static const std::string wCUME_DIST("CUME_DIST");
-		static const std::string wDENSE_RANK("DENSE_RANK");
-		static const std::string wLISTAGG("LISTAGG");
-		static const std::string wPERCENT_RANK("PERCENT_RANK");
-		static const std::string wPERCENTILE_CONT("PERCENTILE_CONT");
-		static const std::string wPERCENTILE_DISC("PERCENTILE_DISC");
-		static const std::string wRANK("RANK");		
+		static const char* wCUME_DIST("CUME_DIST");
+		static const char* wDENSE_RANK("DENSE_RANK");
+		static const char* wLISTAGG("LISTAGG");
+		static const char* wPERCENT_RANK("PERCENT_RANK");
+		static const char* wPERCENTILE_CONT("PERCENTILE_CONT");
+		static const char* wPERCENTILE_DISC("PERCENTILE_DISC");
+		static const char* wRANK("RANK");		
 		// StringType functionName = originalFunctionName;
 		// std::transform(functionName.begin(), functionName.end(), functionName.begin(), ::toupper);
 		
-		if ( boost::iequals(originalFunctionName, wCUME_DIST)
-		     || boost::iequals(originalFunctionName, wDENSE_RANK)
-		     || boost::iequals(originalFunctionName, wLISTAGG)
-		     || boost::iequals(originalFunctionName, wPERCENT_RANK)
-		     || boost::iequals(originalFunctionName, wPERCENTILE_CONT)
-		     || boost::iequals(originalFunctionName, wPERCENTILE_DISC)
-		     || boost::iequals(originalFunctionName, wRANK)
+		if ( (originalFunctionName == wCUME_DIST)
+		     || (originalFunctionName == wDENSE_RANK)
+		     || (originalFunctionName == wLISTAGG)
+		     || (originalFunctionName == wPERCENT_RANK)
+		     || (originalFunctionName == wPERCENTILE_CONT)
+		     || (originalFunctionName == wPERCENTILE_DISC)
+		     || (originalFunctionName == wRANK)
 			)
 		{
 			return true;
@@ -123,16 +193,13 @@ namespace Antlr3Test {
 		return false;
 	}
 
+
 	template<class StringType>          
 	inline bool enablesUsingClause(StringType const& originalFunctionName) {
-		static const std::string wCLUSTER("CLUSTER_");
-		static const std::string wFEATURE("FEATURE_");		
-		// StringType functionName = originalFunctionName;
-		// std::transform(functionName.begin(), functionName.end(), functionName.begin(), ::toupper);
-		
-		if ( boost::algorithm::istarts_with(originalFunctionName, wCLUSTER)
-		     || boost::algorithm::istarts_with(originalFunctionName, wFEATURE)
-			)
+		static const char *wCLUSTER("CLUSTER_");
+		static const char *wFEATURE("FEATURE_");
+	
+		if ( starts_with(originalFunctionName, wCLUSTER) || starts_with(originalFunctionName, wFEATURE) )
 		{
 			return true;
 		}
@@ -141,41 +208,41 @@ namespace Antlr3Test {
 
 	//template<class StringType>     
 	inline bool enablesOverClause(PLSQLTraits::StringType const& originalFunctionName) {
-		static const std::string wREGR("REGR_");
-		static const std::string wSTDDEV("STDDEV");
-		static const std::string wVAR("VAR_");
-		static const std::string wCOVAR("COVAR_");		
-		static const std::string wAVG("AVG");
-		static const std::string wCORR("CORR");
-		static const std::string wLAG("LAG");
-		static const std::string wLEAD("LEAD");
-		static const std::string wMAX ("MAX");
-		static const std::string wMEDIAN("MEDIAN");
-		static const std::string wMIN("MIN");
-		static const std::string wNTILE("NTILE");
-		static const std::string wRATIO_TO_REPORT("RATIO_TO_REPORT");
-		static const std::string wROW_NUMBER("ROW_NUMBER");
-		static const std::string wSUM("SUM");
-		static const std::string wVARIANCE("VARIANCE");       
+		static const char* wREGR("REGR_");
+		static const char* wSTDDEV("STDDEV");
+		static const char* wVAR("VAR_");
+		static const char* wCOVAR("COVAR_");		
+		static const char* wAVG("AVG");
+		static const char* wCORR("CORR");
+		static const char* wLAG("LAG");
+		static const char* wLEAD("LEAD");
+		static const char* wMAX ("MAX");
+		static const char* wMEDIAN("MEDIAN");
+		static const char* wMIN("MIN");
+		static const char* wNTILE("NTILE");
+		static const char* wRATIO_TO_REPORT("RATIO_TO_REPORT");
+		static const char* wROW_NUMBER("ROW_NUMBER");
+		static const char* wSUM("SUM");
+		static const char* wVARIANCE("VARIANCE");       
 		// StringType functionName = originalFunctionName;
 		// std::transform(functionName.begin(), functionName.end(), functionName.begin(), ::toupper);		
 		
-		if ( boost::iequals(originalFunctionName, wAVG)
-		     || boost::iequals(originalFunctionName, wCORR)
-		     || boost::iequals(originalFunctionName, wLAG)
-		     || boost::iequals(originalFunctionName, wLEAD)
-		     || boost::iequals(originalFunctionName, wMAX)
-		     || boost::iequals(originalFunctionName, wMEDIAN)
-		     || boost::iequals(originalFunctionName, wMIN)
-		     || boost::iequals(originalFunctionName, wNTILE)
-		     || boost::iequals(originalFunctionName, wRATIO_TO_REPORT)
-		     || boost::iequals(originalFunctionName, wROW_NUMBER)
-		     || boost::iequals(originalFunctionName, wSUM)
-		     || boost::iequals(originalFunctionName, wVARIANCE)
-		     || boost::algorithm::istarts_with(originalFunctionName, wREGR)
-		     || boost::algorithm::istarts_with(originalFunctionName, wSTDDEV)
-		     || boost::algorithm::istarts_with(originalFunctionName, wVAR)
-		     || boost::algorithm::istarts_with(originalFunctionName, wCOVAR)
+		if ( (originalFunctionName == wAVG)
+		     || (originalFunctionName == wCORR)
+		     || (originalFunctionName == wLAG)
+		     || (originalFunctionName == wLEAD)
+		     || (originalFunctionName == wMAX)
+		     || (originalFunctionName == wMEDIAN)
+		     || (originalFunctionName == wMIN)
+		     || (originalFunctionName == wNTILE)
+		     || (originalFunctionName == wRATIO_TO_REPORT)
+		     || (originalFunctionName == wROW_NUMBER)
+		     || (originalFunctionName == wSUM)
+		     || (originalFunctionName == wVARIANCE)
+		     || starts_with(originalFunctionName, wREGR)
+		     || starts_with(originalFunctionName, wSTDDEV)
+		     || starts_with(originalFunctionName, wVAR)
+		     || starts_with(originalFunctionName, wCOVAR)
 			)
 		{
 			return true;
@@ -193,5 +260,5 @@ namespace Antlr3Test {
 		return sstr.str();
 	}
 };
-
+ 
 #endif
diff --git a/runtime/Cpp/tests/a001.cpp b/runtime/Cpp/tests/a001.cpp
index 98d996ba3..ba29342d1 100644
--- a/runtime/Cpp/tests/a001.cpp
+++ b/runtime/Cpp/tests/a001.cpp
@@ -29,7 +29,7 @@ main	(int argc, char *argv[])
 void test1(const char* input)
 {
 	a001LexerTraits::InputStreamType* istream = new a001LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-											 , ANTLR_ENC_8BIT
+											 , antlr3::ENC_8BIT
 											 , strlen(input)
 											 , (ANTLR_UINT8*)"test1");
 	istream->setUcaseLA(true);
@@ -51,7 +51,7 @@ void test1(const char* input)
 void test2(const char* input)
 {
 	auto istream = new a001LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-							    , ANTLR_ENC_8BIT
+							    , antlr3::ENC_8BIT
 							    , strlen(input)
 							    , (ANTLR_UINT8*)"test2");
 	istream->setUcaseLA(true);
@@ -73,7 +73,7 @@ void test2(const char* input)
 void test3(const char* input)
 {
 	auto istream = new a001LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-							    , ANTLR_ENC_8BIT
+							    , antlr3::ENC_8BIT
 							    , strlen(input)
 							    , (ANTLR_UINT8*)"test3");
 	istream->setUcaseLA(true);
diff --git a/runtime/Cpp/tests/a002.cpp b/runtime/Cpp/tests/a002.cpp
index d0a144ea4..8723af1fb 100644
--- a/runtime/Cpp/tests/a002.cpp
+++ b/runtime/Cpp/tests/a002.cpp
@@ -33,7 +33,7 @@ main	(int argc, char *argv[])
 void test1(const char* input)
 {
 	a002LexerTraits::InputStreamType* istream = new a002LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-											 , ANTLR_ENC_8BIT
+											 , antlr3::ENC_8BIT
 											 , strlen(input)
 											 , (ANTLR_UINT8*)"test1");
 	istream->setUcaseLA(true);
@@ -55,7 +55,7 @@ void test1(const char* input)
 void test2(const char* input)
 {
 	auto istream = new a002LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-							    , ANTLR_ENC_8BIT
+							    , antlr3::ENC_8BIT
 							    , strlen(input)
 							    , (ANTLR_UINT8*)"test2");
 	istream->setUcaseLA(true);
@@ -77,7 +77,7 @@ void test2(const char* input)
 void test3(const char* input)
 {
 	auto istream = new a002LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-							    , ANTLR_ENC_8BIT
+							    , antlr3::ENC_8BIT
 							    , strlen(input)
 							    , (ANTLR_UINT8*)"test2");
 	istream->setUcaseLA(true);
@@ -99,7 +99,7 @@ void test3(const char* input)
 void test4(const char* input)
 {
 	auto istream = new a002LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-							    , ANTLR_ENC_8BIT
+							    , antlr3::ENC_8BIT
 							    , strlen(input)
 							    , (ANTLR_UINT8*)"test2");
 	istream->setUcaseLA(true);
@@ -121,7 +121,7 @@ void test4(const char* input)
 void test5(const char* input)
 {
 	auto istream = new a002LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-							    , ANTLR_ENC_8BIT
+							    , antlr3::ENC_8BIT
 							    , strlen(input)
 							    , (ANTLR_UINT8*)"test2");
 	istream->setUcaseLA(true);
diff --git a/runtime/Cpp/tests/a003.cpp b/runtime/Cpp/tests/a003.cpp
index fd0630009..8d513373b 100644
--- a/runtime/Cpp/tests/a003.cpp
+++ b/runtime/Cpp/tests/a003.cpp
@@ -38,7 +38,7 @@ main	(int argc, char *argv[])
 void test1(const char* input)
 {
 	a003LexerTraits::InputStreamType* istream = new a003LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-											 , ANTLR_ENC_8BIT
+											 , antlr3::ENC_8BIT
 											 , strlen(input)
 											 , (ANTLR_UINT8*)"test1");
 	istream->setUcaseLA(true);
@@ -60,7 +60,7 @@ void test1(const char* input)
 void test2(const char* input)
 {
 	auto istream = new a003LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-							    , ANTLR_ENC_8BIT
+							    , antlr3::ENC_8BIT
 							    , strlen(input)
 							    , (ANTLR_UINT8*)"test2");
 	istream->setUcaseLA(true);
@@ -82,7 +82,7 @@ void test2(const char* input)
 void test3(const char* input)
 {
 	auto istream = new a003LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-							    , ANTLR_ENC_8BIT
+							    , antlr3::ENC_8BIT
 							    , strlen(input)
 							    , (ANTLR_UINT8*)"test2");
 	istream->setUcaseLA(true);
@@ -104,7 +104,7 @@ void test3(const char* input)
 void test4(const char* input)
 {
 	auto istream = new a003LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-							    , ANTLR_ENC_8BIT
+							    , antlr3::ENC_8BIT
 							    , strlen(input)
 							    , (ANTLR_UINT8*)"test2");
 	istream->setUcaseLA(true);
@@ -126,7 +126,7 @@ void test4(const char* input)
 void test5(const char* input)
 {
 	auto istream = new a003LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-							    , ANTLR_ENC_8BIT
+							    , antlr3::ENC_8BIT
 							    , strlen(input)
 							    , (ANTLR_UINT8*)"test2");
 	istream->setUcaseLA(true);
diff --git a/runtime/Cpp/tests/a004.cpp b/runtime/Cpp/tests/a004.cpp
index d4715f61a..3ec956051 100644
--- a/runtime/Cpp/tests/a004.cpp
+++ b/runtime/Cpp/tests/a004.cpp
@@ -35,7 +35,7 @@ main	(int argc, char *argv[])
 void test1(const char* input)
 {
 	a004LexerTraits::InputStreamType* istream = new a004LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-											 , ANTLR_ENC_8BIT
+											 , antlr3::ENC_8BIT
 											 , strlen(input)
 											 , (ANTLR_UINT8*)"test1");
 	istream->setUcaseLA(true);
@@ -57,7 +57,7 @@ void test1(const char* input)
 void test2(const char* input)
 {
 	auto istream = new a004LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-							    , ANTLR_ENC_8BIT
+							    , antlr3::ENC_8BIT
 							    , strlen(input)
 							    , (ANTLR_UINT8*)"test2");
 	istream->setUcaseLA(true);
@@ -79,7 +79,7 @@ void test2(const char* input)
 void test3(const char* input)
 {
 	auto istream = new a004LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-							    , ANTLR_ENC_8BIT
+							    , antlr3::ENC_8BIT
 							    , strlen(input)
 							    , (ANTLR_UINT8*)"test2");
 	istream->setUcaseLA(true);
@@ -101,7 +101,7 @@ void test3(const char* input)
 void test4(const char* input)
 {
 	auto istream = new a004LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-							    , ANTLR_ENC_8BIT
+							    , antlr3::ENC_8BIT
 							    , strlen(input)
 							    , (ANTLR_UINT8*)"test4");
 	istream->setUcaseLA(true);
@@ -123,7 +123,7 @@ void test4(const char* input)
 void test5(const char* input)
 {
 	auto istream = new a004LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-							    , ANTLR_ENC_8BIT
+							    , antlr3::ENC_8BIT
 							    , strlen(input)
 							    , (ANTLR_UINT8*)"test5");
 	istream->setUcaseLA(true);
@@ -145,7 +145,7 @@ void test5(const char* input)
 void test6(const char* input)
 {
 	auto istream = new a004LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-							    , ANTLR_ENC_8BIT
+							    , antlr3::ENC_8BIT
 							    , strlen(input)
 							    , (ANTLR_UINT8*)"test6");
 	istream->setUcaseLA(true);
diff --git a/runtime/Cpp/tests/a005.cpp b/runtime/Cpp/tests/a005.cpp
index 5efef3df8..c8e165281 100644
--- a/runtime/Cpp/tests/a005.cpp
+++ b/runtime/Cpp/tests/a005.cpp
@@ -31,7 +31,7 @@ main	(int argc, char *argv[])
 void test1(const char* input)
 {
 	a005LexerTraits::InputStreamType* istream = new a005LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-											 , ANTLR_ENC_8BIT
+											 , antlr3::ENC_8BIT
 											 , strlen(input)
 											 , (ANTLR_UINT8*)"test1");
 	istream->setUcaseLA(true);
@@ -53,7 +53,7 @@ void test1(const char* input)
 void test2(const char* input)
 {
 	a005LexerTraits::InputStreamType* istream = new a005LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-											 , ANTLR_ENC_8BIT
+											 , antlr3::ENC_8BIT
 											 , strlen(input)
 											 , (ANTLR_UINT8*)"test2");
 	istream->setUcaseLA(true);
@@ -75,7 +75,7 @@ void test2(const char* input)
 void test3(const char* input)
 {
 	a005LexerTraits::InputStreamType* istream = new a005LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-											 , ANTLR_ENC_8BIT
+											 , antlr3::ENC_8BIT
 											 , strlen(input)
 											 , (ANTLR_UINT8*)"test3");
 	istream->setUcaseLA(true);
@@ -97,7 +97,7 @@ void test3(const char* input)
 void test4(const char* input)
 {
 	a005LexerTraits::InputStreamType* istream = new a005LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
-											 , ANTLR_ENC_8BIT
+											 , antlr3::ENC_8BIT
 											 , strlen(input)
 											 , (ANTLR_UINT8*)"test4");
 	istream->setUcaseLA(true);
diff --git a/runtime/Cpp/tests/s001.cpp b/runtime/Cpp/tests/s001.cpp
index 81528f8fd..1ca1d1577 100644
--- a/runtime/Cpp/tests/s001.cpp
+++ b/runtime/Cpp/tests/s001.cpp
@@ -50,7 +50,7 @@ void parseFile(const char* fName, int fd)
 	string data = Utils::slurp(fName);
 #endif
 	input	= new s001LexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str()
-						       , ANTLR_ENC_8BIT
+						       , antlr3::ENC_8BIT
 						       , data.length()
 						       , (ANTLR_UINT8*)fName);
 	input->setUcaseLA(true);
diff --git a/runtime/Cpp/tests/s002.cpp b/runtime/Cpp/tests/s002.cpp
index a4523ac01..d801a0d83 100644
--- a/runtime/Cpp/tests/s002.cpp
+++ b/runtime/Cpp/tests/s002.cpp
@@ -44,7 +44,7 @@ void parseFile(const char* fName, int fd)
 	string data = Utils::slurp(fName);
 #endif
 	input	= new s002LexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str()
-						       , ANTLR_ENC_8BIT
+						       , antlr3::ENC_8BIT
 						       , data.length()
 						       , (ANTLR_UINT8*)fName);
 
diff --git a/runtime/Cpp/tests/s003.cpp b/runtime/Cpp/tests/s003.cpp
index b39de2a5d..63b16b3bf 100644
--- a/runtime/Cpp/tests/s003.cpp
+++ b/runtime/Cpp/tests/s003.cpp
@@ -53,7 +53,7 @@ void parseFile(const char* fName, int fd)
 	string data = Utils::slurp(fName);
 #endif
 	input	= new s003LexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-						   ANTLR_ENC_8BIT,
+						   antlr3::ENC_8BIT,
 						   data.length(), //strlen(data.c_str()),
 						   (ANTLR_UINT8*)fName);
 	// No case-sensitivity
diff --git a/runtime/Cpp/tests/s004.cpp b/runtime/Cpp/tests/s004.cpp
index 670c1f3b5..0e3653565 100644
--- a/runtime/Cpp/tests/s004.cpp
+++ b/runtime/Cpp/tests/s004.cpp
@@ -53,14 +53,14 @@ void parseFile(const char* fName, int fd)
 	time ( &rawtime );
 	std::cout<<ctime(&rawtime)<<": parsing started" << std::endl;
 
-	///byIvan input	= new PLSQLTraits::InputStreamType(fName, ANTLR_ENC_8BIT);
+	///byIvan input	= new PLSQLTraits::InputStreamType(fName, antlr3::ENC_8BIT);
 #if defined __linux
 	string data = Utils::slurp(fd);
 #else
 	string data = Utils::slurp(fName);
 #endif
 	auto input = new PLSQLTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-						      ANTLR_ENC_8BIT,
+						      antlr3::ENC_8BIT,
 						      data.length(), //strlen(data.c_str()),
 						      (ANTLR_UINT8*)fName);
 	input->setUcaseLA(true);
diff --git a/runtime/Cpp/tests/s005.cpp b/runtime/Cpp/tests/s005.cpp
index 30beca766..e51d085fd 100644
--- a/runtime/Cpp/tests/s005.cpp
+++ b/runtime/Cpp/tests/s005.cpp
@@ -127,14 +127,14 @@ void parseFile(const char* fName, int fd)
 	// Create the input stream using the supplied file name
 	// (Use antlr3AsciiFileStreamNew for UCS2/16bit input).
 	//
-	///byIvan input	= new PLSQLTraits::InputStreamType(fName, ANTLR_ENC_8BIT);
+	///byIvan input	= new PLSQLTraits::InputStreamType(fName, antlr3::ENC_8BIT);
 #if defined __linux
 	string data = Utils::slurp(fd);
 #else
 	string data = Utils::slurp(fName);
 #endif
 	input	= new SQLMiniLexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-						   ANTLR_ENC_8BIT,
+						   antlr3::ENC_8BIT,
 						   data.length(), //strlen(data.c_str()),
 						   (ANTLR_UINT8*)fName);
 
diff --git a/runtime/Cpp/tests/s006.cpp b/runtime/Cpp/tests/s006.cpp
index 30beca766..e51d085fd 100644
--- a/runtime/Cpp/tests/s006.cpp
+++ b/runtime/Cpp/tests/s006.cpp
@@ -127,14 +127,14 @@ void parseFile(const char* fName, int fd)
 	// Create the input stream using the supplied file name
 	// (Use antlr3AsciiFileStreamNew for UCS2/16bit input).
 	//
-	///byIvan input	= new PLSQLTraits::InputStreamType(fName, ANTLR_ENC_8BIT);
+	///byIvan input	= new PLSQLTraits::InputStreamType(fName, antlr3::ENC_8BIT);
 #if defined __linux
 	string data = Utils::slurp(fd);
 #else
 	string data = Utils::slurp(fName);
 #endif
 	input	= new SQLMiniLexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-						   ANTLR_ENC_8BIT,
+						   antlr3::ENC_8BIT,
 						   data.length(), //strlen(data.c_str()),
 						   (ANTLR_UINT8*)fName);
 
diff --git a/runtime/Cpp/tests/t001.cpp b/runtime/Cpp/tests/t001.cpp
index 453a9b055..6c4225a19 100644
--- a/runtime/Cpp/tests/t001.cpp
+++ b/runtime/Cpp/tests/t001.cpp
@@ -27,7 +27,7 @@ int main (int argc, char *argv[])
 int testValid(string const& data)
 {
 	t001lexerTraits::InputStreamType* input	= new t001lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t001");
 	if (lxr == NULL)
@@ -51,7 +51,7 @@ int testValid(string const& data)
 int testIteratorInterface(string const& data)
 {
 	t001lexerTraits::InputStreamType* input	= new t001lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t001");
 	if (lxr == NULL)
@@ -77,7 +77,7 @@ int testIteratorInterface(string const& data)
 int testMalformedInput(string const& data)
 {
 	t001lexerTraits::InputStreamType* input	= new t001lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t001");
 	if (lxr == NULL)
diff --git a/runtime/Cpp/tests/t002.cpp b/runtime/Cpp/tests/t002.cpp
index 776a4dc29..f0e7548ad 100644
--- a/runtime/Cpp/tests/t002.cpp
+++ b/runtime/Cpp/tests/t002.cpp
@@ -33,7 +33,7 @@ int main (int argc, char *argv[])
 int testValid(string const& data)
 {
 	t002lexerTraits::InputStreamType* input	= new t002lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t002");
 	if (lxr == NULL)
@@ -60,7 +60,7 @@ int testValid(string const& data)
 int testIteratorInterface(string const& data)
 {
 	t002lexerTraits::InputStreamType* input	= new t002lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t002");
 	if (lxr == NULL)
@@ -88,7 +88,7 @@ int testIteratorInterface(string const& data)
 int testMalformedInput(string const& data)
 {
 	t002lexerTraits::InputStreamType* input	= new t002lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t002");
 	if (lxr == NULL)
diff --git a/runtime/Cpp/tests/t003.cpp b/runtime/Cpp/tests/t003.cpp
index e7a163aa7..afef203c0 100644
--- a/runtime/Cpp/tests/t003.cpp
+++ b/runtime/Cpp/tests/t003.cpp
@@ -43,7 +43,7 @@ int main (int argc, char *argv[])
 int testValid(string const& data)
 {
 	t003lexerTraits::InputStreamType* input	= new t003lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t003");
 	if (lxr == NULL)
@@ -70,7 +70,7 @@ int testValid(string const& data)
 int testIteratorInterface(string const& data)
 {
 	t003lexerTraits::InputStreamType* input	= new t003lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t003");
 	if (lxr == NULL)
@@ -100,7 +100,7 @@ int testIteratorInterface(string const& data)
 int testMalformedInput(string const& data)
 {
 	t003lexerTraits::InputStreamType* input	= new t003lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t003");
 	if (lxr == NULL)
diff --git a/runtime/Cpp/tests/t004.cpp b/runtime/Cpp/tests/t004.cpp
index fc0ecd3fd..e6204cc16 100644
--- a/runtime/Cpp/tests/t004.cpp
+++ b/runtime/Cpp/tests/t004.cpp
@@ -41,7 +41,7 @@ int main (int argc, char *argv[])
 int testValid(string const& data)
 {
 	t004lexerTraits::InputStreamType* input	= new t004lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t004");
 	if (lxr == NULL)
@@ -81,7 +81,7 @@ int testValid(string const& data)
 int testMalformedInput(string const& data)
 {
 	t004lexerTraits::InputStreamType* input	= new t004lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t004");
 	if (lxr == NULL)
diff --git a/runtime/Cpp/tests/t005.cpp b/runtime/Cpp/tests/t005.cpp
index 748463052..ee5fea62d 100644
--- a/runtime/Cpp/tests/t005.cpp
+++ b/runtime/Cpp/tests/t005.cpp
@@ -44,7 +44,7 @@ int main (int argc, char *argv[])
 int testValid(string const& data)
 {
 	t005lexerTraits::InputStreamType* input	= new t005lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t005");
 	if (lxr == NULL)
@@ -84,7 +84,7 @@ int testValid(string const& data)
 int testMalformedInput1(string const& data)
 {
 	t005lexerTraits::InputStreamType* input	= new t005lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t005");
 	if (lxr == NULL)
@@ -109,7 +109,7 @@ int testMalformedInput1(string const& data)
 int testMalformedInput2(string const& data)
 {
 	t005lexerTraits::InputStreamType* input	= new t005lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t005");
 	if (lxr == NULL)
diff --git a/runtime/Cpp/tests/t006.cpp b/runtime/Cpp/tests/t006.cpp
index 38c6d2f33..5e6127fc2 100644
--- a/runtime/Cpp/tests/t006.cpp
+++ b/runtime/Cpp/tests/t006.cpp
@@ -41,7 +41,7 @@ int main (int argc, char *argv[])
 int testValid(string const& data)
 {
 	t006lexerTraits::InputStreamType* input	= new t006lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t006");
 	if (lxr == NULL)
@@ -81,7 +81,7 @@ int testValid(string const& data)
 int testMalformedInput(string const& data)
 {
 	t006lexerTraits::InputStreamType* input	= new t006lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t006");
 	if (lxr == NULL)
diff --git a/runtime/Cpp/tests/t007.cpp b/runtime/Cpp/tests/t007.cpp
index dc9b5a3a7..6eeb0ee74 100644
--- a/runtime/Cpp/tests/t007.cpp
+++ b/runtime/Cpp/tests/t007.cpp
@@ -41,7 +41,7 @@ int main (int argc, char *argv[])
 int testValid(string const& data)
 {
 	t007lexerTraits::InputStreamType* input	= new t007lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t007");
 	if (lxr == NULL)
@@ -81,7 +81,7 @@ int testValid(string const& data)
 int testMalformedInput(string const& data)
 {
 	t007lexerTraits::InputStreamType* input	= new t007lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t007");
 	if (lxr == NULL)
diff --git a/runtime/Cpp/tests/t008.cpp b/runtime/Cpp/tests/t008.cpp
index fbb541b7e..a176ac093 100644
--- a/runtime/Cpp/tests/t008.cpp
+++ b/runtime/Cpp/tests/t008.cpp
@@ -42,7 +42,7 @@ int main (int argc, char *argv[])
 int testValid(string const& data)
 {
 	t008lexerTraits::InputStreamType* input	= new t008lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t008");
 	if (lxr == NULL)
@@ -82,7 +82,7 @@ int testValid(string const& data)
 int testMalformedInput(string const& data)
 {
 	t008lexerTraits::InputStreamType* input	= new t008lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t008");
 	if (lxr == NULL)
diff --git a/runtime/Cpp/tests/t009.cpp b/runtime/Cpp/tests/t009.cpp
index 75b2fca6b..b80df5c33 100644
--- a/runtime/Cpp/tests/t009.cpp
+++ b/runtime/Cpp/tests/t009.cpp
@@ -42,7 +42,7 @@ int main (int argc, char *argv[])
 int testValid(string const& data)
 {
 	t009lexerTraits::InputStreamType* input	= new t009lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t009");
 	if (lxr == NULL)
@@ -82,7 +82,7 @@ int testValid(string const& data)
 int testMalformedInput(string const& data)
 {
 	t009lexerTraits::InputStreamType* input	= new t009lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t009");
 	if (lxr == NULL)
diff --git a/runtime/Cpp/tests/t010.cpp b/runtime/Cpp/tests/t010.cpp
index 0b9fca7ea..afeffa6ae 100644
--- a/runtime/Cpp/tests/t010.cpp
+++ b/runtime/Cpp/tests/t010.cpp
@@ -44,7 +44,7 @@ int main (int argc, char *argv[])
 int testValid(string const& data)
 {
 	t010lexerTraits::InputStreamType* input	= new t010lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t010");
 	if (lxr == NULL)
@@ -84,7 +84,7 @@ int testValid(string const& data)
 int testMalformedInput(string const& data)
 {
 	t010lexerTraits::InputStreamType* input	= new t010lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t010");
 	if (lxr == NULL)
diff --git a/runtime/Cpp/tests/t011.cpp b/runtime/Cpp/tests/t011.cpp
index d8e40c748..d36506370 100644
--- a/runtime/Cpp/tests/t011.cpp
+++ b/runtime/Cpp/tests/t011.cpp
@@ -44,7 +44,7 @@ int main (int argc, char *argv[])
 int testValid(string const& data)
 {
 	t011lexerTraits::InputStreamType* input	= new t011lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t011");
 	if (lxr == NULL)
@@ -84,7 +84,7 @@ int testValid(string const& data)
 int testMalformedInput(string const& data)
 {
 	t011lexerTraits::InputStreamType* input	= new t011lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t011");
 	if (lxr == NULL)
diff --git a/runtime/Cpp/tests/t012.cpp b/runtime/Cpp/tests/t012.cpp
index 80b45be2f..76fcb6a46 100644
--- a/runtime/Cpp/tests/t012.cpp
+++ b/runtime/Cpp/tests/t012.cpp
@@ -31,7 +31,7 @@ int testValid(string const& inFilename, string const& outFilename)
 {
 	string data = slurp(inFilename);
 	t012lexerXMLLexerTraits::InputStreamType* input	= new t012lexerXMLLexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 											   (ANTLR_UINT8*)inFilename.c_str());
 	if (lxr == NULL)
@@ -63,7 +63,7 @@ int testValid(string const& inFilename, string const& outFilename)
 int testMalformedInput1(string const& data)
 {
 	t012lexerXMLLexerTraits::InputStreamType* input	= new t012lexerXMLLexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t012");
 	if (lxr == NULL)
@@ -101,7 +101,7 @@ int testMalformedInput1(string const& data)
 int testMalformedInput2(string const& data)
 {
 	t012lexerXMLLexerTraits::InputStreamType* input	= new t012lexerXMLLexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t012");
 	if (lxr == NULL)
@@ -139,7 +139,7 @@ int testMalformedInput2(string const& data)
 int testMalformedInput3(string const& data)
 {
 	t012lexerXMLLexerTraits::InputStreamType* input	= new t012lexerXMLLexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t012");
 	if (lxr == NULL)
diff --git a/runtime/Cpp/tests/t020.cpp b/runtime/Cpp/tests/t020.cpp
index 7b831e5b5..8d691fd20 100644
--- a/runtime/Cpp/tests/t020.cpp
+++ b/runtime/Cpp/tests/t020.cpp
@@ -24,7 +24,7 @@ int testValid(string const& inFilename, string const& outFilename)
 {
 	string data = slurp(inFilename);
 	t020fuzzyLexerTraits::InputStreamType* input	= new t020fuzzyLexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-												    ANTLR_ENC_8BIT,
+												    antlr3::ENC_8BIT,
 												    data.length(), //strlen(data.c_str()),
 												    (ANTLR_UINT8*)inFilename.c_str());
 	if (lxr == NULL)
diff --git a/runtime/Cpp/tests/t039.cpp b/runtime/Cpp/tests/t039.cpp
index d5797ac67..141da9758 100644
--- a/runtime/Cpp/tests/t039.cpp
+++ b/runtime/Cpp/tests/t039.cpp
@@ -62,7 +62,7 @@ int main (int argc, char *argv[])
 int testValid(string const& data)
 {
 	t039labelsLexerTraits::InputStreamType* input	= new t039labelsLexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-										       ANTLR_ENC_8BIT,
+										       antlr3::ENC_8BIT,
 										       data.length(), //strlen(data.c_str()),
 										       (ANTLR_UINT8*)"t039");
 	if (lxr == NULL)
diff --git a/runtime/Cpp/tests/t051.cpp b/runtime/Cpp/tests/t051.cpp
index c89e3a582..0aa7ae0c3 100644
--- a/runtime/Cpp/tests/t051.cpp
+++ b/runtime/Cpp/tests/t051.cpp
@@ -42,7 +42,7 @@ void parseFile(const char* fName)
 	string data = slurp(fName);
 
 	input	= new t051lexerTraits::InputStreamType((const ANTLR_UINT8 *)data.c_str(),
-						       ANTLR_ENC_8BIT,
+						       antlr3::ENC_8BIT,
 						       data.length(), //strlen(data.c_str()),
 						       (ANTLR_UINT8*)fName);
 

From 1ecc77e8f2a25f04552bc2efd691d18556d9adb2 Mon Sep 17 00:00:00 2001
From: ibre5041 <ibre5041@ibrezina.net>
Date: Fri, 15 Aug 2014 21:31:42 +0200
Subject: [PATCH 31/53] Force all enum values (including EOF_TOKEN) to be
 unsigned

- removes compiler warning
---
 runtime/Cpp/include/antlr3commontoken.hpp                       | 2 +-
 tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/Cpp/include/antlr3commontoken.hpp b/runtime/Cpp/include/antlr3commontoken.hpp
index a52f6954c..0ac5089dd 100644
--- a/runtime/Cpp/include/antlr3commontoken.hpp
+++ b/runtime/Cpp/include/antlr3commontoken.hpp
@@ -56,7 +56,7 @@ class CommonToken : public ImplTraits::AllocPolicyType
 public:
 	/* Base token types, which all lexer/parser tokens come after in sequence.
 	*/
-	enum TOKEN_TYPE
+	enum TOKEN_TYPE : ANTLR_UINT32
 	{
 		/** Indicator of an invalid token
 		 */
diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
index 693d36b93..effe9d468 100644
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
@@ -357,7 +357,7 @@ public:
 	 * so we just undef it here for now. That isn't the value we get back from C recognizers
 	 * anyway. We are looking for ANTLR_TOKEN_EOF.
 	 */
-	enum Tokens 
+	enum Tokens : ANTLR_UINT32
 	{
 		EOF_TOKEN = <name>ImplTraits::CommonTokenType::TOKEN_EOF
 		<tokens:{it | , <it.name> = <it.type> }; separator="\n">

From 1e1405fbdd65f8dc38d2a0be27951052e1e82e91 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Sat, 16 Aug 2014 00:23:46 +0200
Subject: [PATCH 32/53] Linux compile fixes, older gcc support

---
 runtime/Cpp/include/antlr3.hpp                |  1 +
 runtime/Cpp/include/antlr3compilerwarning.hpp |  2 +
 runtime/Cpp/tests/Makefile                    | 56 +++++++++----------
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/runtime/Cpp/include/antlr3.hpp b/runtime/Cpp/include/antlr3.hpp
index 4b0367205..d8cccb4aa 100644
--- a/runtime/Cpp/include/antlr3.hpp
+++ b/runtime/Cpp/include/antlr3.hpp
@@ -29,6 +29,7 @@
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <cassert>
+#include <cstddef> // ptrdiff_t
 #include <cstdint> // uint32_t, ...
 #include <cstdio>  // stderr (TODO remove fprintf(stderr)
 #include <cstdlib> // malloc, calloc
diff --git a/runtime/Cpp/include/antlr3compilerwarning.hpp b/runtime/Cpp/include/antlr3compilerwarning.hpp
index 2f7fad5cd..fe6907927 100644
--- a/runtime/Cpp/include/antlr3compilerwarning.hpp
+++ b/runtime/Cpp/include/antlr3compilerwarning.hpp
@@ -48,7 +48,9 @@
 #if defined(__GNUC__) && !defined(__clang__)
 //#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-variable"
+#if __GNUC_MINOR__ >= 8
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#endif
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #endif
 
diff --git a/runtime/Cpp/tests/Makefile b/runtime/Cpp/tests/Makefile
index ae06444ed..628f97cd1 100644
--- a/runtime/Cpp/tests/Makefile
+++ b/runtime/Cpp/tests/Makefile
@@ -33,87 +33,87 @@ $(ANTLR): $(STGS)
 	-C ../../../tool/src/main/resources org/antlr/codegen/templates/Cpp/ASTParser.stg
 
 a001:	a001.cpp a001.tokens ATestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 a002:	a002.cpp a002.tokens ATestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 a003:	a003.cpp a003.tokens ATestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 a004:	a004.cpp a004.tokens ATestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 a005:	a005.cpp a005.tokens ATestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 s001:	s001.cpp s001.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) utils.cpp -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) utils.cpp -o $@
 
 s002:	s002.cpp s002.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) utils.cpp -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) utils.cpp -o $@
 
 s003:	s003.cpp s003.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) utils.cpp -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) utils.cpp -o $@
 
 t001:	t001.cpp t001lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL -DD $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t002:	t002.cpp t002lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t003:	t003.cpp t003lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t004:	t004.cpp t004lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t005:	t005.cpp t005lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t006:	t006.cpp t006lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t007:	t007.cpp t007lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t008:	t008.cpp t008lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t009:	t009.cpp t009lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t010:	t010.cpp t010lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t011:	t011.cpp t011lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t012:	t012.cpp t012lexerXMLLexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t020:	t020.cpp t020fuzzyLexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t039:	t039.cpp t039labels.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 t051:	t051.cpp t051lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 s004:   s004.cpp PLSQLLexer.tokens PLSQLParser.tokens PLSQL_DMLParser.g PTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< PLSQLLexer*.cpp PLSQLParser*.cpp utils.cpp -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< PLSQLLexer*.cpp PLSQLParser*.cpp utils.cpp -o $@
 
 s005:   s005.cpp SQLMini.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< SQLMiniLexer.cpp SQLMiniParser.cpp utils.cpp -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< SQLMiniLexer.cpp SQLMiniParser.cpp utils.cpp -o $@
 
 s006:   s006.cpp SQLMini2.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< SQLMiniLexer.cpp SQLMiniParser.cpp utils.cpp -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $< SQLMiniLexer.cpp SQLMiniParser.cpp utils.cpp -o $@
 
 # AST commented out
 #
 # t042:	t042.cpp t005lexer.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
-# 	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+# 	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
 clean:
 	rm -f *.o [ast]0[0-9][0-9]??*.[ch]pp *.tokens [ast][0-9][0-9][0-9] [ast]0[0-9][0-9].exe
@@ -136,4 +136,4 @@ endif
 endif
 
 %.o: %.cpp $(HEADERS) utils.hpp
-	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) -c $< -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) -c $< -o $@

From fff22712c8bf4d78a246478863f6c2b66ee0daf3 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Sat, 16 Aug 2014 01:02:50 +0200
Subject: [PATCH 33/53] fix for BLOCK[$lc,"BLOCK"]

create( ANTLR_UINT32 tokenType, const CommonTokenType* fromToken, const char* text);
---
 runtime/Cpp/include/antlr3commontreeadaptor.inl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.inl b/runtime/Cpp/include/antlr3commontreeadaptor.inl
index 6cc8a4bad..7419b3a4d 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.inl
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.inl
@@ -327,13 +327,13 @@ CommonTreeAdaptor<ImplTraits>::create( ANTLR_UINT32 tokenType, const CommonToken
 	if (fromToken == NULL)
 		return create(tokenType, text);
 	/* Create the new token */
-	fromToken = this->createToken(fromToken);
+	auto newToken = this->createToken(fromToken);
 	/* Set the type of the new token to that supplied */
-	fromToken->set_type(tokenType);
+	newToken->set_type(tokenType);
 	/* Set the text of the token accordingly */
-	fromToken->set_text(text);
+	newToken->setText(text);
 	/* Return a new node based upon this token */
-	return	this->create(fromToken);
+	return	this->create(newToken);
 }
 
 template<class ImplTraits>

From e33569be400290689c71923869c317aeadf6168c Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Sat, 16 Aug 2014 05:13:22 +0200
Subject: [PATCH 34/53] CommonTree::getCharPositionInLine/getLine renamed and
 fixed

---
 runtime/Cpp/include/antlr3commontree.hpp |  7 ++++---
 runtime/Cpp/include/antlr3commontree.inl | 16 ++++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/runtime/Cpp/include/antlr3commontree.hpp b/runtime/Cpp/include/antlr3commontree.hpp
index 3aa7177a2..3f12e2f97 100644
--- a/runtime/Cpp/include/antlr3commontree.hpp
+++ b/runtime/Cpp/include/antlr3commontree.hpp
@@ -120,13 +120,14 @@ class CommonTree : public ImplTraits::AllocPolicyType
 	CommonTree*	dupNode(void *) const;
 
 
-	ANTLR_UINT32	getCharPositionInLine();
+	ANTLR_UINT32	get_charPositionInLine() const;
+	ANTLR_UINT32	get_line() const;
+
 	TreeTypePtr&	getChild(ANTLR_UINT32 i);
-	
 	ANTLR_UINT32	getChildCount() const;
 	ANTLR_UINT32	getType();
 	TreeTypePtr&	getFirstChildWithType(ANTLR_UINT32 type);
-	ANTLR_UINT32	getLine();
+
 	StringType	getText();
 	bool	isNilNode();
 	void	setChild(ANTLR_UINT32 i, TreeTypePtr child);
diff --git a/runtime/Cpp/include/antlr3commontree.inl b/runtime/Cpp/include/antlr3commontree.inl
index 57634f49f..ff164ef7e 100644
--- a/runtime/Cpp/include/antlr3commontree.inl
+++ b/runtime/Cpp/include/antlr3commontree.inl
@@ -238,11 +238,13 @@ CommonTree<ImplTraits>*	CommonTree<ImplTraits>::dupNode(void *p) const
 }
 
 template<class ImplTraits>
-ANTLR_UINT32	CommonTree<ImplTraits>::getCharPositionInLine()
+ANTLR_UINT32	CommonTree<ImplTraits>::get_charPositionInLine() const
 {
 	if(m_token == NULL || (m_token->get_charPositionInLine() == 0) )
 	{
-		if(!m_children.empty() && m_children.front())
+		if(m_children.empty())
+			return 0;
+		if(m_children.front())
 			return m_children.front()->get_charPositionInLine();
 		return 0;
 	}
@@ -351,15 +353,17 @@ typename CommonTree<ImplTraits>::TreeTypePtr& CommonTree<ImplTraits>::getFirstCh
 }
 
 template<class ImplTraits>
-ANTLR_UINT32	CommonTree<ImplTraits>::getLine()
+ANTLR_UINT32	CommonTree<ImplTraits>::get_line() const
 {
 	if(m_token == NULL || m_token->get_line() == 0)
 	{
-		if  ( this->getChildCount() > 0)
-			return this->getChild(0)->get_line();
+		if ( m_children.empty())
+			return 0;
+		if ( m_children.front())
+			return m_children.front()->get_line();
 		return 0;
 	}
-	return  m_token->get_line();
+	return m_token->get_line();
 }
 
 template<class ImplTraits>

From 1e6ddad9dfe37cbcabc6816ce112abc82db501a0 Mon Sep 17 00:00:00 2001
From: ibre5041 <ibre5041@ibrezina.net>
Date: Thu, 21 Aug 2014 14:17:24 +0200
Subject: [PATCH 35/53] Function name aligned

_LA renamed to LA

Conflicts:
	runtime/Cpp/include/antlr3intstream.inl
---
 runtime/Cpp/include/antlr3baserecognizer.inl |  8 ++--
 runtime/Cpp/include/antlr3cyclicdfa.inl      |  2 +-
 runtime/Cpp/include/antlr3input.inl          |  2 +-
 runtime/Cpp/include/antlr3intstream.hpp      | 28 ++++++-------
 runtime/Cpp/include/antlr3intstream.inl      | 42 ++++++++++----------
 runtime/Cpp/include/antlr3lexer.inl          | 10 ++---
 runtime/Cpp/include/antlr3parser.inl         |  2 +-
 runtime/Cpp/include/antlr3tokenstream.inl    |  2 +-
 8 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/runtime/Cpp/include/antlr3baserecognizer.inl b/runtime/Cpp/include/antlr3baserecognizer.inl
index bd7cc5319..0c4cd886d 100644
--- a/runtime/Cpp/include/antlr3baserecognizer.inl
+++ b/runtime/Cpp/include/antlr3baserecognizer.inl
@@ -62,7 +62,7 @@ BaseRecognizer<ImplTraits, StreamType>::match(ANTLR_UINT32 ttype, BitsetListType
 	//
 	const UnitType* matchedSymbol = this->getCurrentInputSymbol(is);
 
-	//if (is->_LA(1) == ttype)
+	//if (is->LA(1) == ttype)
 	if (matchedSymbol->get_type() == ttype)
 	{
 		// The token was the one we were told to expect
@@ -108,7 +108,7 @@ void BaseRecognizer<ImplTraits, StreamType>::matchAny()
 template< class ImplTraits, class StreamType >
 bool BaseRecognizer<ImplTraits, StreamType>::mismatchIsUnwantedToken(IntStreamType* is, ANTLR_UINT32 ttype)
 {
-	ANTLR_UINT32 nextt = is->_LA(2);
+	ANTLR_UINT32 nextt = is->LA(2);
 
 	if	(nextt == ttype)
 	{
@@ -173,7 +173,7 @@ bool BaseRecognizer<ImplTraits, StreamType>::mismatchIsMissingToken(IntStreamTyp
 	/// in follow set to indicate that the fall of the start symbol is
 	/// in the set (EOF can follow).
 	///
-	if	(		followClone->isMember(is->_LA(1))
+	if	(		followClone->isMember(is->LA(1))
 			||	followClone->isMember(ImplTraits::CommonTokenType::EOR_TOKEN_TYPE)
 		)
 	{
@@ -580,7 +580,7 @@ bool  BaseRecognizer<ImplTraits, StreamType>::recoverFromMismatchedElement(Bitse
      * is consistent, then we can "insert" that token by not throwing
      * an exception and assuming that we saw it.
      */
-    if	( follow->isMember(is->_LA(1)) == true)
+    if	( follow->isMember(is->LA(1)) == true)
     {
 		/* report the error, but don't cause any rules to abort and stuff
 		 */
diff --git a/runtime/Cpp/include/antlr3cyclicdfa.inl b/runtime/Cpp/include/antlr3cyclicdfa.inl
index c25c7c0aa..f88cd692e 100644
--- a/runtime/Cpp/include/antlr3cyclicdfa.inl
+++ b/runtime/Cpp/include/antlr3cyclicdfa.inl
@@ -121,7 +121,7 @@ ANTLR_INT32	CyclicDFA<ImplTraits, CtxType>::predict(CtxType * ctx,
 
 		/* Look for a normal transition state based upon the input token element
 		 */
-		c = is->_LA(1);
+		c = is->LA(1);
 
 		/* Check against min and max for this state
 		 */
diff --git a/runtime/Cpp/include/antlr3input.inl b/runtime/Cpp/include/antlr3input.inl
index f64867c8f..3f5fb3f9b 100644
--- a/runtime/Cpp/include/antlr3input.inl
+++ b/runtime/Cpp/include/antlr3input.inl
@@ -319,7 +319,7 @@ void    InputStream<ImplTraits>::reuse(ANTLR_UINT8* inString, ANTLR_UINT32 size,
 template<class ImplTraits>
 typename InputStream<ImplTraits>::DataType*	InputStream<ImplTraits>::_LT(ANTLR_INT32 lt)
 {
-	return this->_LA(lt);
+	return this->LA(lt);
 }
 */
 
diff --git a/runtime/Cpp/include/antlr3intstream.hpp b/runtime/Cpp/include/antlr3intstream.hpp
index 7249f9312..b9b2db917 100644
--- a/runtime/Cpp/include/antlr3intstream.hpp
+++ b/runtime/Cpp/include/antlr3intstream.hpp
@@ -141,7 +141,7 @@ class IntStream : public ImplTraits::AllocPolicyType
 
     /** Get ANTLR3_UINT32 at current input pointer + i ahead where i=1 is next ANTLR3_UINT32 
      */
-    ANTLR_UINT32	_LA( ANTLR_INT32 i);
+    ANTLR_UINT32	LA( ANTLR_INT32 i);
 
     /** Tell the stream to start buffering if it hasn't already.  Return
      *  current input position, index(), or some other marker so that
@@ -215,7 +215,7 @@ class IntStream : public ImplTraits::AllocPolicyType
 	void findout_endian_spec(bool machineBigEndian, bool inputBigEndian);
 
 	//If the user chooses this option, then we will be resolving stuffs at run-time
-	ANTLR_UINT32	_LA( ANTLR_INT32 i, ClassForwarder<RESOLVE_ENDIAN_AT_RUNTIME> );
+	ANTLR_UINT32	LA( ANTLR_INT32 i, ClassForwarder<RESOLVE_ENDIAN_AT_RUNTIME> );
 
 	//resolve into one of the three categories below at runtime
 	void	consume( ClassForwarder<RESOLVE_ENDIAN_AT_RUNTIME> );
@@ -225,7 +225,7 @@ template<class ImplTraits, class SuperType>
 class EBCDIC_IntStream : public IntStream<ImplTraits, SuperType>
 {
 public:
-	ANTLR_UINT32	_LA( ANTLR_INT32 i);
+	ANTLR_UINT32	LA( ANTLR_INT32 i);
 
 protected:
 	void setupIntStream();
@@ -235,7 +235,7 @@ template<class ImplTraits, class SuperType>
 class UTF8_IntStream : public IntStream<ImplTraits, SuperType>
 {
 public:
-	ANTLR_UINT32	_LA( ANTLR_INT32 i);
+	ANTLR_UINT32	LA( ANTLR_INT32 i);
 	void consume();
 
 protected:
@@ -250,7 +250,7 @@ template<class ImplTraits, class SuperType>
 class UTF16_IntStream : public IntStream<ImplTraits, SuperType>
 {
 public:
-	ANTLR_UINT32	_LA( ANTLR_INT32 i);
+	ANTLR_UINT32	LA( ANTLR_INT32 i);
 	void		    consume();
 	ANTLR_MARKER	index();
 	void seek(ANTLR_MARKER seekPoint);
@@ -265,7 +265,7 @@ class UTF16_IntStream : public IntStream<ImplTraits, SuperType>
 	///
 	/// \return Next input character in internal ANTLR3 encoding (UTF32)
 	///
-	ANTLR_UINT32	_LA( ANTLR_INT32 i, ClassForwarder<BYTE_AGNOSTIC> );
+	ANTLR_UINT32	LA( ANTLR_INT32 i, ClassForwarder<BYTE_AGNOSTIC> );
 
 	/// \brief Return the input element assuming a UTF16 input when the input is Little Endian and the machine is not
 	///
@@ -274,7 +274,7 @@ class UTF16_IntStream : public IntStream<ImplTraits, SuperType>
 	///
 	/// \return Next input character in internal ANTLR3 encoding (UTF32)
 	///
-	ANTLR_UINT32	_LA( ANTLR_INT32 i, ClassForwarder<ANTLR_LITTLE_ENDIAN> );
+	ANTLR_UINT32	LA( ANTLR_INT32 i, ClassForwarder<ANTLR_LITTLE_ENDIAN> );
 	
 	/// \brief Return the input element assuming a UTF16 input when the input is Little Endian and the machine is not
 	///
@@ -283,7 +283,7 @@ class UTF16_IntStream : public IntStream<ImplTraits, SuperType>
 	///
 	/// \return Next input character in internal ANTLR3 encoding (UTF32)
 	///
-	ANTLR_UINT32	_LA( ANTLR_INT32 i, ClassForwarder<ANTLR_BIG_ENDIAN> );
+	ANTLR_UINT32	LA( ANTLR_INT32 i, ClassForwarder<ANTLR_BIG_ENDIAN> );
 
 	/// \brief Consume the next character in a UTF16 input stream
 	///
@@ -314,7 +314,7 @@ template<class ImplTraits, class SuperType>
 class UTF32_IntStream : public IntStream<ImplTraits, SuperType>
 {
 public:
-	ANTLR_UINT32	_LA( ANTLR_INT32 i);
+	ANTLR_UINT32	LA( ANTLR_INT32 i);
 	void		    consume();
 	
 	/// \brief Calculate the current index in the output stream.
@@ -325,10 +325,10 @@ class UTF32_IntStream : public IntStream<ImplTraits, SuperType>
 
 protected:
 	void setupIntStream(bool machineBigEndian, bool inputBigEndian);
-	ANTLR_UINT32	_LA( ANTLR_INT32 i, ClassForwarder<RESOLVE_ENDIAN_AT_RUNTIME> );
-	ANTLR_UINT32	_LA( ANTLR_INT32 i, ClassForwarder<BYTE_AGNOSTIC> );
-	ANTLR_UINT32	_LA( ANTLR_INT32 i, ClassForwarder<ANTLR_LITTLE_ENDIAN> );
-	ANTLR_UINT32	_LA( ANTLR_INT32 i, ClassForwarder<ANTLR_BIG_ENDIAN> );
+	ANTLR_UINT32	LA( ANTLR_INT32 i, ClassForwarder<RESOLVE_ENDIAN_AT_RUNTIME> );
+	ANTLR_UINT32	LA( ANTLR_INT32 i, ClassForwarder<BYTE_AGNOSTIC> );
+	ANTLR_UINT32	LA( ANTLR_INT32 i, ClassForwarder<ANTLR_LITTLE_ENDIAN> );
+	ANTLR_UINT32	LA( ANTLR_INT32 i, ClassForwarder<ANTLR_BIG_ENDIAN> );
 
 	void	consume( ClassForwarder<RESOLVE_ENDIAN_AT_RUNTIME> );
 	void	consume( ClassForwarder<BYTE_AGNOSTIC> );
@@ -359,7 +359,7 @@ class TokenIntStream : public IntStream<ImplTraits, typename ImplTraits::TokenSt
 
 	void consume();
 	void  consumeInitialHiddenTokens();
-	ANTLR_UINT32  _LA( ANTLR_INT32 i );
+	ANTLR_UINT32  LA( ANTLR_INT32 i );
 	ANTLR_MARKER  mark();
 	ANTLR_UINT32  size();
 	void release();
diff --git a/runtime/Cpp/include/antlr3intstream.inl b/runtime/Cpp/include/antlr3intstream.inl
index 17dc100fa..ed69d5997 100644
--- a/runtime/Cpp/include/antlr3intstream.inl
+++ b/runtime/Cpp/include/antlr3intstream.inl
@@ -74,7 +74,7 @@ void	IntStream<ImplTraits, SuperType>::consume()
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la )
+ANTLR_UINT32	IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 la )
 {
 	SuperType* input = this->get_super();
 	const ANTLR_UINT8* nextChar = input->get_nextChar();
@@ -230,7 +230,7 @@ IntStream<ImplTraits, SuperType>::~IntStream()
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	EBCDIC_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la)
+ANTLR_UINT32	EBCDIC_IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 la)
 {
 	// EBCDIC to ASCII conversion table
 	//
@@ -295,9 +295,9 @@ void EBCDIC_IntStream<ImplTraits, SuperType>::setupIntStream()
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 i)
+ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 i)
 {
-	return this->_LA(i, ClassForwarder< typename ImplTraits::Endianness >() );
+	return this->LA(i, ClassForwarder< typename ImplTraits::Endianness >() );
 }
 
 template<class ImplTraits, class SuperType>
@@ -331,7 +331,7 @@ void UTF16_IntStream<ImplTraits, SuperType>::seek(ANTLR_MARKER seekPoint)
 	{
         // Call consume until we reach the asked for seek point or EOF
         //
-        while( (this->_LA(1) != ANTLR_CHARSTREAM_EOF) && (seekPoint < (ANTLR_MARKER)input->get_nextChar() ) )
+        while( (this->LA(1) != ANTLR_CHARSTREAM_EOF) && (seekPoint < (ANTLR_MARKER)input->get_nextChar() ) )
 	    {
 			this->consume();
 	    }
@@ -396,19 +396,19 @@ void UTF16_IntStream<ImplTraits, SuperType>::setupIntStream(bool machineBigEndia
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32 IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 i, ClassForwarder<RESOLVE_ENDIAN_AT_RUNTIME> )
+ANTLR_UINT32 IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 i, ClassForwarder<RESOLVE_ENDIAN_AT_RUNTIME> )
 {
 	assert( (m_endian_spec >= 1) && (m_endian_spec <= 3));
 	switch(m_endian_spec)
 	{
 	case 1:
-		return this->_LA(i, ClassForwarder<BYTE_AGNOSTIC>() );
+		return this->LA(i, ClassForwarder<BYTE_AGNOSTIC>() );
 		break;
 	case 2:
-		return this->_LA(i, ClassForwarder<ANTLR_LITTLE_ENDIAN>() );
+		return this->LA(i, ClassForwarder<ANTLR_LITTLE_ENDIAN>() );
 		break;
 	case 3:
-		return this->_LA(i, ClassForwarder<ANTLR_BIG_ENDIAN>() );
+		return this->LA(i, ClassForwarder<ANTLR_BIG_ENDIAN>() );
 		break;
 	default:
 		break;
@@ -437,7 +437,7 @@ void	IntStream<ImplTraits, SuperType>::consume( ClassForwarder<RESOLVE_ENDIAN_AT
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassForwarder<BYTE_AGNOSTIC> )
+ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 la, ClassForwarder<BYTE_AGNOSTIC> )
 {
 	SuperType* input;
     UTF32   ch;
@@ -572,7 +572,7 @@ ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassF
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassForwarder<ANTLR_LITTLE_ENDIAN> )
+ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 la, ClassForwarder<ANTLR_LITTLE_ENDIAN> )
 {
 	SuperType* input;
     UTF32           ch;
@@ -710,7 +710,7 @@ ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassF
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassForwarder<ANTLR_BIG_ENDIAN> )
+ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 la, ClassForwarder<ANTLR_BIG_ENDIAN> )
 {
 	SuperType* input;
     UTF32           ch;
@@ -1063,9 +1063,9 @@ void	UTF16_IntStream<ImplTraits, SuperType>::consume( ClassForwarder<ANTLR_BIG_E
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 i)
+ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 i)
 {
-	return this->_LA( i, ClassForwarder<typename ImplTraits::Endianness>() );
+	return this->LA( i, ClassForwarder<typename ImplTraits::Endianness>() );
 }
 
 template<class ImplTraits, class SuperType>
@@ -1095,7 +1095,7 @@ void UTF32_IntStream<ImplTraits, SuperType>::seek(ANTLR_MARKER seekPoint)
 	{
         // Call consume until we reach the asked for seek point or EOF
         //
-        while( (this->_LA(1) != ANTLR_CHARSTREAM_EOF) && (seekPoint < (ANTLR_MARKER)input->get_nextChar()) )
+        while( (this->LA(1) != ANTLR_CHARSTREAM_EOF) && (seekPoint < (ANTLR_MARKER)input->get_nextChar()) )
 	    {
 			this->consume();
 	    }
@@ -1113,7 +1113,7 @@ void UTF32_IntStream<ImplTraits, SuperType>::setupIntStream(bool machineBigEndia
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassForwarder<BYTE_AGNOSTIC> )
+ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 la, ClassForwarder<BYTE_AGNOSTIC> )
 {
     SuperType* input = this->get_super();
 
@@ -1128,7 +1128,7 @@ ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassF
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassForwarder<ANTLR_LITTLE_ENDIAN> )
+ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 la, ClassForwarder<ANTLR_LITTLE_ENDIAN> )
 {
 	SuperType* input = this->get_super();
 
@@ -1149,7 +1149,7 @@ ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassF
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassForwarder<ANTLR_BIG_ENDIAN> )
+ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 la, ClassForwarder<ANTLR_BIG_ENDIAN> )
 {
 	SuperType* input = this->get_super();
 
@@ -1323,7 +1323,7 @@ void UTF8_IntStream<ImplTraits, SuperType>::consume()
  * \return Next input character in internal ANTLR3 encoding (UTF32)
  */
 template<class ImplTraits, class SuperType>
-ANTLR_UCHAR UTF8_IntStream<ImplTraits, SuperType>::_LA(ANTLR_INT32 la)
+ANTLR_UCHAR UTF8_IntStream<ImplTraits, SuperType>::LA(ANTLR_INT32 la)
 {
     SuperType* input = this->get_super();
 	const ANTLR_UINT32* trailingBytesForUTF8 = UTF8_IntStream::TrailingBytesForUTF8();
@@ -1477,7 +1477,7 @@ void  TokenIntStream<ImplTraits>::consumeInitialHiddenTokens()
 
 
 template<class ImplTraits>
-ANTLR_UINT32	TokenIntStream<ImplTraits>::_LA( ANTLR_INT32 i )
+ANTLR_UINT32	TokenIntStream<ImplTraits>::LA( ANTLR_INT32 i )
 {
 	const CommonTokenType*    tok;
 	TokenStreamType*    ts	    = static_cast<TokenStreamType*>(this);
@@ -1583,7 +1583,7 @@ ANTLR_MARKER		TreeNodeIntStream<ImplTraits>::tindex()
 }
 
 template<class ImplTraits>
-ANTLR_UINT32		TreeNodeIntStream<ImplTraits>::_LA(ANTLR_INT32 i)
+ANTLR_UINT32 TreeNodeIntStream<ImplTraits>::LA(ANTLR_INT32 i)
 {
 	TreeNodeStreamType* tns	    = this->get_super();
 
diff --git a/runtime/Cpp/include/antlr3lexer.inl b/runtime/Cpp/include/antlr3lexer.inl
index 578510c62..bf6960569 100644
--- a/runtime/Cpp/include/antlr3lexer.inl
+++ b/runtime/Cpp/include/antlr3lexer.inl
@@ -109,7 +109,7 @@ void Lexer<ImplTraits>::displayRecognitionError( ANTLR_UINT8** , ExceptionBaseTy
 template<class ImplTraits>
 void Lexer<ImplTraits>::fillExceptionData( ExceptionBaseType* ex )
 {
-	ex->set_c( m_input->_LA(1) );					/* Current input character			*/
+	ex->set_c( m_input->LA(1) );					/* Current input character			*/
 	ex->set_line( m_input->get_line() );						/* Line number comes from stream		*/
 	ex->set_charPositionInLine( m_input->get_charPositionInLine() );	    /* Line offset also comes from the stream   */
 	ex->set_index( m_input->index() );
@@ -235,7 +235,7 @@ bool	Lexer<ImplTraits>::matchs(ANTLR_UCHAR* str )
 	RecognizerSharedStateType* state = this->get_rec()->get_state();
 	while   (*str != ANTLR_STRING_TERMINATOR)
 	{
-		if  ( this->get_istream()->_LA(1) != (*str))
+		if  ( this->get_istream()->LA(1) != (*str))
 		{
 			if	( state->get_backtracking() > 0)
 			{
@@ -267,7 +267,7 @@ bool	Lexer<ImplTraits>::matchs(ANTLR_UCHAR* str )
 template<class ImplTraits>
 bool	Lexer<ImplTraits>::matchc(ANTLR_UCHAR c)
 {
-	if	(this->get_istream()->_LA(1) == c)
+	if	(this->get_istream()->LA(1) == c)
 	{
 		/* Matched correctly, do consume it
 		 */
@@ -304,7 +304,7 @@ bool	Lexer<ImplTraits>::matchRange(ANTLR_UCHAR low, ANTLR_UCHAR high)
 
     /* What is in the stream at the moment?
      */
-    c	= this->get_istream()->_LA(1);
+    c	= this->get_istream()->LA(1);
     if	( c >= low && c <= high)
     {
 		/* Matched correctly, consume it
@@ -579,7 +579,7 @@ ANTLR_INLINE typename Lexer<ImplTraits>::DebuggerType* Lexer<ImplTraits>::get_de
 template< class ImplTraits>
 ANTLR_INLINE ANTLR_UINT32 Lexer<ImplTraits>::LA(ANTLR_INT32 i)
 {
-	return this->get_istream()->_LA(i);
+	return this->get_istream()->LA(i);
 }
 
 template< class ImplTraits>
diff --git a/runtime/Cpp/include/antlr3parser.inl b/runtime/Cpp/include/antlr3parser.inl
index 6b72ae398..617792188 100644
--- a/runtime/Cpp/include/antlr3parser.inl
+++ b/runtime/Cpp/include/antlr3parser.inl
@@ -362,7 +362,7 @@ ANTLR_INLINE void Parser<ImplTraits>::preporterror()
 template< class ImplTraits>
 ANTLR_INLINE ANTLR_UINT32 Parser<ImplTraits>::LA(ANTLR_INT32 i)
 {
-	return this->get_istream()->_LA(i);
+	return this->get_istream()->LA(i);
 }
 
 template< class ImplTraits>
diff --git a/runtime/Cpp/include/antlr3tokenstream.inl b/runtime/Cpp/include/antlr3tokenstream.inl
index 4f6851a62..76f89bb94 100644
--- a/runtime/Cpp/include/antlr3tokenstream.inl
+++ b/runtime/Cpp/include/antlr3tokenstream.inl
@@ -82,7 +82,7 @@ typename TokenSource<ImplTraits>::TokenType*	TokenSource<ImplTraits>::nextTokenS
             state->set_tokenStartLine( input->get_line() );
             state->set_text("");
 
-            if  (istream->_LA(1) == ANTLR_CHARSTREAM_EOF)
+            if  (istream->LA(1) == ANTLR_CHARSTREAM_EOF)
             {
                 // Reached the end of the current stream, nothing more to do if this is
                 // the last in the stack.

From 7365950be63162a947f9e960c0dad1fa33e3cd03 Mon Sep 17 00:00:00 2001
From: ibre5041 <ibre5041@ibrezina.net>
Date: Thu, 21 Aug 2014 16:27:52 +0200
Subject: [PATCH 36/53]     Function name aligned

    _LT renamed to LT

Conflicts:
	runtime/Cpp/include/antlr3treeparser.inl
---
 runtime/Cpp/include/antlr3baserecognizer.inl |  4 ++--
 runtime/Cpp/include/antlr3input.hpp          |  2 +-
 runtime/Cpp/include/antlr3input.inl          |  2 +-
 runtime/Cpp/include/antlr3intstream.inl      |  4 ++--
 runtime/Cpp/include/antlr3parser.inl         |  8 ++++----
 runtime/Cpp/include/antlr3tokenstream.hpp    |  2 +-
 runtime/Cpp/include/antlr3tokenstream.inl    |  2 +-
 runtime/Cpp/include/antlr3treeparser.inl     | 11 ++++++-----
 8 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/runtime/Cpp/include/antlr3baserecognizer.inl b/runtime/Cpp/include/antlr3baserecognizer.inl
index 0c4cd886d..0ce2c91c4 100644
--- a/runtime/Cpp/include/antlr3baserecognizer.inl
+++ b/runtime/Cpp/include/antlr3baserecognizer.inl
@@ -774,7 +774,7 @@ BaseRecognizer<ImplTraits, StreamType>::getCurrentInputSymbol(IntStreamType* ist
 {
 	typedef typename ImplTraits::TokenStreamType TokenStreamType;
 	TokenStreamType* token_stream = static_cast<TokenStreamType*>(istream);
-	return token_stream->_LT(1);
+	return token_stream->LT(1);
 }
 
 template< class ImplTraits, class StreamType >
@@ -783,7 +783,7 @@ BaseRecognizer<ImplTraits, StreamType>::getCurrentInputSymbol(IntStreamType* ist
 {
 	typedef typename ImplTraits::TreeNodeStreamType TreeNodeStreamType;
 	TreeNodeStreamType*	ctns = static_cast<TreeNodeStreamType*>(istream);
-	return ctns->_LT(1);
+	return ctns->LT(1);
 }
 
 
diff --git a/runtime/Cpp/include/antlr3input.hpp b/runtime/Cpp/include/antlr3input.hpp
index 681615304..c3088c0c0 100644
--- a/runtime/Cpp/include/antlr3input.hpp
+++ b/runtime/Cpp/include/antlr3input.hpp
@@ -39,7 +39,7 @@
 namespace antlr3 {
 
 /// Master context structure for an ANTLR3 C runtime based input stream.
-/// \ingroup apistructures. Calling _LT on this doesn't seem right. You would
+/// \ingroup apistructures. Calling LT on this doesn't seem right. You would
 /// call it only with parser / TreeParser, and their respective input streams 
 /// has that function. calling it from lexer will throw a compile time error
 ///
diff --git a/runtime/Cpp/include/antlr3input.inl b/runtime/Cpp/include/antlr3input.inl
index 3f5fb3f9b..6837a0654 100644
--- a/runtime/Cpp/include/antlr3input.inl
+++ b/runtime/Cpp/include/antlr3input.inl
@@ -317,7 +317,7 @@ void    InputStream<ImplTraits>::reuse(ANTLR_UINT8* inString, ANTLR_UINT32 size,
 
 /*
 template<class ImplTraits>
-typename InputStream<ImplTraits>::DataType*	InputStream<ImplTraits>::_LT(ANTLR_INT32 lt)
+typename InputStream<ImplTraits>::DataType*	InputStream<ImplTraits>::LT(ANTLR_INT32 lt)
 {
 	return this->LA(lt);
 }
diff --git a/runtime/Cpp/include/antlr3intstream.inl b/runtime/Cpp/include/antlr3intstream.inl
index ed69d5997..5cd5bd13f 100644
--- a/runtime/Cpp/include/antlr3intstream.inl
+++ b/runtime/Cpp/include/antlr3intstream.inl
@@ -1482,7 +1482,7 @@ ANTLR_UINT32	TokenIntStream<ImplTraits>::LA( ANTLR_INT32 i )
 	const CommonTokenType*    tok;
 	TokenStreamType*    ts	    = static_cast<TokenStreamType*>(this);
 
-	tok	    =  ts->_LT(i);
+	tok	    =  ts->LT(i);
 
 	if	(tok != NULL)
 	{
@@ -1589,7 +1589,7 @@ ANTLR_UINT32 TreeNodeIntStream<ImplTraits>::LA(ANTLR_INT32 i)
 
 	// Ask LT for the 'token' at that position
 	//
-	TreeTypePtr t = tns->_LT(i);
+	TreeTypePtr t = tns->LT(i);
 
 	if	(t == NULL)
 	{
diff --git a/runtime/Cpp/include/antlr3parser.inl b/runtime/Cpp/include/antlr3parser.inl
index 617792188..cba55c350 100644
--- a/runtime/Cpp/include/antlr3parser.inl
+++ b/runtime/Cpp/include/antlr3parser.inl
@@ -52,7 +52,7 @@ ANTLR_INLINE typename Parser<ImplTraits>::TokenStreamType* Parser<ImplTraits>::g
 template< class ImplTraits >
 void Parser<ImplTraits>::fillExceptionData( ExceptionBaseType* ex )
 {
-	ex->set_token( new CommonTokenType(*(m_tstream->_LT(1))) ); /* Current input token (clonned) - held by the exception */
+	ex->set_token( new CommonTokenType(*(m_tstream->LT(1))) ); /* Current input token (clonned) - held by the exception */
 	ex->set_line( ex->get_token()->get_line() );
 	ex->set_charPositionInLine( ex->get_token()->get_charPositionInLine() );
 	ex->set_index( this->get_istream()->index() );
@@ -200,10 +200,10 @@ typename Parser<ImplTraits>::TokenType*	Parser<ImplTraits>::getMissingSymbol( In
 	// Work out what to use as the current symbol to make a line and offset etc
 	// If we are at EOF, we use the token before EOF
 	//
-	const CommonTokenType* current = cts->_LT(1);
+	const CommonTokenType* current = cts->LT(1);
 	if	(current->get_type() == CommonTokenType::TOKEN_EOF)
 	{
-		current = cts->_LT(-1);
+		current = cts->LT(-1);
 	}
 
 	CommonTokenType* token = new CommonTokenType;
@@ -368,7 +368,7 @@ ANTLR_INLINE ANTLR_UINT32 Parser<ImplTraits>::LA(ANTLR_INT32 i)
 template< class ImplTraits>
 ANTLR_INLINE const typename Parser<ImplTraits>::CommonTokenType*  Parser<ImplTraits>::LT(ANTLR_INT32 k)
 {
-	return this->get_input()->_LT(k);
+	return this->get_input()->LT(k);
 }
 
 template< class ImplTraits>
diff --git a/runtime/Cpp/include/antlr3tokenstream.hpp b/runtime/Cpp/include/antlr3tokenstream.hpp
index 669965809..d97308788 100644
--- a/runtime/Cpp/include/antlr3tokenstream.hpp
+++ b/runtime/Cpp/include/antlr3tokenstream.hpp
@@ -172,7 +172,7 @@ class TokenStream  : public ImplTraits::TokenIntStreamType
      *  Return null for LT(0) and any index that results in an absolute address
      *  that is negative.
      */
-    const TokenType*  _LT(ANTLR_INT32 k);
+    const TokenType*  LT(ANTLR_INT32 k);
 
     /** Where is this stream pulling tokens from?  This is not the name, but
      *  a pointer into an interface that contains a ANTLR3_TOKEN_SOURCE interface.
diff --git a/runtime/Cpp/include/antlr3tokenstream.inl b/runtime/Cpp/include/antlr3tokenstream.inl
index 76f89bb94..21b6dddfa 100644
--- a/runtime/Cpp/include/antlr3tokenstream.inl
+++ b/runtime/Cpp/include/antlr3tokenstream.inl
@@ -387,7 +387,7 @@ void	TokenStream<ImplTraits>::setDebugListener(DebugEventListenerType* debugger)
 }
 
 template<class ImplTraits>
-const typename TokenStream<ImplTraits>::TokenType*  TokenStream<ImplTraits>::_LT(ANTLR_INT32 k)
+const typename TokenStream<ImplTraits>::TokenType*  TokenStream<ImplTraits>::LT(ANTLR_INT32 k)
 {
 	ANTLR_INT32    i;
 	ANTLR_INT32    n;
diff --git a/runtime/Cpp/include/antlr3treeparser.inl b/runtime/Cpp/include/antlr3treeparser.inl
index a6b105a18..668029105 100644
--- a/runtime/Cpp/include/antlr3treeparser.inl
+++ b/runtime/Cpp/include/antlr3treeparser.inl
@@ -44,9 +44,10 @@ typename TreeParser<ImplTraits>::RecognizerType* TreeParser<ImplTraits>::get_rec
 template< class ImplTraits >
 void TreeParser<ImplTraits>::fillExceptionData( ExceptionBaseType* ex )
 {
-	ex->set_token( m_ctnstream->_LT(1) );	    /* Current input tree node */
-	ex->set_line( ex->get_token()->getLine() );
-	ex->set_charPositionInLine( ex->get_token()->getCharPositionInLine() );
+	auto xxx = m_ctnstream->LT(1);
+	//ex->set_token( m_ctnstream->LT(1) );	    /* Current input tree node */
+	ex->set_line( ex->get_token()->get_line() );
+	ex->set_charPositionInLine( ex->get_token()->get_charPositionInLine() );
 	ex->set_index( m_ctnstream->index() );
 
 	// Are you ready for this? Deep breath now...
@@ -168,12 +169,12 @@ TreeParser<ImplTraits>::getMissingSymbol( IntStreamType* istream, ExceptionBaseT
 
 	// Create a new empty node, by stealing the current one, or the previous one if the current one is EOF
 	//
-	current	= tns->_LT(1);
+	current	= tns->LT(1);
     i       = -1;
 
 	if	(current == tns->get_EOF_NODE_p())
 	{
-		current = tns->_LT(-1);
+		current = tns->LT(-1);
         i--;
 	}
 	node	= current->dupNode();

From bfa144c9090e86ae3e655bdacb5f9d2fc7b5f2d4 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibre5041@ibrezina.net>
Date: Sat, 23 Aug 2014 20:20:27 +0200
Subject: [PATCH 37/53] AST construcition fixes - clone recursively

---
 runtime/Cpp/include/antlr3commontreeadaptor.hpp        |  2 +-
 runtime/Cpp/include/antlr3commontreeadaptor.inl        | 10 +++++-----
 runtime/Cpp/include/antlr3rewriterulesubtreestream.inl |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.hpp b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
index 03b409ed5..e4c4c559a 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.hpp
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
@@ -186,7 +186,7 @@ class CommonTreeAdaptor
 	~CommonTreeAdaptor();
 
 protected:
-	TreeTypePtr	dupTreeImpl( const TreeTypePtr& root, TreeType* parent);
+	TreeTypePtr	dupTreeImpl( const TreeType* root, TreeType* parent);
 
 	void defineDotNodes(TreeTypePtr t, const StringType& dotSpec);
 	void defineDotEdges(TreeTypePtr t, const StringType& dotSpec);
diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.inl b/runtime/Cpp/include/antlr3commontreeadaptor.inl
index 7419b3a4d..5e00f13bd 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.inl
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.inl
@@ -99,25 +99,25 @@ CommonTreeAdaptor<ImplTraits>::dupTree( const TreeTypePtr& tree)
 {
 	if (tree == NULL)
 		return NULL;
-	return std::move(this->dupTreeImpl(tree, NULL));
+	return std::move(dupTreeImpl(tree.get(), NULL));
 }
 
 template<class ImplTraits>
 typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
-CommonTreeAdaptor<ImplTraits>::dupTreeImpl( const TreeTypePtr& root, TreeType* parent)
+CommonTreeAdaptor<ImplTraits>::dupTreeImpl( const TreeType *root, TreeType* parent)
 {
-	TreeTypePtr newTree(this->dupNode(root));
+	TreeTypePtr newTree(dupNode(root));
 
 	// Ensure new subtree root has parent/child index set
 	//
 	this->setChildIndex( newTree, root->get_childIndex() );
 	this->setParent(newTree, parent);
 
-	ChildrenType& r_children = root->get_children();
+	ChildrenType const& r_children = root->get_children();
 	for (auto i = r_children.begin(); i != r_children.end(); ++i)
 	{
 		// add child's clone
-		this->addChild(newTree, this->dupTreeImpl(*i, newTree.get()));
+		this->addChild(newTree, dupTreeImpl(i->get(), newTree.get()));
 	}
 
 	return	newTree;
diff --git a/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl b/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
index bc93d7132..ea1c55017 100644
--- a/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
+++ b/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
@@ -159,14 +159,14 @@ template<class ImplTraits>
 typename RewriteRuleSubtreeStream<ImplTraits>::TreeTypePtr
 RewriteRuleSubtreeStream<ImplTraits>::dupTree(const TreeTypePtr& element)
 {
-	return std::move(m_adaptor->dupNode(element));
+	return std::move(m_adaptor->dupTree(element));
 }
 
 template<class ImplTraits>
 typename RewriteRuleSubtreeStream<ImplTraits>::TreeTypePtr
 RewriteRuleSubtreeStream<ImplTraits>::dupTree(const TreeType* element)
 {
-	return std::move(m_adaptor->dupNode(element));
+	return std::move(m_adaptor->dupTree(element));
 }
 
 template<class ImplTraits>

From bdaf927ad527156119b026ae3eaf1ed728cc853e Mon Sep 17 00:00:00 2001
From: ibre5041 <ibre5041@ibrezina.net>
Date: Wed, 27 Aug 2014 16:03:32 +0200
Subject: [PATCH 38/53] Reduce size of rule return class. Do not keep pointer
 onto parser in every tree node.

Conflicts:
	tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
---
 runtime/Cpp/include/antlr3parser.hpp          | 13 +++++------
 runtime/Cpp/include/antlr3parser.inl          | 22 +++++++++----------
 .../org/antlr/codegen/templates/Cpp/Cpp.stg   |  7 ++++--
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/runtime/Cpp/include/antlr3parser.hpp b/runtime/Cpp/include/antlr3parser.hpp
index 57a8ba769..ccf8e9a32 100644
--- a/runtime/Cpp/include/antlr3parser.hpp
+++ b/runtime/Cpp/include/antlr3parser.hpp
@@ -159,17 +159,15 @@ class RuleReturnValue
 public:
 	typedef typename ImplTraits::BaseParserType BaseParserType;
 	typedef typename ImplTraits::CommonTokenType CommonTokenType;
-	
-public:
+
 	const CommonTokenType*		start;
 	const CommonTokenType*		stop;
-	BaseParserType*			parser;
 
 	RuleReturnValue(BaseParserType* psr = NULL );
 	RuleReturnValue( const RuleReturnValue& val );
 	RuleReturnValue& operator=( const RuleReturnValue& val );
-	void call_start_placeholder(); 
-	void call_stop_placeholder(); 
+	void call_start_placeholder(BaseParserType*);
+	void call_stop_placeholder(BaseParserType*);
 	RuleReturnValue& get_struct();
 	~RuleReturnValue();
 };
@@ -183,11 +181,12 @@ class RuleReturnValue_1 : public RuleReturnValue<ImplTraits>
 	typedef RuleReturnValue<ImplTraits> BaseType;
 	typedef typename BaseType::BaseParserType BaseParserType;
 
-public:
+	BaseParserType* parser;
+
 	RuleReturnValue_1();
 	RuleReturnValue_1( BaseParserType* psr);
 	RuleReturnValue_1( const RuleReturnValue_1& val );
-	void call_start_placeholder();  //its dummy here
+	void call_start_placeholder(BaseParserType*);  //its dummy here
 	~RuleReturnValue_1();
 };
 
diff --git a/runtime/Cpp/include/antlr3parser.inl b/runtime/Cpp/include/antlr3parser.inl
index cba55c350..d1b099a2b 100644
--- a/runtime/Cpp/include/antlr3parser.inl
+++ b/runtime/Cpp/include/antlr3parser.inl
@@ -493,8 +493,7 @@ ANTLR_INLINE typename Parser<ImplTraits>::TokenStreamType* Parser<ImplTraits>::g
 
 template< class ImplTraits>
 ANTLR_INLINE RuleReturnValue<ImplTraits>::RuleReturnValue(BaseParserType* psr) 
-{ 
-	parser = psr; 
+{
 	start = NULL;
 	stop = NULL;
 }
@@ -502,7 +501,6 @@ ANTLR_INLINE RuleReturnValue<ImplTraits>::RuleReturnValue(BaseParserType* psr)
 template< class ImplTraits>
 ANTLR_INLINE RuleReturnValue<ImplTraits>::RuleReturnValue( const RuleReturnValue& val )
 {
-	parser	= val.parser; 
 	start	= val.start;
 	stop	= val.stop;
 }
@@ -510,7 +508,6 @@ ANTLR_INLINE RuleReturnValue<ImplTraits>::RuleReturnValue( const RuleReturnValue
 template< class ImplTraits>
 ANTLR_INLINE RuleReturnValue<ImplTraits>& RuleReturnValue<ImplTraits>::operator=( const RuleReturnValue& val )
 {
-	parser	= val.parser; 
 	start	= val.start;
 	stop	= val.stop;
 	return *this;
@@ -522,26 +519,28 @@ ANTLR_INLINE RuleReturnValue<ImplTraits>::~RuleReturnValue()
 }
 
 template< class ImplTraits>
-ANTLR_INLINE void RuleReturnValue<ImplTraits>::call_start_placeholder()
+ANTLR_INLINE void RuleReturnValue<ImplTraits>::call_start_placeholder(BaseParserType *parser)
 {
 	start = parser->LT(1); 
 	stop = start;
 }
 
 template< class ImplTraits>
-ANTLR_INLINE void RuleReturnValue<ImplTraits>::call_stop_placeholder()
+ANTLR_INLINE void RuleReturnValue<ImplTraits>::call_stop_placeholder(BaseParserType *parser)
 {
 	stop = parser->LT(-1);
 }
 
 template< class ImplTraits>
 ANTLR_INLINE RuleReturnValue_1<ImplTraits>::RuleReturnValue_1()
+	: parser()
 {
 }
 
 template< class ImplTraits>
 RuleReturnValue_1<ImplTraits>::RuleReturnValue_1( BaseParserType* psr )
-	:RuleReturnValue_1<ImplTraits>::BaseType(psr)
+	: RuleReturnValue_1<ImplTraits>::BaseType(psr)
+	, parser(psr)
 {
 	BaseType::start = psr->LT(1);
 	BaseType::stop = BaseType::start;
@@ -549,19 +548,20 @@ RuleReturnValue_1<ImplTraits>::RuleReturnValue_1( BaseParserType* psr )
 
 template< class ImplTraits>
 RuleReturnValue_1<ImplTraits>::RuleReturnValue_1( const RuleReturnValue_1& val )
-	:BaseType(val)
+	: RuleReturnValue_1<ImplTraits>::BaseType(val)
+	, parser(val.parser)
 {
 }
 
 template< class ImplTraits>
-void RuleReturnValue_1<ImplTraits>::call_start_placeholder()
+void RuleReturnValue_1<ImplTraits>::call_start_placeholder(BaseParserType*)
 {
 }
 
 template< class ImplTraits>
 RuleReturnValue_1<ImplTraits>::~RuleReturnValue_1()
 {
-	if( BaseType::parser && ( BaseType::parser->get_backtracking() == 0 ) )
+	if( parser && parser->get_backtracking() == 0 )
 	{
 		if( BaseType::stop == NULL )
 			BaseType::stop = BaseType::parser->LT(-1);
@@ -571,7 +571,7 @@ RuleReturnValue_1<ImplTraits>::~RuleReturnValue_1()
 			ANTLR_MARKER stop_token_idx		= BaseType::stop->get_index() - 1;
 			if( start_token_idx > stop_token_idx )
 				return;
-			BaseType::parser->getTokenStream()->discardTokens( start_token_idx, stop_token_idx); 
+			parser->getTokenStream()->discardTokens( start_token_idx, stop_token_idx);
 		}
 	}
 }
diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
index effe9d468..c2d3df513 100644
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
@@ -1219,7 +1219,7 @@ ruleLabelDefs() ::= <<
 ruleLabelInitializations() ::= <<
 <if(ruleDescriptor.hasMultipleReturnValues)>
 <if(!ruleDescriptor.isSynPred)>
-retval.call_start_placeholder();
+retval.call_start_placeholder(this);
 <endif>
 <endif>
 >>
@@ -1288,7 +1288,7 @@ rule<ruleDescriptor.name>Ex: ;
 <if(ruleDescriptor.hasMultipleReturnValues)>
 <if(!TREE_PARSER)>
 <if(!ruleDescriptor.isSynPred)>
-retval.call_stop_placeholder();<\n>
+retval.call_stop_placeholder(this);<\n>
 <endif>
 <endif>
 <endif>
@@ -2353,6 +2353,9 @@ public:
     	<scope.attributes:{it | <it.name> = other.<it.name>; }; separator="\n">
     	return *this;
     }
+    
+	void call_start_placeholder(<componentBaseType()>* parser) { start = stop= static_cast\< <name>* >(parser)->get_istream()->LT(1); };
+	void call_stop_placeholder(<componentBaseType()>* parser) { stop = static_cast\< <name>* >(parser)->get_istream()->LT(-1); };
 <endif>
     <if(scope)><scope.attributes:{it |<it.type> <it.name>;}; separator="\n"><endif>
 };

From 09e49a4631472a94ca640d5e799d44765e1a5ca6 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Fri, 28 Aug 2015 21:40:48 +0200
Subject: [PATCH 39/53] linux headers fix

---
 runtime/Cpp/tests/utils.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/Cpp/tests/utils.cpp b/runtime/Cpp/tests/utils.cpp
index 13c30bb8e..4ca2f081f 100644
--- a/runtime/Cpp/tests/utils.cpp
+++ b/runtime/Cpp/tests/utils.cpp
@@ -5,6 +5,7 @@
 #  include <sys/mman.h>
 #  define DIRDELIM '/'
 #  include <dirent.h>
+#  include <unistd.h>
 #elif __MINGW32__
 #  include <iostream>
 #  include <fstream>

From b4839bf29f477bc77dfee766e5f21ebf8623247b Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Fri, 4 Sep 2015 20:58:03 +0200
Subject: [PATCH 40/53] fix test s005

---
 runtime/Cpp/tests/SQLMini.g | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/Cpp/tests/SQLMini.g b/runtime/Cpp/tests/SQLMini.g
index ee225c664..7dbf340b0 100644
--- a/runtime/Cpp/tests/SQLMini.g
+++ b/runtime/Cpp/tests/SQLMini.g
@@ -24,7 +24,7 @@ tokens
 
 @lexer::namespace{ Antlr3Mini }
 
-@lexer::members {
+@lexer::context {
 
   void advanceInput()
   {

From 545bc01c9e95764cef4f58b830f9d58f25076898 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Fri, 4 Sep 2015 21:03:13 +0200
Subject: [PATCH 41/53] add TreeTypePtr create( ANTLR_UINT32 tokenType, const
 CommonTokenType* fromToken, StringType const& text);

---
 runtime/Cpp/include/antlr3commontreeadaptor.hpp |  1 +
 runtime/Cpp/include/antlr3commontreeadaptor.inl | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.hpp b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
index 03b409ed5..40234389d 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.hpp
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
@@ -146,6 +146,7 @@ class CommonTreeAdaptor
 	TreeTypePtr create( CommonTokenType const* payload);
 	TreeTypePtr create( ANTLR_UINT32 tokenType, const CommonTokenType* fromToken);
 	TreeTypePtr create( ANTLR_UINT32 tokenType, const CommonTokenType* fromToken, const char* text);
+	TreeTypePtr create( ANTLR_UINT32 tokenType, const CommonTokenType* fromToken, StringType const& text);
 	TreeTypePtr create( ANTLR_UINT32 tokenType, const char* text);
 	
 	CommonTokenType* createToken( ANTLR_UINT32 tokenType, const char* text);
diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.inl b/runtime/Cpp/include/antlr3commontreeadaptor.inl
index 7419b3a4d..347c2dc77 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.inl
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.inl
@@ -336,6 +336,22 @@ CommonTreeAdaptor<ImplTraits>::create( ANTLR_UINT32 tokenType, const CommonToken
 	return	this->create(newToken);
 }
 
+template<class ImplTraits>
+typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
+CommonTreeAdaptor<ImplTraits>::create( ANTLR_UINT32 tokenType, const CommonTokenType* fromToken, typename CommonTreeAdaptor<ImplTraits>::StringType const& text)
+{
+	if (fromToken == NULL)
+		return create(tokenType, text);
+	/* Create the new token */
+	auto newToken = this->createToken(fromToken);
+	/* Set the type of the new token to that supplied */
+	newToken->set_type(tokenType);
+	/* Set the text of the token accordingly */
+	newToken->setText(text);
+	/* Return a new node based upon this token */
+	return	this->create(newToken);
+}
+  
 template<class ImplTraits>
 typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
 CommonTreeAdaptor<ImplTraits>::create( ANTLR_UINT32 tokenType, const char* text)

From 2ed5d99b8ab7251ef85e78adcd9f979a5ae28b35 Mon Sep 17 00:00:00 2001
From: ibre5041 <ibre5041@ibrezina.net>
Date: Wed, 27 Aug 2014 16:03:32 +0200
Subject: [PATCH 42/53] Reduce size of rule return class. Do not keep pointer
 onto parser in every tree node.

---
 runtime/Cpp/include/antlr3parser.hpp          | 13 +++++------
 runtime/Cpp/include/antlr3parser.inl          | 22 +++++++++----------
 .../org/antlr/codegen/templates/Cpp/Cpp.stg   |  7 ++++--
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/runtime/Cpp/include/antlr3parser.hpp b/runtime/Cpp/include/antlr3parser.hpp
index 57a8ba769..ccf8e9a32 100644
--- a/runtime/Cpp/include/antlr3parser.hpp
+++ b/runtime/Cpp/include/antlr3parser.hpp
@@ -159,17 +159,15 @@ class RuleReturnValue
 public:
 	typedef typename ImplTraits::BaseParserType BaseParserType;
 	typedef typename ImplTraits::CommonTokenType CommonTokenType;
-	
-public:
+
 	const CommonTokenType*		start;
 	const CommonTokenType*		stop;
-	BaseParserType*			parser;
 
 	RuleReturnValue(BaseParserType* psr = NULL );
 	RuleReturnValue( const RuleReturnValue& val );
 	RuleReturnValue& operator=( const RuleReturnValue& val );
-	void call_start_placeholder(); 
-	void call_stop_placeholder(); 
+	void call_start_placeholder(BaseParserType*);
+	void call_stop_placeholder(BaseParserType*);
 	RuleReturnValue& get_struct();
 	~RuleReturnValue();
 };
@@ -183,11 +181,12 @@ class RuleReturnValue_1 : public RuleReturnValue<ImplTraits>
 	typedef RuleReturnValue<ImplTraits> BaseType;
 	typedef typename BaseType::BaseParserType BaseParserType;
 
-public:
+	BaseParserType* parser;
+
 	RuleReturnValue_1();
 	RuleReturnValue_1( BaseParserType* psr);
 	RuleReturnValue_1( const RuleReturnValue_1& val );
-	void call_start_placeholder();  //its dummy here
+	void call_start_placeholder(BaseParserType*);  //its dummy here
 	~RuleReturnValue_1();
 };
 
diff --git a/runtime/Cpp/include/antlr3parser.inl b/runtime/Cpp/include/antlr3parser.inl
index 6b72ae398..e5b4fedb6 100644
--- a/runtime/Cpp/include/antlr3parser.inl
+++ b/runtime/Cpp/include/antlr3parser.inl
@@ -493,8 +493,7 @@ ANTLR_INLINE typename Parser<ImplTraits>::TokenStreamType* Parser<ImplTraits>::g
 
 template< class ImplTraits>
 ANTLR_INLINE RuleReturnValue<ImplTraits>::RuleReturnValue(BaseParserType* psr) 
-{ 
-	parser = psr; 
+{
 	start = NULL;
 	stop = NULL;
 }
@@ -502,7 +501,6 @@ ANTLR_INLINE RuleReturnValue<ImplTraits>::RuleReturnValue(BaseParserType* psr)
 template< class ImplTraits>
 ANTLR_INLINE RuleReturnValue<ImplTraits>::RuleReturnValue( const RuleReturnValue& val )
 {
-	parser	= val.parser; 
 	start	= val.start;
 	stop	= val.stop;
 }
@@ -510,7 +508,6 @@ ANTLR_INLINE RuleReturnValue<ImplTraits>::RuleReturnValue( const RuleReturnValue
 template< class ImplTraits>
 ANTLR_INLINE RuleReturnValue<ImplTraits>& RuleReturnValue<ImplTraits>::operator=( const RuleReturnValue& val )
 {
-	parser	= val.parser; 
 	start	= val.start;
 	stop	= val.stop;
 	return *this;
@@ -522,26 +519,28 @@ ANTLR_INLINE RuleReturnValue<ImplTraits>::~RuleReturnValue()
 }
 
 template< class ImplTraits>
-ANTLR_INLINE void RuleReturnValue<ImplTraits>::call_start_placeholder()
+ANTLR_INLINE void RuleReturnValue<ImplTraits>::call_start_placeholder(BaseParserType *parser)
 {
 	start = parser->LT(1); 
 	stop = start;
 }
 
 template< class ImplTraits>
-ANTLR_INLINE void RuleReturnValue<ImplTraits>::call_stop_placeholder()
+ANTLR_INLINE void RuleReturnValue<ImplTraits>::call_stop_placeholder(BaseParserType *parser)
 {
 	stop = parser->LT(-1);
 }
 
 template< class ImplTraits>
 ANTLR_INLINE RuleReturnValue_1<ImplTraits>::RuleReturnValue_1()
+	: parser()
 {
 }
 
 template< class ImplTraits>
 RuleReturnValue_1<ImplTraits>::RuleReturnValue_1( BaseParserType* psr )
-	:RuleReturnValue_1<ImplTraits>::BaseType(psr)
+	: RuleReturnValue_1<ImplTraits>::BaseType(psr)
+	, parser(psr)
 {
 	BaseType::start = psr->LT(1);
 	BaseType::stop = BaseType::start;
@@ -549,19 +548,20 @@ RuleReturnValue_1<ImplTraits>::RuleReturnValue_1( BaseParserType* psr )
 
 template< class ImplTraits>
 RuleReturnValue_1<ImplTraits>::RuleReturnValue_1( const RuleReturnValue_1& val )
-	:BaseType(val)
+	: RuleReturnValue_1<ImplTraits>::BaseType(val)
+	, parser(val.parser)
 {
 }
 
 template< class ImplTraits>
-void RuleReturnValue_1<ImplTraits>::call_start_placeholder()
+void RuleReturnValue_1<ImplTraits>::call_start_placeholder(BaseParserType*)
 {
 }
 
 template< class ImplTraits>
 RuleReturnValue_1<ImplTraits>::~RuleReturnValue_1()
 {
-	if( BaseType::parser && ( BaseType::parser->get_backtracking() == 0 ) )
+	if( parser && parser->get_backtracking() == 0 )
 	{
 		if( BaseType::stop == NULL )
 			BaseType::stop = BaseType::parser->LT(-1);
@@ -571,7 +571,7 @@ RuleReturnValue_1<ImplTraits>::~RuleReturnValue_1()
 			ANTLR_MARKER stop_token_idx		= BaseType::stop->get_index() - 1;
 			if( start_token_idx > stop_token_idx )
 				return;
-			BaseType::parser->getTokenStream()->discardTokens( start_token_idx, stop_token_idx); 
+			parser->getTokenStream()->discardTokens( start_token_idx, stop_token_idx);
 		}
 	}
 }
diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
index effe9d468..c2d3df513 100644
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
@@ -1219,7 +1219,7 @@ ruleLabelDefs() ::= <<
 ruleLabelInitializations() ::= <<
 <if(ruleDescriptor.hasMultipleReturnValues)>
 <if(!ruleDescriptor.isSynPred)>
-retval.call_start_placeholder();
+retval.call_start_placeholder(this);
 <endif>
 <endif>
 >>
@@ -1288,7 +1288,7 @@ rule<ruleDescriptor.name>Ex: ;
 <if(ruleDescriptor.hasMultipleReturnValues)>
 <if(!TREE_PARSER)>
 <if(!ruleDescriptor.isSynPred)>
-retval.call_stop_placeholder();<\n>
+retval.call_stop_placeholder(this);<\n>
 <endif>
 <endif>
 <endif>
@@ -2353,6 +2353,9 @@ public:
     	<scope.attributes:{it | <it.name> = other.<it.name>; }; separator="\n">
     	return *this;
     }
+    
+	void call_start_placeholder(<componentBaseType()>* parser) { start = stop= static_cast\< <name>* >(parser)->get_istream()->LT(1); };
+	void call_stop_placeholder(<componentBaseType()>* parser) { stop = static_cast\< <name>* >(parser)->get_istream()->LT(-1); };
 <endif>
     <if(scope)><scope.attributes:{it |<it.type> <it.name>;}; separator="\n"><endif>
 };

From 9146932feb13bdca44aa0b0dcbaa115de8dcb732 Mon Sep 17 00:00:00 2001
From: ibre5041 <ibre5041@ibrezina.net>
Date: Thu, 21 Aug 2014 14:17:24 +0200
Subject: [PATCH 43/53] Function names aligned

_LA renamed to LA
_LT renamed to LT

    Function name aligned

    _LT renamed to LT

test synced _LT => LT
---
 runtime/Cpp/include/antlr3baserecognizer.inl | 20 ++++-----
 runtime/Cpp/include/antlr3cyclicdfa.inl      |  2 +-
 runtime/Cpp/include/antlr3input.hpp          |  2 +-
 runtime/Cpp/include/antlr3input.inl          |  4 +-
 runtime/Cpp/include/antlr3intstream.hpp      | 30 ++++++-------
 runtime/Cpp/include/antlr3intstream.inl      | 46 ++++++++++----------
 runtime/Cpp/include/antlr3lexer.inl          | 10 ++---
 runtime/Cpp/include/antlr3parser.inl         | 10 ++---
 runtime/Cpp/include/antlr3tokenstream.hpp    |  2 +-
 runtime/Cpp/include/antlr3tokenstream.inl    |  4 +-
 runtime/Cpp/include/antlr3treeparser.inl     | 11 ++---
 runtime/Cpp/tests/a005.cpp                   | 44 +++++++++++++++++++
 runtime/Cpp/tests/s001.cpp                   |  8 ++--
 runtime/Cpp/tests/s002.cpp                   |  8 ++--
 runtime/Cpp/tests/s003.cpp                   |  8 ++--
 runtime/Cpp/tests/s004.cpp                   |  4 +-
 runtime/Cpp/tests/s005.cpp                   |  8 ++--
 runtime/Cpp/tests/s006.cpp                   |  8 ++--
 runtime/Cpp/tests/t001.cpp                   |  4 +-
 runtime/Cpp/tests/t002.cpp                   |  6 +--
 runtime/Cpp/tests/t003.cpp                   |  8 ++--
 runtime/Cpp/tests/t051.cpp                   |  2 +-
 22 files changed, 147 insertions(+), 102 deletions(-)

diff --git a/runtime/Cpp/include/antlr3baserecognizer.inl b/runtime/Cpp/include/antlr3baserecognizer.inl
index bd7cc5319..8eaa416e1 100644
--- a/runtime/Cpp/include/antlr3baserecognizer.inl
+++ b/runtime/Cpp/include/antlr3baserecognizer.inl
@@ -62,7 +62,7 @@ BaseRecognizer<ImplTraits, StreamType>::match(ANTLR_UINT32 ttype, BitsetListType
 	//
 	const UnitType* matchedSymbol = this->getCurrentInputSymbol(is);
 
-	//if (is->_LA(1) == ttype)
+	//if (is->LA(1) == ttype)
 	if (matchedSymbol->get_type() == ttype)
 	{
 		// The token was the one we were told to expect
@@ -108,7 +108,7 @@ void BaseRecognizer<ImplTraits, StreamType>::matchAny()
 template< class ImplTraits, class StreamType >
 bool BaseRecognizer<ImplTraits, StreamType>::mismatchIsUnwantedToken(IntStreamType* is, ANTLR_UINT32 ttype)
 {
-	ANTLR_UINT32 nextt = is->_LA(2);
+	ANTLR_UINT32 nextt = is->LA(2);
 
 	if	(nextt == ttype)
 	{
@@ -173,7 +173,7 @@ bool BaseRecognizer<ImplTraits, StreamType>::mismatchIsMissingToken(IntStreamTyp
 	/// in follow set to indicate that the fall of the start symbol is
 	/// in the set (EOF can follow).
 	///
-	if	(		followClone->isMember(is->_LA(1))
+	if	(		followClone->isMember(is->LA(1))
 			||	followClone->isMember(ImplTraits::CommonTokenType::EOR_TOKEN_TYPE)
 		)
 	{
@@ -580,7 +580,7 @@ bool  BaseRecognizer<ImplTraits, StreamType>::recoverFromMismatchedElement(Bitse
      * is consistent, then we can "insert" that token by not throwing
      * an exception and assuming that we saw it.
      */
-    if	( follow->isMember(is->_LA(1)) == true)
+    if	( follow->isMember(is->LA(1)) == true)
     {
 		/* report the error, but don't cause any rules to abort and stuff
 		 */
@@ -613,14 +613,14 @@ void	BaseRecognizer<ImplTraits, StreamType>::consumeUntil(ANTLR_UINT32   tokenTy
 
 	// What do have at the moment?
     //
-    ANTLR_UINT32 ttype	= is->_LA(1);
+    ANTLR_UINT32 ttype	= is->LA(1);
 
     // Start eating tokens until we get to the one we want.
     //
     while   (ttype != ImplTraits::CommonTokenType::TOKEN_EOF && ttype != tokenType)
     {
 		is->consume();
-		ttype	= is->_LA(1);
+		ttype	= is->LA(1);
     }
 }
 
@@ -633,14 +633,14 @@ void	BaseRecognizer<ImplTraits, StreamType>::consumeUntilSet(BitsetType*	set)
 
     // What do have at the moment?
     //
-    ttype	= is->_LA(1);
+    ttype	= is->LA(1);
 
     // Start eating tokens until we get to one we want.
     //
     while   (ttype != ImplTraits::CommonTokenType::TOKEN_EOF && set->isMember(ttype) == false)
     {
 		is->consume();
-		ttype	= is->_LA(1);
+		ttype	= is->LA(1);
     }
 
 }
@@ -774,7 +774,7 @@ BaseRecognizer<ImplTraits, StreamType>::getCurrentInputSymbol(IntStreamType* ist
 {
 	typedef typename ImplTraits::TokenStreamType TokenStreamType;
 	TokenStreamType* token_stream = static_cast<TokenStreamType*>(istream);
-	return token_stream->_LT(1);
+	return token_stream->LT(1);
 }
 
 template< class ImplTraits, class StreamType >
@@ -783,7 +783,7 @@ BaseRecognizer<ImplTraits, StreamType>::getCurrentInputSymbol(IntStreamType* ist
 {
 	typedef typename ImplTraits::TreeNodeStreamType TreeNodeStreamType;
 	TreeNodeStreamType*	ctns = static_cast<TreeNodeStreamType*>(istream);
-	return ctns->_LT(1);
+	return ctns->LT(1);
 }
 
 
diff --git a/runtime/Cpp/include/antlr3cyclicdfa.inl b/runtime/Cpp/include/antlr3cyclicdfa.inl
index c25c7c0aa..f88cd692e 100644
--- a/runtime/Cpp/include/antlr3cyclicdfa.inl
+++ b/runtime/Cpp/include/antlr3cyclicdfa.inl
@@ -121,7 +121,7 @@ ANTLR_INT32	CyclicDFA<ImplTraits, CtxType>::predict(CtxType * ctx,
 
 		/* Look for a normal transition state based upon the input token element
 		 */
-		c = is->_LA(1);
+		c = is->LA(1);
 
 		/* Check against min and max for this state
 		 */
diff --git a/runtime/Cpp/include/antlr3input.hpp b/runtime/Cpp/include/antlr3input.hpp
index 681615304..c3088c0c0 100644
--- a/runtime/Cpp/include/antlr3input.hpp
+++ b/runtime/Cpp/include/antlr3input.hpp
@@ -39,7 +39,7 @@
 namespace antlr3 {
 
 /// Master context structure for an ANTLR3 C runtime based input stream.
-/// \ingroup apistructures. Calling _LT on this doesn't seem right. You would
+/// \ingroup apistructures. Calling LT on this doesn't seem right. You would
 /// call it only with parser / TreeParser, and their respective input streams 
 /// has that function. calling it from lexer will throw a compile time error
 ///
diff --git a/runtime/Cpp/include/antlr3input.inl b/runtime/Cpp/include/antlr3input.inl
index f64867c8f..6837a0654 100644
--- a/runtime/Cpp/include/antlr3input.inl
+++ b/runtime/Cpp/include/antlr3input.inl
@@ -317,9 +317,9 @@ void    InputStream<ImplTraits>::reuse(ANTLR_UINT8* inString, ANTLR_UINT32 size,
 
 /*
 template<class ImplTraits>
-typename InputStream<ImplTraits>::DataType*	InputStream<ImplTraits>::_LT(ANTLR_INT32 lt)
+typename InputStream<ImplTraits>::DataType*	InputStream<ImplTraits>::LT(ANTLR_INT32 lt)
 {
-	return this->_LA(lt);
+	return this->LA(lt);
 }
 */
 
diff --git a/runtime/Cpp/include/antlr3intstream.hpp b/runtime/Cpp/include/antlr3intstream.hpp
index 7249f9312..01bf60a7c 100644
--- a/runtime/Cpp/include/antlr3intstream.hpp
+++ b/runtime/Cpp/include/antlr3intstream.hpp
@@ -141,7 +141,7 @@ class IntStream : public ImplTraits::AllocPolicyType
 
     /** Get ANTLR3_UINT32 at current input pointer + i ahead where i=1 is next ANTLR3_UINT32 
      */
-    ANTLR_UINT32	_LA( ANTLR_INT32 i);
+    ANTLR_UINT32	LA( ANTLR_INT32 i);
 
     /** Tell the stream to start buffering if it hasn't already.  Return
      *  current input position, index(), or some other marker so that
@@ -215,7 +215,7 @@ class IntStream : public ImplTraits::AllocPolicyType
 	void findout_endian_spec(bool machineBigEndian, bool inputBigEndian);
 
 	//If the user chooses this option, then we will be resolving stuffs at run-time
-	ANTLR_UINT32	_LA( ANTLR_INT32 i, ClassForwarder<RESOLVE_ENDIAN_AT_RUNTIME> );
+	ANTLR_UINT32	LA( ANTLR_INT32 i, ClassForwarder<RESOLVE_ENDIAN_AT_RUNTIME> );
 
 	//resolve into one of the three categories below at runtime
 	void	consume( ClassForwarder<RESOLVE_ENDIAN_AT_RUNTIME> );
@@ -225,7 +225,7 @@ template<class ImplTraits, class SuperType>
 class EBCDIC_IntStream : public IntStream<ImplTraits, SuperType>
 {
 public:
-	ANTLR_UINT32	_LA( ANTLR_INT32 i);
+	ANTLR_UINT32	LA( ANTLR_INT32 i);
 
 protected:
 	void setupIntStream();
@@ -235,7 +235,7 @@ template<class ImplTraits, class SuperType>
 class UTF8_IntStream : public IntStream<ImplTraits, SuperType>
 {
 public:
-	ANTLR_UINT32	_LA( ANTLR_INT32 i);
+	ANTLR_UINT32	LA( ANTLR_INT32 i);
 	void consume();
 
 protected:
@@ -250,7 +250,7 @@ template<class ImplTraits, class SuperType>
 class UTF16_IntStream : public IntStream<ImplTraits, SuperType>
 {
 public:
-	ANTLR_UINT32	_LA( ANTLR_INT32 i);
+	ANTLR_UINT32	LA( ANTLR_INT32 i);
 	void		    consume();
 	ANTLR_MARKER	index();
 	void seek(ANTLR_MARKER seekPoint);
@@ -265,7 +265,7 @@ class UTF16_IntStream : public IntStream<ImplTraits, SuperType>
 	///
 	/// \return Next input character in internal ANTLR3 encoding (UTF32)
 	///
-	ANTLR_UINT32	_LA( ANTLR_INT32 i, ClassForwarder<BYTE_AGNOSTIC> );
+	ANTLR_UINT32	LA( ANTLR_INT32 i, ClassForwarder<BYTE_AGNOSTIC> );
 
 	/// \brief Return the input element assuming a UTF16 input when the input is Little Endian and the machine is not
 	///
@@ -274,7 +274,7 @@ class UTF16_IntStream : public IntStream<ImplTraits, SuperType>
 	///
 	/// \return Next input character in internal ANTLR3 encoding (UTF32)
 	///
-	ANTLR_UINT32	_LA( ANTLR_INT32 i, ClassForwarder<ANTLR_LITTLE_ENDIAN> );
+	ANTLR_UINT32	LA( ANTLR_INT32 i, ClassForwarder<ANTLR_LITTLE_ENDIAN> );
 	
 	/// \brief Return the input element assuming a UTF16 input when the input is Little Endian and the machine is not
 	///
@@ -283,7 +283,7 @@ class UTF16_IntStream : public IntStream<ImplTraits, SuperType>
 	///
 	/// \return Next input character in internal ANTLR3 encoding (UTF32)
 	///
-	ANTLR_UINT32	_LA( ANTLR_INT32 i, ClassForwarder<ANTLR_BIG_ENDIAN> );
+	ANTLR_UINT32	LA( ANTLR_INT32 i, ClassForwarder<ANTLR_BIG_ENDIAN> );
 
 	/// \brief Consume the next character in a UTF16 input stream
 	///
@@ -314,7 +314,7 @@ template<class ImplTraits, class SuperType>
 class UTF32_IntStream : public IntStream<ImplTraits, SuperType>
 {
 public:
-	ANTLR_UINT32	_LA( ANTLR_INT32 i);
+	ANTLR_UINT32	LA( ANTLR_INT32 i);
 	void		    consume();
 	
 	/// \brief Calculate the current index in the output stream.
@@ -325,10 +325,10 @@ class UTF32_IntStream : public IntStream<ImplTraits, SuperType>
 
 protected:
 	void setupIntStream(bool machineBigEndian, bool inputBigEndian);
-	ANTLR_UINT32	_LA( ANTLR_INT32 i, ClassForwarder<RESOLVE_ENDIAN_AT_RUNTIME> );
-	ANTLR_UINT32	_LA( ANTLR_INT32 i, ClassForwarder<BYTE_AGNOSTIC> );
-	ANTLR_UINT32	_LA( ANTLR_INT32 i, ClassForwarder<ANTLR_LITTLE_ENDIAN> );
-	ANTLR_UINT32	_LA( ANTLR_INT32 i, ClassForwarder<ANTLR_BIG_ENDIAN> );
+	ANTLR_UINT32	LA( ANTLR_INT32 i, ClassForwarder<RESOLVE_ENDIAN_AT_RUNTIME> );
+	ANTLR_UINT32	LA( ANTLR_INT32 i, ClassForwarder<BYTE_AGNOSTIC> );
+	ANTLR_UINT32	LA( ANTLR_INT32 i, ClassForwarder<ANTLR_LITTLE_ENDIAN> );
+	ANTLR_UINT32	LA( ANTLR_INT32 i, ClassForwarder<ANTLR_BIG_ENDIAN> );
 
 	void	consume( ClassForwarder<RESOLVE_ENDIAN_AT_RUNTIME> );
 	void	consume( ClassForwarder<BYTE_AGNOSTIC> );
@@ -359,7 +359,7 @@ class TokenIntStream : public IntStream<ImplTraits, typename ImplTraits::TokenSt
 
 	void consume();
 	void  consumeInitialHiddenTokens();
-	ANTLR_UINT32  _LA( ANTLR_INT32 i );
+	ANTLR_UINT32  LA( ANTLR_INT32 i );
 	ANTLR_MARKER  mark();
 	ANTLR_UINT32  size();
 	void release();
@@ -384,7 +384,7 @@ class TreeNodeIntStream : public IntStream<ImplTraits, typename ImplTraits::Tree
 public:
 	void				consume();
 	ANTLR_MARKER		tindex();
-	ANTLR_UINT32		_LA(ANTLR_INT32 i);
+	ANTLR_UINT32		LA(ANTLR_INT32 i);
 	ANTLR_MARKER		mark();
 	void				release(ANTLR_MARKER marker);
 	void				rewindMark(ANTLR_MARKER marker);
diff --git a/runtime/Cpp/include/antlr3intstream.inl b/runtime/Cpp/include/antlr3intstream.inl
index 17dc100fa..5cd5bd13f 100644
--- a/runtime/Cpp/include/antlr3intstream.inl
+++ b/runtime/Cpp/include/antlr3intstream.inl
@@ -74,7 +74,7 @@ void	IntStream<ImplTraits, SuperType>::consume()
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la )
+ANTLR_UINT32	IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 la )
 {
 	SuperType* input = this->get_super();
 	const ANTLR_UINT8* nextChar = input->get_nextChar();
@@ -230,7 +230,7 @@ IntStream<ImplTraits, SuperType>::~IntStream()
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	EBCDIC_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la)
+ANTLR_UINT32	EBCDIC_IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 la)
 {
 	// EBCDIC to ASCII conversion table
 	//
@@ -295,9 +295,9 @@ void EBCDIC_IntStream<ImplTraits, SuperType>::setupIntStream()
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 i)
+ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 i)
 {
-	return this->_LA(i, ClassForwarder< typename ImplTraits::Endianness >() );
+	return this->LA(i, ClassForwarder< typename ImplTraits::Endianness >() );
 }
 
 template<class ImplTraits, class SuperType>
@@ -331,7 +331,7 @@ void UTF16_IntStream<ImplTraits, SuperType>::seek(ANTLR_MARKER seekPoint)
 	{
         // Call consume until we reach the asked for seek point or EOF
         //
-        while( (this->_LA(1) != ANTLR_CHARSTREAM_EOF) && (seekPoint < (ANTLR_MARKER)input->get_nextChar() ) )
+        while( (this->LA(1) != ANTLR_CHARSTREAM_EOF) && (seekPoint < (ANTLR_MARKER)input->get_nextChar() ) )
 	    {
 			this->consume();
 	    }
@@ -396,19 +396,19 @@ void UTF16_IntStream<ImplTraits, SuperType>::setupIntStream(bool machineBigEndia
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32 IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 i, ClassForwarder<RESOLVE_ENDIAN_AT_RUNTIME> )
+ANTLR_UINT32 IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 i, ClassForwarder<RESOLVE_ENDIAN_AT_RUNTIME> )
 {
 	assert( (m_endian_spec >= 1) && (m_endian_spec <= 3));
 	switch(m_endian_spec)
 	{
 	case 1:
-		return this->_LA(i, ClassForwarder<BYTE_AGNOSTIC>() );
+		return this->LA(i, ClassForwarder<BYTE_AGNOSTIC>() );
 		break;
 	case 2:
-		return this->_LA(i, ClassForwarder<ANTLR_LITTLE_ENDIAN>() );
+		return this->LA(i, ClassForwarder<ANTLR_LITTLE_ENDIAN>() );
 		break;
 	case 3:
-		return this->_LA(i, ClassForwarder<ANTLR_BIG_ENDIAN>() );
+		return this->LA(i, ClassForwarder<ANTLR_BIG_ENDIAN>() );
 		break;
 	default:
 		break;
@@ -437,7 +437,7 @@ void	IntStream<ImplTraits, SuperType>::consume( ClassForwarder<RESOLVE_ENDIAN_AT
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassForwarder<BYTE_AGNOSTIC> )
+ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 la, ClassForwarder<BYTE_AGNOSTIC> )
 {
 	SuperType* input;
     UTF32   ch;
@@ -572,7 +572,7 @@ ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassF
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassForwarder<ANTLR_LITTLE_ENDIAN> )
+ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 la, ClassForwarder<ANTLR_LITTLE_ENDIAN> )
 {
 	SuperType* input;
     UTF32           ch;
@@ -710,7 +710,7 @@ ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassF
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassForwarder<ANTLR_BIG_ENDIAN> )
+ANTLR_UINT32	UTF16_IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 la, ClassForwarder<ANTLR_BIG_ENDIAN> )
 {
 	SuperType* input;
     UTF32           ch;
@@ -1063,9 +1063,9 @@ void	UTF16_IntStream<ImplTraits, SuperType>::consume( ClassForwarder<ANTLR_BIG_E
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 i)
+ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 i)
 {
-	return this->_LA( i, ClassForwarder<typename ImplTraits::Endianness>() );
+	return this->LA( i, ClassForwarder<typename ImplTraits::Endianness>() );
 }
 
 template<class ImplTraits, class SuperType>
@@ -1095,7 +1095,7 @@ void UTF32_IntStream<ImplTraits, SuperType>::seek(ANTLR_MARKER seekPoint)
 	{
         // Call consume until we reach the asked for seek point or EOF
         //
-        while( (this->_LA(1) != ANTLR_CHARSTREAM_EOF) && (seekPoint < (ANTLR_MARKER)input->get_nextChar()) )
+        while( (this->LA(1) != ANTLR_CHARSTREAM_EOF) && (seekPoint < (ANTLR_MARKER)input->get_nextChar()) )
 	    {
 			this->consume();
 	    }
@@ -1113,7 +1113,7 @@ void UTF32_IntStream<ImplTraits, SuperType>::setupIntStream(bool machineBigEndia
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassForwarder<BYTE_AGNOSTIC> )
+ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 la, ClassForwarder<BYTE_AGNOSTIC> )
 {
     SuperType* input = this->get_super();
 
@@ -1128,7 +1128,7 @@ ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassF
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassForwarder<ANTLR_LITTLE_ENDIAN> )
+ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 la, ClassForwarder<ANTLR_LITTLE_ENDIAN> )
 {
 	SuperType* input = this->get_super();
 
@@ -1149,7 +1149,7 @@ ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassF
 }
 
 template<class ImplTraits, class SuperType>
-ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::_LA( ANTLR_INT32 la, ClassForwarder<ANTLR_BIG_ENDIAN> )
+ANTLR_UINT32	UTF32_IntStream<ImplTraits, SuperType>::LA( ANTLR_INT32 la, ClassForwarder<ANTLR_BIG_ENDIAN> )
 {
 	SuperType* input = this->get_super();
 
@@ -1323,7 +1323,7 @@ void UTF8_IntStream<ImplTraits, SuperType>::consume()
  * \return Next input character in internal ANTLR3 encoding (UTF32)
  */
 template<class ImplTraits, class SuperType>
-ANTLR_UCHAR UTF8_IntStream<ImplTraits, SuperType>::_LA(ANTLR_INT32 la)
+ANTLR_UCHAR UTF8_IntStream<ImplTraits, SuperType>::LA(ANTLR_INT32 la)
 {
     SuperType* input = this->get_super();
 	const ANTLR_UINT32* trailingBytesForUTF8 = UTF8_IntStream::TrailingBytesForUTF8();
@@ -1477,12 +1477,12 @@ void  TokenIntStream<ImplTraits>::consumeInitialHiddenTokens()
 
 
 template<class ImplTraits>
-ANTLR_UINT32	TokenIntStream<ImplTraits>::_LA( ANTLR_INT32 i )
+ANTLR_UINT32	TokenIntStream<ImplTraits>::LA( ANTLR_INT32 i )
 {
 	const CommonTokenType*    tok;
 	TokenStreamType*    ts	    = static_cast<TokenStreamType*>(this);
 
-	tok	    =  ts->_LT(i);
+	tok	    =  ts->LT(i);
 
 	if	(tok != NULL)
 	{
@@ -1583,13 +1583,13 @@ ANTLR_MARKER		TreeNodeIntStream<ImplTraits>::tindex()
 }
 
 template<class ImplTraits>
-ANTLR_UINT32		TreeNodeIntStream<ImplTraits>::_LA(ANTLR_INT32 i)
+ANTLR_UINT32 TreeNodeIntStream<ImplTraits>::LA(ANTLR_INT32 i)
 {
 	TreeNodeStreamType* tns	    = this->get_super();
 
 	// Ask LT for the 'token' at that position
 	//
-	TreeTypePtr t = tns->_LT(i);
+	TreeTypePtr t = tns->LT(i);
 
 	if	(t == NULL)
 	{
diff --git a/runtime/Cpp/include/antlr3lexer.inl b/runtime/Cpp/include/antlr3lexer.inl
index 578510c62..bf6960569 100644
--- a/runtime/Cpp/include/antlr3lexer.inl
+++ b/runtime/Cpp/include/antlr3lexer.inl
@@ -109,7 +109,7 @@ void Lexer<ImplTraits>::displayRecognitionError( ANTLR_UINT8** , ExceptionBaseTy
 template<class ImplTraits>
 void Lexer<ImplTraits>::fillExceptionData( ExceptionBaseType* ex )
 {
-	ex->set_c( m_input->_LA(1) );					/* Current input character			*/
+	ex->set_c( m_input->LA(1) );					/* Current input character			*/
 	ex->set_line( m_input->get_line() );						/* Line number comes from stream		*/
 	ex->set_charPositionInLine( m_input->get_charPositionInLine() );	    /* Line offset also comes from the stream   */
 	ex->set_index( m_input->index() );
@@ -235,7 +235,7 @@ bool	Lexer<ImplTraits>::matchs(ANTLR_UCHAR* str )
 	RecognizerSharedStateType* state = this->get_rec()->get_state();
 	while   (*str != ANTLR_STRING_TERMINATOR)
 	{
-		if  ( this->get_istream()->_LA(1) != (*str))
+		if  ( this->get_istream()->LA(1) != (*str))
 		{
 			if	( state->get_backtracking() > 0)
 			{
@@ -267,7 +267,7 @@ bool	Lexer<ImplTraits>::matchs(ANTLR_UCHAR* str )
 template<class ImplTraits>
 bool	Lexer<ImplTraits>::matchc(ANTLR_UCHAR c)
 {
-	if	(this->get_istream()->_LA(1) == c)
+	if	(this->get_istream()->LA(1) == c)
 	{
 		/* Matched correctly, do consume it
 		 */
@@ -304,7 +304,7 @@ bool	Lexer<ImplTraits>::matchRange(ANTLR_UCHAR low, ANTLR_UCHAR high)
 
     /* What is in the stream at the moment?
      */
-    c	= this->get_istream()->_LA(1);
+    c	= this->get_istream()->LA(1);
     if	( c >= low && c <= high)
     {
 		/* Matched correctly, consume it
@@ -579,7 +579,7 @@ ANTLR_INLINE typename Lexer<ImplTraits>::DebuggerType* Lexer<ImplTraits>::get_de
 template< class ImplTraits>
 ANTLR_INLINE ANTLR_UINT32 Lexer<ImplTraits>::LA(ANTLR_INT32 i)
 {
-	return this->get_istream()->_LA(i);
+	return this->get_istream()->LA(i);
 }
 
 template< class ImplTraits>
diff --git a/runtime/Cpp/include/antlr3parser.inl b/runtime/Cpp/include/antlr3parser.inl
index e5b4fedb6..d1b099a2b 100644
--- a/runtime/Cpp/include/antlr3parser.inl
+++ b/runtime/Cpp/include/antlr3parser.inl
@@ -52,7 +52,7 @@ ANTLR_INLINE typename Parser<ImplTraits>::TokenStreamType* Parser<ImplTraits>::g
 template< class ImplTraits >
 void Parser<ImplTraits>::fillExceptionData( ExceptionBaseType* ex )
 {
-	ex->set_token( new CommonTokenType(*(m_tstream->_LT(1))) ); /* Current input token (clonned) - held by the exception */
+	ex->set_token( new CommonTokenType(*(m_tstream->LT(1))) ); /* Current input token (clonned) - held by the exception */
 	ex->set_line( ex->get_token()->get_line() );
 	ex->set_charPositionInLine( ex->get_token()->get_charPositionInLine() );
 	ex->set_index( this->get_istream()->index() );
@@ -200,10 +200,10 @@ typename Parser<ImplTraits>::TokenType*	Parser<ImplTraits>::getMissingSymbol( In
 	// Work out what to use as the current symbol to make a line and offset etc
 	// If we are at EOF, we use the token before EOF
 	//
-	const CommonTokenType* current = cts->_LT(1);
+	const CommonTokenType* current = cts->LT(1);
 	if	(current->get_type() == CommonTokenType::TOKEN_EOF)
 	{
-		current = cts->_LT(-1);
+		current = cts->LT(-1);
 	}
 
 	CommonTokenType* token = new CommonTokenType;
@@ -362,13 +362,13 @@ ANTLR_INLINE void Parser<ImplTraits>::preporterror()
 template< class ImplTraits>
 ANTLR_INLINE ANTLR_UINT32 Parser<ImplTraits>::LA(ANTLR_INT32 i)
 {
-	return this->get_istream()->_LA(i);
+	return this->get_istream()->LA(i);
 }
 
 template< class ImplTraits>
 ANTLR_INLINE const typename Parser<ImplTraits>::CommonTokenType*  Parser<ImplTraits>::LT(ANTLR_INT32 k)
 {
-	return this->get_input()->_LT(k);
+	return this->get_input()->LT(k);
 }
 
 template< class ImplTraits>
diff --git a/runtime/Cpp/include/antlr3tokenstream.hpp b/runtime/Cpp/include/antlr3tokenstream.hpp
index 669965809..d97308788 100644
--- a/runtime/Cpp/include/antlr3tokenstream.hpp
+++ b/runtime/Cpp/include/antlr3tokenstream.hpp
@@ -172,7 +172,7 @@ class TokenStream  : public ImplTraits::TokenIntStreamType
      *  Return null for LT(0) and any index that results in an absolute address
      *  that is negative.
      */
-    const TokenType*  _LT(ANTLR_INT32 k);
+    const TokenType*  LT(ANTLR_INT32 k);
 
     /** Where is this stream pulling tokens from?  This is not the name, but
      *  a pointer into an interface that contains a ANTLR3_TOKEN_SOURCE interface.
diff --git a/runtime/Cpp/include/antlr3tokenstream.inl b/runtime/Cpp/include/antlr3tokenstream.inl
index 4f6851a62..21b6dddfa 100644
--- a/runtime/Cpp/include/antlr3tokenstream.inl
+++ b/runtime/Cpp/include/antlr3tokenstream.inl
@@ -82,7 +82,7 @@ typename TokenSource<ImplTraits>::TokenType*	TokenSource<ImplTraits>::nextTokenS
             state->set_tokenStartLine( input->get_line() );
             state->set_text("");
 
-            if  (istream->_LA(1) == ANTLR_CHARSTREAM_EOF)
+            if  (istream->LA(1) == ANTLR_CHARSTREAM_EOF)
             {
                 // Reached the end of the current stream, nothing more to do if this is
                 // the last in the stack.
@@ -387,7 +387,7 @@ void	TokenStream<ImplTraits>::setDebugListener(DebugEventListenerType* debugger)
 }
 
 template<class ImplTraits>
-const typename TokenStream<ImplTraits>::TokenType*  TokenStream<ImplTraits>::_LT(ANTLR_INT32 k)
+const typename TokenStream<ImplTraits>::TokenType*  TokenStream<ImplTraits>::LT(ANTLR_INT32 k)
 {
 	ANTLR_INT32    i;
 	ANTLR_INT32    n;
diff --git a/runtime/Cpp/include/antlr3treeparser.inl b/runtime/Cpp/include/antlr3treeparser.inl
index a6b105a18..668029105 100644
--- a/runtime/Cpp/include/antlr3treeparser.inl
+++ b/runtime/Cpp/include/antlr3treeparser.inl
@@ -44,9 +44,10 @@ typename TreeParser<ImplTraits>::RecognizerType* TreeParser<ImplTraits>::get_rec
 template< class ImplTraits >
 void TreeParser<ImplTraits>::fillExceptionData( ExceptionBaseType* ex )
 {
-	ex->set_token( m_ctnstream->_LT(1) );	    /* Current input tree node */
-	ex->set_line( ex->get_token()->getLine() );
-	ex->set_charPositionInLine( ex->get_token()->getCharPositionInLine() );
+	auto xxx = m_ctnstream->LT(1);
+	//ex->set_token( m_ctnstream->LT(1) );	    /* Current input tree node */
+	ex->set_line( ex->get_token()->get_line() );
+	ex->set_charPositionInLine( ex->get_token()->get_charPositionInLine() );
 	ex->set_index( m_ctnstream->index() );
 
 	// Are you ready for this? Deep breath now...
@@ -168,12 +169,12 @@ TreeParser<ImplTraits>::getMissingSymbol( IntStreamType* istream, ExceptionBaseT
 
 	// Create a new empty node, by stealing the current one, or the previous one if the current one is EOF
 	//
-	current	= tns->_LT(1);
+	current	= tns->LT(1);
     i       = -1;
 
 	if	(current == tns->get_EOF_NODE_p())
 	{
-		current = tns->_LT(-1);
+		current = tns->LT(-1);
         i--;
 	}
 	node	= current->dupNode();
diff --git a/runtime/Cpp/tests/a005.cpp b/runtime/Cpp/tests/a005.cpp
index c8e165281..451810abb 100644
--- a/runtime/Cpp/tests/a005.cpp
+++ b/runtime/Cpp/tests/a005.cpp
@@ -115,3 +115,47 @@ void test4(const char* input)
 	delete lxr;
 	delete istream;
 }
+
+void test5(const char* input)
+{
+	a005LexerTraits::InputStreamType* istream = new a005LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+											 , antlr3::ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test5");
+	istream->setUcaseLA(true);
+	
+	a005Lexer* lxr = new a005Lexer(istream);
+	a005LexerTraits::TokenStreamType* tstream = new a005LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a005Parser* psr = new a005Parser(tstream);	
+	{
+		auto r1 = psr->test5();
+		std::cout << r1.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test6(const char* input)
+{
+	a005LexerTraits::InputStreamType* istream = new a005LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+											 , antlr3::ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test6");
+	istream->setUcaseLA(true);
+	
+	a005Lexer* lxr = new a005Lexer(istream);
+	a005LexerTraits::TokenStreamType* tstream = new a005LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a005Parser* psr = new a005Parser(tstream);	
+	{
+		auto r1 = psr->test6();
+		std::cout << r1.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
diff --git a/runtime/Cpp/tests/s001.cpp b/runtime/Cpp/tests/s001.cpp
index 1ca1d1577..44b3c35b4 100644
--- a/runtime/Cpp/tests/s001.cpp
+++ b/runtime/Cpp/tests/s001.cpp
@@ -70,20 +70,20 @@ void parseFile(const char* fName, int fd)
 		ANTLR_INT32 T = 0;
 		while	(T != s001Lexer::EOF_TOKEN)
 		{
-			T = tstream->_LA(1);
-			s001LexerTraits::CommonTokenType const* token = tstream->_LT(1);
+			T = tstream->LA(1);
+			s001LexerTraits::CommonTokenType const* token = tstream->LT(1);
 			ANTLR_UINT8 const *name = lxr->getTokenName(T);
 			  
 			printf("%d %s\t\"%s\"\n",
 			       T,
 			       name,
-			       tstream->_LT(1)->getText().c_str()
+			       tstream->LT(1)->getText().c_str()
 			       );
 			tstream->consume();
 		}
 	}
 
-	tstream->_LT(1);	// Don't do this mormally, just causes lexer to run for timings here
+	tstream->LT(1);	// Don't do this mormally, just causes lexer to run for timings here
 
 	delete psr;
 	delete tstream; 
diff --git a/runtime/Cpp/tests/s002.cpp b/runtime/Cpp/tests/s002.cpp
index d801a0d83..3af236668 100644
--- a/runtime/Cpp/tests/s002.cpp
+++ b/runtime/Cpp/tests/s002.cpp
@@ -71,20 +71,20 @@ void parseFile(const char* fName, int fd)
 		ANTLR_INT32 T = 0;
 		while	(T != s002Lexer::EOF_TOKEN)
 		{
-			T = tstream->_LA(1);
-			s002LexerTraits::CommonTokenType const* token = tstream->_LT(1);
+			T = tstream->LA(1);
+			s002LexerTraits::CommonTokenType const* token = tstream->LT(1);
 			ANTLR_UINT8 const *name = lxr->getTokenName(T);
 			  
 			printf("%d %s\t\"%s\"\n",
 			       T,
 			       name,
-			       tstream->_LT(1)->getText().c_str()
+			       tstream->LT(1)->getText().c_str()
 			       );
 			tstream->consume();
 		}
 	}
 
-	tstream->_LT(1);	// Don't do this mormally, just causes lexer to run for timings here
+	tstream->LT(1);	// Don't do this mormally, just causes lexer to run for timings here
 
 	delete psr;
 	delete tstream; 
diff --git a/runtime/Cpp/tests/s003.cpp b/runtime/Cpp/tests/s003.cpp
index 63b16b3bf..1f3641c6f 100644
--- a/runtime/Cpp/tests/s003.cpp
+++ b/runtime/Cpp/tests/s003.cpp
@@ -87,20 +87,20 @@ void parseFile(const char* fName, int fd)
 		ANTLR_INT32 T = 0;
 		while	(T != s003Lexer::EOF_TOKEN)
 		{
-			T = tstream->_LA(1);
-			s003LexerTraits::CommonTokenType const* token = tstream->_LT(1);
+			T = tstream->LA(1);
+			s003LexerTraits::CommonTokenType const* token = tstream->LT(1);
 			ANTLR_UINT8 const *name = lxr->getTokenName(T);
 			  
 			printf("%d %s\t\"%s\"\n",
 			       T,
 			       name,
-			       tstream->_LT(1)->getText().c_str()
+			       tstream->LT(1)->getText().c_str()
 			       );
 			tstream->consume();
 		}
 	}
 
-	tstream->_LT(1);	// Don't do this mormally, just causes lexer to run for timings here
+	tstream->LT(1);	// Don't do this mormally, just causes lexer to run for timings here
 
 	if(r.evaluator)
 	{
diff --git a/runtime/Cpp/tests/s004.cpp b/runtime/Cpp/tests/s004.cpp
index 0e3653565..dbe49cb6b 100644
--- a/runtime/Cpp/tests/s004.cpp
+++ b/runtime/Cpp/tests/s004.cpp
@@ -88,13 +88,13 @@ void parseFile(const char* fName, int fd)
 	//	T = 0;
 	//	while	(T != ANTLR3_TOKEN_EOF)
 	//	{
-	//		T = tstream->tstream->istream->_LA(tstream->tstream->istream, 1);
+	//		T = tstream->tstream->istream->LA(tstream->tstream->istream, 1);
 	//		tstream->tstream->istream->consume(tstream->tstream->istream);
 	//		printf("%d %s\n", T,  (psr->pParser->rec->state->tokenNames)[T]);
 	//	}
 	//}
 	{
-		//tstream->_LT(1);	// Don't do this mormally, just causes lexer to run for timings here
+		//tstream->LT(1);	// Don't do this mormally, just causes lexer to run for timings here
 		//putc('P', stdout); fflush(stdout);
 		auto ast = psr->seq_of_statements();
 		std::cout << ast.tree->toStringTree() << std::endl;
diff --git a/runtime/Cpp/tests/s005.cpp b/runtime/Cpp/tests/s005.cpp
index e51d085fd..fa132b793 100644
--- a/runtime/Cpp/tests/s005.cpp
+++ b/runtime/Cpp/tests/s005.cpp
@@ -183,20 +183,20 @@ void parseFile(const char* fName, int fd)
 		ANTLR_INT32 T = 0;
 		while	(T != SQLMiniLexer::EOF_TOKEN)
 		{
-			T = tstream->_LA(1);
-			SQLMiniLexerTraits::CommonTokenType const* token = tstream->_LT(1);
+			T = tstream->LA(1);
+			SQLMiniLexerTraits::CommonTokenType const* token = tstream->LT(1);
 			ANTLR_UINT8 const *name = lxr->getTokenName(T);
 			  
 			printf("%d %s\t\"%s\"\n",
 			       T,
 			       name,
-			       tstream->_LT(1)->getText().c_str()
+			       tstream->LT(1)->getText().c_str()
 			       );
 			tstream->consume();
 		}
 	}
 
-	tstream->_LT(1);	// Don't do this mormally, just causes lexer to run for timings here
+	tstream->LT(1);	// Don't do this mormally, just causes lexer to run for timings here
 
 	delete tstream; 
 	delete lxr; lxr = NULL;
diff --git a/runtime/Cpp/tests/s006.cpp b/runtime/Cpp/tests/s006.cpp
index e51d085fd..fa132b793 100644
--- a/runtime/Cpp/tests/s006.cpp
+++ b/runtime/Cpp/tests/s006.cpp
@@ -183,20 +183,20 @@ void parseFile(const char* fName, int fd)
 		ANTLR_INT32 T = 0;
 		while	(T != SQLMiniLexer::EOF_TOKEN)
 		{
-			T = tstream->_LA(1);
-			SQLMiniLexerTraits::CommonTokenType const* token = tstream->_LT(1);
+			T = tstream->LA(1);
+			SQLMiniLexerTraits::CommonTokenType const* token = tstream->LT(1);
 			ANTLR_UINT8 const *name = lxr->getTokenName(T);
 			  
 			printf("%d %s\t\"%s\"\n",
 			       T,
 			       name,
-			       tstream->_LT(1)->getText().c_str()
+			       tstream->LT(1)->getText().c_str()
 			       );
 			tstream->consume();
 		}
 	}
 
-	tstream->_LT(1);	// Don't do this mormally, just causes lexer to run for timings here
+	tstream->LT(1);	// Don't do this mormally, just causes lexer to run for timings here
 
 	delete tstream; 
 	delete lxr; lxr = NULL;
diff --git a/runtime/Cpp/tests/t001.cpp b/runtime/Cpp/tests/t001.cpp
index 6c4225a19..c6b3fa7c5 100644
--- a/runtime/Cpp/tests/t001.cpp
+++ b/runtime/Cpp/tests/t001.cpp
@@ -62,8 +62,8 @@ int testIteratorInterface(string const& data)
 	std::cout << "testIteratorInterface: \"" << data << '"' <<std::endl;
 
 	t001lexerTraits::TokenStreamType *tstream = new t001lexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
-	t001lexerTraits::CommonTokenType const *token0 = tstream->_LT(1);
-	t001lexerTraits::CommonTokenType const *token1 = tstream->_LT(2);
+	t001lexerTraits::CommonTokenType const *token0 = tstream->LT(1);
+	t001lexerTraits::CommonTokenType const *token1 = tstream->LT(2);
 
 	std::cout << token0->getText() << std::endl;
 	std::cout << token1->getText() << std::endl;
diff --git a/runtime/Cpp/tests/t002.cpp b/runtime/Cpp/tests/t002.cpp
index f0e7548ad..a71f3da76 100644
--- a/runtime/Cpp/tests/t002.cpp
+++ b/runtime/Cpp/tests/t002.cpp
@@ -71,9 +71,9 @@ int testIteratorInterface(string const& data)
 	std::cout << "testIteratorInterface: \"" << data << '"' <<std::endl;
 	
 	t002lexerTraits::TokenStreamType *tstream = new t002lexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
-	t002lexerTraits::CommonTokenType const *token0 = tstream->_LT(1);
-	t002lexerTraits::CommonTokenType const *token1 = tstream->_LT(2);
-	t002lexerTraits::CommonTokenType const *token2 = tstream->_LT(3);
+	t002lexerTraits::CommonTokenType const *token0 = tstream->LT(1);
+	t002lexerTraits::CommonTokenType const *token1 = tstream->LT(2);
+	t002lexerTraits::CommonTokenType const *token2 = tstream->LT(3);
 
 	std::cout << token0->getText() << std::endl;
 	std::cout << token1->getText() << std::endl;
diff --git a/runtime/Cpp/tests/t003.cpp b/runtime/Cpp/tests/t003.cpp
index afef203c0..e4eb45388 100644
--- a/runtime/Cpp/tests/t003.cpp
+++ b/runtime/Cpp/tests/t003.cpp
@@ -81,10 +81,10 @@ int testIteratorInterface(string const& data)
 	std::cout << "testIteratorInterface: \"" << data << '"' <<std::endl;
 		
 	t003lexerTraits::TokenStreamType *tstream = new t003lexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
-	t003lexerTraits::CommonTokenType const *token0 = tstream->_LT(1);
-	t003lexerTraits::CommonTokenType const *token1 = tstream->_LT(2);
-	t003lexerTraits::CommonTokenType const *token2 = tstream->_LT(3);
-	t003lexerTraits::CommonTokenType const *token3 = tstream->_LT(4);
+	t003lexerTraits::CommonTokenType const *token0 = tstream->LT(1);
+	t003lexerTraits::CommonTokenType const *token1 = tstream->LT(2);
+	t003lexerTraits::CommonTokenType const *token2 = tstream->LT(3);
+	t003lexerTraits::CommonTokenType const *token3 = tstream->LT(4);
 
 	std::cout << token0->getText() << std::endl;
 	std::cout << token1->getText() << std::endl;
diff --git a/runtime/Cpp/tests/t051.cpp b/runtime/Cpp/tests/t051.cpp
index 0aa7ae0c3..dc79d30d3 100644
--- a/runtime/Cpp/tests/t051.cpp
+++ b/runtime/Cpp/tests/t051.cpp
@@ -68,7 +68,7 @@ void parseFile(const char* fName)
 		ANTLR_INT32 T = 0;
 		while	(T != t051lexer::EOF_TOKEN)
 		{
-			T = tstream->_LA(1);
+			T = tstream->LA(1);
 			t051lexerTraits::CommonTokenType const* token = tstream->_LT(1);
 			  
 			printf("%d\t\"%s\"\n",

From 7af3cd897975c7b46c486f0867c7c135a53951df Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibre5041@ibrezina.net>
Date: Sat, 23 Aug 2014 20:20:27 +0200
Subject: [PATCH 44/53] AST construcition fixes - clone recursively

---
 runtime/Cpp/include/antlr3commontreeadaptor.hpp        |  2 +-
 runtime/Cpp/include/antlr3commontreeadaptor.inl        | 10 +++++-----
 runtime/Cpp/include/antlr3rewriterulesubtreestream.inl |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.hpp b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
index 40234389d..9ef4ef9f5 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.hpp
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
@@ -187,7 +187,7 @@ class CommonTreeAdaptor
 	~CommonTreeAdaptor();
 
 protected:
-	TreeTypePtr	dupTreeImpl( const TreeTypePtr& root, TreeType* parent);
+	TreeTypePtr	dupTreeImpl( const TreeType* root, TreeType* parent);
 
 	void defineDotNodes(TreeTypePtr t, const StringType& dotSpec);
 	void defineDotEdges(TreeTypePtr t, const StringType& dotSpec);
diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.inl b/runtime/Cpp/include/antlr3commontreeadaptor.inl
index 347c2dc77..c72399aad 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.inl
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.inl
@@ -99,25 +99,25 @@ CommonTreeAdaptor<ImplTraits>::dupTree( const TreeTypePtr& tree)
 {
 	if (tree == NULL)
 		return NULL;
-	return std::move(this->dupTreeImpl(tree, NULL));
+	return std::move(dupTreeImpl(tree.get(), NULL));
 }
 
 template<class ImplTraits>
 typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
-CommonTreeAdaptor<ImplTraits>::dupTreeImpl( const TreeTypePtr& root, TreeType* parent)
+CommonTreeAdaptor<ImplTraits>::dupTreeImpl( const TreeType *root, TreeType* parent)
 {
-	TreeTypePtr newTree(this->dupNode(root));
+	TreeTypePtr newTree(dupNode(root));
 
 	// Ensure new subtree root has parent/child index set
 	//
 	this->setChildIndex( newTree, root->get_childIndex() );
 	this->setParent(newTree, parent);
 
-	ChildrenType& r_children = root->get_children();
+	ChildrenType const& r_children = root->get_children();
 	for (auto i = r_children.begin(); i != r_children.end(); ++i)
 	{
 		// add child's clone
-		this->addChild(newTree, this->dupTreeImpl(*i, newTree.get()));
+		this->addChild(newTree, dupTreeImpl(i->get(), newTree.get()));
 	}
 
 	return	newTree;
diff --git a/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl b/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
index bc93d7132..ea1c55017 100644
--- a/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
+++ b/runtime/Cpp/include/antlr3rewriterulesubtreestream.inl
@@ -159,14 +159,14 @@ template<class ImplTraits>
 typename RewriteRuleSubtreeStream<ImplTraits>::TreeTypePtr
 RewriteRuleSubtreeStream<ImplTraits>::dupTree(const TreeTypePtr& element)
 {
-	return std::move(m_adaptor->dupNode(element));
+	return std::move(m_adaptor->dupTree(element));
 }
 
 template<class ImplTraits>
 typename RewriteRuleSubtreeStream<ImplTraits>::TreeTypePtr
 RewriteRuleSubtreeStream<ImplTraits>::dupTree(const TreeType* element)
 {
-	return std::move(m_adaptor->dupNode(element));
+	return std::move(m_adaptor->dupTree(element));
 }
 
 template<class ImplTraits>

From 3552feb50909f40a794c01fb30ad51b03eb08467 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Tue, 29 Jul 2014 11:35:32 +0200
Subject: [PATCH 45/53] test a005 - rewrites having predicates

---
 runtime/Cpp/tests/a005.cpp |  8 +++++++-
 runtime/Cpp/tests/a005.g   | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/runtime/Cpp/tests/a005.cpp b/runtime/Cpp/tests/a005.cpp
index 451810abb..05ced1b0a 100644
--- a/runtime/Cpp/tests/a005.cpp
+++ b/runtime/Cpp/tests/a005.cpp
@@ -14,6 +14,8 @@ void test1(const char* input);
 void test2(const char* input);
 void test3(const char* input);
 void test4(const char* input);
+void test5(const char* input);
+void test6(const char* input);
 
 int 
 main	(int argc, char *argv[])
@@ -21,7 +23,11 @@ main	(int argc, char *argv[])
 	test1("ABC");
 	test2("AABBCC");
 	test3("AABBCC");
-	test4("ABC"); // NOTE: this one leaks memory
+	test4("ABC");
+	test5("ABDE");
+	test5("ACDE");
+	test6("ABDE");
+	test6("ACDE");
 
 	printf("finished parsing OK\n");	// Finnish parking is pretty good - I think it is all the snow
 
diff --git a/runtime/Cpp/tests/a005.g b/runtime/Cpp/tests/a005.g
index 1780b5c0b..31e1d4b58 100644
--- a/runtime/Cpp/tests/a005.g
+++ b/runtime/Cpp/tests/a005.g
@@ -39,6 +39,25 @@ test4
     :	a1=A b1=B c1=C -> ^(T_A[$a1] $a1 $b1 $c1)
 	;
 
+test5
+@init	{    int mode = 0;    }
+	:	aa (bb {mode = 1;} | cc) dd ee
+        -> {mode == 1}? ^( aa bb? cc? dd ee)
+        -> ^( aa bb? cc? dd ee)
+    ;
+aa: A;
+bb: B;
+cc: C;
+dd: D;
+ee: E;
+
+test6
+@init	{    int mode = 0;    }
+	:	A (B {mode = 1;} | C) D E
+        -> {mode == 1}? ^( A B? C? D E)
+        -> ^( A B? C? D E)
+    ;
+
 A: 'A';
 B: 'B';
 C: 'C';

From 14bd4a5d64bb952b9cdd62aa52bd7024796d5ed0 Mon Sep 17 00:00:00 2001
From: ibre5041 <ibre5041@ibrezina.net>
Date: Wed, 13 Aug 2014 16:56:47 +0200
Subject: [PATCH 46/53] a006

---
 runtime/Cpp/tests/ATestTraits.hpp |   2 +
 runtime/Cpp/tests/Makefile        |   5 ++
 runtime/Cpp/tests/a006.cpp        | 104 ++++++++++++++++++++++++++++++
 runtime/Cpp/tests/a006.g          |  73 +++++++++++++++++++++
 4 files changed, 184 insertions(+)
 create mode 100644 runtime/Cpp/tests/a006.cpp
 create mode 100644 runtime/Cpp/tests/a006.g

diff --git a/runtime/Cpp/tests/ATestTraits.hpp b/runtime/Cpp/tests/ATestTraits.hpp
index a5723c5d7..fe6d35be3 100644
--- a/runtime/Cpp/tests/ATestTraits.hpp
+++ b/runtime/Cpp/tests/ATestTraits.hpp
@@ -23,6 +23,7 @@ namespace Antlr3Test {
 	class a003Lexer;	class a003Parser;
 	class a004Lexer;	class a004Parser;
 	class a005Lexer;	class a005Parser;
+  	class a006Lexer;	class a006Parser;
 
 	// Instantiate the Traits class(will be used for Lexer/Parser template instantiations)
 	typedef antlr3::Traits<a001Lexer, a001Parser, UserTraits> a001LexerTraits;	typedef a001LexerTraits a001ParserTraits;
@@ -30,6 +31,7 @@ namespace Antlr3Test {
 	typedef antlr3::Traits<a003Lexer, a003Parser, UserTraits> a003LexerTraits;	typedef a003LexerTraits a003ParserTraits;
 	typedef antlr3::Traits<a004Lexer, a004Parser, UserTraits> a004LexerTraits;	typedef a004LexerTraits a004ParserTraits;
 	typedef antlr3::Traits<a005Lexer, a005Parser, UserTraits> a005LexerTraits;	typedef a005LexerTraits a005ParserTraits;
+  	typedef antlr3::Traits<a006Lexer, a006Parser, UserTraits> a006LexerTraits;	typedef a006LexerTraits a006ParserTraits;
 };
 
 #endif
diff --git a/runtime/Cpp/tests/Makefile b/runtime/Cpp/tests/Makefile
index 628f97cd1..5acd0ed4d 100644
--- a/runtime/Cpp/tests/Makefile
+++ b/runtime/Cpp/tests/Makefile
@@ -15,6 +15,8 @@ STGS  = $(wildcard ../../../tool/src/main/resources/org/antlr/codegen/templates/
 
 INCLUDES= -I. -I../include/
 
+#-I/usr/lib/gcc/x86_64-pc-cygwin/4.8.3/include/c++/ -I/usr/lib/gcc/x86_64-pc-cygwin/4.8.3/include/c++/x86_64-pc-cygwin
+
 #CXX=/usr/bin/clang++
 CFLAGS=-ggdb3 -O0 -fno-inline -Wall -std=c++0x
 #CFLAGS=-ggdb3 -O3 -std=c++0x
@@ -47,6 +49,9 @@ a004:	a004.cpp a004.tokens ATestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 a005:	a005.cpp a005.tokens ATestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
+a006:	a006.cpp a006.tokens ATestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+
 s001:	s001.cpp s001.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) utils.cpp -o $@
 
diff --git a/runtime/Cpp/tests/a006.cpp b/runtime/Cpp/tests/a006.cpp
new file mode 100644
index 000000000..61cffd6bb
--- /dev/null
+++ b/runtime/Cpp/tests/a006.cpp
@@ -0,0 +1,104 @@
+#include "utils.hpp"
+#include "ATestTraits.hpp"
+#include "a006Lexer.hpp"
+#include "a006Parser.hpp"
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+using namespace Antlr3Test;
+using namespace std;
+
+void test1(const char* input);
+void test2(const char* input);
+void test3(const char* input);
+
+int 
+main	(int argc, char *argv[])
+{
+	test1("ABC");
+ 	test1("(ABC)");
+	test1("ABC AS 5");
+	test1("ABC AS(1,2,3,4,5,6)");
+	test1("(ABC,ABD,ABE,ABF)AS(1,2,3,4,5,6)");
+
+	test2("ABC");
+	test2("(ABC)");
+	test2("ABC AS 5");
+	test2("ABC AS(1,2,3,4,5,6)");
+	test2("(ABC,ABD,ABE,ABF)AS(1,2,3,4,5,6)");
+
+	test3("SAMPLE (4)");
+	test3("SAMPLE BLOCK(4,5)");
+	
+	printf("finished parsing OK\n");	// Finnish parking is pretty good - I think it is all the snow
+
+	return 0;
+}
+
+void test1(const char* input)
+{
+	a006LexerTraits::InputStreamType* istream = new a006LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+											 , ANTLR_ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test1");
+	istream->setUcaseLA(true);
+	
+	a006Lexer* lxr = new a006Lexer(istream);
+	a006LexerTraits::TokenStreamType* tstream = new a006LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a006Parser* psr = new a006Parser(tstream);	
+	{
+		auto r1 = psr->test1();
+		std::cout << r1.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test2(const char* input)
+{
+	a006LexerTraits::InputStreamType* istream = new a006LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+											 , ANTLR_ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test2");
+	istream->setUcaseLA(true);
+	
+	a006Lexer* lxr = new a006Lexer(istream);
+	a006LexerTraits::TokenStreamType* tstream = new a006LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a006Parser* psr = new a006Parser(tstream);	
+	{
+		auto r1 = psr->test2();
+		std::cout << r1.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test3(const char* input)
+{
+	a006LexerTraits::InputStreamType* istream = new a006LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+											 , ANTLR_ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test3");
+	istream->setUcaseLA(true);
+	
+	a006Lexer* lxr = new a006Lexer(istream);
+	a006LexerTraits::TokenStreamType* tstream = new a006LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a006Parser* psr = new a006Parser(tstream);	
+	{
+		auto r1 = psr->test3();
+		std::cout << r1.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
diff --git a/runtime/Cpp/tests/a006.g b/runtime/Cpp/tests/a006.g
new file mode 100644
index 000000000..a72684464
--- /dev/null
+++ b/runtime/Cpp/tests/a006.g
@@ -0,0 +1,73 @@
+grammar a006;
+
+options {
+	language=Cpp;
+	output=AST;
+}
+
+tokens {
+    T_A = 'token A';
+    P_R = 'token pivot root';
+    S_R = 'token sample root';
+    E_R = 'token expression root';
+}
+
+@lexer::includes 
+{
+#include "ATestTraits.hpp"
+}
+@lexer::namespace 
+{ Antlr3Test }
+
+@parser::includes {
+#include "ATestTraits.hpp"
+#include "a006Lexer.hpp"
+}
+@parser::namespace 
+{ Antlr3Test }
+
+test1 // see unpivot_in_elements
+    :   (    column_name
+        |    '(' column_name (',' column_name)* ')'
+        )
+        (     'AS'
+            (    constant
+            |    ('(')=> '(' constant (',' constant)* ')'
+            )
+        )?
+        -> column_name+ ^(P_R constant*)
+    ;
+
+test2 // see unpivot_in_elements
+    :   (    column_name
+        |    '(' column_name (',' column_name)* ')'
+        )
+        (     'AS'
+            (    constant
+            |    ('(')=> '(' constant (',' constant)* ')'
+            )
+        )?
+        -> column_name+ ^(P_R constant)*
+    ;
+
+
+test3 //sample_clause
+    :	s='SAMPLE' 'BLOCK'? 
+        '(' c1=constant (',' c2=constant)? ')'
+        -> ^(S_R[$s] 'BLOCK'? ^(E_R $c1) ^(E_R $c2)?)
+    ;
+
+column_name
+	:	T_COLUMN_NAME;
+
+constant
+	:	T_CONSTANT;
+
+T_COLUMN_NAME
+	:	('A'..'Z')+;
+
+T_CONSTANT
+	:	('0'..'9')+;
+
+WS
+    : ' '+  { $channel = HIDDEN; };

From 8557bc638ef4e38dda32bd18f946db136bca7024 Mon Sep 17 00:00:00 2001
From: ibre5041 <ibre5041@ibrezina.net>
Date: Sun, 6 Sep 2015 17:02:46 +0200
Subject: [PATCH 47/53] missing create functions

---
 .../Cpp/include/antlr3commontreeadaptor.hpp   |  2 ++
 .../Cpp/include/antlr3commontreeadaptor.inl   | 22 +++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.hpp b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
index 9ef4ef9f5..c32968ac9 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.hpp
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.hpp
@@ -148,8 +148,10 @@ class CommonTreeAdaptor
 	TreeTypePtr create( ANTLR_UINT32 tokenType, const CommonTokenType* fromToken, const char* text);
 	TreeTypePtr create( ANTLR_UINT32 tokenType, const CommonTokenType* fromToken, StringType const& text);
 	TreeTypePtr create( ANTLR_UINT32 tokenType, const char* text);
+	TreeTypePtr create( ANTLR_UINT32 tokenType, StringType const& text);
 	
 	CommonTokenType* createToken( ANTLR_UINT32 tokenType, const char* text);
+  	CommonTokenType* createToken( ANTLR_UINT32 tokenType, StringType const& text);
 	CommonTokenType* createToken( const CommonTokenType* fromToken);
 
 	ANTLR_UINT32	getType( TreeTypePtr& t);
diff --git a/runtime/Cpp/include/antlr3commontreeadaptor.inl b/runtime/Cpp/include/antlr3commontreeadaptor.inl
index c72399aad..871b547c1 100644
--- a/runtime/Cpp/include/antlr3commontreeadaptor.inl
+++ b/runtime/Cpp/include/antlr3commontreeadaptor.inl
@@ -347,11 +347,11 @@ CommonTreeAdaptor<ImplTraits>::create( ANTLR_UINT32 tokenType, const CommonToken
 	/* Set the type of the new token to that supplied */
 	newToken->set_type(tokenType);
 	/* Set the text of the token accordingly */
-	newToken->setText(text);
+	newToken->set_tokText(text);
 	/* Return a new node based upon this token */
 	return	this->create(newToken);
 }
-  
+
 template<class ImplTraits>
 typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
 CommonTreeAdaptor<ImplTraits>::create( ANTLR_UINT32 tokenType, const char* text)
@@ -360,6 +360,14 @@ CommonTreeAdaptor<ImplTraits>::create( ANTLR_UINT32 tokenType, const char* text)
 	return	this->create(fromToken);
 }
 
+template<class ImplTraits>
+typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
+CommonTreeAdaptor<ImplTraits>::create( ANTLR_UINT32 tokenType, CommonTreeAdaptor<ImplTraits>::StringType const& text)
+{
+	auto fromToken = this->createToken(tokenType, text);
+	return	this->create(fromToken);
+}
+
 template<class ImplTraits>
 typename CommonTreeAdaptor<ImplTraits>::TreeTypePtr
 CommonTreeAdaptor<ImplTraits>::dupNode(const TreeType* treeNode)
@@ -455,6 +463,16 @@ CommonTreeAdaptor<ImplTraits>::createToken( ANTLR_UINT32 tokenType, const char*
 	return newToken;
 }
 
+template<class ImplTraits>
+typename CommonTreeAdaptor<ImplTraits>::CommonTokenType*
+CommonTreeAdaptor<ImplTraits>::createToken( ANTLR_UINT32 tokenType, CommonTreeAdaptor<ImplTraits>::StringType const& text)
+{
+	CommonTokenType* newToken = TreeStoreType::createToken();
+	newToken->set_tokText( text );
+	newToken->set_type(tokenType);
+	return newToken;
+}
+
 template<class ImplTraits>
 typename CommonTreeAdaptor<ImplTraits>::CommonTokenType*
 CommonTreeAdaptor<ImplTraits>::createToken( const CommonTokenType* fromToken)

From b33964725f07c24b63677235e32babf7101517d3 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Thu, 17 Sep 2015 21:14:02 +0200
Subject: [PATCH 48/53] Store additional information in Tokens member
 TokenUserDataType

Also:
	CommonTree<ImplTraits>::toString() calls Token's method toString() insted of getText()
	Test a007 shows how to use Token's UserData to pass information from Tree node to Tree leaf
	Test a007 shows how to override Tokens toString() method
---
 runtime/Cpp/include/antlr3commontoken.hpp |   2 +
 runtime/Cpp/include/antlr3commontoken.inl |   2 +
 runtime/Cpp/include/antlr3commontree.inl  |   2 +-
 runtime/Cpp/include/antlr3traits.hpp      |   9 +-
 runtime/Cpp/tests/A007TestTraits.hpp      |  59 ++++++++++++
 runtime/Cpp/tests/Makefile                |   3 +
 runtime/Cpp/tests/a007.cpp                | 104 ++++++++++++++++++++++
 runtime/Cpp/tests/a007.g                  |  81 +++++++++++++++++
 8 files changed, 258 insertions(+), 4 deletions(-)
 create mode 100644 runtime/Cpp/tests/A007TestTraits.hpp
 create mode 100644 runtime/Cpp/tests/a007.cpp
 create mode 100644 runtime/Cpp/tests/a007.g

diff --git a/runtime/Cpp/include/antlr3commontoken.hpp b/runtime/Cpp/include/antlr3commontoken.hpp
index 0ac5089dd..51fa3954a 100644
--- a/runtime/Cpp/include/antlr3commontoken.hpp
+++ b/runtime/Cpp/include/antlr3commontoken.hpp
@@ -85,6 +85,7 @@ class CommonToken : public ImplTraits::AllocPolicyType
 	typedef typename ImplTraits::StringType StringType;
 	typedef typename ImplTraits::InputStreamType InputStreamType;
 	typedef typename ImplTraits::StreamDataType StreamDataType;
+	typedef typename ImplTraits::TokenUserDataType UserDataType;
 
 private:
     /** The actual type of this token
@@ -243,6 +244,7 @@ class CommonToken : public ImplTraits::AllocPolicyType
      */
     StringType  toString() const;
 
+	UserDataType UserData;	
 };
 
 }
diff --git a/runtime/Cpp/include/antlr3commontoken.inl b/runtime/Cpp/include/antlr3commontoken.inl
index 0b9d2ae00..3277b3def 100644
--- a/runtime/Cpp/include/antlr3commontoken.inl
+++ b/runtime/Cpp/include/antlr3commontoken.inl
@@ -45,6 +45,7 @@ CommonToken<ImplTraits>::CommonToken(TOKEN_TYPE type)
 template<class ImplTraits>
 CommonToken<ImplTraits>::CommonToken( const CommonToken& ctoken )
 	:m_tokText( ctoken.m_tokText )
+	,UserData(ctoken.UserData)	 
 {
 	m_type = ctoken.m_type;
 	m_channel = ctoken.m_channel;
@@ -60,6 +61,7 @@ CommonToken<ImplTraits>::CommonToken( const CommonToken& ctoken )
 template<class ImplTraits>
 CommonToken<ImplTraits>& CommonToken<ImplTraits>::operator=( const CommonToken& ctoken )
 {
+	UserData = ctoken.UserData;
 	m_type = ctoken.m_type;
 	m_channel = ctoken.m_channel;
 	m_lineStart = ctoken.m_lineStart;
diff --git a/runtime/Cpp/include/antlr3commontree.inl b/runtime/Cpp/include/antlr3commontree.inl
index ff164ef7e..86240b167 100644
--- a/runtime/Cpp/include/antlr3commontree.inl
+++ b/runtime/Cpp/include/antlr3commontree.inl
@@ -441,7 +441,7 @@ typename CommonTree<ImplTraits>::StringType	CommonTree<ImplTraits>::toString()
 {
 	if( this->isNilNode())
 		return StringType("nil");
-	return	m_token->getText();
+	return	m_token->toString();
 }
 
 template<class ImplTraits>
diff --git a/runtime/Cpp/include/antlr3traits.hpp b/runtime/Cpp/include/antlr3traits.hpp
index 37b61bf2b..817904450 100644
--- a/runtime/Cpp/include/antlr3traits.hpp
+++ b/runtime/Cpp/include/antlr3traits.hpp
@@ -34,6 +34,7 @@ class CustomTraitsBase
 	typedef Empty LexStateType;
 
 	typedef Empty CommonTokenType;
+	typedef Empty TokenUserDataType;
 
 	typedef Empty TokenIntStreamType;
 	typedef Empty TokenStreamType;
@@ -60,7 +61,6 @@ class CustomTraitsBase
 	typedef Empty TreeType;
 	typedef Empty TreeAdaptorType;
 	typedef Empty TreeStoreType;
-  
 	
 	template<class StreamType>
 	class ExceptionBaseType : public Empty
@@ -84,7 +84,7 @@ class CustomTraitsBase
 	};
 
 	typedef Empty  RuleReturnValueType;
-	
+
 	//If we want to change the way tokens are stored
 	static const bool TOKENS_ACCESSED_FROM_OWNING_RULE = false;
 	static const unsigned TOKEN_FILL_BUFFER_INCREMENT = 100; //used only if the above val is true
@@ -218,6 +218,10 @@ class Traits : public TraitsBase<UserTraits>
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::CommonTokenType, 
 					 CommonToken<TraitsType> >::selected CommonTokenType;
 
+	// TokenUserDataType
+	typedef typename TraitsSelector< typename UserTraits<TraitsType>::TokenUserDataType,
+					 Empty >::selected TokenUserDataType;
+
 	// TokenListType
 	typedef typename BaseTraitsType::AllocPolicyType::template ListType<const CommonTokenType*> TokenListType;
 
@@ -272,7 +276,6 @@ class Traits : public TraitsBase<UserTraits>
 	// TreeType
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::TreeType, 
 					 CommonTree<TraitsType> >::selected TreeType;
-
 	// TreeAdaptorType
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::TreeAdaptorType, 
 					 CommonTreeAdaptor<TraitsType> >::selected TreeAdaptorType;
diff --git a/runtime/Cpp/tests/A007TestTraits.hpp b/runtime/Cpp/tests/A007TestTraits.hpp
new file mode 100644
index 000000000..87a4cd551
--- /dev/null
+++ b/runtime/Cpp/tests/A007TestTraits.hpp
@@ -0,0 +1,59 @@
+#ifndef	_A007_TEST_TRAITS_H
+#define	_A007_TEST_TRAITS_H
+
+#include <antlr3.hpp>
+
+#include <fstream>
+#include <iostream>
+#include <sstream>
+
+// Forward declaration for Lexer&Parser class(es)
+namespace Antlr3Test {
+	//code for overriding
+	template<class ImplTraits>
+	class UserTraits : public antlr3::CustomTraitsBase<ImplTraits>
+	{
+	public:
+		struct A007TokenUserDataType
+		{
+			A007TokenUserDataType() : identifierClass(-1), usageType(-1) {};
+			int identifierClass, usageType;
+		};
+
+		class A007Token : public antlr3::CommonToken<ImplTraits>
+		{
+			typedef antlr3::CommonToken<ImplTraits> super;
+			typedef typename antlr3::CommonToken<ImplTraits>::TOKEN_TYPE TOKEN_TYPE;
+			typedef typename super::StringType StringType;
+		public:
+			// Override all possible constructors
+			A007Token() : super() {};
+			A007Token( ANTLR_UINT32 type) : super(type) {};
+			A007Token( TOKEN_TYPE type) : super(type) {};
+			A007Token( const A007Token& ctoken ) : super(ctoken) {};
+			A007Token& operator=( const A007Token& other ) { super::operator=(other); return *this; };
+
+			// Override toString method
+			StringType toString() const
+			{
+				StringType m_txt;
+				m_txt = super::getText();
+				if (super::UserData.identifierClass > 0)
+					m_txt += "[" + std::to_string(super::UserData.identifierClass) + "]";
+				return m_txt;
+			}
+		};
+
+		// Override default trait's types
+		typedef A007Token CommonTokenType;
+		typedef A007TokenUserDataType TokenUserDataType;
+	};
+
+  	class a007Lexer;	class a007Parser;
+
+	// Instantiate the Traits class(will be used for Lexer/Parser template instantiations)
+	typedef antlr3::Traits<a007Lexer, a007Parser, UserTraits> a007LexerTraits;
+	typedef a007LexerTraits a007ParserTraits;
+};
+
+#endif
diff --git a/runtime/Cpp/tests/Makefile b/runtime/Cpp/tests/Makefile
index 5acd0ed4d..7cd19f655 100644
--- a/runtime/Cpp/tests/Makefile
+++ b/runtime/Cpp/tests/Makefile
@@ -52,6 +52,9 @@ a005:	a005.cpp a005.tokens ATestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 a006:	a006.cpp a006.tokens ATestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
+a007:	a007.cpp a007.tokens A007TestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+
 s001:	s001.cpp s001.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) utils.cpp -o $@
 
diff --git a/runtime/Cpp/tests/a007.cpp b/runtime/Cpp/tests/a007.cpp
new file mode 100644
index 000000000..fd5c55fa3
--- /dev/null
+++ b/runtime/Cpp/tests/a007.cpp
@@ -0,0 +1,104 @@
+#include "utils.hpp"
+#include "A007TestTraits.hpp"
+#include "a007Lexer.hpp"
+#include "a007Parser.hpp"
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+using namespace Antlr3Test;
+using namespace std;
+
+void test1(const char* input);
+void test2(const char* input);
+void test3(const char* input);
+
+int 
+main	(int argc, char *argv[])
+{
+	test1("ABC");
+ 	test1("(ABC)");
+	test1("ABC AS 5");
+	test1("ABC AS(1,2,3,4,5,6)");
+	test1("(ABC,ABD,ABE,ABF)AS(1,2,3,4,5,6)");
+
+	test2("ABC");
+	test2("(ABC)");
+	test2("ABC AS 5");
+	test2("ABC AS(1,2,3,4,5,6)");
+	test2("(ABC,ABD,ABE,ABF)AS(1,2,3,4,5,6)");
+
+	test3("SAMPLE (4)");
+	test3("SAMPLE BLOCK(4,5)");
+	
+	printf("finished parsing OK\n");	// Finnish parking is pretty good - I think it is all the snow
+
+	return 0;
+}
+
+void test1(const char* input)
+{
+	a007LexerTraits::InputStreamType* istream = new a007LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+											 , antlr3::ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test1");
+	istream->setUcaseLA(true);
+	
+	a007Lexer* lxr = new a007Lexer(istream);
+	a007LexerTraits::TokenStreamType* tstream = new a007LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a007Parser* psr = new a007Parser(tstream);	
+	{
+		auto r1 = psr->test1();
+		std::cout << r1.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test2(const char* input)
+{
+	a007LexerTraits::InputStreamType* istream = new a007LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+											 , antlr3::ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test2");
+	istream->setUcaseLA(true);
+	
+	a007Lexer* lxr = new a007Lexer(istream);
+	a007LexerTraits::TokenStreamType* tstream = new a007LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a007Parser* psr = new a007Parser(tstream);	
+	{
+		auto r1 = psr->test2();
+		std::cout << r1.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test3(const char* input)
+{
+	a007LexerTraits::InputStreamType* istream = new a007LexerTraits::InputStreamType((const ANTLR_UINT8 *)input
+											 , antlr3::ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test3");
+	istream->setUcaseLA(true);
+	
+	a007Lexer* lxr = new a007Lexer(istream);
+	a007LexerTraits::TokenStreamType* tstream = new a007LexerTraits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a007Parser* psr = new a007Parser(tstream);	
+	{
+		auto r1 = psr->test3();
+		std::cout << r1.tree->toStringTree() << std::endl;
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
diff --git a/runtime/Cpp/tests/a007.g b/runtime/Cpp/tests/a007.g
new file mode 100644
index 000000000..3196c9b3b
--- /dev/null
+++ b/runtime/Cpp/tests/a007.g
@@ -0,0 +1,81 @@
+grammar a007;
+
+options {
+	language=Cpp;
+	output=AST;
+}
+
+tokens {
+    T_A = 'token A';
+    P_R = 'token pivot root';
+    S_R = 'token sample root';
+    E_R = 'token expression root';
+
+    T_ADHOC_ENUM_VAL = 'ad-hoc generated enum constant';
+}
+
+@lexer::includes 
+{
+#include "A007TestTraits.hpp"
+}
+@lexer::namespace 
+{ Antlr3Test }
+
+@parser::includes {
+#include "A007TestTraits.hpp"
+#include "a007Lexer.hpp"
+}
+@parser::namespace 
+{ Antlr3Test }
+
+test1 // see unpivot_in_elements
+    :   (    column_name[T_ADHOC_ENUM_VAL]
+        |    '(' column_name[0] (',' column_name[0])* ')'
+        )
+        (     'AS'
+            (    constant
+            |    ('(')=> '(' constant (',' constant)* ')'
+            )
+        )?
+        -> column_name+ ^(P_R constant*)
+    ;
+
+test2 // see unpivot_in_elements
+    :   (    column_name[T_ADHOC_ENUM_VAL]
+        |    '(' column_name[0] (',' column_name[0])* ')'
+        )
+        (     'AS'
+            (    constant
+            |    ('(')=> '(' constant (',' constant)* ')'
+            )
+        )?
+        -> column_name+ ^(P_R constant)*
+    ;
+
+
+test3 //sample_clause
+    :	s='SAMPLE' 'BLOCK'? 
+        '(' c1=constant (',' c2=constant)? ')'
+        -> ^(S_R[$s] 'BLOCK'? ^(E_R $c1) ^(E_R $c2)?)
+    ;
+
+column_name[int identifierClass]
+	:	t=T_COLUMN_NAME
+        {
+            // We have to get over const correctness here:
+            // const_cast<CommonTokenType*>($t)->set_type(ID);
+            const_cast<CommonTokenType*>($t)->UserData.identifierClass = identifierClass;            
+        }
+    ;
+
+constant
+	:	T_CONSTANT;
+
+T_COLUMN_NAME
+	:	('A'..'Z')+;
+
+T_CONSTANT
+	:	('0'..'9')+;
+
+WS
+    : ' '+  { $channel = HIDDEN; };

From 5cdcf00b5e30ddfddfeb258cdc6157da878a0c4e Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Sun, 27 Sep 2015 03:08:17 +0200
Subject: [PATCH 49/53] Store UserData in Tree node

---
 runtime/Cpp/include/antlr3commontree.hpp |   6 +-
 runtime/Cpp/include/antlr3commontree.inl |  19 +++-
 runtime/Cpp/include/antlr3traits.hpp     |   3 +
 runtime/Cpp/tests/A008TestTraits.hpp     |  57 +++++++++++
 runtime/Cpp/tests/Makefile               |   3 +
 runtime/Cpp/tests/a008.cpp               | 125 +++++++++++++++++++++++
 runtime/Cpp/tests/a008.g                 |  91 +++++++++++++++++
 7 files changed, 297 insertions(+), 7 deletions(-)
 create mode 100644 runtime/Cpp/tests/A008TestTraits.hpp
 create mode 100644 runtime/Cpp/tests/a008.cpp
 create mode 100644 runtime/Cpp/tests/a008.g

diff --git a/runtime/Cpp/include/antlr3commontree.hpp b/runtime/Cpp/include/antlr3commontree.hpp
index 3f12e2f97..2a5e61f94 100644
--- a/runtime/Cpp/include/antlr3commontree.hpp
+++ b/runtime/Cpp/include/antlr3commontree.hpp
@@ -47,8 +47,8 @@ class CommonTree : public ImplTraits::AllocPolicyType
 	//typedef CommonTree TokenType;
 	typedef typename AllocPolicyType::template VectorType<TreeTypePtr> ChildrenType;
 	typedef typename AllocPolicyType::template ListType<TreeTypePtr> ChildListType;
-
-private:
+	typedef typename ImplTraits::TreeUserDataType UserDataType;
+protected:
 	/// The list of all the children that belong to this node. They are not part of the node
     /// as they belong to the common tree node that implements this.
     ///
@@ -139,6 +139,8 @@ class CommonTree : public ImplTraits::AllocPolicyType
 	void	freshenParentAndChildIndexesDeeply(ANTLR_UINT32 offset);
 	// Prepare tree node to be re-used
 	void	reuse();
+
+	UserDataType UserData;
 };
 
 }
diff --git a/runtime/Cpp/include/antlr3commontree.inl b/runtime/Cpp/include/antlr3commontree.inl
index 86240b167..a6f3f61f2 100644
--- a/runtime/Cpp/include/antlr3commontree.inl
+++ b/runtime/Cpp/include/antlr3commontree.inl
@@ -13,6 +13,7 @@ CommonTree<ImplTraits>::CommonTree()
 template<class ImplTraits>
 CommonTree<ImplTraits>::CommonTree( const CommonTree& ctree )
 	:m_children( ctree.m_children)
+	,UserData(ctree.UserData)
 {
 	m_startIndex = ctree.m_startIndex;
 	m_stopIndex  = ctree.m_stopIndex;
@@ -33,6 +34,7 @@ CommonTree<ImplTraits>::CommonTree( const CommonTokenType* token )
 
 template<class ImplTraits>
 CommonTree<ImplTraits>::CommonTree( const CommonTree* tree )
+	:UserData(tree->UserData)
 {
 	m_startIndex = tree->get_startIndex();
 	m_stopIndex  = tree->get_stopIndex();
@@ -96,7 +98,9 @@ void	CommonTree<ImplTraits>::addChild(TreeTypePtr& child)
 					if ((*i) != NULL)
 					{
 						m_children.push_back(std::move(*i));
-						m_children.back()->set_parent(this);
+						// static_cast to possible subtype (if TreeType trait defined)
+						TreeType* tree = static_cast<TreeType*>(this);
+						m_children.back()->set_parent(tree);
 						m_children.back()->set_childIndex(m_children.size() - 1);
 					}
                 }
@@ -116,7 +120,9 @@ void	CommonTree<ImplTraits>::addChild(TreeTypePtr& child)
 	{
 		// Tree we are adding is not a Nil and might have children to copy
 		m_children.push_back( std::move(child) );
-		m_children.back()->set_parent(this);
+		// static_cast to possible subtype (if TreeType trait defined)
+		TreeType* tree = static_cast<TreeType*>(this);
+		m_children.back()->set_parent(tree);
 		m_children.back()->set_childIndex(m_children.size() - 1);
 	}
 }
@@ -185,7 +191,8 @@ void	CommonTree<ImplTraits>::replaceChildren(ANTLR_INT32 startChildIndex, ANTLR_
 		{
 			TreeType *child = newChildrenRef.at(j);
 			m_children[i] = child;
-			child->set_parent(this);
+			TreeType* tree = static_cast<TreeType*>(this);
+			child->set_parent(tree);
 			child->set_childIndex(i);
 			j++;
 		}
@@ -398,7 +405,8 @@ void CommonTree<ImplTraits>::setChild(ANTLR_UINT32 i, TreeTypePtr child)
 		m_children.resize(i+1);
 
 	m_children[i] = child;
-	child->set_parent(this);
+	TreeType* tree = static_cast<TreeType*>(this);
+	child->set_parent(tree);
 	child->set_childIndex(i);
 }
 
@@ -469,7 +477,8 @@ void	CommonTree<ImplTraits>::freshenParentAndChildIndexes(ANTLR_UINT32 offset)
 	for(; i != m_children.end(); ++i, ++c)
 	{
 		(*i)->set_childIndex(c);
-		(*i)->set_parent(this);
+		TreeType* tree = static_cast<TreeType*>(this);
+		(*i)->set_parent(tree);
 	}
 }
 
diff --git a/runtime/Cpp/include/antlr3traits.hpp b/runtime/Cpp/include/antlr3traits.hpp
index 817904450..c5741ce98 100644
--- a/runtime/Cpp/include/antlr3traits.hpp
+++ b/runtime/Cpp/include/antlr3traits.hpp
@@ -59,6 +59,7 @@ class CustomTraitsBase
 	};
 	
 	typedef Empty TreeType;
+	typedef Empty TreeUserDataType;
 	typedef Empty TreeAdaptorType;
 	typedef Empty TreeStoreType;
 	
@@ -276,6 +277,8 @@ class Traits : public TraitsBase<UserTraits>
 	// TreeType
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::TreeType, 
 					 CommonTree<TraitsType> >::selected TreeType;
+	typedef typename TraitsSelector< typename UserTraits<TraitsType>::TreeUserDataType,
+					 Empty >::selected TreeUserDataType;
 	// TreeAdaptorType
 	typedef typename TraitsSelector< typename UserTraits<TraitsType>::TreeAdaptorType, 
 					 CommonTreeAdaptor<TraitsType> >::selected TreeAdaptorType;
diff --git a/runtime/Cpp/tests/A008TestTraits.hpp b/runtime/Cpp/tests/A008TestTraits.hpp
new file mode 100644
index 000000000..afefa0012
--- /dev/null
+++ b/runtime/Cpp/tests/A008TestTraits.hpp
@@ -0,0 +1,57 @@
+#ifndef	_A008_TEST_TRAITS_H
+#define	_A008_TEST_TRAITS_H
+
+#include <antlr3.hpp>
+
+#include <fstream>
+#include <iostream>
+#include <sstream>
+
+namespace Antlr3Test {
+	//code for overriding
+	template<class ImplTraits>
+	class UserTraits : public antlr3::CustomTraitsBase<ImplTraits>
+	{
+	public:
+		struct A008TreeUserDataType
+		{
+			A008TreeUserDataType() : identifierClass(-1), usageType(-1) {};
+			int identifierClass, usageType;
+		};
+
+		class A008Token : public antlr3::CommonToken<ImplTraits>
+		{
+			typedef antlr3::CommonToken<ImplTraits> super;
+			typedef typename antlr3::CommonToken<ImplTraits>::TOKEN_TYPE TOKEN_TYPE;
+			typedef typename super::StringType StringType;
+		public:
+			// Override all possible constructors
+			A008Token() : super() {};
+			A008Token( ANTLR_UINT32 type) : super(type) {};
+			A008Token( TOKEN_TYPE type) : super(type) {};
+			A008Token( const A008Token& ctoken ) : super(ctoken) {};
+			A008Token& operator=( const A008Token& other ) { super::operator=(other); return *this; };
+
+			// Override toString method
+			StringType toString() const
+			{
+				return super::getText();
+			}
+		};
+		
+		// Override default trait's types
+		typedef A008Token CommonTokenType;
+		typedef A008TreeUserDataType TreeUserDataType;
+	};
+
+	// Forward declaration for Lexer&Parser class(es)
+  	class a008Lexer;
+	class a008Parser;
+
+	// Instantiate the Traits class(will be used for Lexer/Parser template instantiations)
+	typedef antlr3::Traits<a008Lexer, a008Parser, UserTraits> a008Traits;
+	typedef a008Traits a008LexerTraits;
+	typedef a008Traits a008ParserTraits;
+};
+
+#endif
diff --git a/runtime/Cpp/tests/Makefile b/runtime/Cpp/tests/Makefile
index 7cd19f655..b7a25900c 100644
--- a/runtime/Cpp/tests/Makefile
+++ b/runtime/Cpp/tests/Makefile
@@ -55,6 +55,9 @@ a006:	a006.cpp a006.tokens ATestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 a007:	a007.cpp a007.tokens A007TestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
+a008:	a008.cpp a008.tokens A008TestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+
 s001:	s001.cpp s001.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) utils.cpp -o $@
 
diff --git a/runtime/Cpp/tests/a008.cpp b/runtime/Cpp/tests/a008.cpp
new file mode 100644
index 000000000..f457f5842
--- /dev/null
+++ b/runtime/Cpp/tests/a008.cpp
@@ -0,0 +1,125 @@
+#include "utils.hpp"
+#include "A008TestTraits.hpp"
+#include "a008Lexer.hpp"
+#include "a008Parser.hpp"
+
+#include <iostream>
+#include <ostream>
+#include <sstream>
+#include <fstream>
+#include <iomanip>
+
+using namespace Antlr3Test;
+using namespace std;
+
+void test1(const char* input);
+void test2(const char* input);
+void test3(const char* input);
+
+void treeWalk(a008Traits::TreeTypePtr const& root, unsigned depth = 0);
+	
+int 
+main	(int argc, char *argv[])
+{
+	test1("ABC");
+ 	test1("(ABC)");
+	test1("ABC AS 5");
+	test1("ABC AS(1,2,3,4,5,6)");
+	test1("(ABC,ABD,ABE,ABF)AS(1,2,3,4,5,6)");
+
+	test2("ABC");
+	test2("(ABC)");
+	test2("ABC AS 5");
+	test2("ABC AS(1,2,3,4,5,6)");
+	test2("(ABC,ABD,ABE,ABF)AS(1,2,3,4,5,6)");
+
+	test3("SAMPLE (4)");
+	test3("SAMPLE BLOCK(4,5)");
+	
+	printf("finished parsing OK\n");	// Finnish parking is pretty good - I think it is all the snow
+
+	return 0;
+}
+
+void test1(const char* input)
+{
+	a008Traits::InputStreamType* istream = new a008Traits::InputStreamType((const ANTLR_UINT8 *)input
+											 , antlr3::ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test1");
+	istream->setUcaseLA(true);
+	
+	a008Lexer* lxr = new a008Lexer(istream);
+	a008Traits::TokenStreamType* tstream = new a008Traits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a008Parser* psr = new a008Parser(tstream);	
+	{
+		auto r1 = psr->test1();
+		std::cout << r1.tree->toStringTree() << std::endl;
+		treeWalk(r1.tree);
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test2(const char* input)
+{
+	a008Traits::InputStreamType* istream = new a008Traits::InputStreamType((const ANTLR_UINT8 *)input
+											 , antlr3::ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test2");
+	istream->setUcaseLA(true);
+	
+	a008Lexer* lxr = new a008Lexer(istream);
+	a008Traits::TokenStreamType* tstream = new a008Traits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a008Parser* psr = new a008Parser(tstream);	
+	{
+		auto r1 = psr->test2();
+		std::cout << r1.tree->toStringTree() << std::endl;
+		treeWalk(r1.tree);		
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test3(const char* input)
+{
+	a008Traits::InputStreamType* istream = new a008Traits::InputStreamType((const ANTLR_UINT8 *)input
+											 , antlr3::ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test3");
+	istream->setUcaseLA(true);
+	
+	a008Lexer* lxr = new a008Lexer(istream);
+	a008Traits::TokenStreamType* tstream = new a008Traits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a008Parser* psr = new a008Parser(tstream);	
+	{
+		auto r1 = psr->test3();
+		std::cout << r1.tree->toStringTree() << std::endl;
+		treeWalk(r1.tree);
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+
+void treeWalk(a008Traits::TreeTypePtr const& root, unsigned depth)
+{
+	auto &children = root->get_children();
+
+	if (root->UserData.usageType == 101)			
+		cout << "column:" << setw(4 * depth + 3) << root->toStringTree() << endl;
+
+	for (auto i = children.begin(); i != children.end(); ++i)
+	{
+		treeWalk(*i, depth+1);
+	}
+}
diff --git a/runtime/Cpp/tests/a008.g b/runtime/Cpp/tests/a008.g
new file mode 100644
index 000000000..35488952b
--- /dev/null
+++ b/runtime/Cpp/tests/a008.g
@@ -0,0 +1,91 @@
+grammar a008;
+
+options {
+	language=Cpp;
+	output=AST;
+}
+
+tokens {
+    T_A = 'token A';
+    P_R = 'token pivot root';
+    S_R = 'token sample root';
+    E_R = 'token expression root';
+
+    T_ADHOC_ENUM_VAL = 'ad-hoc generated enum constant';
+}
+
+@lexer::includes 
+{
+#include "A008TestTraits.hpp"
+}
+@lexer::namespace 
+{ Antlr3Test }
+
+@parser::includes {
+#include "A008TestTraits.hpp"
+#include "a008Lexer.hpp"
+}
+@parser::namespace 
+{ Antlr3Test }
+
+test1 // see unpivot_in_elements
+    :   (    column_name[T_ADHOC_ENUM_VAL]
+        |    '(' column_name[0] (',' column_name[0])* ')'
+        )
+        (     'AS'
+            (    constant
+            |    ('(')=> '(' constant (',' constant)* ')'
+            )
+        )?
+        -> column_name+ ^(P_R constant*)
+    ;
+
+test2 // see unpivot_in_elements
+    :   (    column_name[T_ADHOC_ENUM_VAL]
+        |    '(' column_name[0] (',' column_name[0])* ')'
+        )
+        (     'AS'
+            (    constant
+            |    ('(')=> '(' constant (',' constant)* ')'
+            )
+        )?
+        -> column_name+ ^(P_R constant)*
+    ;
+
+
+test3 //sample_clause
+    :	s='SAMPLE' 'BLOCK'? 
+        '(' c1=constant (',' c2=constant)? ')'
+        -> ^(S_R[$s] 'BLOCK'? ^(E_R $c1) ^(E_R $c2)?)
+    ;
+
+column_name[int identifierClass]
+@after {
+        // Node's user data access
+		auto &pRoot = retval.tree;
+		if(retval.start != 0 && pRoot != 0)
+		{
+            pRoot->UserData.identifierClass = identifierClass;
+            pRoot->UserData.usageType = 101;
+        }
+}
+	:	t=T_COLUMN_NAME
+        // Token's user data access (see a007)
+        // {
+        //     // We have to get over const correctness here:
+        //     // const_cast<CommonTokenType*>($t)->set_type(ID);
+        //     const_cast<CommonTokenType*>($t)->UserData.identifierClass = identifierClass;            
+        // }
+    ;
+
+constant
+	:	T_CONSTANT;
+
+T_COLUMN_NAME
+	:	('A'..'Z')+;
+
+T_CONSTANT
+	:	('0'..'9')+;
+
+WS
+    : ' '+  { $channel = HIDDEN; };

From e28a57c03b60e29e4c0f038452dc21132c3741ad Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Sun, 27 Sep 2015 19:13:07 +0200
Subject: [PATCH 50/53] display additional comments(enum value) in generated
 sources

---
 tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
index c2d3df513..21688a84d 100644
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
@@ -762,7 +762,7 @@ ANTLR_UINT8* <name>TokenNames[<length(tokenNames)>+4]
         (ANTLR_UINT8*) "\<EOR>",
         (ANTLR_UINT8*) "\<DOWN>",
         (ANTLR_UINT8*) "\<UP>",
-        <tokenNames:{it |(ANTLR_UINT8*) <it>}; separator=",\n">
+        <rest(tokens):{it |(ANTLR_UINT8*) "<it.name>", //<it.type>}; separator="\n">
        };
 <endif>
 

From 2808ae96ca382f1dbed9a080861cd9d70eb648b6 Mon Sep 17 00:00:00 2001
From: Ivan Brezina <ibrezina@ibrezina.net>
Date: Wed, 30 Sep 2015 19:32:40 +0200
Subject: [PATCH 51/53] test a009 treeAdaptor override example

---
 runtime/Cpp/tests/Makefile |   3 +
 runtime/Cpp/tests/a009.cpp | 130 +++++++++++++++++++++++++++++++++++++
 runtime/Cpp/tests/a009.g   |  92 ++++++++++++++++++++++++++
 3 files changed, 225 insertions(+)
 create mode 100644 runtime/Cpp/tests/a009.cpp
 create mode 100644 runtime/Cpp/tests/a009.g

diff --git a/runtime/Cpp/tests/Makefile b/runtime/Cpp/tests/Makefile
index b7a25900c..dde77a085 100644
--- a/runtime/Cpp/tests/Makefile
+++ b/runtime/Cpp/tests/Makefile
@@ -58,6 +58,9 @@ a007:	a007.cpp a007.tokens A007TestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADER
 a008:	a008.cpp a008.tokens A008TestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
 
+a009:	a009.cpp a009.tokens A009TestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
+	$(CXX) $(CFLAGS) -DUSESTL $(INCLUDES) $< $(wildcard $@?*.cpp) -o $@
+
 s001:	s001.cpp s001.tokens UserTestTraits.hpp Makefile $(ANTLR) $(RUNTIME_HEADERS)
 	$(CXX) $(CFLAGS) $(INCLUDES) $< $(wildcard $@?*.cpp) utils.cpp -o $@
 
diff --git a/runtime/Cpp/tests/a009.cpp b/runtime/Cpp/tests/a009.cpp
new file mode 100644
index 000000000..17a6118bc
--- /dev/null
+++ b/runtime/Cpp/tests/a009.cpp
@@ -0,0 +1,130 @@
+#include "utils.hpp"
+#include "A009TestTraits.hpp"
+#include "a009Lexer.hpp"
+#include "a009Parser.hpp"
+
+#include <iostream>
+#include <ostream>
+#include <sstream>
+#include <fstream>
+#include <iomanip>
+
+using namespace Antlr3Test;
+using namespace std;
+
+void test1(const char* input);
+void test2(const char* input);
+void test3(const char* input);
+
+void treeWalk(a009Traits::TreeTypePtr const& root, unsigned depth = 0);
+	
+int 
+main	(int argc, char *argv[])
+{
+	test1("ABC");
+ 	test1("(ABC)");
+	test1("ABC AS 5");
+	test1("ABC AS(1,2,3,4,5,6)");
+	test1("(ABC,ABD,ABE,ABF)AS(1,2,3,4,5,6)");
+
+	test2("ABC");
+	test2("(ABC)");
+	test2("ABC AS 5");
+	test2("ABC AS(1,2,3,4,5,6)");
+	test2("(ABC,ABD,ABE,ABF)AS(1,2,3,4,5,6)");
+
+	test3("SAMPLE (4)");
+	test3("SAMPLE BLOCK(4,5)");
+	
+	printf("finished parsing OK\n");	// Finnish parking is pretty good - I think it is all the snow
+
+	return 0;
+}
+
+void test1(const char* input)
+{
+	a009Traits::InputStreamType* istream = new a009Traits::InputStreamType((const ANTLR_UINT8 *)input
+											 , antlr3::ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test1");
+	istream->setUcaseLA(true);
+	
+	a009Lexer* lxr = new a009Lexer(istream);
+	a009Traits::TokenStreamType* tstream = new a009Traits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a009Parser* psr = new a009Parser(tstream);	
+	{
+		auto r1 = psr->test1();
+		std::cout << r1.tree->toStringTree() << std::endl;
+		treeWalk(r1.tree);
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test2(const char* input)
+{
+	a009Traits::InputStreamType* istream = new a009Traits::InputStreamType((const ANTLR_UINT8 *)input
+											 , antlr3::ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test2");
+	istream->setUcaseLA(true);
+	
+	a009Lexer* lxr = new a009Lexer(istream);
+	a009Traits::TokenStreamType* tstream = new a009Traits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a009Parser* psr = new a009Parser(tstream);	
+	{
+		auto r1 = psr->test2();
+		std::cout << r1.tree->toStringTree() << std::endl;
+		treeWalk(r1.tree);		
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+void test3(const char* input)
+{
+	a009Traits::InputStreamType* istream = new a009Traits::InputStreamType((const ANTLR_UINT8 *)input
+											 , antlr3::ENC_8BIT
+											 , strlen(input)
+											 , (ANTLR_UINT8*)"test3");
+	istream->setUcaseLA(true);
+	
+	a009Lexer* lxr = new a009Lexer(istream);
+	a009Traits::TokenStreamType* tstream = new a009Traits::TokenStreamType(ANTLR_SIZE_HINT, lxr->get_tokSource());
+	a009Parser* psr = new a009Parser(tstream);	
+	{
+		auto r1 = psr->test3();
+		std::cout << r1.tree->toStringTree() << std::endl;
+		treeWalk(r1.tree);
+	}
+	
+	delete psr;
+	delete tstream; 
+	delete lxr;
+	delete istream;
+}
+
+
+void treeWalk(a009Traits::TreeTypePtr const& root, unsigned depth)
+{
+	auto &children = root->get_children();
+
+	if (root->UserData.usageType == 101)			
+		cout << "column:" << setw(4 * depth + 3) << root->toStringTree() << endl;
+
+	if (root->UserData.identifierClass)
+		cout << "node:" << setw(4 * depth + 3) << root->toString() << '[' << root->UserData.identifierClass << ']' << endl;
+	if (root->get_token() && root->get_token()->UserData.identifierClass)
+		cout << "token:" << setw(4 * depth + 3) << root->toString() << '[' << root->get_token()->UserData.identifierClass << ']' << endl;
+		
+	for (auto i = children.begin(); i != children.end(); ++i)
+	{
+		treeWalk(*i, depth+1);
+	}
+}
diff --git a/runtime/Cpp/tests/a009.g b/runtime/Cpp/tests/a009.g
new file mode 100644
index 000000000..8a79601a3
--- /dev/null
+++ b/runtime/Cpp/tests/a009.g
@@ -0,0 +1,92 @@
+grammar a009;
+
+options {
+	language=Cpp;
+	output=AST;
+}
+
+tokens {
+    T_A = 'token A';
+    P_R = 'token pivot root';
+    S_R = 'token sample root';
+    E_R = 'token expression root';
+
+    T_ADHOC_ENUM_VAL1 = 'ad-hoc generated enum constant 1';
+    T_ADHOC_ENUM_VAL2 = 'ad-hoc generated enum constant 2';
+}
+
+@lexer::includes 
+{
+#include "A009TestTraits.hpp"
+}
+@lexer::namespace 
+{ Antlr3Test }
+
+@parser::includes {
+#include "A009TestTraits.hpp"
+#include "a009Lexer.hpp"
+}
+@parser::namespace 
+{ Antlr3Test }
+
+test1 // see unpivot_in_elements
+    :   (    column_name[T_ADHOC_ENUM_VAL1]
+        |    '(' column_name[0] (',' column_name[0])* ')'
+        )
+        (     'AS'
+            (    constant
+            |    ('(')=> '(' constant (',' constant)* ')'
+            )
+        )?
+        -> column_name+ ^(P_R[(A009ID)T_ADHOC_ENUM_VAL2] constant*)
+    ;
+
+test2 // see unpivot_in_elements
+    :   (    column_name[T_ADHOC_ENUM_VAL1]
+        |    '(' column_name[0] (',' column_name[0])* ')'
+        )
+        (     as='AS'
+            (    constant
+            |    ('(')=> '(' constant (',' constant)* ')'
+            )
+        )?
+        -> column_name+ ^(P_R[$as,(A009ID)T_ADHOC_ENUM_VAL2] constant)*
+    ;
+
+
+test3 //sample_clause
+    :	s='SAMPLE' 'BLOCK'? 
+        '(' c1=constant (',' c2=constant)? ')'
+        -> ^(S_R[$s] 'BLOCK'? ^(E_R $c1) ^(E_R $c2)?)
+    ;
+
+column_name[int identifierClass]
+@after {
+        // Node's user data access
+		auto &pRoot = retval.tree;
+		if(retval.start != 0 && pRoot != 0)
+		{
+            pRoot->UserData.identifierClass = identifierClass;
+            pRoot->UserData.usageType = 101;
+        }
+}
+	:	t=T_COLUMN_NAME
+        // Token's user data access (see a007)
+        // {
+        //     // We have to get over const correctness here:
+        //     // const_cast<CommonTokenType*>($t)->set_type(ID);
+        //     const_cast<CommonTokenType*>($t)->UserData.identifierClass = identifierClass;            
+        // }
+    ;
+
+constant
+	:	T_CONSTANT;
+
+T_COLUMN_NAME
+	:	('A'..'Z')+;
+
+T_CONSTANT
+	:	('0'..'9')+;
+
+WS
+    : ' '+  { $channel = HIDDEN; };

From a4d1928e03b2b3f74579e54a6211cd1d695001b9 Mon Sep 17 00:00:00 2001
From: ibre5041 <ibre5041@ibrezina.net>
Date: Thu, 31 Mar 2016 18:03:33 +0200
Subject: [PATCH 52/53] allow overriden recover() method to emit a
 factored("hand make") token

---
 runtime/Cpp/include/antlr3tokenstream.inl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/runtime/Cpp/include/antlr3tokenstream.inl b/runtime/Cpp/include/antlr3tokenstream.inl
index 21b6dddfa..b2c4e3bcc 100644
--- a/runtime/Cpp/include/antlr3tokenstream.inl
+++ b/runtime/Cpp/include/antlr3tokenstream.inl
@@ -110,6 +110,10 @@ typename TokenSource<ImplTraits>::TokenType*	TokenSource<ImplTraits>::nextTokenS
                 state->set_failed(true);
                 lexer->get_rec()->reportError();
                 lexer->recover(); 
+                if (state->get_token_present())
+                    // Good(or invalid) token factored by custom recover procedure
+                    //
+                    return  state->get_token();
             }
             else
             {

From 45cc4ebd74e398cfafaa4e081d0d6786a5f0685a Mon Sep 17 00:00:00 2001
From: ibre5041 <ibre5041@ibrezina.net>
Date: Wed, 11 May 2016 15:08:19 +0200
Subject: [PATCH 53/53] Do not segfault when getTokenName(index) is out of
 bounds (return <UNKNOWN> token name)

---
 .../org/antlr/codegen/templates/Cpp/Cpp.stg    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
index 21688a84d..aea6527d3 100644
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
@@ -164,13 +164,6 @@ outputFile( LEXER,
 
 <beginNamespace(actions)>
 <if(LEXER)><if(!PARSER)>
-const ANTLR_UINT8* <name>Tokens::getTokenName(ANTLR_UINT32 index)
-{
-       if( EOF_TOKEN == index)
-               return (ANTLR_UINT8*) "\<EOF>";
-       return TokenNames[index];
-}
-
 /** \brief Table of all token names in symbolic order, mainly used for debugging.
  */
 ANTLR_UINT8* <name>Tokens::TokenNames[<length(tokens)>+4]
@@ -181,6 +174,15 @@ ANTLR_UINT8* <name>Tokens::TokenNames[<length(tokens)>+4]
        (ANTLR_UINT8*) "\<UP>",
        <rest(tokens):{it |(ANTLR_UINT8*) "<it.name>",//<it.type>}; separator="\n">
        };
+
+const ANTLR_UINT8* <name>Tokens::getTokenName(ANTLR_UINT32 index)
+{
+       if( EOF_TOKEN == index)
+               return (ANTLR_UINT8*) "\<EOF>";
+       if( arraysize(TokenNames) \<= index)
+               return (ANTLR_UINT8*) "\<UNKNOWN>";
+       return TokenNames[index];
+}
 <endif><endif>
 
 /** String literals used by <name> that we must do things like MATCHS() with.
@@ -367,6 +369,8 @@ public:
 
 protected:
 	static ANTLR_UINT8* TokenNames[];
+	template\<class T, size_t N>
+	inline static size_t arraysize(const T(&)[N]) { return N; }
 
 <endif>
 };