Default enable new accumulator variable.

PiperOrigin-RevId: 708371506
google · Dec 20, 2024 · b95bae4 · b95bae4
1 parent 8ce99ed
commit b95bae4
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 94 deletions.
diff --git a/compiler/compiler_factory_test.cc b/compiler/compiler_factory_test.cc
@@ -49,7 +49,7 @@ TEST(CompilerFactoryTest, Works) {
       NewCompilerBuilder(cel::internal::GetSharedTestingDescriptorPool()));
 
   ASSERT_THAT(builder->AddLibrary(StandardCheckerLibrary()), IsOk());
-
+  builder->GetParserBuilder().GetOptions().enable_hidden_accumulator_var = true;
   ASSERT_OK_AND_ASSIGN(auto compiler, std::move(*builder).Build());
 
   ASSERT_OK_AND_ASSIGN(
@@ -71,18 +71,18 @@ TEST(CompilerFactoryTest, Works) {
       "c"~string
     ]~list(string),
     // Accumulator
-    __result__,
+    @result,
     // Init
     false~bool,
     // LoopCondition
     @not_strictly_false(
       !_(
-        __result__~bool^__result__
+        @result~bool^@result
       )~bool^logical_not
     )~bool^not_strictly_false,
     // LoopStep
     _||_(
-      __result__~bool^__result__,
+      @result~bool^@result,
       @in(
         x~string^x,
         [
@@ -93,7 +93,7 @@ TEST(CompilerFactoryTest, Works) {
       )~bool^in_list
     )~bool^logical_or,
     // Result
-    __result__~bool^__result__)~bool,
+    @result~bool^@result)~bool,
   _<_(
     10~int,
     _-_(

diff --git a/extensions/comprehensions_v2_macros.cc b/extensions/comprehensions_v2_macros.cc
@@ -72,7 +72,7 @@ absl::optional<Expr> ExpandAllMacro2(MacroExprFactory& factory, Expr& target,
   auto result = factory.NewAccuIdent();
   return factory.NewComprehension(
       args[0].ident_expr().name(), args[1].ident_expr().name(),
-      std::move(target), kAccumulatorVariableName, std::move(init),
+      std::move(target), factory.AccuVarName(), std::move(init),
       std::move(condition), std::move(step), std::move(result));
 }
 
@@ -119,7 +119,7 @@ absl::optional<Expr> ExpandExistsMacro2(MacroExprFactory& factory, Expr& target,
   auto result = factory.NewAccuIdent();
   return factory.NewComprehension(
       args[0].ident_expr().name(), args[1].ident_expr().name(),
-      std::move(target), kAccumulatorVariableName, std::move(init),
+      std::move(target), factory.AccuVarName(), std::move(init),
       std::move(condition), std::move(step), std::move(result));
 }
 
@@ -172,7 +172,7 @@ absl::optional<Expr> ExpandExistsOneMacro2(MacroExprFactory& factory,
                                 factory.NewIntConst(1));
   return factory.NewComprehension(
       args[0].ident_expr().name(), args[1].ident_expr().name(),
-      std::move(target), kAccumulatorVariableName, std::move(init),
+      std::move(target), factory.AccuVarName(), std::move(init),
       std::move(condition), std::move(step), std::move(result));
 }
 
@@ -220,7 +220,7 @@ absl::optional<Expr> ExpandFilterMacro2(MacroExprFactory& factory, Expr& target,
   step = factory.NewCall(CelOperator::CONDITIONAL, std::move(args[2]),
                          std::move(step), factory.NewAccuIdent());
   return factory.NewComprehension(
-      name, name2, std::move(target), kAccumulatorVariableName, std::move(init),
+      name, name2, std::move(target), factory.AccuVarName(), std::move(init),
       std::move(condition), std::move(step), factory.NewAccuIdent());
 }
 
@@ -268,7 +268,7 @@ absl::optional<Expr> ExpandTransformList3Macro(MacroExprFactory& factory,
       CelOperator::ADD, factory.NewAccuIdent(),
       factory.NewList(factory.NewListElement(std::move(args[2]))));
   return factory.NewComprehension(std::move(iter_var), std::move(iter_var2),
-                                  std::move(target), kAccumulatorVariableName,
+                                  std::move(target), factory.AccuVarName(),
                                   factory.NewList(), factory.NewBoolConst(true),
                                   std::move(step), factory.NewAccuIdent());
 }
@@ -319,7 +319,7 @@ absl::optional<Expr> ExpandTransformList4Macro(MacroExprFactory& factory,
   step = factory.NewCall(CelOperator::CONDITIONAL, std::move(args[2]),
                          std::move(step), factory.NewAccuIdent());
   return factory.NewComprehension(std::move(iter_var), std::move(iter_var2),
-                                  std::move(target), kAccumulatorVariableName,
+                                  std::move(target), factory.AccuVarName(),
                                   factory.NewList(), factory.NewBoolConst(true),
                                   std::move(step), factory.NewAccuIdent());
 }
@@ -367,7 +367,7 @@ absl::optional<Expr> ExpandTransformMap3Macro(MacroExprFactory& factory,
   auto step = factory.NewCall("cel.@mapInsert", factory.NewAccuIdent(),
                               std::move(args[0]), std::move(args[2]));
   return factory.NewComprehension(std::move(iter_var), std::move(iter_var2),
-                                  std::move(target), kAccumulatorVariableName,
+                                  std::move(target), factory.AccuVarName(),
                                   factory.NewMap(), factory.NewBoolConst(true),
                                   std::move(step), factory.NewAccuIdent());
 }
@@ -417,7 +417,7 @@ absl::optional<Expr> ExpandTransformMap4Macro(MacroExprFactory& factory,
   step = factory.NewCall(CelOperator::CONDITIONAL, std::move(args[2]),
                          std::move(step), factory.NewAccuIdent());
   return factory.NewComprehension(std::move(iter_var), std::move(iter_var2),
-                                  std::move(target), kAccumulatorVariableName,
+                                  std::move(target), factory.AccuVarName(),
                                   factory.NewMap(), factory.NewBoolConst(true),
                                   std::move(step), factory.NewAccuIdent());
 }

diff --git a/parser/options.h b/parser/options.h
@@ -52,7 +52,7 @@ struct ParserOptions final {
   bool disable_standard_macros = false;
 
   // Enable hidden accumulator variable '@result' for builtin comprehensions.
-  bool enable_hidden_accumulator_var = false;
+  bool enable_hidden_accumulator_var = true;
 };
 
 }  // namespace cel