From 20ae5eeeb9577f24bf27bcb74f17b92257d0e1a8 Mon Sep 17 00:00:00 2001 From: Mike Voronov Date: Mon, 7 Aug 2023 20:00:02 +0300 Subject: [PATCH] feat(execution-engine): rename boxed_values into value_types (#664) --- .../execution_context/scalar_variables.rs | 4 ++-- .../execution_context/stream_maps_variables.rs | 2 +- .../instructions/ap/apply_to_arguments.rs | 6 +++--- .../instructions/call/resolved_call.rs | 2 +- air/src/execution_step/instructions/canon.rs | 4 ++-- .../instructions/canon_stream_map_scalar.rs | 4 ++-- .../instructions/canon_utils/mod.rs | 2 +- air/src/execution_step/instructions/fold/mod.rs | 2 +- .../execution_step/instructions/fold/utils.rs | 4 ++-- .../execution_step/instructions/fold_scalar.rs | 2 +- .../execution_step/instructions/fold_stream.rs | 2 +- .../fold_stream/stream_execute_helpers.rs | 8 ++++---- air/src/execution_step/instructions/mod.rs | 2 +- air/src/execution_step/mod.rs | 16 ++++++++-------- .../execution_step/resolver/resolvable_impl.rs | 2 +- .../{boxed_value => value_types}/canon_stream.rs | 0 .../{boxed_value => value_types}/iterable.rs | 0 .../iterable/canon_stream.rs | 4 ++-- .../iterable/lambda_result.rs | 0 .../iterable/resolved_call.rs | 0 .../iterable/vec_resolved_call.rs | 0 .../{boxed_value => value_types}/jvaluable.rs | 0 .../jvaluable/canon_stream.rs | 2 +- .../jvaluable/cell_vec_resolved_call_result.rs | 2 +- .../jvaluable/iterable_item.rs | 2 +- .../jvaluable/resolved_call_result.rs | 2 +- .../{boxed_value => value_types}/mod.rs | 0 .../{boxed_value => value_types}/scalar.rs | 0 .../scalar/values.rs | 0 .../{boxed_value => value_types}/stream/mod.rs | 0 .../stream/recursive_stream.rs | 6 +++--- .../stream/stream_definition.rs | 2 +- .../stream/values_matrix.rs | 0 .../{boxed_value => value_types}/stream_map.rs | 4 ++-- .../{boxed_value => value_types}/utils.rs | 0 35 files changed, 43 insertions(+), 43 deletions(-) rename air/src/execution_step/{boxed_value => value_types}/canon_stream.rs (100%) rename air/src/execution_step/{boxed_value => value_types}/iterable.rs (100%) rename air/src/execution_step/{boxed_value => value_types}/iterable/canon_stream.rs (94%) rename air/src/execution_step/{boxed_value => value_types}/iterable/lambda_result.rs (100%) rename air/src/execution_step/{boxed_value => value_types}/iterable/resolved_call.rs (100%) rename air/src/execution_step/{boxed_value => value_types}/iterable/vec_resolved_call.rs (100%) rename air/src/execution_step/{boxed_value => value_types}/jvaluable.rs (100%) rename air/src/execution_step/{boxed_value => value_types}/jvaluable/canon_stream.rs (98%) rename air/src/execution_step/{boxed_value => value_types}/jvaluable/cell_vec_resolved_call_result.rs (97%) rename air/src/execution_step/{boxed_value => value_types}/jvaluable/iterable_item.rs (97%) rename air/src/execution_step/{boxed_value => value_types}/jvaluable/resolved_call_result.rs (96%) rename air/src/execution_step/{boxed_value => value_types}/mod.rs (100%) rename air/src/execution_step/{boxed_value => value_types}/scalar.rs (100%) rename air/src/execution_step/{boxed_value => value_types}/scalar/values.rs (100%) rename air/src/execution_step/{boxed_value => value_types}/stream/mod.rs (100%) rename air/src/execution_step/{boxed_value => value_types}/stream/recursive_stream.rs (98%) rename air/src/execution_step/{boxed_value => value_types}/stream/stream_definition.rs (99%) rename air/src/execution_step/{boxed_value => value_types}/stream/values_matrix.rs (100%) rename air/src/execution_step/{boxed_value => value_types}/stream_map.rs (98%) rename air/src/execution_step/{boxed_value => value_types}/utils.rs (100%) diff --git a/air/src/execution_step/execution_context/scalar_variables.rs b/air/src/execution_step/execution_context/scalar_variables.rs index 60426031..c23d62a3 100644 --- a/air/src/execution_step/execution_context/scalar_variables.rs +++ b/air/src/execution_step/execution_context/scalar_variables.rs @@ -16,9 +16,9 @@ mod values_sparse_matrix; -use crate::execution_step::boxed_value::CanonStreamWithProvenance; -use crate::execution_step::boxed_value::ScalarRef; use crate::execution_step::errors_prelude::*; +use crate::execution_step::value_types::CanonStreamWithProvenance; +use crate::execution_step::value_types::ScalarRef; use crate::execution_step::ExecutionResult; use crate::execution_step::FoldState; use crate::execution_step::ValueAggregate; diff --git a/air/src/execution_step/execution_context/stream_maps_variables.rs b/air/src/execution_step/execution_context/stream_maps_variables.rs index 55bb36a6..4c02d218 100644 --- a/air/src/execution_step/execution_context/stream_maps_variables.rs +++ b/air/src/execution_step/execution_context/stream_maps_variables.rs @@ -18,7 +18,7 @@ pub(crate) mod errors; pub(crate) mod stream_map_key; use self::stream_map_key::StreamMapKey; -use crate::execution_step::boxed_value::StreamMap; +use crate::execution_step::value_types::StreamMap; use crate::execution_step::ExecutionResult; use crate::execution_step::Generation; use crate::execution_step::ValueAggregate; diff --git a/air/src/execution_step/instructions/ap/apply_to_arguments.rs b/air/src/execution_step/instructions/ap/apply_to_arguments.rs index 2481167e..8127ba5a 100644 --- a/air/src/execution_step/instructions/ap/apply_to_arguments.rs +++ b/air/src/execution_step/instructions/ap/apply_to_arguments.rs @@ -15,8 +15,8 @@ */ use super::*; -use crate::execution_step::boxed_value::TracePosOperate; use crate::execution_step::resolver::Resolvable; +use crate::execution_step::value_types::TracePosOperate; use crate::execution_step::CanonResultAggregate; use crate::execution_step::LiteralAggregate; use crate::execution_step::PEEK_ALLOWED_ON_NON_EMPTY; @@ -126,7 +126,7 @@ fn apply_canon_stream( trace_ctx: &TraceHandler, ) -> ExecutionResult { // TODO: refactor this code after boxed value - use crate::execution_step::boxed_value::JValuable; + use crate::execution_step::value_types::JValuable; let canon_stream = exec_ctx.scalars.get_canon_stream(ast_stream.name)?; let value = JValuable::as_jvalue(&&canon_stream.canon_stream).into_owned(); @@ -148,7 +148,7 @@ fn apply_canon_stream_wl( trace_ctx: &TraceHandler, ) -> ExecutionResult { // TODO: refactor this code after boxed value - use crate::execution_step::boxed_value::JValuable; + use crate::execution_step::value_types::JValuable; let canon_stream = exec_ctx.scalars.get_canon_stream(ast_stream.name)?; let canon_stream_value = &canon_stream.canon_stream; diff --git a/air/src/execution_step/instructions/call/resolved_call.rs b/air/src/execution_step/instructions/call/resolved_call.rs index e531402b..3edd1ac5 100644 --- a/air/src/execution_step/instructions/call/resolved_call.rs +++ b/air/src/execution_step/instructions/call/resolved_call.rs @@ -245,7 +245,7 @@ impl<'i> ResolvedCall<'i> { /// Check output type name for being already in execution context. // TODO: this check should be moved on a parsing stage fn check_output_name(output: &ast::CallOutputValue<'_>, exec_ctx: &ExecutionCtx<'_>) -> ExecutionResult<()> { - use crate::execution_step::boxed_value::ScalarRef; + use crate::execution_step::value_types::ScalarRef; let scalar_name = match output { ast::CallOutputValue::Scalar(scalar) => scalar.name, diff --git a/air/src/execution_step/instructions/canon.rs b/air/src/execution_step/instructions/canon.rs index 8b81aff3..99498b3f 100644 --- a/air/src/execution_step/instructions/canon.rs +++ b/air/src/execution_step/instructions/canon.rs @@ -21,8 +21,8 @@ use super::canon_utils::CreateCanonStreamClosure; use super::ExecutionCtx; use super::ExecutionResult; use super::TraceHandler; -use crate::execution_step::boxed_value::CanonStream; -use crate::execution_step::boxed_value::CanonStreamWithProvenance; +use crate::execution_step::value_types::CanonStream; +use crate::execution_step::value_types::CanonStreamWithProvenance; use crate::log_instruction; use crate::trace_to_exec_err; diff --git a/air/src/execution_step/instructions/canon_stream_map_scalar.rs b/air/src/execution_step/instructions/canon_stream_map_scalar.rs index b2939d61..92d3cba9 100644 --- a/air/src/execution_step/instructions/canon_stream_map_scalar.rs +++ b/air/src/execution_step/instructions/canon_stream_map_scalar.rs @@ -21,8 +21,8 @@ use super::canon_utils::CreateCanonStreamClosure; use super::ExecutionCtx; use super::ExecutionResult; use super::TraceHandler; -use crate::execution_step::boxed_value::CanonStream; -use crate::execution_step::boxed_value::JValuable; +use crate::execution_step::value_types::CanonStream; +use crate::execution_step::value_types::JValuable; use crate::execution_step::CanonResultAggregate; use crate::execution_step::ValueAggregate; use crate::log_instruction; diff --git a/air/src/execution_step/instructions/canon_utils/mod.rs b/air/src/execution_step/instructions/canon_utils/mod.rs index 212818ee..ab2a7c60 100644 --- a/air/src/execution_step/instructions/canon_utils/mod.rs +++ b/air/src/execution_step/instructions/canon_utils/mod.rs @@ -14,9 +14,9 @@ * limitations under the License. */ -use crate::execution_step::boxed_value::CanonStream; use crate::execution_step::errors::UncatchableError; use crate::execution_step::instructions::resolve_peer_id_to_string; +use crate::execution_step::value_types::CanonStream; use crate::execution_step::ExecutionCtx; use crate::execution_step::ExecutionResult; use crate::execution_step::TraceHandler; diff --git a/air/src/execution_step/instructions/fold/mod.rs b/air/src/execution_step/instructions/fold/mod.rs index d9095a2e..e5ea3a31 100644 --- a/air/src/execution_step/instructions/fold/mod.rs +++ b/air/src/execution_step/instructions/fold/mod.rs @@ -25,4 +25,4 @@ use super::ExecutionCtx; use super::ExecutionResult; use super::Instruction; use super::ScalarRef; -use crate::execution_step::boxed_value::*; +use crate::execution_step::value_types::*; diff --git a/air/src/execution_step/instructions/fold/utils.rs b/air/src/execution_step/instructions/fold/utils.rs index 2b71a0ee..ba7dd866 100644 --- a/air/src/execution_step/instructions/fold/utils.rs +++ b/air/src/execution_step/instructions/fold/utils.rs @@ -15,8 +15,8 @@ */ use super::*; -use crate::execution_step::boxed_value::populate_tetraplet_with_lambda; -use crate::execution_step::boxed_value::IterableValue; +use crate::execution_step::value_types::populate_tetraplet_with_lambda; +use crate::execution_step::value_types::IterableValue; use crate::execution_step::CatchableError; use crate::execution_step::PEEK_ALLOWED_ON_NON_EMPTY; use crate::JValue; diff --git a/air/src/execution_step/instructions/fold_scalar.rs b/air/src/execution_step/instructions/fold_scalar.rs index fdf9bfad..bd36356a 100644 --- a/air/src/execution_step/instructions/fold_scalar.rs +++ b/air/src/execution_step/instructions/fold_scalar.rs @@ -19,7 +19,7 @@ use super::ExecutableInstruction; use super::ExecutionCtx; use super::ExecutionResult; use super::TraceHandler; -use crate::execution_step::boxed_value::IterableValue; +use crate::execution_step::value_types::IterableValue; use crate::execution_step::Joinable; use crate::joinable; use crate::log_instruction; diff --git a/air/src/execution_step/instructions/fold_stream.rs b/air/src/execution_step/instructions/fold_stream.rs index c63dba54..5908cebf 100644 --- a/air/src/execution_step/instructions/fold_stream.rs +++ b/air/src/execution_step/instructions/fold_stream.rs @@ -21,8 +21,8 @@ use super::ExecutableInstruction; use super::ExecutionCtx; use super::ExecutionResult; use super::TraceHandler; -use crate::execution_step::boxed_value::Stream; use crate::execution_step::instructions::fold_stream::stream_execute_helpers::execute_with_stream; +use crate::execution_step::value_types::Stream; use crate::log_instruction; use air_parser::ast::FoldStream; diff --git a/air/src/execution_step/instructions/fold_stream/stream_execute_helpers.rs b/air/src/execution_step/instructions/fold_stream/stream_execute_helpers.rs index 3b220ed5..a73fec94 100644 --- a/air/src/execution_step/instructions/fold_stream/stream_execute_helpers.rs +++ b/air/src/execution_step/instructions/fold_stream/stream_execute_helpers.rs @@ -18,12 +18,12 @@ use super::completeness_updater::FoldGenerationObserver; use super::ExecutionCtx; use super::ExecutionResult; use super::TraceHandler; -use crate::execution_step::boxed_value::IterableValue; -use crate::execution_step::boxed_value::RecursiveCursorState; -use crate::execution_step::boxed_value::RecursiveStreamCursor; -use crate::execution_step::boxed_value::Stream; use crate::execution_step::instructions::fold::IterableType; use crate::execution_step::instructions::fold_scalar::fold; +use crate::execution_step::value_types::IterableValue; +use crate::execution_step::value_types::RecursiveCursorState; +use crate::execution_step::value_types::RecursiveStreamCursor; +use crate::execution_step::value_types::Stream; use crate::trace_to_exec_err; use air_parser::ast::Instruction; diff --git a/air/src/execution_step/instructions/mod.rs b/air/src/execution_step/instructions/mod.rs index c112aa13..e8e6ca6d 100644 --- a/air/src/execution_step/instructions/mod.rs +++ b/air/src/execution_step/instructions/mod.rs @@ -39,7 +39,7 @@ mod xor; pub(crate) use call::triplet::resolve_peer_id_to_string; pub(crate) use fold::FoldState; -use super::boxed_value::ScalarRef; +use super::value_types::ScalarRef; use super::ExecutionCtx; use super::ExecutionError; use super::ExecutionResult; diff --git a/air/src/execution_step/mod.rs b/air/src/execution_step/mod.rs index dd54cabd..26850cad 100644 --- a/air/src/execution_step/mod.rs +++ b/air/src/execution_step/mod.rs @@ -14,12 +14,12 @@ * limitations under the License. */ -mod boxed_value; mod errors; pub(crate) mod execution_context; mod instructions; mod lambda_applier; mod resolver; +mod value_types; const PEEK_ALLOWED_ON_NON_EMPTY: &str = "peek always return elements inside fold,\ this guaranteed by implementation of next and avoiding empty folds"; @@ -40,17 +40,17 @@ pub mod errors_prelude { pub(super) use self::instructions::ExecutableInstruction; pub(super) use self::instructions::FoldState; -pub(super) use boxed_value::CanonResultAggregate; -pub(super) use boxed_value::Generation; -pub(super) use boxed_value::LiteralAggregate; -pub(super) use boxed_value::ScalarRef; -pub(super) use boxed_value::ServiceResultAggregate; -pub(super) use boxed_value::Stream; -pub(super) use boxed_value::ValueAggregate; pub(crate) use errors::Joinable; pub(crate) use errors::LastErrorAffectable; pub(crate) use execution_context::ExecutionCtx; pub(crate) use execution_context::LastError; +pub(super) use value_types::CanonResultAggregate; +pub(super) use value_types::Generation; +pub(super) use value_types::LiteralAggregate; +pub(super) use value_types::ScalarRef; +pub(super) use value_types::ServiceResultAggregate; +pub(super) use value_types::Stream; +pub(super) use value_types::ValueAggregate; pub(crate) use air_trace_handler::TraceHandler; diff --git a/air/src/execution_step/resolver/resolvable_impl.rs b/air/src/execution_step/resolver/resolvable_impl.rs index c6899a41..fa69d671 100644 --- a/air/src/execution_step/resolver/resolvable_impl.rs +++ b/air/src/execution_step/resolver/resolvable_impl.rs @@ -16,9 +16,9 @@ use super::RcSecurityTetraplets; use super::Resolvable; -use crate::execution_step::boxed_value::JValuable; use crate::execution_step::execution_context::ExecutionCtx; use crate::execution_step::lambda_applier::select_by_lambda_from_scalar; +use crate::execution_step::value_types::JValuable; use crate::execution_step::ExecutionResult; use crate::JValue; use crate::LambdaAST; diff --git a/air/src/execution_step/boxed_value/canon_stream.rs b/air/src/execution_step/value_types/canon_stream.rs similarity index 100% rename from air/src/execution_step/boxed_value/canon_stream.rs rename to air/src/execution_step/value_types/canon_stream.rs diff --git a/air/src/execution_step/boxed_value/iterable.rs b/air/src/execution_step/value_types/iterable.rs similarity index 100% rename from air/src/execution_step/boxed_value/iterable.rs rename to air/src/execution_step/value_types/iterable.rs diff --git a/air/src/execution_step/boxed_value/iterable/canon_stream.rs b/air/src/execution_step/value_types/iterable/canon_stream.rs similarity index 94% rename from air/src/execution_step/boxed_value/iterable/canon_stream.rs rename to air/src/execution_step/value_types/iterable/canon_stream.rs index 0d5efd2a..f87e0360 100644 --- a/air/src/execution_step/boxed_value/iterable/canon_stream.rs +++ b/air/src/execution_step/value_types/iterable/canon_stream.rs @@ -16,8 +16,8 @@ use super::Iterable; use super::IterableItem; -use crate::execution_step::boxed_value::CanonStream; -use crate::execution_step::boxed_value::TracePosOperate; +use crate::execution_step::value_types::CanonStream; +use crate::execution_step::value_types::TracePosOperate; use crate::foldable_next; use crate::foldable_prev; diff --git a/air/src/execution_step/boxed_value/iterable/lambda_result.rs b/air/src/execution_step/value_types/iterable/lambda_result.rs similarity index 100% rename from air/src/execution_step/boxed_value/iterable/lambda_result.rs rename to air/src/execution_step/value_types/iterable/lambda_result.rs diff --git a/air/src/execution_step/boxed_value/iterable/resolved_call.rs b/air/src/execution_step/value_types/iterable/resolved_call.rs similarity index 100% rename from air/src/execution_step/boxed_value/iterable/resolved_call.rs rename to air/src/execution_step/value_types/iterable/resolved_call.rs diff --git a/air/src/execution_step/boxed_value/iterable/vec_resolved_call.rs b/air/src/execution_step/value_types/iterable/vec_resolved_call.rs similarity index 100% rename from air/src/execution_step/boxed_value/iterable/vec_resolved_call.rs rename to air/src/execution_step/value_types/iterable/vec_resolved_call.rs diff --git a/air/src/execution_step/boxed_value/jvaluable.rs b/air/src/execution_step/value_types/jvaluable.rs similarity index 100% rename from air/src/execution_step/boxed_value/jvaluable.rs rename to air/src/execution_step/value_types/jvaluable.rs diff --git a/air/src/execution_step/boxed_value/jvaluable/canon_stream.rs b/air/src/execution_step/value_types/jvaluable/canon_stream.rs similarity index 98% rename from air/src/execution_step/boxed_value/jvaluable/canon_stream.rs rename to air/src/execution_step/value_types/jvaluable/canon_stream.rs index 84b5ce1e..77333eed 100644 --- a/air/src/execution_step/boxed_value/jvaluable/canon_stream.rs +++ b/air/src/execution_step/value_types/jvaluable/canon_stream.rs @@ -17,7 +17,7 @@ use super::select_by_lambda_from_stream; use super::ExecutionResult; use super::JValuable; -use crate::execution_step::boxed_value::CanonStream; +use crate::execution_step::value_types::CanonStream; use crate::execution_step::ExecutionCtx; use crate::execution_step::RcSecurityTetraplets; use crate::JValue; diff --git a/air/src/execution_step/boxed_value/jvaluable/cell_vec_resolved_call_result.rs b/air/src/execution_step/value_types/jvaluable/cell_vec_resolved_call_result.rs similarity index 97% rename from air/src/execution_step/boxed_value/jvaluable/cell_vec_resolved_call_result.rs rename to air/src/execution_step/value_types/jvaluable/cell_vec_resolved_call_result.rs index 69533acd..5a87e60c 100644 --- a/air/src/execution_step/boxed_value/jvaluable/cell_vec_resolved_call_result.rs +++ b/air/src/execution_step/value_types/jvaluable/cell_vec_resolved_call_result.rs @@ -18,7 +18,7 @@ use super::select_by_lambda_from_stream; use super::ExecutionResult; use super::JValuable; use super::ValueAggregate; -use crate::execution_step::boxed_value::populate_tetraplet_with_lambda; +use crate::execution_step::value_types::populate_tetraplet_with_lambda; use crate::execution_step::ExecutionCtx; use crate::execution_step::RcSecurityTetraplets; use crate::JValue; diff --git a/air/src/execution_step/boxed_value/jvaluable/iterable_item.rs b/air/src/execution_step/value_types/jvaluable/iterable_item.rs similarity index 97% rename from air/src/execution_step/boxed_value/jvaluable/iterable_item.rs rename to air/src/execution_step/value_types/jvaluable/iterable_item.rs index b7eee3ac..c927b9dc 100644 --- a/air/src/execution_step/boxed_value/jvaluable/iterable_item.rs +++ b/air/src/execution_step/value_types/jvaluable/iterable_item.rs @@ -19,7 +19,7 @@ use super::ExecutionResult; use super::IterableItem; use super::JValuable; use super::LambdaAST; -use crate::execution_step::boxed_value::populate_tetraplet_with_lambda; +use crate::execution_step::value_types::populate_tetraplet_with_lambda; use crate::execution_step::ExecutionCtx; use crate::execution_step::RcSecurityTetraplets; use crate::JValue; diff --git a/air/src/execution_step/boxed_value/jvaluable/resolved_call_result.rs b/air/src/execution_step/value_types/jvaluable/resolved_call_result.rs similarity index 96% rename from air/src/execution_step/boxed_value/jvaluable/resolved_call_result.rs rename to air/src/execution_step/value_types/jvaluable/resolved_call_result.rs index 7cc4cf1b..f42c3287 100644 --- a/air/src/execution_step/boxed_value/jvaluable/resolved_call_result.rs +++ b/air/src/execution_step/value_types/jvaluable/resolved_call_result.rs @@ -19,7 +19,7 @@ use super::ExecutionResult; use super::JValuable; use super::LambdaAST; use super::ValueAggregate; -use crate::execution_step::boxed_value::populate_tetraplet_with_lambda; +use crate::execution_step::value_types::populate_tetraplet_with_lambda; use crate::execution_step::ExecutionCtx; use crate::execution_step::RcSecurityTetraplets; use crate::JValue; diff --git a/air/src/execution_step/boxed_value/mod.rs b/air/src/execution_step/value_types/mod.rs similarity index 100% rename from air/src/execution_step/boxed_value/mod.rs rename to air/src/execution_step/value_types/mod.rs diff --git a/air/src/execution_step/boxed_value/scalar.rs b/air/src/execution_step/value_types/scalar.rs similarity index 100% rename from air/src/execution_step/boxed_value/scalar.rs rename to air/src/execution_step/value_types/scalar.rs diff --git a/air/src/execution_step/boxed_value/scalar/values.rs b/air/src/execution_step/value_types/scalar/values.rs similarity index 100% rename from air/src/execution_step/boxed_value/scalar/values.rs rename to air/src/execution_step/value_types/scalar/values.rs diff --git a/air/src/execution_step/boxed_value/stream/mod.rs b/air/src/execution_step/value_types/stream/mod.rs similarity index 100% rename from air/src/execution_step/boxed_value/stream/mod.rs rename to air/src/execution_step/value_types/stream/mod.rs diff --git a/air/src/execution_step/boxed_value/stream/recursive_stream.rs b/air/src/execution_step/value_types/stream/recursive_stream.rs similarity index 98% rename from air/src/execution_step/boxed_value/stream/recursive_stream.rs rename to air/src/execution_step/value_types/stream/recursive_stream.rs index 2689f816..94cd659f 100644 --- a/air/src/execution_step/boxed_value/stream/recursive_stream.rs +++ b/air/src/execution_step/value_types/stream/recursive_stream.rs @@ -15,9 +15,9 @@ */ use super::Stream; -use crate::execution_step::boxed_value::Iterable; -use crate::execution_step::boxed_value::IterableItem; -use crate::execution_step::boxed_value::IterableVecResolvedCall; +use crate::execution_step::value_types::Iterable; +use crate::execution_step::value_types::IterableItem; +use crate::execution_step::value_types::IterableVecResolvedCall; use crate::execution_step::ValueAggregate; use air_interpreter_data::GenerationIdx; diff --git a/air/src/execution_step/boxed_value/stream/stream_definition.rs b/air/src/execution_step/value_types/stream/stream_definition.rs similarity index 99% rename from air/src/execution_step/boxed_value/stream/stream_definition.rs rename to air/src/execution_step/value_types/stream/stream_definition.rs index e82a3141..d5e965bb 100644 --- a/air/src/execution_step/boxed_value/stream/stream_definition.rs +++ b/air/src/execution_step/value_types/stream/stream_definition.rs @@ -17,7 +17,7 @@ use super::values_matrix::NewValuesMatrix; use super::values_matrix::ValuesMatrix; use super::StreamCursor; -use crate::execution_step::boxed_value::TracePosOperate; +use crate::execution_step::value_types::TracePosOperate; use crate::execution_step::ExecutionResult; use air_interpreter_data::GenerationIdx; diff --git a/air/src/execution_step/boxed_value/stream/values_matrix.rs b/air/src/execution_step/value_types/stream/values_matrix.rs similarity index 100% rename from air/src/execution_step/boxed_value/stream/values_matrix.rs rename to air/src/execution_step/value_types/stream/values_matrix.rs diff --git a/air/src/execution_step/boxed_value/stream_map.rs b/air/src/execution_step/value_types/stream_map.rs similarity index 98% rename from air/src/execution_step/boxed_value/stream_map.rs rename to air/src/execution_step/value_types/stream_map.rs index 1b7d4c70..b28f2d2a 100644 --- a/air/src/execution_step/boxed_value/stream_map.rs +++ b/air/src/execution_step/value_types/stream_map.rs @@ -17,8 +17,8 @@ use super::Generation; use super::Stream; use super::ValueAggregate; -use crate::execution_step::boxed_value::TracePosOperate; use crate::execution_step::execution_context::stream_map_key::StreamMapKey; +use crate::execution_step::value_types::TracePosOperate; use crate::execution_step::ExecutionResult; use crate::JValue; @@ -86,8 +86,8 @@ impl fmt::Display for StreamMap { mod test { use super::Generation; use super::StreamMap; - use crate::execution_step::boxed_value::stream_map::from_key_value; use crate::execution_step::execution_context::stream_map_key::StreamMapKey; + use crate::execution_step::value_types::stream_map::from_key_value; use crate::execution_step::ValueAggregate; use crate::ExecutionError; use crate::JValue; diff --git a/air/src/execution_step/boxed_value/utils.rs b/air/src/execution_step/value_types/utils.rs similarity index 100% rename from air/src/execution_step/boxed_value/utils.rs rename to air/src/execution_step/value_types/utils.rs