Rust: Add Callable.getBody()

Author: hvitved

rust/ast-generator/src/main.rs

@@ -44,6 +44,8 @@ fn property_name(type_name: &str, field_name: &str) -> String {
         ("StructField", "expr") => "default",
         ("UseTree", "is_star") => "is_glob",
         (_, "ty") => "type_repr",
+        ("Function", "body") => "function_body",
+        ("ClosureExpr", "body") => "closure_body",
         _ if field_name.contains("record") => &field_name.replacen("record", "struct", 1),
         _ => field_name,
     };

rust/extractor/src/generated/.generated.list

@@ -36,8 +36,7 @@ query predicate scopeNoFirst(CfgScope scope) {
   Consistency::scopeNoFirst(scope) and
   not scope =
     [
-      any(AstNode f | not f.(Function).hasBody()),
-      any(ClosureExpr c | not c.hasBody()),
+      any(AstNode f | not f.(Callable).hasBody()),
       any(AsyncBlockExpr b | not b.hasStmtList())
     ]
 }

rust/extractor/src/generated/top.rs

@@ -35,16 +35,7 @@ final class CallableScope extends CfgScopeImpl, Callable {
   CallableScope() {
     // A function without a body corresponds to a trait method signature and
     // should not have a CFG scope.
-    this.(Function).hasBody()
-    or
-    this instanceof ClosureExpr
-  }
-
-  /** Gets the body of this callable. */
-  AstNode getBody() {
-    result = this.(Function).getBody()
-    or
-    result = this.(ClosureExpr).getBody()
+    this.hasBody()
   }
 
   override predicate scopeFirst(AstNode first) {

rust/extractor/src/translate/generated.rs

@@ -29,5 +29,7 @@ module Impl {
    */
   class ClosureExpr extends Generated::ClosureExpr {
     override string toStringImpl() { result = "|...| " + this.getBody().toAbbreviatedString() }
+
+    override Expr getBody() { result = this.getClosureBody() }
   }
 }

rust/ql/.generated.list

@@ -69,5 +69,7 @@ module Impl {
       this.getLocation().getStartLine() <= result.getLocation().getStartLine() and
       result.getLocation().getStartLine() <= this.getName().getLocation().getStartLine()
     }
+
+    override BlockExpr getBody() { result = this.getFunctionBody() }
   }
 }