filter pattern

NeoSuit/src/main/resources/patterns_puff/TinkerPop-Subpattern/FilterFunctionPipe2AbstractFilter-PPQuery.xml

@@ -16,10 +16,9 @@
             WHERE functionClass.fqn = function.vartype  
             AND computeMethod.name="compute"  
             
-        MATCH (functionClass)-[*2]->(concreteComputeMethod:Method)-[:CONTROL_FLOW*]->(concreteExecuteReturn:ReturnStmt)
+        MATCH (functionClass)-[*2]->(concreteComputeMethod:Method)
             WHERE functionClass.fqn = function.vartype  
             AND concreteComputeMethod.name="compute" 
-		MATCH (beforeExecuteReturn)-[cfExecReturn:CONTROL_FLOW]->(concreteExecuteReturn)
    		MATCH (computeMethod)-[:CONTROL_FLOW*]->(computeMethodCall:MethodCall)
    			WHERE computeMethodCall.name = "compute"
    		MATCH (computeMethodCall)-[:CONTROL_FLOW*]->(abstractExecuteReturn:ReturnStmt)
@@ -29,7 +28,8 @@
         MATCH (endPipe)-[:CONTROL_FLOW]->(successor)  		     
         
         // constructor extension
-        MATCH (functionClass)-[:CONTAINS_CONSTRUCTOR]->()-[:CONTROL_FLOW*]->(ctorReturn:ReturnStmt)
+        MATCH (functionClass)-[:CONTAINS_CONSTRUCTOR]->(ctor:Constructor)-[:CONTROL_FLOW*]->(ctorReturn:ReturnStmt)
+            WHERE ctor.parameterscount > 0
         MATCH (nodeBeforCtorReturn)-[cfReturn:CONTROL_FLOW]->(ctorReturn)
         
         //tinkerpop interface and extends