Update ruby/ql/lib/codeql/ruby/printAst.qll

aibaars · hvitved · aibaars · commit 35f7fdf24b30 · 2022-08-03T12:06:47.000+02:00
Co-authored-by: Tom Hvitved &lt;hvitved@github.com&gt;
diff --git a/ruby/ql/lib/codeql/ruby/printAst.qll b/ruby/ql/lib/codeql/ruby/printAst.qll
@@ -36,6 +36,8 @@ private predicate shouldPrintAstEdge(AstNode parent, string edgeName, AstNode ch
   any(PrintAstConfiguration config).shouldPrintAstEdge(parent, edgeName, child)
 }
 
+private int nonSynthIndex() { result = min([-1, any(int i | exists(getSynthChild(_, i)))]) - 1 }
+
 newtype TPrintNode =
   TPrintRegularAstNode(AstNode n) { shouldPrintNode(n) } or
   TPrintRegExpNode(RE::RegExpTerm term) {
@@ -114,7 +116,7 @@ class PrintRegularAstNode extends PrintAstNode, TPrintRegularAstNode {
   }
 
   private int getSynthAstNodeIndex() {
-    not astNode.isSynthesized() and result = -10
+    not astNode.isSynthesized() and result = nonSynthIndex()
     or
     astNode = getSynthChild(astNode.getParent(), result)
   }

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ private predicate shouldPrintAstEdge(AstNode parent, string edgeName, AstNode ch`
`36`	`36`	`any(PrintAstConfiguration config).shouldPrintAstEdge(parent, edgeName, child)`
`37`	`37`	`}`
`38`	`38`
	`39`	`+private int nonSynthIndex() { result = min([-1, any(int i \| exists(getSynthChild(_, i)))]) - 1 }`
	`40`	`+`
`39`	`41`	`newtype TPrintNode =`
`40`	`42`	`TPrintRegularAstNode(AstNode n) { shouldPrintNode(n) } or`
`41`	`43`	`TPrintRegExpNode(RE::RegExpTerm term) {`
`@@ -114,7 +116,7 @@ class PrintRegularAstNode extends PrintAstNode, TPrintRegularAstNode {`
`114`	`116`	`}`
`115`	`117`
`116`	`118`	`private int getSynthAstNodeIndex() {`
`117`		`- not astNode.isSynthesized() and result = -10`
	`119`	`+ not astNode.isSynthesized() and result = nonSynthIndex()`
`118`	`120`	`or`
`119`	`121`	`astNode = getSynthChild(astNode.getParent(), result)`
`120`	`122`	`}`