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

Python: Cleanup default-indexing upgrade script

Browse Source
This commit is contained in:
Rasmus Wriedt Larsen
2020-05-06 09:52:40 +02:00
parent 010d5fb769
commit f1630983d3
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
python/upgrades/f635b392038a494915307f913657cd3058f9b476/py_exprs.ql
View File

@@ -64,27 +64,18 @@ class Arguments_ extends @py_arguments {
}
class Function_ extends @py_Function {
/** Gets the name of this function. */
string getName() { py_strs(result, this, 0) }
/** 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 tuple (*) parameter of this function. */
Expr_ getVararg() { py_exprs(result, _, this, 2) }
/** 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 dictionary (**) parameter of this function. */
Expr_ getKwarg() { py_exprs(result, _, this, 4) }
string toString() { result = "Function" }
}
@@ -125,32 +116,42 @@ class FunctionExpr_ extends @py_FunctionExpr, CallableExprAdjusted, Expr_ {
override string toString() { result = "FunctionExpr" }
}
from Expr_ id, int kind, ExprParent_ parent, int oldidx, int newidx
/*
* 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(id, kind, parent, oldidx) and
py_exprs(expr, kind, parent, oldidx) and
(
not exists(Arguments_ args | args.getDefault(oldidx) = id) and
not exists(Arguments_ args | args.getKwDefault(oldidx) = id) 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) = id 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
exists(Arguments_ args, CallableExprAdjusted callable |
callable.getArgs() = args and
args.getKwDefault(oldidx) = id and
args.getKwDefault(oldidx) = expr and
newidx =
max(int i |
exists(Parameter_ param | param = callable.getInnerScope().getKwonlyarg(i) |
param.getLocation().getStartLine() < id.getLocation().getStartLine()
param.getLocation().getStartLine() < expr.getLocation().getStartLine()
or
param.getLocation().getStartLine() = id.getLocation().getStartLine() and
param.getLocation().getStartColumn() < id.getLocation().getStartColumn()
param.getLocation().getStartLine() = expr.getLocation().getStartLine() and
param.getLocation().getStartColumn() < expr.getLocation().getStartColumn()
)
)
)
)
select id, kind, parent, newidx
select expr, kind, parent, newidx

2
python/upgrades/f635b392038a494915307f913657cd3058f9b476/upgrade.properties
View File

@@ -1,3 +1,3 @@
description: Support defaults for keyword-only parameters
description: Changed indexing for parameter defaults
compatibility: full
py_exprs.rel: run py_exprs.qlo