WGSL template arg. parsing should permit a single trailing comma

[ErichDonGubler]

Description

Until recently, Dawn didn't allow a trailing comma in template argument lists, and WebGPU CTS also tested that parse cases with a trailing comma failed to parse. Naga also implemented this behavior. However, it turns out that this was all incorrect! 😱

The WGSL. spec. states that the template_arg_comma_list must accept a single optional trailing comma:

As of gpuweb/cts#3959, the CTS fixed this to follow the spec., with Dawn following suit in https://crbug.com/366000875. Naga should also fix this, so we don't diverge.

Repro steps

Try to compile this shader:

// ../in.wgsl

@group(0) @binding(0)
var<storage, read,> x: i32;

@group(0) @binding(1)
var<storage,> x: i32;

…which, at time of writing, yields the following in naga-cli:

$ cargo run --package naga-cli -- ../in.wgsl

    Finished dev [unoptimized + debuginfo] target(s) in 0.08s
     Running `target/debug/naga ../in.wgsl`
Could not parse WGSL:
error: expected identifier, found '>'
  ┌─ ../in.wgsl:7:13
  │
7 │ var<storage,> x: i32;
  │             ^ expected identifier


Error: nu::shell::non_zero_exit_code

  × External command had a non-zero exit code
   ╭─[entry #3:1:1]
 1 │ cargo run -p naga-cli -- ../in.wgsl
   · ──┬──
   ·   ╰── exited with code 1
   ╰────

Alternatively, if lines 3-4 are commented out:

    Finished dev [unoptimized + debuginfo] target(s) in 0.08s
     Running `target/debug/naga ../in.wgsl`
Could not parse WGSL:
error: expected identifier, found '>'
  ┌─ ../in.wgsl:7:13
  │
7 │ var<storage,> x: i32;
  │             ^ expected identifier


Error: nu::shell::non_zero_exit_code

  × External command had a non-zero exit code
   ╭─[entry #4:1:1]
 1 │ cargo run -p naga-cli -- ../in.wgsl | clip
   · ──┬──
   ·   ╰── exited with code 1
   ╰────

Expected vs observed behavior

The repro steps should produce no errors.

Extra materials

-

Platform

-