mirror of
https://github.com/github/codeql.git
synced 2026-04-29 02:35:15 +02:00
Python: Autoformat everything using qlformat.
Will need subsequent PRs fixing up test failures (due to deprecated methods moving around), but other than that everything should be straight-forward.
This commit is contained in:
Taus Brock-Nannestad
@@ -1,82 +1,82 @@
|
||||
class Location extends @location {
|
||||
/** Gets the start line of this location */
|
||||
int getStartLine() {
|
||||
locations_default(this, _, result, _, _, _) or
|
||||
locations_ast(this, _, result, _, _, _)
|
||||
}
|
||||
/** Gets the start line of this location */
|
||||
int getStartLine() {
|
||||
locations_default(this, _, result, _, _, _) or
|
||||
locations_ast(this, _, result, _, _, _)
|
||||
}
|
||||
|
||||
/** Gets the start column of this location */
|
||||
int getStartColumn() {
|
||||
locations_default(this, _, _, result, _, _) or
|
||||
locations_ast(this, _, _, result, _, _)
|
||||
}
|
||||
/** Gets the start column of this location */
|
||||
int getStartColumn() {
|
||||
locations_default(this, _, _, result, _, _) or
|
||||
locations_ast(this, _, _, result, _, _)
|
||||
}
|
||||
|
||||
string toString() { result = "<some file>" + ":" + this.getStartLine().toString() }
|
||||
string toString() { result = "<some file>" + ":" + this.getStartLine().toString() }
|
||||
}
|
||||
|
||||
class Expr_ extends @py_expr {
|
||||
string toString() { result = "Expr" }
|
||||
string toString() { result = "Expr" }
|
||||
|
||||
Location getLocation() { py_locations(result, this) }
|
||||
Location getLocation() { py_locations(result, this) }
|
||||
}
|
||||
|
||||
class ExprParent_ extends @py_expr_parent {
|
||||
string toString() { result = "ExprParent" }
|
||||
string toString() { result = "ExprParent" }
|
||||
}
|
||||
|
||||
class ExprList_ extends @py_expr_list {
|
||||
/** Gets the nth item of this expression list */
|
||||
Expr_ getItem(int index) { py_exprs(result, _, this, index) }
|
||||
/** Gets the nth item of this expression list */
|
||||
Expr_ getItem(int index) { py_exprs(result, _, this, index) }
|
||||
|
||||
string toString() { result = "ExprList" }
|
||||
string toString() { result = "ExprList" }
|
||||
}
|
||||
|
||||
class Parameter_ extends @py_parameter {
|
||||
string toString() { result = "Parameter" }
|
||||
string toString() { result = "Parameter" }
|
||||
|
||||
Location getLocation() { result = this.(Expr_).getLocation() }
|
||||
Location getLocation() { result = this.(Expr_).getLocation() }
|
||||
}
|
||||
|
||||
class ParameterList extends @py_parameter_list {
|
||||
/** Gets the nth parameter */
|
||||
Parameter_ getItem(int index) {
|
||||
/* Item can be a Name or a Tuple, both of which are expressions */
|
||||
py_exprs(result, _, this, index)
|
||||
}
|
||||
/** Gets the nth parameter */
|
||||
Parameter_ getItem(int index) {
|
||||
/* Item can be a Name or a Tuple, both of which are expressions */
|
||||
py_exprs(result, _, this, index)
|
||||
}
|
||||
|
||||
string toString() { result = "ParameterList" }
|
||||
string toString() { result = "ParameterList" }
|
||||
}
|
||||
|
||||
class Arguments_ extends @py_arguments {
|
||||
/** Gets the keyword-only default values of this parameters definition. */
|
||||
ExprList_ getKwDefaults() { py_expr_lists(result, this, 0) }
|
||||
/** Gets the keyword-only default values of this parameters definition. */
|
||||
ExprList_ getKwDefaults() { py_expr_lists(result, this, 0) }
|
||||
|
||||
/** Gets the nth keyword-only default value of this parameters definition. */
|
||||
Expr_ getKwDefault(int index) { result = this.getKwDefaults().getItem(index) }
|
||||
/** Gets the nth keyword-only default value of this parameters definition. */
|
||||
Expr_ getKwDefault(int index) { result = this.getKwDefaults().getItem(index) }
|
||||
|
||||
/** Gets the default values of this parameters definition. */
|
||||
ExprList_ getDefaults() { py_expr_lists(result, this, 1) }
|
||||
/** Gets the default values of this parameters definition. */
|
||||
ExprList_ getDefaults() { py_expr_lists(result, this, 1) }
|
||||
|
||||
/** Gets the nth default value of this parameters definition. */
|
||||
Expr_ getDefault(int index) { result = this.getDefaults().getItem(index) }
|
||||
/** Gets the nth default value of this parameters definition. */
|
||||
Expr_ getDefault(int index) { result = this.getDefaults().getItem(index) }
|
||||
|
||||
string toString() { result = "Arguments" }
|
||||
string toString() { result = "Arguments" }
|
||||
}
|
||||
|
||||
class Function_ extends @py_Function {
|
||||
/** Gets the positional parameter list of this function. */
|
||||
ParameterList getArgs() { py_parameter_lists(result, this) }
|
||||
/** Gets the positional parameter list of this function. */
|
||||
ParameterList getArgs() { py_parameter_lists(result, this) }
|
||||
|
||||
/** Gets the nth positional parameter of this function. */
|
||||
Parameter_ getArg(int index) { result = this.getArgs().getItem(index) }
|
||||
/** Gets the nth positional parameter of this function. */
|
||||
Parameter_ getArg(int index) { result = this.getArgs().getItem(index) }
|
||||
|
||||
/** Gets the keyword-only parameter list of this function. */
|
||||
ExprList_ getKwonlyargs() { py_expr_lists(result, this, 3) }
|
||||
/** Gets the keyword-only parameter list of this function. */
|
||||
ExprList_ getKwonlyargs() { py_expr_lists(result, this, 3) }
|
||||
|
||||
/** Gets the nth keyword-only parameter of this function. */
|
||||
Expr_ getKwonlyarg(int index) { result = this.getKwonlyargs().getItem(index) }
|
||||
/** Gets the nth keyword-only parameter of this function. */
|
||||
Expr_ getKwonlyarg(int index) { result = this.getKwonlyargs().getItem(index) }
|
||||
|
||||
string toString() { result = "Function" }
|
||||
string toString() { result = "Function" }
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -85,77 +85,77 @@ class Function_ extends @py_Function {
|
||||
* hierarchy slightly different (that's why it's called Adjusted)
|
||||
*/
|
||||
abstract class CallableExprAdjusted extends Expr_ {
|
||||
/**
|
||||
* Gets The default values and annotations (type-hints) for the arguments of this callable.
|
||||
*
|
||||
* This predicate is called getArgs(), rather than getParameters() for compatibility with Python's AST module.
|
||||
*/
|
||||
abstract Arguments_ getArgs();
|
||||
/**
|
||||
* Gets The default values and annotations (type-hints) for the arguments of this callable.
|
||||
*
|
||||
* This predicate is called getArgs(), rather than getParameters() for compatibility with Python's AST module.
|
||||
*/
|
||||
abstract Arguments_ getArgs();
|
||||
|
||||
/** Gets the function scope of this code expression. */
|
||||
abstract Function_ getInnerScope();
|
||||
/** Gets the function scope of this code expression. */
|
||||
abstract Function_ getInnerScope();
|
||||
}
|
||||
|
||||
class Lambda_ extends @py_Lambda, CallableExprAdjusted, Expr_ {
|
||||
/** Gets the arguments of this lambda expression. */
|
||||
override Arguments_ getArgs() { py_arguments(result, this) }
|
||||
/** Gets the arguments of this lambda expression. */
|
||||
override Arguments_ getArgs() { py_arguments(result, this) }
|
||||
|
||||
/** Gets the function scope of this lambda expression. */
|
||||
override Function_ getInnerScope() { py_Functions(result, this) }
|
||||
/** Gets the function scope of this lambda expression. */
|
||||
override Function_ getInnerScope() { py_Functions(result, this) }
|
||||
|
||||
override string toString() { result = "Lambda" }
|
||||
override string toString() { result = "Lambda" }
|
||||
}
|
||||
|
||||
class FunctionExpr_ extends @py_FunctionExpr, CallableExprAdjusted, Expr_ {
|
||||
/** Gets the parameters of this function definition. */
|
||||
override Arguments_ getArgs() { py_arguments(result, this) }
|
||||
/** Gets the parameters of this function definition. */
|
||||
override Arguments_ getArgs() { py_arguments(result, this) }
|
||||
|
||||
/** Gets the function scope of this function definition. */
|
||||
override Function_ getInnerScope() { py_Functions(result, this) }
|
||||
/** Gets the function scope of this function definition. */
|
||||
override Function_ getInnerScope() { py_Functions(result, this) }
|
||||
|
||||
override string toString() { result = "FunctionExpr" }
|
||||
override string toString() { result = "FunctionExpr" }
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* This upgrade changes the *layout* of the default values for parameters, by
|
||||
* making `Argument.getKwDefault(i)` return the default value for keyword-only parameter `i`
|
||||
* (instead of the i'th default for a keyword-only parameter). `Argument.getDefault` is
|
||||
* changed in the same manner to keep consistency.
|
||||
*/
|
||||
|
||||
from Expr_ expr, int kind, ExprParent_ parent, int oldidx, int newidx
|
||||
where
|
||||
py_exprs(expr, kind, parent, oldidx) and
|
||||
(
|
||||
// expr is not a parameter default
|
||||
not exists(Arguments_ args | args.getDefault(oldidx) = expr) and
|
||||
not exists(Arguments_ args | args.getKwDefault(oldidx) = expr) and
|
||||
newidx = oldidx
|
||||
or
|
||||
// expr is a default for a normal parameter
|
||||
exists(Arguments_ args, CallableExprAdjusted callable |
|
||||
callable.getArgs() = args and
|
||||
args.getDefault(oldidx) = expr and
|
||||
newidx = oldidx + count(callable.getInnerScope().getArg(_)) - count(args.getDefault(_))
|
||||
)
|
||||
or
|
||||
// expr is a default for a keyword-only parameter.
|
||||
// before this upgrade, we would not always attach the default value to the correct keyword-only parameter,
|
||||
// to fix this, we calculate the new index based on the source location of the default value (a default value
|
||||
// must belong to the parameter that was defined immediately before the default value).
|
||||
exists(Arguments_ args, CallableExprAdjusted callable |
|
||||
callable.getArgs() = args and
|
||||
args.getKwDefault(oldidx) = expr and
|
||||
newidx =
|
||||
// the last parameter to be defined before this default value
|
||||
max(int i |
|
||||
exists(Parameter_ param | param = callable.getInnerScope().getKwonlyarg(i) |
|
||||
param.getLocation().getStartLine() < expr.getLocation().getStartLine()
|
||||
or
|
||||
param.getLocation().getStartLine() = expr.getLocation().getStartLine() and
|
||||
param.getLocation().getStartColumn() < expr.getLocation().getStartColumn()
|
||||
)
|
||||
)
|
||||
py_exprs(expr, kind, parent, oldidx) and
|
||||
(
|
||||
// expr is not a parameter default
|
||||
not exists(Arguments_ args | args.getDefault(oldidx) = expr) and
|
||||
not exists(Arguments_ args | args.getKwDefault(oldidx) = expr) and
|
||||
newidx = oldidx
|
||||
or
|
||||
// expr is a default for a normal parameter
|
||||
exists(Arguments_ args, CallableExprAdjusted callable |
|
||||
callable.getArgs() = args and
|
||||
args.getDefault(oldidx) = expr and
|
||||
newidx = oldidx + count(callable.getInnerScope().getArg(_)) - count(args.getDefault(_))
|
||||
)
|
||||
or
|
||||
// expr is a default for a keyword-only parameter.
|
||||
// before this upgrade, we would not always attach the default value to the correct keyword-only parameter,
|
||||
// to fix this, we calculate the new index based on the source location of the default value (a default value
|
||||
// must belong to the parameter that was defined immediately before the default value).
|
||||
exists(Arguments_ args, CallableExprAdjusted callable |
|
||||
callable.getArgs() = args and
|
||||
args.getKwDefault(oldidx) = expr and
|
||||
newidx =
|
||||
// the last parameter to be defined before this default value
|
||||
max(int i |
|
||||
exists(Parameter_ param | param = callable.getInnerScope().getKwonlyarg(i) |
|
||||
param.getLocation().getStartLine() < expr.getLocation().getStartLine()
|
||||
or
|
||||
param.getLocation().getStartLine() = expr.getLocation().getStartLine() and
|
||||
param.getLocation().getStartColumn() < expr.getLocation().getStartColumn()
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
select expr, kind, parent, newidx
|
||||
|
||||
Reference in New Issue
Block a user