@@ -37,6 +37,7 @@ java_library(
3737 "//common:cel_ast" ,
3838 "//common:container" ,
3939 "//common:operator" ,
40+ "//common:options" ,
4041 "//common/annotations" ,
4142 "//common/ast" ,
4243 "//common/types" ,
@@ -59,11 +60,14 @@ java_library(
5960 srcs = ["PlannedProgram.java" ],
6061 deps = [
6162 ":error_metadata" ,
63+ ":execution_frame" ,
6264 ":planned_interpretable" ,
6365 ":strict_error_exception" ,
6466 "//:auto_value" ,
67+ "//common:options" ,
6568 "//common:runtime_exception" ,
6669 "//common/values" ,
70+ "//runtime" ,
6771 "//runtime:activation" ,
6872 "//runtime:evaluation_exception" ,
6973 "//runtime:evaluation_exception_builder" ,
@@ -78,11 +82,10 @@ java_library(
7882 name = "eval_const" ,
7983 srcs = ["EvalConstant.java" ],
8084 deps = [
85+ ":execution_frame" ,
8186 ":planned_interpretable" ,
8287 "//common/values" ,
8388 "//common/values:cel_byte_string" ,
84- "//runtime:evaluation_listener" ,
85- "//runtime:function_resolver" ,
8689 "//runtime:interpretable" ,
8790 "@maven//:com_google_errorprone_error_prone_annotations" ,
8891 "@maven//:com_google_guava_guava" ,
@@ -111,6 +114,7 @@ java_library(
111114 ],
112115 deps = [
113116 ":eval_helpers" ,
117+ ":execution_frame" ,
114118 ":planned_interpretable" ,
115119 ":qualifier" ,
116120 "//common:container" ,
@@ -158,10 +162,9 @@ java_library(
158162 srcs = ["EvalAttribute.java" ],
159163 deps = [
160164 ":attribute" ,
165+ ":execution_frame" ,
161166 ":interpretable_attribute" ,
162167 ":qualifier" ,
163- "//runtime:evaluation_listener" ,
164- "//runtime:function_resolver" ,
165168 "//runtime:interpretable" ,
166169 "@maven//:com_google_errorprone_error_prone_annotations" ,
167170 "@maven//:com_google_guava_guava" ,
@@ -172,12 +175,11 @@ java_library(
172175 name = "eval_test_only" ,
173176 srcs = ["EvalTestOnly.java" ],
174177 deps = [
178+ ":execution_frame" ,
175179 ":interpretable_attribute" ,
176180 ":presence_test_qualifier" ,
177181 ":qualifier" ,
178182 "//runtime:evaluation_exception" ,
179- "//runtime:evaluation_listener" ,
180- "//runtime:function_resolver" ,
181183 "//runtime:interpretable" ,
182184 "@maven//:com_google_errorprone_error_prone_annotations" ,
183185 ],
@@ -187,10 +189,9 @@ java_library(
187189 name = "eval_zero_arity" ,
188190 srcs = ["EvalZeroArity.java" ],
189191 deps = [
192+ ":execution_frame" ,
190193 ":planned_interpretable" ,
191194 "//runtime:evaluation_exception" ,
192- "//runtime:evaluation_listener" ,
193- "//runtime:function_resolver" ,
194195 "//runtime:interpretable" ,
195196 "//runtime:resolved_overload" ,
196197 ],
@@ -201,10 +202,9 @@ java_library(
201202 srcs = ["EvalUnary.java" ],
202203 deps = [
203204 ":eval_helpers" ,
205+ ":execution_frame" ,
204206 ":planned_interpretable" ,
205207 "//runtime:evaluation_exception" ,
206- "//runtime:evaluation_listener" ,
207- "//runtime:function_resolver" ,
208208 "//runtime:interpretable" ,
209209 "//runtime:resolved_overload" ,
210210 ],
@@ -215,10 +215,9 @@ java_library(
215215 srcs = ["EvalVarArgsCall.java" ],
216216 deps = [
217217 ":eval_helpers" ,
218+ ":execution_frame" ,
218219 ":planned_interpretable" ,
219220 "//runtime:evaluation_exception" ,
220- "//runtime:evaluation_listener" ,
221- "//runtime:function_resolver" ,
222221 "//runtime:interpretable" ,
223222 "//runtime:resolved_overload" ,
224223 ],
@@ -229,10 +228,9 @@ java_library(
229228 srcs = ["EvalOr.java" ],
230229 deps = [
231230 ":eval_helpers" ,
231+ ":execution_frame" ,
232232 ":planned_interpretable" ,
233233 "//common/values" ,
234- "//runtime:evaluation_listener" ,
235- "//runtime:function_resolver" ,
236234 "//runtime:interpretable" ,
237235 "@maven//:com_google_guava_guava" ,
238236 ],
@@ -243,10 +241,9 @@ java_library(
243241 srcs = ["EvalAnd.java" ],
244242 deps = [
245243 ":eval_helpers" ,
244+ ":execution_frame" ,
246245 ":planned_interpretable" ,
247246 "//common/values" ,
248- "//runtime:evaluation_listener" ,
249- "//runtime:function_resolver" ,
250247 "//runtime:interpretable" ,
251248 "@maven//:com_google_guava_guava" ,
252249 ],
@@ -256,10 +253,9 @@ java_library(
256253 name = "eval_conditional" ,
257254 srcs = ["EvalConditional.java" ],
258255 deps = [
256+ ":execution_frame" ,
259257 ":planned_interpretable" ,
260258 "//runtime:evaluation_exception" ,
261- "//runtime:evaluation_listener" ,
262- "//runtime:function_resolver" ,
263259 "//runtime:interpretable" ,
264260 "@maven//:com_google_guava_guava" ,
265261 ],
@@ -269,13 +265,12 @@ java_library(
269265 name = "eval_create_struct" ,
270266 srcs = ["EvalCreateStruct.java" ],
271267 deps = [
268+ ":execution_frame" ,
272269 ":planned_interpretable" ,
273270 "//common/types" ,
274271 "//common/values" ,
275272 "//common/values:cel_value_provider" ,
276273 "//runtime:evaluation_exception" ,
277- "//runtime:evaluation_listener" ,
278- "//runtime:function_resolver" ,
279274 "//runtime:interpretable" ,
280275 "@maven//:com_google_errorprone_error_prone_annotations" ,
281276 "@maven//:com_google_guava_guava" ,
@@ -286,10 +281,9 @@ java_library(
286281 name = "eval_create_list" ,
287282 srcs = ["EvalCreateList.java" ],
288283 deps = [
284+ ":execution_frame" ,
289285 ":planned_interpretable" ,
290286 "//runtime:evaluation_exception" ,
291- "//runtime:evaluation_listener" ,
292- "//runtime:function_resolver" ,
293287 "//runtime:interpretable" ,
294288 "@maven//:com_google_errorprone_error_prone_annotations" ,
295289 "@maven//:com_google_guava_guava" ,
@@ -300,10 +294,9 @@ java_library(
300294 name = "eval_create_map" ,
301295 srcs = ["EvalCreateMap.java" ],
302296 deps = [
297+ ":execution_frame" ,
303298 ":planned_interpretable" ,
304299 "//runtime:evaluation_exception" ,
305- "//runtime:evaluation_listener" ,
306- "//runtime:function_resolver" ,
307300 "//runtime:interpretable" ,
308301 "@maven//:com_google_errorprone_error_prone_annotations" ,
309302 "@maven//:com_google_guava_guava" ,
@@ -314,22 +307,33 @@ java_library(
314307 name = "eval_fold" ,
315308 srcs = ["EvalFold.java" ],
316309 deps = [
310+ ":execution_frame" ,
317311 ":planned_interpretable" ,
318312 "//runtime:concatenated_list_view" ,
319313 "//runtime:evaluation_exception" ,
320- "//runtime:evaluation_listener" ,
321- "//runtime:function_resolver" ,
322314 "//runtime:interpretable" ,
323315 "@maven//:com_google_errorprone_error_prone_annotations" ,
324316 "@maven//:com_google_guava_guava" ,
325317 "@maven//:org_jspecify_jspecify" ,
326318 ],
327319)
328320
321+ java_library (
322+ name = "execution_frame" ,
323+ srcs = ["ExecutionFrame.java" ],
324+ deps = [
325+ "//common:options" ,
326+ "//common/exceptions:iteration_budget_exceeded" ,
327+ "//runtime:interpretable" ,
328+ "@maven//:org_jspecify_jspecify" ,
329+ ],
330+ )
331+
329332java_library (
330333 name = "eval_helpers" ,
331334 srcs = ["EvalHelpers.java" ],
332335 deps = [
336+ ":execution_frame" ,
333337 ":planned_interpretable" ,
334338 ":strict_error_exception" ,
335339 "//common:error_codes" ,
@@ -362,6 +366,8 @@ java_library(
362366 name = "planned_interpretable" ,
363367 srcs = ["PlannedInterpretable.java" ],
364368 deps = [
369+ ":execution_frame" ,
370+ "//runtime:evaluation_exception" ,
365371 "//runtime:interpretable" ,
366372 "@maven//:com_google_errorprone_error_prone_annotations" ,
367373 ],
0 commit comments