Parameters and local variables: add isAnonymous predicate

smowton · smowton · commit 33b807f3bb2d · 2024-03-25T16:31:36.000Z
diff --git a/java/ql/lib/semmle/code/java/Expr.qll b/java/ql/lib/semmle/code/java/Expr.qll
@@ -1691,6 +1691,9 @@ class LocalVariableDeclExpr extends Expr, @localvariabledeclexpr {
   /** Gets the name of the variable declared by this local variable declaration expression. */
   string getName() { result = this.getVariable().getName() }
 
+  /** Holds if this is an anonymous local variable, `_` */
+  predicate isAnonymous() { this.getName() = "" }
+
   /**
    * Gets the switch statement or expression whose pattern declares this identifier, if any.
    */
@@ -1763,7 +1766,9 @@ class LocalVariableDeclExpr extends Expr, @localvariabledeclexpr {
   }
 
   /** Gets a printable representation of this expression. */
-  override string toString() { result = this.getName() }
+  override string toString() {
+    if this.getName() = "" then result = "<anonymous local variable>" else result = this.getName()
+  }
 
   override string getAPrimaryQlClass() { result = "LocalVariableDeclExpr" }
 }
diff --git a/java/ql/lib/semmle/code/java/Variable.qll b/java/ql/lib/semmle/code/java/Variable.qll
@@ -117,4 +117,11 @@ class Parameter extends Element, @param, LocalScopeVariable {
   }
 
   override string getAPrimaryQlClass() { result = "Parameter" }
+
+  override string toString() {
+    if this.getName() = "" then result = "<anonymous parameter>" else result = super.toString()
+  }
+
+  /** Holds if this is an anonymous parameter, `_` */
+  predicate isAnonymous() { this.getName() = "" }
 }

Original file line number	Diff line number	Diff line change
`@@ -117,4 +117,11 @@ class Parameter extends Element, @param, LocalScopeVariable {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`override string getAPrimaryQlClass() { result = "Parameter" }`
	`120`	`+`
	`121`	`+ override string toString() {`
	`122`	`+ if this.getName() = "" then result = "<anonymous parameter>" else result = super.toString()`
	`123`	`+ }`
	`124`	`+`
	`125`	+ /** Holds if this is an anonymous parameter, `_` */
	`126`	`+ predicate isAnonymous() { this.getName() = "" }`
`120`	`127`	`}`