Rust: add back getAttr to ArrayExpr

Author: Paolo Tranquilli

rust/ast-generator/src/main.rs

@@ -359,7 +359,7 @@ fn get_fields(node: &AstNodeSrc) -> Vec<FieldInfo> {
             result.push(FieldInfo {
                 name: "is_semicolon".to_string(),
                 tp: "predicate".to_string(),
-                is_many: true,
+                is_many: false,
             });
         }
         _ => {}

rust/ql/.generated.list

@@ -1,23 +1,38 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `ArrayExpr`.
  *
  * INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.ArrayExpr
+private import codeql.rust.elements.internal.generated.Raw
+private import codeql.rust.elements.internal.generated.Synth
 
 /**
  * INTERNAL: This module contains the customizable definition of `ArrayExpr` and should not
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * The base class for array expressions. For example:
    * ```rust
    * [1, 2, 3];
    * [1; 10];
    * ```
    */
-  class ArrayExpr extends Generated::ArrayExpr { }
+  class ArrayExpr extends Generated::ArrayExpr {
+    cached
+    private Raw::ArrayExprInternal getUnderlyingEntity() {
+      this = Synth::TArrayListExpr(result) or this = Synth::TArrayRepeatExpr(result)
+    }
+
+    override Expr getExpr(int index) {
+      result = Synth::convertExprFromRaw(this.getUnderlyingEntity().getExpr(index))
+    }
+
+    override Attr getAttr(int index) {
+      result = Synth::convertAttrFromRaw(this.getUnderlyingEntity().getAttr(index))
+    }
+  }
 }

rust/ql/.gitattributes

@@ -22,13 +22,6 @@ module Impl {
    * ```
    */
   class ArrayListExpr extends Generated::ArrayListExpr {
-    cached
-    private Raw::ArrayExprInternal getUnderlyingEntity() { this = Synth::TArrayListExpr(result) }
-
     override string toString() { result = "[...]" }
-
-    override Expr getExpr(int index) {
-      result = Synth::convertExprFromRaw(this.getUnderlyingEntity().getExpr(index))
-    }
   }
 }

rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll

@@ -21,9 +21,6 @@ module Impl {
    * ```
    */
   class ArrayRepeatExpr extends Generated::ArrayRepeatExpr {
-    cached
-    private Raw::ArrayExprInternal getUnderlyingEntity() { this = Synth::TArrayRepeatExpr(result) }
-
     override string toString() {
       result =
         "[" + this.getRepeatOperand().toAbbreviatedString() + "; " +
@@ -33,9 +30,5 @@ module Impl {
     override Expr getRepeatOperand() { result = this.getExpr(0) }
 
     override Expr getRepeatLength() { result = this.getExpr(1) }
-
-    override Expr getExpr(int index) {
-      result = Synth::convertExprFromRaw(this.getUnderlyingEntity().getExpr(index))
-    }
   }
 }