git.delta.rocks / jrsonnet / refs/commits / 45caf79f1ab3

no syntactic changes

343				Val::Func(func) => push(None, || "during TLA call".to_owned(), || Ok(func.evaluate_map(343				Val::Func(func) => push(
344					None,
345					|| "during TLA call".to_owned(),
346					|| {
347						Ok(func.evaluate_map(
344					self.create_default_context()?,348							self.create_default_context()?,
345					&self.settings().tla_vars,349							&self.settings().tla_vars,
346					true,350							true,
347				)?))?,351						)?)
352					},
353				)?,
348				v => v,354				v => v,
349			})355			})

no syntactic changes

118			.trace()118			.trace()
119			.0119			.0
120			.iter()120			.iter()
121			.map(|el| el.location.as_ref().map(|l| {121			.map(|el| {
122				el.location.as_ref().map(|l| {
122				use std::fmt::Write;123					use std::fmt::Write;
123				let mut resolved_path = self.resolver.resolve(&l.0);124					let mut resolved_path = self.resolver.resolve(&l.0);
124				// TODO: Process all trace elements first125					// TODO: Process all trace elements first
125				let location = evaluation_state126					let location = evaluation_state.map_source_locations(&l.0, &[l.1, l.2]);
126					.map_source_locations(&l.0, &[l.1, l.2]);
127				write!(resolved_path, ":").unwrap();127					write!(resolved_path, ":").unwrap();
128				print_code_location(&mut resolved_path, &location[0], &location[1]).unwrap();128					print_code_location(&mut resolved_path, &location[0], &location[1]).unwrap();
129				resolved_path129					resolved_path
130			}))130				})
131			})
131			.collect::<Vec<_>>();132			.collect::<Vec<_>>();
132		let align = file_names.iter().flatten().map(|e| e.len()).max().unwrap_or(0);133		let align = file_names
134			.iter()

17			$match(v) => v,17			$match(v) => v,
18			_ => unreachable!(),18			_ => unreachable!(),
19		}19			}
20	}}20		}};
21}21}
2222
23#[derive(Debug, Error, Clone)]23#[derive(Debug, Error, Clone)]