hm

thatbirdguythatuknownot · Aug 22, 2023 · 03d0449 · 03d0449 · thatbirdguythatuknownot · Aug 22, 2023
1 parent 4d56f51
commit 03d0449
Show file tree

Hide file tree

Showing 24 changed files with 2,746 additions and 2,080 deletions.
diff --git a/Grammar/python.gram b/Grammar/python.gram
@@ -839,7 +839,7 @@ await_primary[expr_ty] (memo):
 
 primary[expr_ty]:
     | a=primary '.' b=NAME { _PyAST_Attribute(a, b->v.Name.id, Load, EXTRA) }
-    | a=primary b=genexp { _PyAST_Call(a, CHECK(asdl_expr_seq*, (asdl_expr_seq*)_PyPegen_singleton_seq(p, b)), NULL, EXTRA) }
+    | a=primary b=(genexp | tuplecomp) { _PyAST_Call(a, CHECK(asdl_expr_seq*, (asdl_expr_seq*)_PyPegen_singleton_seq(p, b)), NULL, EXTRA) }
     | a=primary '(' b=[arguments] ')' {
         _PyAST_Call(a,
                  (b) ? ((expr_ty) b)->v.Call.args : NULL,
@@ -867,7 +867,7 @@ atom[expr_ty]:
         RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "template not in righthand side of pipe operation") }
     | &(STRING|FSTRING_START) strings
     | NUMBER
-    | &'(' (tuple | group | genexp)
+    | &'(' (tuple | group | genexp | tuplecomp)
     | &'[' (list | listcomp)
     | &'{' (dict | set | dictcomp | setcomp)
     | '...' { _PyAST_Constant(Py_Ellipsis, NULL, EXTRA) }
@@ -994,12 +994,18 @@ for_if_clause[comprehension_ty]:
         CHECK_VERSION(comprehension_ty, 6, "Async comprehensions are", _PyAST_comprehension(a, b, c, 1, p->arena)) }
     | 'for' a=star_targets 'in' ~ b=disjunction c[asdl_expr_seq*]=('if' z=disjunction { z })* {
         _PyAST_comprehension(a, b, c, 0, p->arena) }
+    | "where" a=star_targets '=' b=disjunction c[asdl_expr_seq*]=('if' z=disjunction { z })* {
+        _PyAST_comprehension(a, _PyAST_List(CHECK(asdl_expr_seq*, _PyPegen_singleton_seq(p, b)), Load, EXTRA), c, 0, p->arena) }
     | invalid_for_target
 
 listcomp[expr_ty]:
     | '[' a=named_expression b=for_if_clauses ']' { _PyAST_ListComp(a, b, EXTRA) }
     | invalid_comprehension
 
+tuplecomp[expr_ty]:
+    | '(' a=named_expression b=for_if_clauses ',' ')' { _PyAST_TupleComp(a, b, EXTRA) }
+    | invalid_comprehension
+
 setcomp[expr_ty]:
     | '{' a=named_expression b=for_if_clauses '}' { _PyAST_SetComp(a, b, EXTRA) }
     | invalid_comprehension
@@ -1242,8 +1248,13 @@ invalid_comprehension:
     | ('[' | '{') a=star_named_expression ',' b=star_named_expressions for_if_clauses {
         RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, PyPegen_last_item(b, expr_ty),
         "did you forget parentheses around the comprehension target?") }
+    | '(' a=star_named_expression ',' b=star_named_expressions for_if_clauses ',' {
+        RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, PyPegen_last_item(b, expr_ty),
+        "did you forget parentheses around the comprehension target?") }
     | ('[' | '{') a=star_named_expression b=',' for_if_clauses {
         RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "did you forget parentheses around the comprehension target?") }
+    | '(' a=star_named_expression b=',' for_if_clauses ',' {
+        RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "did you forget parentheses around the comprehension target?") }
 invalid_dict_comprehension:
     | '{' a='**' bitwise_or for_if_clauses '}' {
         RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "dict unpacking cannot be used in dict comprehension") }

diff --git a/Include/internal/pycore_ast.h b/Include/internal/pycore_ast.h
diff --git a/Include/internal/pycore_ast_state.h b/Include/internal/pycore_ast_state.h
diff --git a/Include/internal/pycore_global_objects_fini_generated.h b/Include/internal/pycore_global_objects_fini_generated.h
diff --git a/Include/internal/pycore_global_strings.h b/Include/internal/pycore_global_strings.h
@@ -36,6 +36,7 @@ struct _Py_global_strings {
         STRUCT_FOR_STR(anon_null, "<NULL>")
         STRUCT_FOR_STR(anon_setcomp, "<setcomp>")
         STRUCT_FOR_STR(anon_string, "<string>")
+        STRUCT_FOR_STR(anon_tuplecomp, "<tuplecomp>")
         STRUCT_FOR_STR(anon_unknown, "<unknown>")
         STRUCT_FOR_STR(close_br, "}")
         STRUCT_FOR_STR(comm_at, "@")
@@ -724,6 +725,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(translate)
         STRUCT_FOR_ID(true)
         STRUCT_FOR_ID(truncate)
+        STRUCT_FOR_ID(tuplecomp)
         STRUCT_FOR_ID(twice)
         STRUCT_FOR_ID(txt)
         STRUCT_FOR_ID(type)

diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Include/internal/pycore_runtime_init_generated.h b/Include/internal/pycore_runtime_init_generated.h
diff --git a/Include/internal/pycore_symtable.h b/Include/internal/pycore_symtable.h
@@ -24,10 +24,11 @@ typedef enum _block_type {
 
 typedef enum _comprehension_type {
     NoComprehension = 0,
-    ListComprehension = 1,
-    DictComprehension = 2,
-    SetComprehension = 3,
-    GeneratorExpression = 4 } _Py_comprehension_ty;
+    ListComprehension,
+    TupleComprehension,
+    DictComprehension,
+    SetComprehension,
+    GeneratorExpression } _Py_comprehension_ty;
 
 struct _symtable_entry;
 

diff --git a/Include/internal/pycore_unicodeobject_generated.h b/Include/internal/pycore_unicodeobject_generated.h
diff --git a/Include/opcode_ids.h b/Include/opcode_ids.h
diff --git a/Lib/keyword.py b/Lib/keyword.py
diff --git a/Lib/opcode.py b/Lib/opcode.py
@@ -164,6 +164,8 @@ def def_op(name, op):
 def_op('DICT_MERGE', 164)
 def_op('DICT_UPDATE', 165)
 
+def_op('LIST_TO_TUPLE', 166)
+
 def_op('LOAD_FAST_LOAD_FAST', 168)
 def_op('STORE_FAST_LOAD_FAST', 169)
 def_op('STORE_FAST_STORE_FAST', 170)

diff --git a/Parser/Python.asdl b/Parser/Python.asdl
@@ -69,6 +69,7 @@ module Python
          | Dict(expr* keys, expr* values)
          | Set(expr* elts)
          | ListComp(expr elt, comprehension* generators)
+         | TupleComp(expr elt, comprehension* generators)
          | SetComp(expr elt, comprehension* generators)
          | DictComp(expr key, expr value, comprehension* generators)
          | GeneratorExp(expr elt, comprehension* generators)