Merge pull request #46 from github/hvitved/unique-parent

hvitved · web-flow · commit d5582f3f48b2 · 2020-11-23T16:16:02.000+01:00
Add `unique` wrapper to `AstNode::getParent()`
diff --git a/generator/src/ql.rs b/generator/src/ql.rs
@@ -97,6 +97,12 @@ pub enum Expression<'a> {
     Or(Vec<Expression<'a>>),
     Equals(Box<Expression<'a>>, Box<Expression<'a>>),
     Dot(Box<Expression<'a>>, &'a str, Vec<Expression<'a>>),
+    Aggregate(
+        &'a str,
+        Vec<FormalParameter<'a>>,
+        Box<Expression<'a>>,
+        Box<Expression<'a>>,
+    ),
 }
 
 impl<'a> fmt::Display for Expression<'a> {
@@ -138,6 +144,16 @@ impl<'a> fmt::Display for Expression<'a> {
                 }
                 write!(f, ")")
             }
+            Expression::Aggregate(n, vars, range, term) => {
+                write!(f, "{}(", n)?;
+                for (index, var) in vars.iter().enumerate() {
+                    if index > 0 {
+                        write!(f, ", ")?;
+                    }
+                    write!(f, "{}", var)?;
+                }
+                write!(f, " | {} | {})", range, term)
+            }
         }
     }
 }
diff --git a/generator/src/ql_gen.rs b/generator/src/ql_gen.rs
@@ -52,11 +52,22 @@ fn create_ast_node_class<'a>() -> ql::Class<'a> {
         return_type: Some(ql::Type::Normal("AstNode")),
         formal_parameters: vec![],
         body: ql::Expression::Equals(
-            Box::new(ql::Expression::Var("this")),
-            Box::new(ql::Expression::Dot(
-                Box::new(ql::Expression::Var("result")),
-                "getAFieldOrChild",
-                vec![],
+            Box::new(ql::Expression::Var("result")),
+            Box::new(ql::Expression::Aggregate(
+                "unique",
+                vec![ql::FormalParameter {
+                    name: "parent",
+                    param_type: ql::Type::Normal("AstNode"),
+                }],
+                Box::new(ql::Expression::Equals(
+                    Box::new(ql::Expression::Var("this")),
+                    Box::new(ql::Expression::Dot(
+                        Box::new(ql::Expression::Var("parent")),
+                        "getAFieldOrChild",
+                        vec![],
+                    )),
+                )),
+                Box::new(ql::Expression::Var("parent")),
             )),
         ),
     };
diff --git a/ql/src/codeql_ruby/ast.qll b/ql/src/codeql_ruby/ast.qll
@@ -11,7 +11,9 @@ class AstNode extends @ast_node {
 
   Location getLocation() { none() }
 
-  AstNode getParent() { this = result.getAFieldOrChild() }
+  AstNode getParent() {
+    result = unique(AstNode parent | this = parent.getAFieldOrChild() | parent)
+  }
 
   AstNode getAFieldOrChild() { none() }
 

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,12 @@ pub enum Expression<'a> {`
`97`	`97`	`Or(Vec<Expression<'a>>),`
`98`	`98`	`Equals(Box<Expression<'a>>, Box<Expression<'a>>),`
`99`	`99`	`Dot(Box<Expression<'a>>, &'a str, Vec<Expression<'a>>),`
	`100`	`+ Aggregate(`
	`101`	`+ &'a str,`
	`102`	`+ Vec<FormalParameter<'a>>,`
	`103`	`+ Box<Expression<'a>>,`
	`104`	`+ Box<Expression<'a>>,`
	`105`	`+ ),`
`100`	`106`	`}`
`101`	`107`
`102`	`108`	`impl<'a> fmt::Display for Expression<'a> {`
`@@ -138,6 +144,16 @@ impl<'a> fmt::Display for Expression<'a> {`
`138`	`144`	`}`
`139`	`145`	`write!(f, ")")`
`140`	`146`	`}`
	`147`	`+ Expression::Aggregate(n, vars, range, term) => {`
	`148`	`+ write!(f, "{}(", n)?;`
	`149`	`+ for (index, var) in vars.iter().enumerate() {`
	`150`	`+ if index > 0 {`
	`151`	`+ write!(f, ", ")?;`
	`152`	`+ }`
	`153`	`+ write!(f, "{}", var)?;`
	`154`	`+ }`
	`155`	`+ write!(f, " \| {} \| {})", range, term)`
	`156`	`+ }`
`141`	`157`	`}`
`142`	`158`	`}`
`143`	`159`	`}`