Remove reserved words.
The `line`, `lineadj` and `point` reserved words were removed from
the spec. Update Tint to match.
Bug: tint:1769
Change-Id: I219bcf1d6053013133b8e369bb01c86af7bb9193
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/111320
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>
diff --git a/src/tint/reader/wgsl/parser_impl.cc b/src/tint/reader/wgsl/parser_impl.cc
index 6314133..7b09931 100644
--- a/src/tint/reader/wgsl/parser_impl.cc
+++ b/src/tint/reader/wgsl/parser_impl.cc
@@ -87,24 +87,23 @@
t == "goto" || t == "groupshared" || t == "handle" || t == "highp" || t == "impl" ||
t == "implements" || t == "import" || t == "inline" || t == "inout" ||
t == "instanceof" || t == "interface" || t == "invariant" || t == "layout" ||
- t == "line" || t == "lineadj" || t == "lowp" || t == "macro" || t == "macro_rules" ||
- t == "match" || t == "mediump" || t == "meta" || t == "mod" || t == "module" ||
- t == "move" || t == "mut" || t == "mutable" || t == "namespace" || t == "new" ||
- t == "nil" || t == "noexcept" || t == "noinline" || t == "nointerpolation" ||
- t == "noperspective" || t == "null" || t == "nullptr" || t == "of" || t == "operator" ||
- t == "package" || t == "packoffset" || t == "partition" || t == "pass" || t == "patch" ||
- t == "pixelfragment" || t == "point" || t == "precise" || t == "precision" ||
- t == "premerge" || t == "priv" || t == "protected" || t == "pub" || t == "public" ||
- t == "readonly" || t == "ref" || t == "regardless" || t == "register" ||
- t == "reinterpret_cast" || t == "requires" || t == "resource" || t == "restrict" ||
- t == "self" || t == "set" || t == "shared" || t == "signed" || t == "sizeof" ||
- t == "smooth" || t == "snorm" || t == "static" || t == "static_cast" || t == "std" ||
- t == "subroutine" || t == "super" || t == "target" || t == "template" || t == "this" ||
- t == "thread_local" || t == "throw" || t == "trait" || t == "try" || t == "typedef" ||
- t == "typeid" || t == "typename" || t == "typeof" || t == "union" || t == "unless" ||
- t == "unorm" || t == "unsafe" || t == "unsized" || t == "use" || t == "using" ||
- t == "varying" || t == "virtual" || t == "volatile" || t == "wgsl" || t == "where" ||
- t == "with" || t == "writeonly" || t == "yield";
+ t == "lowp" || t == "macro" || t == "macro_rules" || t == "match" || t == "mediump" ||
+ t == "meta" || t == "mod" || t == "module" || t == "move" || t == "mut" ||
+ t == "mutable" || t == "namespace" || t == "new" || t == "nil" || t == "noexcept" ||
+ t == "noinline" || t == "nointerpolation" || t == "noperspective" || t == "null" ||
+ t == "nullptr" || t == "of" || t == "operator" || t == "package" || t == "packoffset" ||
+ t == "partition" || t == "pass" || t == "patch" || t == "pixelfragment" ||
+ t == "precise" || t == "precision" || t == "premerge" || t == "priv" ||
+ t == "protected" || t == "pub" || t == "public" || t == "readonly" || t == "ref" ||
+ t == "regardless" || t == "register" || t == "reinterpret_cast" || t == "requires" ||
+ t == "resource" || t == "restrict" || t == "self" || t == "set" || t == "shared" ||
+ t == "signed" || t == "sizeof" || t == "smooth" || t == "snorm" || t == "static" ||
+ t == "static_cast" || t == "std" || t == "subroutine" || t == "super" || t == "target" ||
+ t == "template" || t == "this" || t == "thread_local" || t == "throw" || t == "trait" ||
+ t == "try" || t == "typedef" || t == "typeid" || t == "typename" || t == "typeof" ||
+ t == "union" || t == "unless" || t == "unorm" || t == "unsafe" || t == "unsized" ||
+ t == "use" || t == "using" || t == "varying" || t == "virtual" || t == "volatile" ||
+ t == "wgsl" || t == "where" || t == "with" || t == "writeonly" || t == "yield";
}
/// Enter-exit counters for block token types.
diff --git a/src/tint/reader/wgsl/parser_impl_reserved_keyword_test.cc b/src/tint/reader/wgsl/parser_impl_reserved_keyword_test.cc
index 8e178ab..f2adc06 100644
--- a/src/tint/reader/wgsl/parser_impl_reserved_keyword_test.cc
+++ b/src/tint/reader/wgsl/parser_impl_reserved_keyword_test.cc
@@ -154,8 +154,6 @@
"interface",
"invariant",
"layout",
- "line",
- "lineadj",
"lowp",
"macro",
"macro_rules",
@@ -184,7 +182,6 @@
"pass",
"patch",
"pixelfragment",
- "point",
"precise",
"precision",
"premerge",
