Store UserDate in Tree node

Author: ibre5041

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

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

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;