Update standard macro expanders to give a more stable numbering across compilers/compiler options.

Split benchmarks from parser tests. Re-add parser unit tests to cloud build.

PiperOrigin-RevId: 721115170

Author: jnthntatum

parser/BUILD

@@ -171,6 +171,30 @@ cc_library(
 cc_test(
     name = "parser_test",
     srcs = ["parser_test.cc"],
+    deps = [
+        ":macro",
+        ":options",
+        ":parser",
+        ":source_factory",
+        "//base/ast_internal:ast_impl",
+        "//common:constant",
+        "//common:expr",
+        "//common:source",
+        "//internal:testing",
+        "//testutil:expr_printer",
+        "@com_google_absl//absl/algorithm:container",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/status:status_matchers",
+        "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/strings:str_format",
+        "@com_google_absl//absl/types:optional",
+        "@com_google_cel_spec//proto/cel/expr:syntax_cc_proto",
+    ],
+)
+
+cc_test(
+    name = "parser_benchmarks",
+    srcs = ["parser_benchmarks.cc"],
     tags = ["benchmark"],
     deps = [
         ":macro",
@@ -185,6 +209,7 @@ cc_test(
         "//internal:testing",
         "//testutil:expr_printer",
         "@com_google_absl//absl/algorithm:container",
+        "@com_google_absl//absl/log:absl_check",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:status_matchers",
         "@com_google_absl//absl/strings",

parser/macro.cc

@@ -164,12 +164,15 @@ absl::optional<Expr> ExpandExistsOneMacro(MacroExprFactory& factory,
   }
   auto init = factory.NewIntConst(0);
   auto condition = factory.NewBoolConst(true);
-  auto step =
-      factory.NewCall(CelOperator::CONDITIONAL, std::move(args[1]),
-                      factory.NewCall(CelOperator::ADD, factory.NewAccuIdent(),
-                                      factory.NewIntConst(1)),
-                      factory.NewAccuIdent());
-  auto result = factory.NewCall(CelOperator::EQUALS, factory.NewAccuIdent(),
+  auto accu_ident = factory.NewAccuIdent();
+  auto const_1 = factory.NewIntConst(1);
+  auto inc_step = factory.NewCall(CelOperator::ADD, std::move(accu_ident),
+                                  std::move(const_1));
+
+  auto step = factory.NewCall(CelOperator::CONDITIONAL, std::move(args[1]),
+                              std::move(inc_step), factory.NewAccuIdent());
+  accu_ident = factory.NewAccuIdent();
+  auto result = factory.NewCall(CelOperator::EQUALS, std::move(accu_ident),
                                 factory.NewIntConst(1));
   return factory.NewComprehension(args[0].ident_expr().name(),
                                   std::move(target), factory.AccuVarName(),
@@ -200,9 +203,11 @@ absl::optional<Expr> ExpandMap2Macro(MacroExprFactory& factory, Expr& target,
   }
   auto init = factory.NewList();
   auto condition = factory.NewBoolConst(true);
-  auto step = factory.NewCall(
-      CelOperator::ADD, factory.NewAccuIdent(),
-      factory.NewList(factory.NewListElement(std::move(args[1]))));
+  auto accu_ref = factory.NewAccuIdent();
+  auto accu_update =
+      factory.NewList(factory.NewListElement(std::move(args[1])));
+  auto step = factory.NewCall(CelOperator::ADD, std::move(accu_ref),
+                              std::move(accu_update));
   return factory.NewComprehension(args[0].ident_expr().name(),
                                   std::move(target), factory.AccuVarName(),
                                   std::move(init), std::move(condition),
@@ -231,9 +236,11 @@ absl::optional<Expr> ExpandMap3Macro(MacroExprFactory& factory, Expr& target,
   }
   auto init = factory.NewList();
   auto condition = factory.NewBoolConst(true);
-  auto step = factory.NewCall(
-      CelOperator::ADD, factory.NewAccuIdent(),
-      factory.NewList(factory.NewListElement(std::move(args[2]))));
+  auto accu_ref = factory.NewAccuIdent();
+  auto accu_update =
+      factory.NewList(factory.NewListElement(std::move(args[2])));
+  auto step = factory.NewCall(CelOperator::ADD, std::move(accu_ref),
+                              std::move(accu_update));
   step = factory.NewCall(CelOperator::CONDITIONAL, std::move(args[1]),
                          std::move(step), factory.NewAccuIdent());
   return factory.NewComprehension(args[0].ident_expr().name(),
@@ -266,9 +273,11 @@ absl::optional<Expr> ExpandFilterMacro(MacroExprFactory& factory, Expr& target,
 
   auto init = factory.NewList();
   auto condition = factory.NewBoolConst(true);
-  auto step = factory.NewCall(
-      CelOperator::ADD, factory.NewAccuIdent(),
-      factory.NewList(factory.NewListElement(std::move(args[0]))));
+  auto accu_ref = factory.NewAccuIdent();
+  auto accu_update =
+      factory.NewList(factory.NewListElement(std::move(args[0])));
+  auto step = factory.NewCall(CelOperator::ADD, std::move(accu_ref),
+                              std::move(accu_update));
   step = factory.NewCall(CelOperator::CONDITIONAL, std::move(args[1]),
                          std::move(step), factory.NewAccuIdent());
   return factory.NewComprehension(std::move(name), std::move(target),

parser/parser.cc

@@ -685,16 +685,6 @@ class ParserVisitor final : public CelBaseVisitor,
     return GlobalCallOrMacroImpl(expr_id, function, std::move(arguments));
   }
 
-  template <typename... Args>
-  Expr ReceiverCallOrMacro(int64_t expr_id, absl::string_view function,
-                           Expr target, Args&&... args) {
-    std::vector<Expr> arguments;
-    arguments.reserve(sizeof...(Args));
-    (arguments.push_back(std::forward<Args>(args)), ...);
-    return ReceiverCallOrMacroImpl(expr_id, function, std::move(target),
-                                   std::move(arguments));
-  }
-
   Expr GlobalCallOrMacroImpl(int64_t expr_id, absl::string_view function,
                              std::vector<Expr> args);
   Expr ReceiverCallOrMacroImpl(int64_t expr_id, absl::string_view function,