simplify some code based on review

erik-krogh · erik-krogh · commit 0391db678768 · 2022-06-19T20:09:31.000+02:00
diff --git a/ql/ql/src/codeql_ql/ast/Ast.qll b/ql/ql/src/codeql_ql/ast/Ast.qll
@@ -2226,9 +2226,7 @@ class ModuleExpr extends TModuleExpr, TypeRef {
     or
     not exists(me.getName()) and result = me.getChild().(QL::SimpleId).getValue()
     or
-    exists(QL::ModuleInstantiation instantiation | instantiation.getParent() = me |
-      result = instantiation.getName().getChild().getValue()
-    )
+    result = me.getChild().(QL::ModuleInstantiation).getName().getChild().getValue()
   }
 
   /**
@@ -2263,9 +2261,7 @@ class ModuleExpr extends TModuleExpr, TypeRef {
    * The result is either a `PredicateExpr` or a `TypeExpr`.
    */
   SignatureExpr getArgument(int i) {
-    exists(QL::ModuleInstantiation instantiation | instantiation.getParent() = me |
-      result.toQL() = instantiation.getChild(i)
-    )
+    result.toQL() = me.getChild().(QL::ModuleInstantiation).getChild(i)
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2226,9 +2226,7 @@ class ModuleExpr extends TModuleExpr, TypeRef {`
`2226`	`2226`	`or`
`2227`	`2227`	`not exists(me.getName()) and result = me.getChild().(QL::SimpleId).getValue()`
`2228`	`2228`	`or`
`2229`		`- exists(QL::ModuleInstantiation instantiation \| instantiation.getParent() = me \|`
`2230`		`- result = instantiation.getName().getChild().getValue()`
`2231`		`- )`
	`2229`	`+ result = me.getChild().(QL::ModuleInstantiation).getName().getChild().getValue()`
`2232`	`2230`	`}`
`2233`	`2231`
`2234`	`2232`	`/**`
`@@ -2263,9 +2261,7 @@ class ModuleExpr extends TModuleExpr, TypeRef {`
`2263`	`2261`	* The result is either a `PredicateExpr` or a `TypeExpr`.
`2264`	`2262`	`*/`
`2265`	`2263`	`SignatureExpr getArgument(int i) {`
`2266`		`- exists(QL::ModuleInstantiation instantiation \| instantiation.getParent() = me \|`
`2267`		`- result.toQL() = instantiation.getChild(i)`
`2268`		`- )`
	`2264`	`+ result.toQL() = me.getChild().(QL::ModuleInstantiation).getChild(i)`
`2269`	`2265`	`}`
`2270`	`2266`	`}`
`2271`	`2267`