Various Cpp/C target fixes

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
     //

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);
+		}
 	}
 }
 

runtime/Cpp/include/antlr3.hpp

@@ -28,33 +28,62 @@
 // (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 <cstddef> // ptrdiff_t
+#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	"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

runtime/Cpp/include/antlr3.inl

@@ -1,9 +1,9 @@
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 //static 
 ANTLR_INLINE void GenericStream::displayRecognitionError( const StringType& str )
 {
 	fprintf(stderr, str.c_str() );
 }
 
-ANTLR_END_NAMESPACE()
+}

runtime/Cpp/include/antlr3baserecognizer.hpp

@@ -35,10 +35,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.
 
-#include    "antlr3defs.hpp"
-#include    "antlr3collections.hpp"
-
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 /** \brief Base tracking context structure for all types of
  * recognizers.
@@ -501,7 +498,7 @@ class BaseRecognizer : public ImplTraits::AllocPolicyType
 
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3baserecognizer.inl"
 

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,
@@ -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.
@@ -107,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)
 	{
@@ -172,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)
 		)
 	{
@@ -579,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
 		 */
@@ -612,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);
     }
 }
 
@@ -632,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);
     }
 
 }
@@ -773,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 >
@@ -782,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);
 }
 
 
@@ -916,4 +917,4 @@ BaseRecognizer<ImplTraits, StreamType>::~BaseRecognizer()
 
 
 
-ANTLR_END_NAMESPACE()
+}

runtime/Cpp/include/antlr3bitset.hpp

@@ -36,9 +36,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.
 
-#include    "antlr3defs.hpp"
-
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 /** How many bits in the elements
  */
@@ -216,7 +214,7 @@ class Bitset : public ImplTraits::AllocPolicyType
 
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3bitset.inl"
 

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()
+}

runtime/Cpp/include/antlr3collections.hpp

@@ -29,9 +29,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.
 
-#include    "antlr3defs.hpp"
-
-ANTLR_BEGIN_NAMESPACE()
+namespace antlr3 {
 
 /* -------------- TRIE Interfaces ---------------- */
 
@@ -276,7 +274,7 @@ class Topo : public ImplTraits::AllocPolicyType
 	~Topo();
 };
 
-ANTLR_END_NAMESPACE()
+}
 
 #include "antlr3collections.inl"
 

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()
+}