Merge pull request #16545 from geoffw0/salvage

Swift: Salvage

Author: geoffw0

swift/ql/.generated.list

@@ -1,5 +1,13 @@
 private import codeql.swift.generated.expr.BooleanLiteralExpr
 
+/**
+ * A boolean literal. For example `true` in:
+ * ```
+ * let x = true
+ * ```
+ */
 class BooleanLiteralExpr extends Generated::BooleanLiteralExpr {
   override string toString() { result = this.getValue().toString() }
+
+  override string getValueString() { result = this.getValue().toString() }
 }

swift/ql/.gitattributes

@@ -1,8 +1,15 @@
-// generated by codegen/codegen.py, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `BuiltinLiteralExpr`.
  */
 
 private import codeql.swift.generated.expr.BuiltinLiteralExpr
 
-class BuiltinLiteralExpr extends Generated::BuiltinLiteralExpr { }
+/**
+ * A Swift literal of a kind that is built in to the Swift language.
+ */
+class BuiltinLiteralExpr extends Generated::BuiltinLiteralExpr {
+  /**
+   * Gets the value of this literal expression (as a string).
+   */
+  string getValueString() { none() }
+}

swift/ql/lib/codeql/swift/elements/expr/BooleanLiteralExpr.qll

@@ -2,4 +2,6 @@ private import codeql.swift.generated.expr.FloatLiteralExpr
 
 class FloatLiteralExpr extends Generated::FloatLiteralExpr {
   override string toString() { result = this.getStringValue() }
+
+  override string getValueString() { result = this.getStringValue() }
 }

swift/ql/lib/codeql/swift/elements/expr/BuiltinLiteralExpr.qll

@@ -1,5 +1,13 @@
 private import codeql.swift.generated.expr.IntegerLiteralExpr
 
+/**
+ * An integer literal. For example `1` in:
+ * ```
+ * let x = 1
+ * ```
+ */
 class IntegerLiteralExpr extends Generated::IntegerLiteralExpr {
   override string toString() { result = this.getStringValue() }
+
+  override string getValueString() { result = this.getStringValue() }
 }

swift/ql/lib/codeql/swift/elements/expr/FloatLiteralExpr.qll

@@ -1,8 +1,12 @@
-// generated by codegen/codegen.py, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `LiteralExpr`.
  */
 
 private import codeql.swift.generated.expr.LiteralExpr
 
+/**
+ * A Swift literal.
+ *
+ * This is the root class for all literals.
+ */
 class LiteralExpr extends Generated::LiteralExpr { }

swift/ql/lib/codeql/swift/elements/expr/IntegerLiteralExpr.qll

@@ -1,5 +1,13 @@
 private import codeql.swift.generated.expr.MagicIdentifierLiteralExpr
 
+/**
+ * An identifier literal that is expanded at compile time. For example `#file` in:
+ * ```
+ * let x = #file
+ * ```
+ */
 class MagicIdentifierLiteralExpr extends Generated::MagicIdentifierLiteralExpr {
   override string toString() { result = "#..." }
+
+  override string getValueString() { none() } // TODO: value not yet extracted
 }

swift/ql/lib/codeql/swift/elements/expr/LiteralExpr.qll

@@ -1,5 +1,13 @@
 private import codeql.swift.generated.expr.StringLiteralExpr
 
+/**
+ * A string literal. For example `"abc"` in:
+ * ```
+ * let x = "abc"
+ * ```
+ */
 class StringLiteralExpr extends Generated::StringLiteralExpr {
   override string toString() { result = this.getValue() }
+
+  override string getValueString() { result = this.getValue() }
 }