C++: Make new predicates private.

criemen · criemen · commit 668764ce4092 · 2020-10-29T14:49:06.000+01:00
diff --git a/cpp/ql/src/semmle/code/cpp/PrintAST.qll b/cpp/ql/src/semmle/code/cpp/PrintAST.qll
@@ -546,17 +546,8 @@ class FunctionNode extends ASTNode {
   }
 
   override string getChildAccessorPredicate(int childIndex) {
-    childIndex = 0 and
-    result = "..."
-    or
-    childIndex = 1 and
-    result = "..."
-    or
     childIndex = 2 and
     result = "getEntryPoint()"
-    or
-    childIndex = 3 and
-    result = "..."
   }
 
   override string getChildEdgeLabelInternal(int childIndex) {
@@ -642,7 +633,7 @@ string getChildAccessor(Locatable parent, Element child) {
   )
 }
 
-predicate namedStmtChildPredicates(Locatable s, Element e, string pred) {
+private predicate namedStmtChildPredicates(Locatable s, Element e, string pred) {
   shouldPrintFunction(getEnclosingFunction(s)) and
   (
     exists(int n | s.(BlockStmt).getStmt(n) = e and pred = "getStmt(" + n + ")")
@@ -724,7 +715,7 @@ predicate namedStmtChildPredicates(Locatable s, Element e, string pred) {
   )
 }
 
-predicate namedExprChildPredicates(Expr expr, Element ele, string pred) {
+private predicate namedExprChildPredicates(Expr expr, Element ele, string pred) {
   shouldPrintFunction(expr.getEnclosingFunction()) and
   (
     expr.(Access).getTarget() = ele and pred = "getTarget()"

Original file line number	Diff line number	Diff line change
`@@ -546,17 +546,8 @@ class FunctionNode extends ASTNode {`
`546`	`546`	`}`
`547`	`547`
`548`	`548`	`override string getChildAccessorPredicate(int childIndex) {`
`549`		`- childIndex = 0 and`
`550`		`- result = "..."`
`551`		`- or`
`552`		`- childIndex = 1 and`
`553`		`- result = "..."`
`554`		`- or`
`555`	`549`	`childIndex = 2 and`
`556`	`550`	`result = "getEntryPoint()"`
`557`		`- or`
`558`		`- childIndex = 3 and`
`559`		`- result = "..."`
`560`	`551`	`}`
`561`	`552`
`562`	`553`	`override string getChildEdgeLabelInternal(int childIndex) {`
`@@ -642,7 +633,7 @@ string getChildAccessor(Locatable parent, Element child) {`
`642`	`633`	`)`
`643`	`634`	`}`
`644`	`635`
`645`		`-predicate namedStmtChildPredicates(Locatable s, Element e, string pred) {`
	`636`	`+private predicate namedStmtChildPredicates(Locatable s, Element e, string pred) {`
`646`	`637`	`shouldPrintFunction(getEnclosingFunction(s)) and`
`647`	`638`	`(`
`648`	`639`	`exists(int n \| s.(BlockStmt).getStmt(n) = e and pred = "getStmt(" + n + ")")`
`@@ -724,7 +715,7 @@ predicate namedStmtChildPredicates(Locatable s, Element e, string pred) {`
`724`	`715`	`)`
`725`	`716`	`}`
`726`	`717`
`727`		`-predicate namedExprChildPredicates(Expr expr, Element ele, string pred) {`
	`718`	`+private predicate namedExprChildPredicates(Expr expr, Element ele, string pred) {`
`728`	`719`	`shouldPrintFunction(expr.getEnclosingFunction()) and`
`729`	`720`	`(`
`730`	`721`	`expr.(Access).getTarget() = ele and pred = "getTarget()"`