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

refactor(tvix/eval): Upgrade to latest rnix-parser

Browse source 
Since the latest published version of rnix-parser on crates.io, the
crate has undergone major changes which are only available in the git
repository at the moment. This commit updates the compiler to this
newer version of rnix.

Most notably, the entire AST provided by rnix is now wrapped in the
AST type system. As a result of this traversal is much nicer in many
places, especially for things like nested attribute selection.

There are a handful of smaller features missing for full feature
parity with the previous version, especially handling of path
literals, but PRs for these already exist in rnix-parser.

Change-Id: Icde6d393067976549492b7d89c4cc49e5e575fc7
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6231
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2022-08-16 23:43:45 +03:00 • committed by tazjin
parent a00e4730a5
commit 813fb98470
6 changed files with 529 additions and 637 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tvix/eval/src/eval.rs
View file

@ -1,6 +1,6 @@
use std::path::PathBuf;
use rnix::{self, types::TypedNode};
use rnix;
use crate::{
errors::{Error, EvalResult},
@ -8,21 +8,27 @@ use crate::{
};
pub fn interpret(code: &str, location: Option<PathBuf>) -> EvalResult<Value> {
let ast = rnix::parse(code);
let parsed = rnix::ast::Root::parse(code);
let errors = parsed.errors();
let errors = ast.errors();
if !errors.is_empty() {
for err in &errors {
for err in errors {
eprintln!("parse error: {}", err);
return Err(Error::ParseErrors(errors));
}
return Err(Error::ParseErrors(errors.to_vec()));
}
// If we've reached this point, there are no errors.
let root_expr = parsed
.tree()
.expr()
.expect("expression should exist if no errors occured");
if std::env::var("TVIX_DISPLAY_AST").is_ok() {
println!("{}", ast.root().dump());
println!("{:?}", root_expr);
}
let result = crate::compiler::compile(ast, location)?;
let result = crate::compiler::compile(root_expr, location)?;
#[cfg(feature = "disassembler")]
crate::disassembler::disassemble_chunk(&result.chunk);