From 09cae799d33d59f60017b170cecdccc1d6f11014 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 28 Jul 2020 09:21:32 +0200 Subject: [PATCH] Fix return type of compile_syntax_node All call sites are only interested in the root component, so might as well return that. --- api/sixtyfps-rs/sixtyfps-build/lib.rs | 4 ++-- api/sixtyfps-rs/sixtyfps-rs-macro/lib.rs | 4 ++-- sixtyfps_compiler/lib.rs | 4 ++-- sixtyfps_runtime/interpreter/dynamic_component.rs | 4 ++-- tests/driver/cpp.rs | 4 ++-- tools/compiler/main.rs | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/api/sixtyfps-rs/sixtyfps-build/lib.rs b/api/sixtyfps-rs/sixtyfps-build/lib.rs index 2651d1aa8..1394974ab 100644 --- a/api/sixtyfps-rs/sixtyfps-build/lib.rs +++ b/api/sixtyfps-rs/sixtyfps-build/lib.rs @@ -103,7 +103,7 @@ pub fn compile(path: impl AsRef) -> Result<(), CompileError> { } }; - let (doc, mut diag) = compile_syntax_node(syntax_node, diag, &compiler_config); + let (root_component, mut diag) = compile_syntax_node(syntax_node, diag, &compiler_config); if diag.has_error() { let vec = diag.to_string_vec(); @@ -121,7 +121,7 @@ pub fn compile(path: impl AsRef) -> Result<(), CompileError> { let file = std::fs::File::create(&output_file_path).map_err(CompileError::SaveError)?; let mut code_formater = CodeFormatter { indentation: 0, in_string: false, sink: file }; - let generated = generator::rust::generate(&doc.root_component, &mut diag).ok_or_else(|| { + let generated = generator::rust::generate(&root_component, &mut diag).ok_or_else(|| { let vec = diag.to_string_vec(); diag.print(); CompileError::CompileError(vec) diff --git a/api/sixtyfps-rs/sixtyfps-rs-macro/lib.rs b/api/sixtyfps-rs/sixtyfps-rs-macro/lib.rs index 7ea3f5f15..3b3c8fca6 100644 --- a/api/sixtyfps-rs/sixtyfps-rs-macro/lib.rs +++ b/api/sixtyfps-rs/sixtyfps-rs-macro/lib.rs @@ -223,14 +223,14 @@ pub fn sixtyfps(stream: TokenStream) -> TokenStream { //println!("{:#?}", syntax_node); let compiler_config = CompilerConfiguration { include_paths: &include_paths, ..Default::default() }; - let (tree, mut diag) = compile_syntax_node(syntax_node, diag, &compiler_config); + let (root_component, mut diag) = compile_syntax_node(syntax_node, diag, &compiler_config); //println!("{:#?}", tree); if diag.has_error() { diag.map_offsets_to_span(&tokens); return diag.into_token_stream().into(); } - let result = generator::rust::generate(&tree.root_component, &mut diag); + let result = generator::rust::generate(&root_component, &mut diag); result .unwrap_or_else(|| { diff --git a/sixtyfps_compiler/lib.rs b/sixtyfps_compiler/lib.rs index d2dfc694d..5d3e0347a 100644 --- a/sixtyfps_compiler/lib.rs +++ b/sixtyfps_compiler/lib.rs @@ -62,7 +62,7 @@ pub fn compile_syntax_node( doc_node: parser::SyntaxNodeWithSourceFile, mut diagnostics: diagnostics::FileDiagnostics, compiler_config: &CompilerConfiguration, -) -> (object_tree::Document, diagnostics::BuildDiagnostics) { +) -> (Rc, diagnostics::BuildDiagnostics) { let mut build_diagnostics = diagnostics::BuildDiagnostics::default(); let global_type_registry = typeregister::TypeRegister::builtin(); @@ -88,7 +88,7 @@ pub fn compile_syntax_node( run_passes(&doc, &mut build_diagnostics, compiler_config); - (doc, build_diagnostics) + (doc.root_component, build_diagnostics) } pub fn run_passes( diff --git a/sixtyfps_runtime/interpreter/dynamic_component.rs b/sixtyfps_runtime/interpreter/dynamic_component.rs index 6baf0e047..cbaa6d035 100644 --- a/sixtyfps_runtime/interpreter/dynamic_component.rs +++ b/sixtyfps_runtime/interpreter/dynamic_component.rs @@ -232,11 +232,11 @@ pub fn load( ) -> Result, sixtyfps_compilerlib::diagnostics::BuildDiagnostics> { let (syntax_node, diag) = parser::parse(source, Some(path)); let compiler_config = CompilerConfiguration { include_paths, ..Default::default() }; - let (tree, diag) = compile_syntax_node(syntax_node, diag, &compiler_config); + let (root_component, diag) = compile_syntax_node(syntax_node, diag, &compiler_config); if diag.has_error() { return Err(diag); } - Ok(generate_component(&tree.root_component)) + Ok(generate_component(&root_component)) } fn generate_component(root_component: &Rc) -> Rc { diff --git a/tests/driver/cpp.rs b/tests/driver/cpp.rs index 975c16552..2b454e619 100644 --- a/tests/driver/cpp.rs +++ b/tests/driver/cpp.rs @@ -12,7 +12,7 @@ pub fn test(testcase: &test_driver_lib::TestCase) -> Result<(), Box> let (syntax_node, diag) = parser::parse(source.clone(), Some(&testcase.absolute_path)); let compiler_config = CompilerConfiguration { include_paths, ..Default::default() }; - let (doc, mut diag) = compile_syntax_node(syntax_node, diag, &compiler_config); + let (root_component, mut diag) = compile_syntax_node(syntax_node, diag, &compiler_config); if diag.has_error() { let vec = diag.to_string_vec(); @@ -24,7 +24,7 @@ pub fn test(testcase: &test_driver_lib::TestCase) -> Result<(), Box> generator::generate( generator::OutputFormat::Cpp, &mut generated_cpp, - &doc.root_component, + &root_component, &mut diag, )?; diff --git a/tools/compiler/main.rs b/tools/compiler/main.rs index d3beb32a7..45ade44e0 100644 --- a/tools/compiler/main.rs +++ b/tools/compiler/main.rs @@ -20,11 +20,11 @@ fn main() -> std::io::Result<()> { //println!("{:#?}", syntax_node); let compiler_config = CompilerConfiguration { include_paths: &args.include_paths, ..Default::default() }; - let (doc, diag) = compile_syntax_node(syntax_node, diag, &compiler_config); + let (root_component, diag) = compile_syntax_node(syntax_node, diag, &compiler_config); let mut diag = diag.check_and_exit_on_error(); - generator::generate(args.format, &mut std::io::stdout(), &doc.root_component, &mut diag)?; + generator::generate(args.format, &mut std::io::stdout(), &root_component, &mut diag)?; diag.check_and_exit_on_error(); Ok(()) }