[wgsl-in] Transition to a pass-based architecture

Cargo.toml

@@ -32,7 +32,7 @@ serialize = ["serde", "indexmap/serde-1"]
 deserialize = ["serde", "indexmap/serde-1"]
 spv-in = ["petgraph", "spirv"]
 spv-out = ["spirv"]
-wgsl-in = ["codespan-reporting", "hexf-parse", "termcolor", "unicode-xid"]
+wgsl-in = ["clone", "codespan-reporting", "termcolor", "aho-corasick", "chumsky", "half", "hexf-parse", "lasso", "logos", "strum"]
 wgsl-out = []
 hlsl-out = []
 span = ["codespan-reporting", "termcolor"]
@@ -58,10 +58,17 @@ num-traits = "0.2"
 spirv = { version = "0.2", optional = true }
 thiserror = "1.0.21"
 serde = { version = "1.0.103", features = ["derive"], optional = true }
-petgraph = { version ="0.6", optional = true }
+petgraph = { version = "0.6", optional = true }
 pp-rs = { version = "0.2.1", optional = true }
+
+# wgsl frontend dependencies
+aho-corasick = { version = "0.7.19", optional = true }
+chumsky = { version = "0.8.0", default-features = false, optional = true }
+half = { version = "1.8.2", optional = true }
 hexf-parse = { version = "0.2.1", optional = true }
-unicode-xid = { version = "0.2.3", optional = true }
+lasso = { version = "0.6.0", optional = true }
+logos = { version = "0.12.1", optional = true }
+strum = { version = "0.24.1", features = ["derive"], optional = true }
 
 [dev-dependencies]
 bincode = "1"

benches/criterion.rs

@@ -42,12 +42,12 @@ fn frontends(c: &mut Criterion) {
     #[cfg(all(feature = "wgsl-in", feature = "serialize", feature = "deserialize"))]
     group.bench_function("bin", |b| {
         let inputs_wgsl = gather_inputs("tests/in", "wgsl");
-        let mut parser = naga::front::wgsl::Parser::new();
+        let mut context = naga::front::wgsl::WgslContext::new();
         let inputs_bin = inputs_wgsl
             .iter()
             .map(|input| {
                 let string = std::str::from_utf8(input).unwrap();
-                let module = parser.parse(string).unwrap();
+                let module = context.parse(string).unwrap();
                 bincode::serialize(&module).unwrap()
             })
             .collect::<Vec<_>>();
@@ -60,14 +60,14 @@ fn frontends(c: &mut Criterion) {
     #[cfg(feature = "wgsl-in")]
     group.bench_function("wgsl", |b| {
         let inputs_wgsl = gather_inputs("tests/in", "wgsl");
+        let mut context = naga::front::wgsl::WgslContext::new();
         let inputs = inputs_wgsl
             .iter()
             .map(|input| std::str::from_utf8(input).unwrap())
             .collect::<Vec<_>>();
-        let mut parser = naga::front::wgsl::Parser::new();
         b.iter(move || {
             for &input in inputs.iter() {
-                parser.parse(input).unwrap();
+                context.parse(input).unwrap();
             }
         });
     });
@@ -99,12 +99,12 @@ fn frontends(c: &mut Criterion) {
 #[cfg(feature = "wgsl-in")]
 fn gather_modules() -> Vec<naga::Module> {
     let inputs = gather_inputs("tests/in", "wgsl");
-    let mut parser = naga::front::wgsl::Parser::new();
+    let mut context = naga::front::wgsl::WgslContext::new();
     inputs
         .iter()
         .map(|input| {
             let string = std::str::from_utf8(input).unwrap();
-            parser.parse(string).unwrap()
+            context.parse(string).unwrap()
         })
         .collect()
 }

cli/src/main.rs

@@ -287,8 +287,12 @@ fn run() -> Result<(), Box<dyn std::error::Error>> {
                 Ok(v) => (v, Some(input)),
                 Err(ref e) => {
                     let path = input_path.to_string_lossy();
-                    e.emit_to_stderr_with_path(&input, &path);
-                    return Err(CliError("Could not parse WGSL").into());
+
+                    for e in e {
+                        e.emit_to_stderr_with_path(&input, &path);
+                    }
+
+                    return Err(CliError("WGSL Error").into());
                 }
             }
         }

src/back/wgsl/writer.rs

@@ -1828,7 +1828,7 @@ impl<W: Write> Writer<W> {
             } => {
                 let name = &self.names[&NameKey::Constant(handle)];
                 // First write only constant name
-                write!(self.out, "let {}: ", name)?;
+                write!(self.out, "const {}: ", name)?;
                 // Next write constant type and value
                 match *value {
                     crate::ScalarValue::Sint(value) => {
@@ -1852,7 +1852,7 @@ impl<W: Write> Writer<W> {
             crate::ConstantInner::Composite { ty, ref components } => {
                 let name = &self.names[&NameKey::Constant(handle)];
                 // First write only constant name
-                write!(self.out, "let {}: ", name)?;
+                write!(self.out, "const {}: ", name)?;
                 // Next write constant type
                 self.write_type(module, ty)?;