difftreelog
refactor remove tla from state
in: master
6 files changed
cmds/jrsonnet/src/main.rsdiffbeforeafterboth--- a/cmds/jrsonnet/src/main.rs
+++ b/cmds/jrsonnet/src/main.rs
@@ -5,8 +5,8 @@
use clap::{CommandFactory, Parser};
use clap_complete::Shell;
-use jrsonnet_cli::{ConfigureState, GeneralOpts, ManifestOpts, OutputOpts};
-use jrsonnet_evaluator::{error::LocError, State};
+use jrsonnet_cli::{ConfigureState, GeneralOpts, ManifestOpts, OutputOpts, TraceOpts};
+use jrsonnet_evaluator::{apply_tla, error::LocError, throw, ResultExt, State, Val};
#[cfg(feature = "mimalloc")]
#[global_allocator]
@@ -121,8 +121,8 @@
}
fn main_real(s: &State, opts: Opts) -> Result<(), Error> {
- let _guards = opts.general.configure(s)?;
- opts.manifest.configure(s)?;
+ let (_stack_guard, tla, _gc_guard) = opts.general.configure(s)?;
+ let manifest_format = opts.manifest.configure(s)?;
let input = opts.input.input.ok_or(Error::MissingInputArgument)?;
let val = if opts.input.exec {
@@ -136,7 +136,7 @@
s.import(&input)?
};
- let val = s.with_tla(val)?;
+ let val = apply_tla(s.clone(), &tla, val)?;
if let Some(multi) = opts.output.multi {
if opts.output.create_output_dirs {
crates/jrsonnet-cli/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-cli/src/lib.rs
+++ b/crates/jrsonnet-cli/src/lib.rs
@@ -71,7 +71,7 @@
misc: MiscOpts,
#[clap(flatten)]
- tla: TLAOpts,
+ tla: TlaOpts,
#[clap(flatten)]
std: StdOpts,
@@ -85,16 +85,17 @@
impl ConfigureState for GeneralOpts {
type Guards = (
<MiscOpts as ConfigureState>::Guards,
+ <TlaOpts as ConfigureState>::Guards,
<GcOpts as ConfigureState>::Guards,
);
fn configure(&self, s: &State) -> Result<Self::Guards> {
// Configure trace first, because tla-code/ext-code can throw
self.trace.configure(s)?;
let misc_guards = self.misc.configure(s)?;
- self.tla.configure(s)?;
+ let tla_guards = self.tla.configure(s)?;
self.std.configure(s)?;
let gc_guards = self.gc.configure(s)?;
- Ok((misc_guards, gc_guards))
+ Ok((misc_guards, tla_guards, gc_guards))
}
}
crates/jrsonnet-cli/src/tla.rsdiffbeforeafterboth--- a/crates/jrsonnet-cli/src/tla.rs
+++ b/crates/jrsonnet-cli/src/tla.rs
@@ -1,11 +1,17 @@
use clap::Parser;
-use jrsonnet_evaluator::{error::Result, State};
+use jrsonnet_evaluator::{
+ error::{Error, Result},
+ function::TlaArg,
+ gc::GcHashMap,
+ IStr, State,
+};
+use jrsonnet_parser::{ParserSettings, Source};
use crate::{ConfigureState, ExtFile, ExtStr};
#[derive(Parser)]
#[clap(next_help_heading = "TOP LEVEL ARGUMENTS")]
-pub struct TLAOpts {
+pub struct TlaOpts {
/// Add top level string argument.
/// Top level arguments will be passed to function before manifestification stage.
/// This is preferred to ExtVars method.
@@ -25,21 +31,41 @@
#[clap(long, name = "name=tla code path", number_of_values = 1)]
tla_code_file: Vec<ExtFile>,
}
-impl ConfigureState for TLAOpts {
- type Guards = ();
- fn configure(&self, s: &State) -> Result<()> {
- for tla in self.tla_str.iter() {
- s.add_tla_str((&tla.name as &str).into(), (&tla.value as &str).into());
+impl ConfigureState for TlaOpts {
+ type Guards = GcHashMap<IStr, TlaArg>;
+ fn configure(&self, _s: &State) -> Result<Self::Guards> {
+ let mut out = GcHashMap::new();
+ for (name, value) in self
+ .tla_str
+ .iter()
+ .map(|c| (&c.name, &c.value))
+ .chain(self.tla_str_file.iter().map(|c| (&c.name, &c.value)))
+ {
+ out.insert(name.into(), TlaArg::String(value.into()));
}
- for tla in self.tla_str_file.iter() {
- s.add_tla_str((&tla.name as &str).into(), (&tla.value as &str).into())
- }
- for tla in self.tla_code.iter() {
- s.add_tla_code((&tla.name as &str).into(), &tla.value as &str)?;
- }
- for tla in self.tla_code_file.iter() {
- s.add_tla_code((&tla.name as &str).into(), &tla.value as &str)?;
+ for (name, code) in self
+ .tla_code
+ .iter()
+ .map(|c| (&c.name, &c.value))
+ .chain(self.tla_code_file.iter().map(|c| (&c.name, &c.value)))
+ {
+ let source = Source::new_virtual(format!("<top-level-arg:{name}>").into(), code.into());
+ out.insert(
+ (&name as &str).into(),
+ TlaArg::Code(
+ jrsonnet_parser::parse(
+ &code,
+ &ParserSettings {
+ source: source.clone(),
+ },
+ )
+ .map_err(|e| Error::ImportSyntaxError {
+ path: source,
+ error: Box::new(e),
+ })?,
+ ),
+ );
}
- Ok(())
+ Ok(out)
}
}
crates/jrsonnet-evaluator/src/function/arglike.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/function/arglike.rs
+++ b/crates/jrsonnet-evaluator/src/function/arglike.rs
@@ -1,10 +1,11 @@
-use std::collections::HashMap;
-
+use hashbrown::HashMap;
use jrsonnet_gcmodule::Trace;
use jrsonnet_interner::IStr;
use jrsonnet_parser::{ArgsDesc, LocExpr};
-use crate::{error::Result, evaluate, tb, typed::Typed, val::ThunkValue, Context, Thunk, Val};
+use crate::{
+ error::Result, evaluate, gc::GcHashMap, tb, typed::Typed, val::ThunkValue, Context, Thunk, Val,
+};
/// Marker for arguments, which can be evaluated with context set to None
pub trait OptionalContext {}
@@ -214,6 +215,34 @@
}
impl<A, S> OptionalContext for HashMap<IStr, A, S> where A: ArgLike + OptionalContext {}
+impl<A: ArgLike> ArgsLike for GcHashMap<IStr, A> {
+ fn unnamed_len(&self) -> usize {
+ self.0.unnamed_len()
+ }
+
+ fn unnamed_iter(
+ &self,
+ ctx: Context,
+ tailstrict: bool,
+ handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,
+ ) -> Result<()> {
+ self.0.unnamed_iter(ctx, tailstrict, handler)
+ }
+
+ fn named_iter(
+ &self,
+ ctx: Context,
+ tailstrict: bool,
+ handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,
+ ) -> Result<()> {
+ self.0.named_iter(ctx, tailstrict, handler)
+ }
+
+ fn named_names(&self, handler: &mut dyn FnMut(&IStr)) {
+ self.0.named_names(handler)
+ }
+}
+
macro_rules! impl_args_like {
($count:expr; $($gen:ident)*) => {
impl<$($gen: ArgLike,)*> sealed::Unnamed for ($($gen,)*) {}
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth1//! jsonnet interpreter implementation2#![cfg_attr(feature = "nightly", feature(thread_local))]3#![deny(unsafe_op_in_unsafe_fn)]4#![warn(5 clippy::all,6 clippy::nursery,7 clippy::pedantic,8 // missing_docs,9 elided_lifetimes_in_paths,10 explicit_outlives_requirements,11 noop_method_call,12 single_use_lifetimes,13 variant_size_differences,14 rustdoc::all15)]16#![allow(17 macro_expanded_macro_exports_accessed_by_absolute_paths,18 clippy::ptr_arg,19 // Too verbose20 clippy::must_use_candidate,21 // A lot of functions pass around errors thrown by code22 clippy::missing_errors_doc,23 // A lot of pointers have interior Rc24 clippy::needless_pass_by_value,25 // Its fine26 clippy::wildcard_imports,27 clippy::enum_glob_use,28 clippy::module_name_repetitions,29 // TODO: fix individual issues, however this works as intended almost everywhere30 clippy::cast_precision_loss,31 clippy::cast_possible_wrap,32 clippy::cast_possible_truncation,33 clippy::cast_sign_loss,34 // False positives35 // https://github.com/rust-lang/rust-clippy/issues/690236 clippy::use_self,37 // https://github.com/rust-lang/rust-clippy/issues/853938 clippy::iter_with_drain,39 // ci is being run with nightly, but library should work on stable40 clippy::missing_const_for_fn,41)]4243// For jrsonnet-macros44extern crate self as jrsonnet_evaluator;4546mod ctx;47mod dynamic;48pub mod error;49mod evaluate;50pub mod function;51pub mod gc;52mod import;53mod integrations;54mod map;55mod obj;56pub mod stack;57pub mod stdlib;58mod tla;59pub mod trace;60pub mod typed;61pub mod val;6263use std::{64 any::Any,65 cell::{Ref, RefCell, RefMut},66 collections::HashMap,67 fmt::{self, Debug},68 path::Path,69};7071pub use ctx::*;72pub use dynamic::*;73use error::{Error::*, LocError, Result, ResultExt};74pub use evaluate::*;75use function::{CallLocation, TlaArg};76use gc::{GcHashMap, TraceBox};77use hashbrown::hash_map::RawEntryMut;78pub use import::*;79use jrsonnet_gcmodule::{Cc, Trace};80pub use jrsonnet_interner::{IBytes, IStr};81pub use jrsonnet_parser as parser;82use jrsonnet_parser::*;83pub use obj::*;84use stack::check_depth;85pub use tla::apply_tla;86pub use val::{ManifestFormat, Thunk, Val};8788/// Thunk without bound `super`/`this`89/// object inheritance may be overriden multiple times, and will be fixed only on field read90pub trait Unbound: Trace {91 /// Type of value after object context is bound92 type Bound;93 /// Create value bound to specified object context94 fn bind(&self, sup: Option<ObjValue>, this: Option<ObjValue>) -> Result<Self::Bound>;95}9697/// Object fields may, or may not depend on `this`/`super`, this enum allows cheaper reuse of object-independent fields for native code98/// Standard jsonnet fields are always unbound99#[derive(Clone, Trace)]100pub enum MaybeUnbound {101 /// Value needs to be bound to `this`/`super`102 Unbound(Cc<TraceBox<dyn Unbound<Bound = Val>>>),103 /// Value is object-independent104 Bound(Thunk<Val>),105}106107impl Debug for MaybeUnbound {108 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {109 write!(f, "MaybeUnbound")110 }111}112impl MaybeUnbound {113 /// Attach object context to value, if required114 pub fn evaluate(&self, sup: Option<ObjValue>, this: Option<ObjValue>) -> Result<Val> {115 match self {116 Self::Unbound(v) => v.bind(sup, this),117 Self::Bound(v) => Ok(v.evaluate()?),118 }119 }120}121122/// During import, this trait will be called to create initial context for file.123/// It may initialize global variables, stdlib for example.124pub trait ContextInitializer: Trace {125 /// Initialize default file context.126 fn initialize(&self, state: State, for_file: Source) -> Context;127 /// Allows upcasting from abstract to concrete context initializer.128 /// jrsonnet by itself doesn't use this method, it is allowed for it to panic.129 fn as_any(&self) -> &dyn Any;130}131132/// Context initializer which adds nothing.133#[derive(Trace)]134pub struct DummyContextInitializer;135impl ContextInitializer for DummyContextInitializer {136 fn initialize(&self, state: State, _for_file: Source) -> Context {137 ContextBuilder::new(state).build()138 }139 fn as_any(&self) -> &dyn Any {140 self141 }142}143144/// Dynamically reconfigurable evaluation settings145#[derive(Trace)]146pub struct EvaluationSettings {147 /// Context initializer, which will be used for imports and everything148 /// [`NoopContextInitializer`] is used by default, most likely you want to have `jrsonnet-stdlib`149 pub context_initializer: TraceBox<dyn ContextInitializer>,150 /// Used to resolve file locations/contents151 pub import_resolver: TraceBox<dyn ImportResolver>,152 /// Used in manifestification functions153 pub manifest_format: ManifestFormat,154 /// Used for bindings155 pub trace_format: TraceBox<dyn TraceFormat>,156}157impl Default for EvaluationSettings {158 fn default() -> Self {159 Self {160 context_initializer: tb!(DummyContextInitializer),161 import_resolver: tb!(DummyImportResolver),162 }163 }164}165166#[derive(Trace)]167struct FileData {168 string: Option<IStr>,169 bytes: Option<IBytes>,170 parsed: Option<LocExpr>,171 evaluated: Option<Val>,172173 evaluating: bool,174}175impl FileData {176 fn new_string(data: IStr) -> Self {177 Self {178 string: Some(data),179 bytes: None,180 parsed: None,181 evaluated: None,182 evaluating: false,183 }184 }185 fn new_bytes(data: IBytes) -> Self {186 Self {187 string: None,188 bytes: Some(data),189 parsed: None,190 evaluated: None,191 evaluating: false,192 }193 }194}195196#[derive(Default, Trace)]197pub struct EvaluationStateInternals {198 /// Internal state199 file_cache: RefCell<GcHashMap<SourcePath, FileData>>,200 /// Settings, safe to change at runtime201 settings: RefCell<EvaluationSettings>,202}203204/// Maintains stack trace and import resolution205#[derive(Default, Clone, Trace)]206pub struct State(Cc<EvaluationStateInternals>);207208impl State {209 /// Should only be called with path retrieved from [`resolve_path`], may panic otherwise210 pub fn import_resolved_str(&self, path: SourcePath) -> Result<IStr> {211 let mut file_cache = self.file_cache();212 let mut file = file_cache.raw_entry_mut().from_key(&path);213214 let file = match file {215 RawEntryMut::Occupied(ref mut d) => d.get_mut(),216 RawEntryMut::Vacant(v) => {217 let data = self.settings().import_resolver.load_file_contents(&path)?;218 v.insert(219 path.clone(),220 FileData::new_string(221 std::str::from_utf8(&data)222 .map_err(|_| ImportBadFileUtf8(path.clone()))?223 .into(),224 ),225 )226 .1227 }228 };229 if let Some(str) = &file.string {230 return Ok(str.clone());231 }232 if file.string.is_none() {233 file.string = Some(234 file.bytes235 .as_ref()236 .expect("either string or bytes should be set")237 .clone()238 .cast_str()239 .ok_or_else(|| ImportBadFileUtf8(path.clone()))?,240 );241 }242 Ok(file.string.as_ref().expect("just set").clone())243 }244 /// Should only be called with path retrieved from [`resolve_path`], may panic otherwise245 pub fn import_resolved_bin(&self, path: SourcePath) -> Result<IBytes> {246 let mut file_cache = self.file_cache();247 let mut file = file_cache.raw_entry_mut().from_key(&path);248249 let file = match file {250 RawEntryMut::Occupied(ref mut d) => d.get_mut(),251 RawEntryMut::Vacant(v) => {252 let data = self.settings().import_resolver.load_file_contents(&path)?;253 v.insert(path.clone(), FileData::new_bytes(data.as_slice().into()))254 .1255 }256 };257 if let Some(str) = &file.bytes {258 return Ok(str.clone());259 }260 if file.bytes.is_none() {261 file.bytes = Some(262 file.string263 .as_ref()264 .expect("either string or bytes should be set")265 .clone()266 .cast_bytes(),267 );268 }269 Ok(file.bytes.as_ref().expect("just set").clone())270 }271 /// Should only be called with path retrieved from [`resolve_path`], may panic otherwise272 pub fn import_resolved(&self, path: SourcePath) -> Result<Val> {273 let mut file_cache = self.file_cache();274 let mut file = file_cache.raw_entry_mut().from_key(&path);275276 let file = match file {277 RawEntryMut::Occupied(ref mut d) => d.get_mut(),278 RawEntryMut::Vacant(v) => {279 let data = self.settings().import_resolver.load_file_contents(&path)?;280 v.insert(281 path.clone(),282 FileData::new_string(283 std::str::from_utf8(&data)284 .map_err(|_| ImportBadFileUtf8(path.clone()))?285 .into(),286 ),287 )288 .1289 }290 };291 if let Some(val) = &file.evaluated {292 return Ok(val.clone());293 }294 if file.string.is_none() {295 file.string = Some(296 std::str::from_utf8(297 file.bytes298 .as_ref()299 .expect("either string or bytes should be set"),300 )301 .map_err(|_| ImportBadFileUtf8(path.clone()))?302 .into(),303 );304 }305 let code = file.string.as_ref().expect("just set");306 let file_name = Source::new(path.clone(), code.clone());307 if file.parsed.is_none() {308 file.parsed = Some(309 jrsonnet_parser::parse(310 code,311 &ParserSettings {312 file_name: file_name.clone(),313 },314 )315 .map_err(|e| ImportSyntaxError {316 path: file_name.clone(),317 error: Box::new(e),318 })?,319 );320 }321 let parsed = file.parsed.as_ref().expect("just set").clone();322 if file.evaluating {323 throw!(InfiniteRecursionDetected)324 }325 file.evaluating = true;326 // Dropping file cache guard here, as evaluation may use this map too327 drop(file_cache);328 let res = evaluate(self.create_default_context(file_name), &parsed);329330 let mut file_cache = self.file_cache();331 let mut file = file_cache.raw_entry_mut().from_key(&path);332333 let RawEntryMut::Occupied(file) = &mut file else {334 unreachable!("this file was just here!")335 };336 let file = file.get_mut();337 file.evaluating = false;338 match res {339 Ok(v) => {340 file.evaluated = Some(v.clone());341 Ok(v)342 }343 Err(e) => Err(e),344 }345 }346347 /// Has same semantics as `import 'path'` called from `from` file348 pub fn import_from(&self, from: &SourcePath, path: &str) -> Result<Val> {349 let resolved = self.resolve_from(from, path)?;350 self.import_resolved(resolved)351 }352 pub fn import(&self, path: impl AsRef<Path>) -> Result<Val> {353 let resolved = self.resolve(path)?;354 self.import_resolved(resolved)355 }356357 /// Creates context with all passed global variables358 pub fn create_default_context(&self, source: Source) -> Context {359 let context_initializer = &self.settings().context_initializer;360 context_initializer.initialize(self.clone(), source)361 }362363 /// Executes code creating a new stack frame364 pub fn push<T>(365 e: CallLocation<'_>,366 frame_desc: impl FnOnce() -> String,367 f: impl FnOnce() -> Result<T>,368 ) -> Result<T> {369 let _guard = check_depth()?;370371 f().with_description_src(e, frame_desc)372 }373374 /// Executes code creating a new stack frame375 pub fn push_val(376 &self,377 e: &ExprLocation,378 frame_desc: impl FnOnce() -> String,379 f: impl FnOnce() -> Result<Val>,380 ) -> Result<Val> {381 let _guard = check_depth()?;382383 f().with_description_src(e, frame_desc)384 }385 /// Executes code creating a new stack frame386 pub fn push_description<T>(387 frame_desc: impl FnOnce() -> String,388 f: impl FnOnce() -> Result<T>,389 ) -> Result<T> {390 let _guard = check_depth()?;391392 f().with_description(frame_desc)393 }394}395396/// Internals397impl State {398 fn file_cache(&self) -> RefMut<'_, GcHashMap<SourcePath, FileData>> {399 self.0.file_cache.borrow_mut()400 }401 pub fn settings(&self) -> Ref<'_, EvaluationSettings> {402 self.0.settings.borrow()403 }404 pub fn settings_mut(&self) -> RefMut<'_, EvaluationSettings> {405 self.0.settings.borrow_mut()406 }407}408409/// Raw methods evaluate passed values but don't perform TLA execution410impl State {411 /// Parses and evaluates the given snippet412 pub fn evaluate_snippet(&self, name: impl Into<IStr>, code: impl Into<IStr>) -> Result<Val> {413 let code = code.into();414 let source = Source::new_virtual(name.into(), code.clone());415 let parsed = jrsonnet_parser::parse(416 &code,417 &ParserSettings {418 file_name: source.clone(),419 },420 )421 .map_err(|e| ImportSyntaxError {422 path: source.clone(),423 error: Box::new(e),424 })?;425 evaluate(self.create_default_context(source), &parsed)426 }427}428429/// Settings utilities430impl State {431 // Only panics in case of [`ImportResolver`] contract violation432 #[allow(clippy::missing_panics_doc)]433 pub fn resolve_from(&self, from: &SourcePath, path: &str) -> Result<SourcePath> {434 self.import_resolver().resolve_from(from, path.as_ref())435 }436437 // Only panics in case of [`ImportResolver`] contract violation438 #[allow(clippy::missing_panics_doc)]439 pub fn resolve(&self, path: impl AsRef<Path>) -> Result<SourcePath> {440 self.import_resolver().resolve(path.as_ref())441 }442 pub fn import_resolver(&self) -> Ref<'_, dyn ImportResolver> {443 Ref::map(self.settings(), |s| &*s.import_resolver)444 }445 pub fn set_import_resolver(&self, resolver: Box<dyn ImportResolver>) {446 self.settings_mut().import_resolver = TraceBox(resolver);447 }448 pub fn context_initializer(&self) -> Ref<'_, dyn ContextInitializer> {449 Ref::map(self.settings(), |s| &*s.context_initializer)450 }451452 pub fn manifest_format(&self) -> ManifestFormat {453 self.settings().manifest_format.clone()454 }455 pub fn set_manifest_format(&self, format: ManifestFormat) {456 self.settings_mut().manifest_format = format;457 }458459 pub fn trace_format(&self) -> Ref<'_, dyn TraceFormat> {460 Ref::map(self.settings(), |s| &*s.trace_format)461 }462 pub fn set_trace_format(&self, format: impl TraceFormat) {463 self.settings_mut().trace_format = tb!(format);464 }465466 pub fn max_trace(&self) -> usize {467 self.settings().max_trace468 }469 pub fn set_max_trace(&self, trace: usize) {470 self.settings_mut().max_trace = trace;471 }472}crates/jrsonnet-evaluator/src/tla.rsdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-evaluator/src/tla.rs
@@ -0,0 +1,25 @@
+use jrsonnet_interner::IStr;
+use jrsonnet_parser::Source;
+
+use crate::{
+ function::{ArgsLike, CallLocation},
+ Result, State, Val,
+};
+
+pub fn apply_tla<A: ArgsLike>(s: State, args: &A, val: Val) -> Result<Val> {
+ Ok(if let Val::Func(func) = val {
+ State::push_description(
+ || "during TLA call".to_owned(),
+ || {
+ func.evaluate(
+ s.create_default_context(Source::new_virtual("<top-level-arg>".into(), IStr::empty())),
+ CallLocation::native(),
+ args,
+ false,
+ )
+ },
+ )?
+ } else {
+ val
+ })
+}