diff --git a/src/bin/gosub-parser.rs b/src/bin/gosub-parser.rs index 117db954..a6a54da6 100644 --- a/src/bin/gosub-parser.rs +++ b/src/bin/gosub-parser.rs @@ -61,11 +61,11 @@ fn main() -> Result<()> { // Create a new document that will be filled in by the parser let doc_handle: DocumentHandle, Css3System> = >::new_document(Some(url)); - let parse_errors = Html5Parser::parse_document(&mut stream, doc_handle.clone(), None)?; + let parse_errors = Html5Parser::, Css3System>::parse_document(&mut stream, doc_handle.clone(), None)?; println!("Found {} stylesheets", doc_handle.get().stylesheets.len()); for sheet in &doc_handle.get().stylesheets { - println!("Stylesheet location: {:?}", sheet.location); + println!("Stylesheet url: {:?}", sheet.url); } // let mut handle_mut = handle.get_mut(); diff --git a/src/bin/html5-parser-test.rs b/src/bin/html5-parser-test.rs index 6c59d9d3..433e4397 100755 --- a/src/bin/html5-parser-test.rs +++ b/src/bin/html5-parser-test.rs @@ -6,6 +6,9 @@ use gosub_testing::testing::tree_construction::Harness; use std::io::Write; use std::path::{Path, PathBuf}; use walkdir::WalkDir; +use gosub_css3::system::Css3System; +use gosub_html5::document::document::DocumentImpl; +use gosub_html5::parser::Html5Parser; fn main() -> Result<()> { let mut files = get_files_from_path(fixture_root_path()); @@ -29,7 +32,7 @@ fn main() -> Result<()> { for test in &fixture.tests { for &scripting_enabled in test.script_modes() { let result = harness - .run_test(test.clone(), scripting_enabled) + .run_test::, Css3System>, Css3System>(test.clone(), scripting_enabled) .expect("problem parsing"); total += 1; diff --git a/src/bin/parser-test.rs b/src/bin/parser-test.rs index d13c3663..e4bc4991 100755 --- a/src/bin/parser-test.rs +++ b/src/bin/parser-test.rs @@ -1,3 +1,6 @@ +use gosub_css3::system::Css3System; +use gosub_html5::document::document::DocumentImpl; +use gosub_html5::parser::Html5Parser; use gosub_testing::testing::tree_construction::fixture::read_fixtures; use gosub_testing::testing::tree_construction::result::ResultStatus; use gosub_testing::testing::tree_construction::Harness; @@ -72,7 +75,7 @@ fn run_test(test_idx: usize, test: Test, all_results: &mut TotalTestResults) { let mut harness = Harness::new(); let result = harness - .run_test(test.clone(), false) + .run_test::, Css3System>, Css3System>(test.clone(), false) .expect("problem parsing"); // #[cfg(all(feature = "debug_parser", not(test)))]