From 1d42e44d3ec943db73671d21b0377ebb379a03b1 Mon Sep 17 00:00:00 2001
From: David Neto <dneto@google.com>
Date: Tue, 19 May 2020 16:18:45 -0400
Subject: [PATCH 1/2] Make tokens for << >> >>>

For example, disallow

    a < < b

from being recognized as a left-shift.
---
 wgsl/index.bs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/wgsl/index.bs b/wgsl/index.bs
index e04671eb5f..73edefb10e 100644
--- a/wgsl/index.bs
+++ b/wgsl/index.bs
@@ -489,8 +489,11 @@ The following is a list of keywords which are reserved for future expansion.
   <tr><td>`NOT_EQUAL`<td>!==
   <tr><td>`GREATER_THAN`<td>>
   <tr><td>`GREATER_THAN_EQUAL`<td>>=
+  <tr><td>`GREATER_GREATER`<td>>>
+  <tr><td>`GREATER_GREATER_GREATER`<td>>>>
   <tr><td>`LESS_THAN`<td><
   <tr><td>`LESS_THAN_EQUAL`<td><=
+  <tr><td>`LESS_LESS`<td><<
   <tr><td>`MOD`<td>%
   <tr><td>`MINUS`<td>-
   <tr><td>`NAMESPACE`<td>::
@@ -1340,11 +1343,11 @@ additive_expression
 
 shift_expression
   : additive_expression
-  | shift_expression LESS_THAN LESS_THAN additive_expression
+  | shift_expression LESS_LESS additive_expression
         OpShiftLeftLogical
-  | shift_expression GREATER_THAN GREATER_THAN additive_expression
+  | shift_expression GREATER_GREATER additive_expression
         OpShiftRightLogical
-  | shift_expression GREATER_THAN GREATER_THAN GREATER_THAN additive_expression
+  | shift_expression GREATER_GREATER_GREATER additive_expression
         OpShiftRightArithmetic
 
 relational_expression

From a1f03bdff1ddebe53fb1699bc08dabd206b13028 Mon Sep 17 00:00:00 2001
From: David Neto <dneto@google.com>
Date: Wed, 20 May 2020 12:49:12 -0400
Subject: [PATCH 2/2] Use semantic names for shift operators

---
 wgsl/index.bs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/wgsl/index.bs b/wgsl/index.bs
index 73edefb10e..ecc606c8e0 100644
--- a/wgsl/index.bs
+++ b/wgsl/index.bs
@@ -489,11 +489,11 @@ The following is a list of keywords which are reserved for future expansion.
   <tr><td>`NOT_EQUAL`<td>!==
   <tr><td>`GREATER_THAN`<td>>
   <tr><td>`GREATER_THAN_EQUAL`<td>>=
-  <tr><td>`GREATER_GREATER`<td>>>
-  <tr><td>`GREATER_GREATER_GREATER`<td>>>>
+  <tr><td>`LOGICAL_SHIFT_RIGHT`<td>>>
+  <tr><td>`ARITH_SHIFT_RIGHT`<td>>>>
   <tr><td>`LESS_THAN`<td><
   <tr><td>`LESS_THAN_EQUAL`<td><=
-  <tr><td>`LESS_LESS`<td><<
+  <tr><td>`SHIFT_LEFT`<td><<
   <tr><td>`MOD`<td>%
   <tr><td>`MINUS`<td>-
   <tr><td>`NAMESPACE`<td>::
@@ -1343,11 +1343,11 @@ additive_expression
 
 shift_expression
   : additive_expression
-  | shift_expression LESS_LESS additive_expression
+  | shift_expression SHIFT_LEFT additive_expression
         OpShiftLeftLogical
-  | shift_expression GREATER_GREATER additive_expression
+  | shift_expression LOGICAL_SHIFT_RIGHT additive_expression
         OpShiftRightLogical
-  | shift_expression GREATER_GREATER_GREATER additive_expression
+  | shift_expression ARITH_SHIFT_RIGHT additive_expression
         OpShiftRightArithmetic
 
 relational_expression