optimize piping

thatbirdguythatuknownot · Sep 1, 2023 · 762398e · 762398e
1 parent 0b76892
commit 762398e
Show file tree

Hide file tree

Showing 17 changed files with 128 additions and 53 deletions.
diff --git a/Grammar/python.gram b/Grammar/python.gram
@@ -869,7 +869,7 @@ atom[expr_ty]:
     | 'None' { _PyAST_Constant(Py_None, NULL, EXTRA) }
     | a='$' {
         p->subn > 0 ?
-        _PyAST_Template(EXTRA) :
+        _PyAST_Template(0, EXTRA) :
         RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "template not in righthand side of pipe operation") }
     | &(STRING|FSTRING_START) strings
     | NUMBER

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_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/opcode_ids.h b/Include/opcode_ids.h
diff --git a/Lib/opcode.py b/Lib/opcode.py
@@ -159,6 +159,8 @@ def def_op(name, op):
 def_op('BUILD_STRING', 157)
 def_op('CONVERT_VALUE', 158)
 
+def_op('SWAP_N', 159)
+
 def_op('LIST_EXTEND', 162)
 def_op('SET_UPDATE', 163)
 def_op('DICT_MERGE', 164)

diff --git a/Parser/Python.asdl b/Parser/Python.asdl
@@ -84,7 +84,7 @@ module Python
          | FormattedValue(expr value, int conversion, expr? format_spec)
          | JoinedStr(expr* values)
          | Constant(constant value, string? kind)
-         | Template()
+         | Template(int last)
 
          -- the following expression can appear in assignment context
          | Attribute(expr value, identifier attr, expr_context ctx)

diff --git a/Parser/parser.c b/Parser/parser.c
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
diff --git a/Python/ast_opt.c b/Python/ast_opt.c
@@ -691,17 +691,17 @@ fold_compare(expr_ty node, PyArena *arena, _PyASTOptimizeState *state)
     } \
 }
 
-static int fold_comp_compinternal(comprehension_ty, int *, expr_ty,
+static int fold_comp_compinternal(comprehension_ty, expr_ty *, expr_ty,
                                   _PyASTOptimizeState *);
-static int fold_comp_keywordinternal(keyword_ty, int *, expr_ty,
+static int fold_comp_keywordinternal(keyword_ty, expr_ty *, expr_ty,
                                      _PyASTOptimizeState *);
-static int fold_comp_argumentsinternal(arguments_ty, int *, expr_ty,
+static int fold_comp_argumentsinternal(arguments_ty, expr_ty *, expr_ty,
                                        _PyASTOptimizeState *);
-static int fold_comp_arginternal(arg_ty, int *, expr_ty,
+static int fold_comp_arginternal(arg_ty, expr_ty *, expr_ty,
                                  _PyASTOptimizeState *);
 
 static int
-fold_comp_internal(expr_ty node_, int *ptr, expr_ty sub,
+fold_comp_internal(expr_ty node_, expr_ty *ptr, expr_ty sub,
                    _PyASTOptimizeState *state)
 {
     switch (node_->kind) {
@@ -814,7 +814,7 @@ fold_comp_internal(expr_ty node_, int *ptr, expr_ty sub,
         if (sub) {
             COPY_NODE(node_, sub);
         }
-        *ptr = 1;
+        *ptr = node_;
         break;
     case Composition_kind:
     case Name_kind:
@@ -826,7 +826,7 @@ fold_comp_internal(expr_ty node_, int *ptr, expr_ty sub,
 }
 
 static int
-fold_comp_compinternal(comprehension_ty node_, int *ptr, expr_ty sub,
+fold_comp_compinternal(comprehension_ty node_, expr_ty *ptr, expr_ty sub,
                        _PyASTOptimizeState *state)
 {
     CALL(node_->target);
@@ -836,15 +836,15 @@ fold_comp_compinternal(comprehension_ty node_, int *ptr, expr_ty sub,
 }
 
 static int
-fold_comp_keywordinternal(keyword_ty node_, int *ptr, expr_ty sub,
+fold_comp_keywordinternal(keyword_ty node_, expr_ty *ptr, expr_ty sub,
                           _PyASTOptimizeState *state)
 {
     CALL(node_->value);
     return 1;
 }
 
 static int
-fold_comp_argumentsinternal(arguments_ty node_, int *ptr, expr_ty sub,
+fold_comp_argumentsinternal(arguments_ty node_, expr_ty *ptr, expr_ty sub,
                             _PyASTOptimizeState *state)
 {
     CALL_SEQ(fold_comp_arginternal, arg, node_->posonlyargs);
@@ -862,7 +862,7 @@ fold_comp_argumentsinternal(arguments_ty node_, int *ptr, expr_ty sub,
 }
 
 static int
-fold_comp_arginternal(arg_ty node_, int *ptr, expr_ty sub,
+fold_comp_arginternal(arg_ty node_, expr_ty *ptr, expr_ty sub,
                       _PyASTOptimizeState *state)
 {
     if (!(state->ff_features & CO_FUTURE_ANNOTATIONS)) {
@@ -878,7 +878,8 @@ fold_comp(expr_ty node, PyArena *arena, _PyASTOptimizeState *state)
 {
     expr_ty arg;
     expr_ty func;
-    int ptr = 0, constant = 1;
+    expr_ty ptr = NULL;
+    int constant = 1;
 
     arg = node->v.Composition.arg;
     if (arg->kind != Constant_kind) {
@@ -902,9 +903,12 @@ fold_comp(expr_ty node, PyArena *arena, _PyASTOptimizeState *state)
         node->v.Call.args = seq;
         node->v.Call.keywords = NULL;
     }
-    else if (constant) {
-        COPY_NODE(node, func);
-        return astfold_expr(node, arena, state); /* second pass */
+    else {
+        if (constant) {
+            COPY_NODE(node, func);
+            return astfold_expr(node, arena, state); /* second pass */
+        }
+        ptr->v.Template.last = 1;
     }
 
     return 1;