hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-26 17:25:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Kotlin: Add KotlinType to exprs

Browse Source
This commit is contained in:
Ian Lynagh
2021-10-14 17:24:23 +01:00
parent 63e96dffea
commit cd41d5b9cf
4 changed files with 73 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/ql/lib/config/semmlecode.dbscheme
View File

@@ -571,6 +571,7 @@ exprs(
unique int id: @expr,
int kind: int ref,
int typeid: @type ref,
int kttypeid: @kt_type ref,
int parent: @exprparent ref,
int idx: int ref
);

17
java/ql/lib/semmle/code/java/Expr.qll
View File

@@ -17,16 +17,19 @@ class Expr extends ExprParent, @expr {
Callable getEnclosingCallable() { callableEnclosingExpr(this, result) }
/** Gets the index of this expression as a child of its parent. */
int getIndex() { exprs(this, _, _, _, result) }
int getIndex() { exprs(this, _, _, _, _, result) }
/** Gets the parent of this expression. */
ExprParent getParent() { exprs(this, _, _, result, _) }
ExprParent getParent() { exprs(this, _, _, _, result, _) }
/** Holds if this expression is the child of the specified parent at the specified (zero-based) position. */
predicate isNthChildOf(ExprParent parent, int index) { exprs(this, _, _, parent, index) }
predicate isNthChildOf(ExprParent parent, int index) { exprs(this, _, _, _, parent, index) }
/** Gets the type of this expression. */
Type getType() { exprs(this, _, result, _, _) }
Type getType() { exprs(this, _, result, _, _, _) }
/** Gets the Kotlin type of this expression. */
KotlinType getKotlinType() { exprs(this, _, _, result, _, _) }
/** Gets the compilation unit in which this expression occurs. */
CompilationUnit getCompilationUnit() { result = this.getFile() }
@@ -44,7 +47,7 @@ class Expr extends ExprParent, @expr {
* comparing whether two expressions have the same kind (as opposed
* to checking whether an expression has a particular kind).
*/
int getKind() { exprs(this, result, _, _, _) }
int getKind() { exprs(this, result, _, _, _, _) }
/** Gets the statement containing this expression, if any. */
Stmt getEnclosingStmt() { statementEnclosingExpr(this, result) }
@@ -56,7 +59,7 @@ class Expr extends ExprParent, @expr {
Stmt getAnEnclosingStmt() { result = this.getEnclosingStmt().getEnclosingStmt*() }
/** Gets a child of this expression. */
Expr getAChildExpr() { exprs(result, _, _, this, _) }
Expr getAChildExpr() { exprs(result, _, _, _, this, _) }
/** Gets the basic block in which this expression occurs, if any. */
BasicBlock getBasicBlock() { result.getANode() = this }
@@ -1707,7 +1710,7 @@ class MethodAccess extends Expr, Call, @methodaccess {
override Expr getAnArgument() { result.getIndex() >= 0 and result.getParent() = this }
/** Gets the argument at the specified (zero-based) position in this method access. */
override Expr getArgument(int index) { exprs(result, _, _, this, index) and index >= 0 }
override Expr getArgument(int index) { exprs(result, _, _, _, this, index) and index >= 0 }
/** Gets a type argument supplied as part of this method access, if any. */
Expr getATypeArgument() { result.getIndex() <= -2 and result.getParent() = this }

4
java/ql/lib/semmle/code/java/Statement.qll
View File

@@ -736,10 +736,10 @@ class LabeledStmt extends Stmt, @labeledstmt {
/** An `assert` statement. */
class AssertStmt extends Stmt, @assertstmt {
/** Gets the boolean expression of this `assert` statement. */
Expr getExpr() { exprs(result, _, _, this, _) and result.getIndex() = 0 }
Expr getExpr() { exprs(result, _, _, _, this, _) and result.getIndex() = 0 }
/** Gets the assertion message expression, if any. */
Expr getMessage() { exprs(result, _, _, this, _) and result.getIndex() = 1 }
Expr getMessage() { exprs(result, _, _, _, this, _) and result.getIndex() = 1 }
override string pp() {
if exists(this.getMessage()) then result = "assert ... : ..." else result = "assert ..."