Fix issue with decl stmt being added multiple times

Author: mjdecker

src/policy_classes/DeclTypePolicySingleEvent.hpp

@@ -102,6 +102,7 @@ public srcSAXEventDispatch::PolicyListener {
         // start of policy
         openEventMap[ParserState::declstmt] = [this](srcSAXEventContext& ctx) {
             if (!declDepth) {
+                data.clear();
                 declDepth = ctx.depth;
                 CollectTypeHandlers();
                 CollectNameHandlers();

src/policy_classes/FunctionPolicySingleEvent.hpp

@@ -152,7 +152,7 @@ public srcSAXEventDispatch::PolicyListener {
 	void InitializeFunctionPolicyHandlers() {
 		using namespace srcSAXEventDispatch;
 		// start of policy
-		std::function<void (srcSAXEventContext& ctx)> functionStart = [this](srcSAXEventContext& ctx) {
+		std::function<void (srcSAXEventContext& ctx)> startFunction = [this](srcSAXEventContext& ctx) {
 			if (!functionDepth) {
 				functionDepth = ctx.depth;
 				data = FunctionData{};
@@ -187,27 +187,27 @@ public srcSAXEventDispatch::PolicyListener {
 		};
 
 		// end of policy
-		std::function<void (srcSAXEventContext& ctx)> functionEnd = [this](srcSAXEventContext& ctx) {
+		std::function<void (srcSAXEventContext& ctx)> endFunction = [this](srcSAXEventContext& ctx) {
 			if (functionDepth && functionDepth == ctx.depth) {
 				functionDepth = 0;
 				NotifyAll(ctx);
 				InitializeFunctionPolicyHandlers();
 			}
 		};
 
-		openEventMap[ParserState::function]        = functionStart;
-		openEventMap[ParserState::functiondecl]    = functionStart;
-		openEventMap[ParserState::constructor]     = functionStart;
-		openEventMap[ParserState::constructordecl] = functionStart;
-		openEventMap[ParserState::destructor]      = functionStart;
-		openEventMap[ParserState::destructordecl]  = functionStart;
-
-		closeEventMap[ParserState::function]        = functionEnd;
-		closeEventMap[ParserState::functiondecl]    = functionEnd;
-		closeEventMap[ParserState::constructor]     = functionEnd;
-		closeEventMap[ParserState::constructordecl] = functionEnd;
-		closeEventMap[ParserState::destructor]      = functionEnd;
-		closeEventMap[ParserState::destructordecl]  = functionEnd;
+		openEventMap[ParserState::function]        = startFunction;
+		openEventMap[ParserState::functiondecl]    = startFunction;
+		openEventMap[ParserState::constructor]     = startFunction;
+		openEventMap[ParserState::constructordecl] = startFunction;
+		openEventMap[ParserState::destructor]      = startFunction;
+		openEventMap[ParserState::destructordecl]  = startFunction;
+
+		closeEventMap[ParserState::function]        = endFunction;
+		closeEventMap[ParserState::functiondecl]    = endFunction;
+		closeEventMap[ParserState::constructor]     = endFunction;
+		closeEventMap[ParserState::constructordecl] = endFunction;
+		closeEventMap[ParserState::destructor]      = endFunction;
+		closeEventMap[ParserState::destructordecl]  = endFunction;
 	}
 
 	void CollectXMLAttributeHandlers() {}

src/policy_classes/UnitPolicySingleEvent.hpp

@@ -72,15 +72,30 @@ class UnitPolicySingleEvent :
         openEventMap[ParserState::structn] = startClassPolicy;
         closeEventMap[ParserState::structn] = endClassPolicy;
 
-        // start functionof policy
-        openEventMap[ParserState::function] = [this](srcSAXEventContext& ctx) {
+        // start function of policy
+        std::function<void(srcSAXEventDispatch::srcSAXEventContext&)> startFunction = [this](srcSAXEventContext& ctx) {
             if(!functionPolicy) functionPolicy = new FunctionPolicy{this};
             ctx.dispatcher->AddListenerDispatch(functionPolicy);
         };
 
         // end of policy
-        closeEventMap[ParserState::function] = [this](srcSAXEventContext& ctx) {
+        std::function<void(srcSAXEventDispatch::srcSAXEventContext&)> endFunction = [this](srcSAXEventContext& ctx) {
         };
+
+        openEventMap[ParserState::function]        = startFunction;
+        openEventMap[ParserState::functiondecl]    = startFunction;
+        openEventMap[ParserState::constructor]     = startFunction;
+        openEventMap[ParserState::constructordecl] = startFunction;
+        openEventMap[ParserState::destructor]      = startFunction;
+        openEventMap[ParserState::destructordecl]  = startFunction;
+
+        closeEventMap[ParserState::function]        = endFunction;
+        closeEventMap[ParserState::functiondecl]    = endFunction;
+        closeEventMap[ParserState::constructor]     = endFunction;
+        closeEventMap[ParserState::constructordecl] = endFunction;
+        closeEventMap[ParserState::destructor]      = endFunction;
+        closeEventMap[ParserState::destructordecl]  = endFunction;
+
     }
 };