maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/eval): don't move parts Vec in compile_str_parts

Browse source 
This allows us to get rid of the count local variable which was a bit
confusing. Calling parts.len() multiple times is fine, since the length
doesn't need to be computed.

Change-Id: I4f626729ad1bf23a93cb701385c3f4b50c57456d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6584
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
sterni 2022-09-15 17:42:26 +02:00
parent 4eb33e82ff
commit 0595870341
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tvix/eval/src/compiler/mod.rs
View file

@ -266,13 +266,11 @@ impl Compiler<'_, '_> {
parent_node: &ast::Str, parent_node: &ast::Str,
parts: Vec<ast::InterpolPart<String>>, parts: Vec<ast::InterpolPart<String>>,
) { ) {
let count = parts.len();
// The string parts are produced in literal order, however // The string parts are produced in literal order, however
// they need to be reversed on the stack in order to // they need to be reversed on the stack in order to
// efficiently create the real string in case of // efficiently create the real string in case of
// interpolation. // interpolation.
for part in parts.into_iter().rev() { for part in parts.iter().rev() {
match part { match part {
// Interpolated expressions are compiled as normal and // Interpolated expressions are compiled as normal and
// dealt with by the VM before being assembled into // dealt with by the VM before being assembled into
@ -281,17 +279,17 @@ impl Compiler<'_, '_> {
ast::InterpolPart::Interpolation(ipol) => { ast::InterpolPart::Interpolation(ipol) => {
self.compile(slot, ipol.expr().unwrap()); self.compile(slot, ipol.expr().unwrap());
// implicitly forces as well // implicitly forces as well
self.push_op(OpCode::OpCoerceToString, &ipol); self.push_op(OpCode::OpCoerceToString, ipol);
} }
ast::InterpolPart::Literal(lit) => { ast::InterpolPart::Literal(lit) => {
self.emit_constant(Value::String(lit.into()), parent_node); self.emit_constant(Value::String(lit.as_str().into()), parent_node);
} }
} }
} }
if count != 1 { if parts.len() != 1 {
self.push_op(OpCode::OpInterpolate(Count(count)), parent_node); self.push_op(OpCode::OpInterpolate(Count(parts.len())), parent_node);
} }
} }