From e6d9be32a2dc6c7752f658f5c8fe4e33024bc2d3 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 13 Oct 2022 18:22:36 +0300 Subject: feat(tvixbolt): add toggle for displaying pretty-printed AST This uses the JSON serialisation of the AST introduced earlier to display a text box with the serialised AST to users. Useful for debugging. Change-Id: Ibc400eaf5ca87fa5072d5c044942505331c3bb40 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7005 Autosubmit: tazjin Tested-by: BuildkiteCI Reviewed-by: Adam Joseph Reviewed-by: tazjin --- corp/tvixbolt/src/main.rs | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'corp') diff --git a/corp/tvixbolt/src/main.rs b/corp/tvixbolt/src/main.rs index e6dda736f4..6cef4851a5 100644 --- a/corp/tvixbolt/src/main.rs +++ b/corp/tvixbolt/src/main.rs @@ -15,12 +15,14 @@ use yew_router::{prelude::*, AnyRoute}; enum Msg { CodeChange(String), ToggleTrace(bool), + ToggleDisplayAst(bool), } #[derive(Clone, Serialize, Deserialize)] struct Model { code: String, trace: bool, + display_ast: bool, } fn tvixbolt_overview() -> Html { @@ -99,6 +101,7 @@ impl Component for Model { .unwrap_or_else(|_| Self { code: String::new(), trace: false, + display_ast: false, }) } @@ -108,6 +111,10 @@ impl Component for Model { self.trace = trace; } + Msg::ToggleDisplayAst(display_ast) => { + self.display_ast = display_ast; + } + Msg::CodeChange(new_code) => { self.code = new_code; } @@ -152,6 +159,17 @@ impl Component for Model { })} /> + +
+ + ().checked(); + Msg::ToggleDisplayAst(trace) + })} + /> +

@@ -179,7 +197,7 @@ impl Model { html! { <>

{"Result:"}

- {eval(self.trace, &self.code).display()} + {eval(self.trace, self.display_ast, &self.code).display()} } } @@ -194,6 +212,7 @@ struct Output { output: String, bytecode: Vec, trace: Vec, + ast: String, } fn maybe_show(title: &str, s: &str) -> Html { @@ -220,12 +239,13 @@ impl Output { {maybe_show("Bytecode:", &String::from_utf8_lossy(&self.bytecode))} {maybe_show("Runtime errors:", &self.runtime_errors)} {maybe_show("Runtime trace:", &String::from_utf8_lossy(&self.trace))} + {maybe_show("Parsed AST:", &self.ast)} } } } -fn eval(trace: bool, code: &str) -> Output { +fn eval(trace: bool, display_ast: bool, code: &str) -> Output { let mut out = Output::default(); if code.is_empty() { @@ -249,6 +269,10 @@ fn eval(trace: bool, code: &str) -> Output { .expr() .expect("expression should exist if no errors occured"); + if display_ast { + out.ast = tvix_eval::pretty_print_expr(&root_expr); + } + let source = SourceCode::new(); let file = source.add_file("nixbolt".to_string(), code.into()); -- cgit 1.4.1