From 92c53fe982560248dc7655a5605db5e3cfc35d04 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 10 Aug 2022 18:53:50 +0300 Subject: feat(tvix/tests): check in Nix' language test suite This adds scaffolding code for running the Nix language test suite. The majority of eval-okay-* tests should eventually be runnable as-is by Tvix, however the eval-fail-* tests might not as we intend to have more useful error messages than upstream Nix. Change-Id: I4f3227f0889c55e4274b804a3072850fb78dd1bd Reviewed-on: https://cl.tvl.fyi/c/depot/+/6126 Tested-by: BuildkiteCI Autosubmit: tazjin Reviewed-by: grfn --- tvix/eval/src/eval.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'tvix/eval/src/eval.rs') diff --git a/tvix/eval/src/eval.rs b/tvix/eval/src/eval.rs index 370aad494d..5e6c53cd8b 100644 --- a/tvix/eval/src/eval.rs +++ b/tvix/eval/src/eval.rs @@ -1,9 +1,9 @@ use rnix::{self, types::TypedNode}; -use crate::errors::EvalResult; +use crate::{errors::EvalResult, value::Value}; -pub fn interpret(code: String) -> EvalResult { - let ast = rnix::parse(&code); +pub fn interpret(code: &str) -> EvalResult { + let ast = rnix::parse(code); let errors = ast.errors(); if !errors.is_empty() { @@ -15,6 +15,5 @@ pub fn interpret(code: String) -> EvalResult { let code = crate::compiler::compile(ast)?; println!("code: {:?}", code); - let value = crate::vm::run_chunk(code)?; - Ok(format!("value: {} :: {}", value, value.type_of())) + crate::vm::run_chunk(code) } -- cgit 1.4.1