traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[3.9] bpo-40769: Allow extra surrounding parentheses for invalid annotated assignment rule (GH-20387) (GH-21186) 

(cherry picked from commit c8f29ad986)
This commit is contained in:
Pablo Galindo 2020-06-28 00:40:41 +01:00 committed by GitHub
parent cb0dc52d37
commit 102ca529ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 284 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Grammar/python.gram
View File

@ -648,8 +648,12 @@ invalid_named_expression:
RAISE_SYNTAX_ERROR_KNOWN_LOCATION( RAISE_SYNTAX_ERROR_KNOWN_LOCATION(
a, "cannot use assignment expressions with %s", _PyPegen_get_expr_name(a)) } a, "cannot use assignment expressions with %s", _PyPegen_get_expr_name(a)) }
invalid_assignment: invalid_assignment:
| a=list ':' expression { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "only single target (not list) can be annotated") } | a=invalid_ann_assign_target ':' expression {
| a=tuple ':' expression { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "only single target (not tuple) can be annotated") } RAISE_SYNTAX_ERROR_KNOWN_LOCATION(
a,
"only single target (not %s) can be annotated",
_PyPegen_get_expr_name(a)
)}
| a=star_named_expression ',' star_named_expressions* ':' expression { | a=star_named_expression ',' star_named_expressions* ':' expression {
RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "only single target (not tuple) can be annotated") } RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "only single target (not tuple) can be annotated") }
| a=expression ':' expression { | a=expression ':' expression {
@ -663,6 +667,10 @@ invalid_assignment:
"'%s' is an illegal expression for augmented assignment", "'%s' is an illegal expression for augmented assignment",
_PyPegen_get_expr_name(a) _PyPegen_get_expr_name(a)
)} )}
invalid_ann_assign_target[expr_ty]:
| list
| tuple
| '(' a=invalid_ann_assign_target ')' { a }
invalid_del_stmt: invalid_del_stmt:
| 'del' a=star_expressions { | 'del' a=star_expressions {
RAISE_SYNTAX_ERROR_INVALID_TARGET(DEL_TARGETS, a) } RAISE_SYNTAX_ERROR_INVALID_TARGET(DEL_TARGETS, a) }

13
Lib/test/test_syntax.py
View File

@ -725,6 +725,19 @@ SyntaxError: trailing comma not allowed without surrounding parentheses
Traceback (most recent call last): Traceback (most recent call last):
SyntaxError: trailing comma not allowed without surrounding parentheses SyntaxError: trailing comma not allowed without surrounding parentheses
>>> (): int
Traceback (most recent call last):
SyntaxError: only single target (not tuple) can be annotated
>>> []: int
Traceback (most recent call last):
SyntaxError: only single target (not list) can be annotated
>>> (()): int
Traceback (most recent call last):
SyntaxError: only single target (not tuple) can be annotated
>>> ([]): int
Traceback (most recent call last):
SyntaxError: only single target (not list) can be annotated
Corner-cases that used to fail to raise the correct error: Corner-cases that used to fail to raise the correct error:
>>> def f(*, x=lambda __debug__:0): pass >>> def f(*, x=lambda __debug__:0): pass

466
Parser/pegen/parse.c
View File

@ -222,173 +222,174 @@ static KeywordToken *reserved_keywords[] = {
#define invalid_kwarg_type 1144 #define invalid_kwarg_type 1144
#define invalid_named_expression_type 1145 #define invalid_named_expression_type 1145
#define invalid_assignment_type 1146 #define invalid_assignment_type 1146
#define invalid_del_stmt_type 1147 #define invalid_ann_assign_target_type 1147
#define invalid_block_type 1148 #define invalid_del_stmt_type 1148
#define invalid_comprehension_type 1149 #define invalid_block_type 1149
#define invalid_dict_comprehension_type 1150 #define invalid_comprehension_type 1150
#define invalid_parameters_type 1151 #define invalid_dict_comprehension_type 1151
#define invalid_lambda_parameters_type 1152 #define invalid_parameters_type 1152
#define invalid_star_etc_type 1153 #define invalid_lambda_parameters_type 1153
#define invalid_lambda_star_etc_type 1154 #define invalid_star_etc_type 1154
#define invalid_double_type_comments_type 1155 #define invalid_lambda_star_etc_type 1155
#define invalid_with_item_type 1156 #define invalid_double_type_comments_type 1156
#define invalid_for_target_type 1157 #define invalid_with_item_type 1157
#define invalid_group_type 1158 #define invalid_for_target_type 1158
#define invalid_import_from_targets_type 1159 #define invalid_group_type 1159
#define _loop0_1_type 1160 #define invalid_import_from_targets_type 1160
#define _loop0_2_type 1161 #define _loop0_1_type 1161
#define _loop0_4_type 1162 #define _loop0_2_type 1162
#define _gather_3_type 1163 #define _loop0_4_type 1163
#define _loop0_6_type 1164 #define _gather_3_type 1164
#define _gather_5_type 1165 #define _loop0_6_type 1165
#define _loop0_8_type 1166 #define _gather_5_type 1166
#define _gather_7_type 1167 #define _loop0_8_type 1167
#define _loop0_10_type 1168 #define _gather_7_type 1168
#define _gather_9_type 1169 #define _loop0_10_type 1169
#define _loop1_11_type 1170 #define _gather_9_type 1170
#define _loop0_13_type 1171 #define _loop1_11_type 1171
#define _gather_12_type 1172 #define _loop0_13_type 1172
#define _tmp_14_type 1173 #define _gather_12_type 1173
#define _tmp_15_type 1174 #define _tmp_14_type 1174
#define _tmp_16_type 1175 #define _tmp_15_type 1175
#define _tmp_17_type 1176 #define _tmp_16_type 1176
#define _tmp_18_type 1177 #define _tmp_17_type 1177
#define _tmp_19_type 1178 #define _tmp_18_type 1178
#define _tmp_20_type 1179 #define _tmp_19_type 1179
#define _tmp_21_type 1180 #define _tmp_20_type 1180
#define _loop1_22_type 1181 #define _tmp_21_type 1181
#define _tmp_23_type 1182 #define _loop1_22_type 1182
#define _tmp_24_type 1183 #define _tmp_23_type 1183
#define _loop0_26_type 1184 #define _tmp_24_type 1184
#define _gather_25_type 1185 #define _loop0_26_type 1185
#define _loop0_28_type 1186 #define _gather_25_type 1186
#define _gather_27_type 1187 #define _loop0_28_type 1187
#define _tmp_29_type 1188 #define _gather_27_type 1188
#define _tmp_30_type 1189 #define _tmp_29_type 1189
#define _loop0_31_type 1190 #define _tmp_30_type 1190
#define _loop1_32_type 1191 #define _loop0_31_type 1191
#define _loop0_34_type 1192 #define _loop1_32_type 1192
#define _gather_33_type 1193 #define _loop0_34_type 1193
#define _tmp_35_type 1194 #define _gather_33_type 1194
#define _loop0_37_type 1195 #define _tmp_35_type 1195
#define _gather_36_type 1196 #define _loop0_37_type 1196
#define _tmp_38_type 1197 #define _gather_36_type 1197
#define _loop0_40_type 1198 #define _tmp_38_type 1198
#define _gather_39_type 1199 #define _loop0_40_type 1199
#define _loop0_42_type 1200 #define _gather_39_type 1200
#define _gather_41_type 1201 #define _loop0_42_type 1201
#define _loop0_44_type 1202 #define _gather_41_type 1202
#define _gather_43_type 1203 #define _loop0_44_type 1203
#define _loop0_46_type 1204 #define _gather_43_type 1204
#define _gather_45_type 1205 #define _loop0_46_type 1205
#define _tmp_47_type 1206 #define _gather_45_type 1206
#define _loop1_48_type 1207 #define _tmp_47_type 1207
#define _tmp_49_type 1208 #define _loop1_48_type 1208
#define _tmp_50_type 1209 #define _tmp_49_type 1209
#define _tmp_51_type 1210 #define _tmp_50_type 1210
#define _tmp_52_type 1211 #define _tmp_51_type 1211
#define _tmp_53_type 1212 #define _tmp_52_type 1212
#define _loop0_54_type 1213 #define _tmp_53_type 1213
#define _loop0_55_type 1214 #define _loop0_54_type 1214
#define _loop0_56_type 1215 #define _loop0_55_type 1215
#define _loop1_57_type 1216 #define _loop0_56_type 1216
#define _loop0_58_type 1217 #define _loop1_57_type 1217
#define _loop1_59_type 1218 #define _loop0_58_type 1218
#define _loop1_60_type 1219 #define _loop1_59_type 1219
#define _loop1_61_type 1220 #define _loop1_60_type 1220
#define _loop0_62_type 1221 #define _loop1_61_type 1221
#define _loop1_63_type 1222 #define _loop0_62_type 1222
#define _loop0_64_type 1223 #define _loop1_63_type 1223
#define _loop1_65_type 1224 #define _loop0_64_type 1224
#define _loop0_66_type 1225 #define _loop1_65_type 1225
#define _loop1_67_type 1226 #define _loop0_66_type 1226
#define _loop1_68_type 1227 #define _loop1_67_type 1227
#define _tmp_69_type 1228 #define _loop1_68_type 1228
#define _loop0_71_type 1229 #define _tmp_69_type 1229
#define _gather_70_type 1230 #define _loop0_71_type 1230
#define _loop1_72_type 1231 #define _gather_70_type 1231
#define _loop0_74_type 1232 #define _loop1_72_type 1232
#define _gather_73_type 1233 #define _loop0_74_type 1233
#define _loop1_75_type 1234 #define _gather_73_type 1234
#define _loop0_76_type 1235 #define _loop1_75_type 1235
#define _loop0_77_type 1236 #define _loop0_76_type 1236
#define _loop0_78_type 1237 #define _loop0_77_type 1237
#define _loop1_79_type 1238 #define _loop0_78_type 1238
#define _loop0_80_type 1239 #define _loop1_79_type 1239
#define _loop1_81_type 1240 #define _loop0_80_type 1240
#define _loop1_82_type 1241 #define _loop1_81_type 1241
#define _loop1_83_type 1242 #define _loop1_82_type 1242
#define _loop0_84_type 1243 #define _loop1_83_type 1243
#define _loop1_85_type 1244 #define _loop0_84_type 1244
#define _loop0_86_type 1245 #define _loop1_85_type 1245
#define _loop1_87_type 1246 #define _loop0_86_type 1246
#define _loop0_88_type 1247 #define _loop1_87_type 1247
#define _loop1_89_type 1248 #define _loop0_88_type 1248
#define _loop1_90_type 1249 #define _loop1_89_type 1249
#define _loop1_91_type 1250 #define _loop1_90_type 1250
#define _loop1_92_type 1251 #define _loop1_91_type 1251
#define _tmp_93_type 1252 #define _loop1_92_type 1252
#define _loop0_95_type 1253 #define _tmp_93_type 1253
#define _gather_94_type 1254 #define _loop0_95_type 1254
#define _tmp_96_type 1255 #define _gather_94_type 1255
#define _tmp_97_type 1256 #define _tmp_96_type 1256
#define _tmp_98_type 1257 #define _tmp_97_type 1257
#define _tmp_99_type 1258 #define _tmp_98_type 1258
#define _loop1_100_type 1259 #define _tmp_99_type 1259
#define _tmp_101_type 1260 #define _loop1_100_type 1260
#define _tmp_102_type 1261 #define _tmp_101_type 1261
#define _loop0_104_type 1262 #define _tmp_102_type 1262
#define _gather_103_type 1263 #define _loop0_104_type 1263
#define _loop1_105_type 1264 #define _gather_103_type 1264
#define _loop0_106_type 1265 #define _loop1_105_type 1265
#define _loop0_107_type 1266 #define _loop0_106_type 1266
#define _tmp_108_type 1267 #define _loop0_107_type 1267
#define _tmp_109_type 1268 #define _tmp_108_type 1268
#define _loop0_111_type 1269 #define _tmp_109_type 1269
#define _gather_110_type 1270 #define _loop0_111_type 1270
#define _loop0_113_type 1271 #define _gather_110_type 1271
#define _gather_112_type 1272 #define _loop0_113_type 1272
#define _loop0_115_type 1273 #define _gather_112_type 1273
#define _gather_114_type 1274 #define _loop0_115_type 1274
#define _loop0_117_type 1275 #define _gather_114_type 1275
#define _gather_116_type 1276 #define _loop0_117_type 1276
#define _loop0_118_type 1277 #define _gather_116_type 1277
#define _loop0_120_type 1278 #define _loop0_118_type 1278
#define _gather_119_type 1279 #define _loop0_120_type 1279
#define _tmp_121_type 1280 #define _gather_119_type 1280
#define _loop0_123_type 1281 #define _tmp_121_type 1281
#define _gather_122_type 1282 #define _loop0_123_type 1282
#define _loop0_125_type 1283 #define _gather_122_type 1283
#define _gather_124_type 1284 #define _loop0_125_type 1284
#define _tmp_126_type 1285 #define _gather_124_type 1285
#define _loop0_127_type 1286 #define _tmp_126_type 1286
#define _loop0_128_type 1287 #define _loop0_127_type 1287
#define _loop0_129_type 1288 #define _loop0_128_type 1288
#define _tmp_130_type 1289 #define _loop0_129_type 1289
#define _tmp_131_type 1290 #define _tmp_130_type 1290
#define _loop0_132_type 1291 #define _tmp_131_type 1291
#define _tmp_133_type 1292 #define _loop0_132_type 1292
#define _loop0_134_type 1293 #define _tmp_133_type 1293
#define _tmp_135_type 1294 #define _loop0_134_type 1294
#define _tmp_136_type 1295 #define _tmp_135_type 1295
#define _tmp_137_type 1296 #define _tmp_136_type 1296
#define _tmp_138_type 1297 #define _tmp_137_type 1297
#define _tmp_139_type 1298 #define _tmp_138_type 1298
#define _tmp_140_type 1299 #define _tmp_139_type 1299
#define _tmp_141_type 1300 #define _tmp_140_type 1300
#define _tmp_142_type 1301 #define _tmp_141_type 1301
#define _tmp_143_type 1302 #define _tmp_142_type 1302
#define _tmp_144_type 1303 #define _tmp_143_type 1303
#define _tmp_145_type 1304 #define _tmp_144_type 1304
#define _tmp_146_type 1305 #define _tmp_145_type 1305
#define _tmp_147_type 1306 #define _tmp_146_type 1306
#define _tmp_148_type 1307 #define _tmp_147_type 1307
#define _tmp_149_type 1308 #define _tmp_148_type 1308
#define _tmp_150_type 1309 #define _tmp_149_type 1309
#define _loop1_151_type 1310 #define _tmp_150_type 1310
#define _loop1_152_type 1311 #define _loop1_151_type 1311
#define _tmp_153_type 1312 #define _loop1_152_type 1312
#define _tmp_154_type 1313 #define _tmp_153_type 1313
#define _tmp_154_type 1314
static mod_ty file_rule(Parser *p); static mod_ty file_rule(Parser *p);
static mod_ty interactive_rule(Parser *p); static mod_ty interactive_rule(Parser *p);
@ -537,6 +538,7 @@ static void *incorrect_arguments_rule(Parser *p);
static void *invalid_kwarg_rule(Parser *p); static void *invalid_kwarg_rule(Parser *p);
static void *invalid_named_expression_rule(Parser *p); static void *invalid_named_expression_rule(Parser *p);
static void *invalid_assignment_rule(Parser *p); static void *invalid_assignment_rule(Parser *p);
static expr_ty invalid_ann_assign_target_rule(Parser *p);
static void *invalid_del_stmt_rule(Parser *p); static void *invalid_del_stmt_rule(Parser *p);
static void *invalid_block_rule(Parser *p); static void *invalid_block_rule(Parser *p);
static void *invalid_comprehension_rule(Parser *p); static void *invalid_comprehension_rule(Parser *p);
@ -14694,8 +14696,7 @@ invalid_named_expression_rule(Parser *p)
} }
// invalid_assignment: // invalid_assignment:
// | list ':' expression // | invalid_ann_assign_target ':' expression
// | tuple ':' expression
// | star_named_expression ',' star_named_expressions* ':' expression // | star_named_expression ',' star_named_expressions* ':' expression
// | expression ':' expression // | expression ':' expression
// | ((star_targets '='))* star_expressions '=' // | ((star_targets '='))* star_expressions '='
@ -14711,25 +14712,25 @@ invalid_assignment_rule(Parser *p)
} }
void * _res = NULL; void * _res = NULL;
int _mark = p->mark; int _mark = p->mark;
{ // list ':' expression { // invalid_ann_assign_target ':' expression
if (p->error_indicator) { if (p->error_indicator) {
D(p->level--); D(p->level--);
return NULL; return NULL;
} }
D(fprintf(stderr, "%*c> invalid_assignment[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "list ':' expression")); D(fprintf(stderr, "%*c> invalid_assignment[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "invalid_ann_assign_target ':' expression"));
Token * _literal; Token * _literal;
expr_ty a; expr_ty a;
expr_ty expression_var; expr_ty expression_var;
if ( if (
(a = list_rule(p)) // list (a = invalid_ann_assign_target_rule(p)) // invalid_ann_assign_target
&& &&
(_literal = _PyPegen_expect_token(p, 11)) // token=':' (_literal = _PyPegen_expect_token(p, 11)) // token=':'
&& &&
(expression_var = expression_rule(p)) // expression (expression_var = expression_rule(p)) // expression
) )
{ {
D(fprintf(stderr, "%*c+ invalid_assignment[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "list ':' expression")); D(fprintf(stderr, "%*c+ invalid_assignment[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "invalid_ann_assign_target ':' expression"));
_res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "only single target (not list) can be annotated" ); _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "only single target (not %s) can be annotated" , _PyPegen_get_expr_name ( a ) );
if (_res == NULL && PyErr_Occurred()) { if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1; p->error_indicator = 1;
D(p->level--); D(p->level--);
@ -14739,37 +14740,7 @@ invalid_assignment_rule(Parser *p)
} }
p->mark = _mark; p->mark = _mark;
D(fprintf(stderr, "%*c%s invalid_assignment[%d-%d]: %s failed!\n", p->level, ' ', D(fprintf(stderr, "%*c%s invalid_assignment[%d-%d]: %s failed!\n", p->level, ' ',
p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "list ':' expression")); p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "invalid_ann_assign_target ':' expression"));
}
{ // tuple ':' expression
if (p->error_indicator) {
D(p->level--);
return NULL;
}
D(fprintf(stderr, "%*c> invalid_assignment[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "tuple ':' expression"));
Token * _literal;
expr_ty a;
expr_ty expression_var;
if (
(a = tuple_rule(p)) // tuple
&&
(_literal = _PyPegen_expect_token(p, 11)) // token=':'
&&
(expression_var = expression_rule(p)) // expression
)
{
D(fprintf(stderr, "%*c+ invalid_assignment[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "tuple ':' expression"));
_res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "only single target (not tuple) can be annotated" );
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
D(p->level--);
return NULL;
}
goto done;
}
p->mark = _mark;
D(fprintf(stderr, "%*c%s invalid_assignment[%d-%d]: %s failed!\n", p->level, ' ',
p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "tuple ':' expression"));
} }
{ // star_named_expression ',' star_named_expressions* ':' expression { // star_named_expression ',' star_named_expressions* ':' expression
if (p->error_indicator) { if (p->error_indicator) {
@ -14933,6 +14904,91 @@ invalid_assignment_rule(Parser *p)
return _res; return _res;
} }
// invalid_ann_assign_target: list | tuple | '(' invalid_ann_assign_target ')'
static expr_ty
invalid_ann_assign_target_rule(Parser *p)
{
D(p->level++);
if (p->error_indicator) {
D(p->level--);
return NULL;
}
expr_ty _res = NULL;
int _mark = p->mark;
{ // list
if (p->error_indicator) {
D(p->level--);
return NULL;
}
D(fprintf(stderr, "%*c> invalid_ann_assign_target[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "list"));
expr_ty list_var;
if (
(list_var = list_rule(p)) // list
)
{
D(fprintf(stderr, "%*c+ invalid_ann_assign_target[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "list"));
_res = list_var;
goto done;
}
p->mark = _mark;
D(fprintf(stderr, "%*c%s invalid_ann_assign_target[%d-%d]: %s failed!\n", p->level, ' ',
p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "list"));
}
{ // tuple
if (p->error_indicator) {
D(p->level--);
return NULL;
}
D(fprintf(stderr, "%*c> invalid_ann_assign_target[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "tuple"));
expr_ty tuple_var;
if (
(tuple_var = tuple_rule(p)) // tuple
)
{
D(fprintf(stderr, "%*c+ invalid_ann_assign_target[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "tuple"));
_res = tuple_var;
goto done;
}
p->mark = _mark;
D(fprintf(stderr, "%*c%s invalid_ann_assign_target[%d-%d]: %s failed!\n", p->level, ' ',
p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "tuple"));
}
{ // '(' invalid_ann_assign_target ')'
if (p->error_indicator) {
D(p->level--);
return NULL;
}
D(fprintf(stderr, "%*c> invalid_ann_assign_target[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'(' invalid_ann_assign_target ')'"));
Token * _literal;
Token * _literal_1;
expr_ty a;
if (
(_literal = _PyPegen_expect_token(p, 7)) // token='('
&&
(a = invalid_ann_assign_target_rule(p)) // invalid_ann_assign_target
&&
(_literal_1 = _PyPegen_expect_token(p, 8)) // token=')'
)
{
D(fprintf(stderr, "%*c+ invalid_ann_assign_target[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'(' invalid_ann_assign_target ')'"));
_res = a;
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
D(p->level--);
return NULL;
}
goto done;
}
p->mark = _mark;
D(fprintf(stderr, "%*c%s invalid_ann_assign_target[%d-%d]: %s failed!\n", p->level, ' ',
p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'(' invalid_ann_assign_target ')'"));
}
_res = NULL;
done:
D(p->level--);
return _res;
}
// invalid_del_stmt: 'del' star_expressions // invalid_del_stmt: 'del' star_expressions
static void * static void *
invalid_del_stmt_rule(Parser *p) invalid_del_stmt_rule(Parser *p)