From 2b334055db5d576c17968bb5ff39ea0f410612ba Mon Sep 17 00:00:00 2001 From: annarailton Date: Tue, 16 Nov 2021 12:32:35 +0000 Subject: [PATCH] Clean up to `astNodes` predicate to make more explicit Co-authored-by: Chris Smowton --- .../adaptivethreatmodeling/CodeToFeatures.qll | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/CodeToFeatures.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/CodeToFeatures.qll index 3619415606b..3de472147ea 100644 --- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/CodeToFeatures.qll +++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/CodeToFeatures.qll @@ -423,15 +423,15 @@ module DatabaseFeatures { } query predicate astNodes( - Entity enclosingEntity, EntityOrAstNode parent, int index, AstNode node, string node_type + Entity enclosingEntity, EntityOrAstNode parent, int index, AstNode child, string childType ) { - node = enclosingEntity.getAstRoot(index) and + child = enclosingEntity.getAstRoot(index) and parent = enclosingEntity and - node_type = node.getType() + childType = child.getType() or astNodes(enclosingEntity, _, _, parent, _) and - node = parent.(AstNode).getChild(index) and - node_type = node.getType() + child = parent.(AstNode).getChild(index) and + childType = child.getType() } query predicate nodeAttributes(AstNode node, string attr) {