commit 092f13b79ac6a1b5ef065e83929eb1403d69f975
author Laurent Le Brun <laurentlb@google.com> Mon Aug 24 14:50:00 2015 +0000
committer Laszlo Csomor <laszlocsomor@google.com> Tue Aug 25 07:39:59 2015 +0000
tree 3e5e753cfe6860f8cfd5a347c36c35c404578025
parent ed5955c5a16996a3b630d7f95206d67d0d0c6380

Introduce '|' operator for set union.

--
MOS_MIGRATED_REVID=101363350

src/main/java/com/google/devtools/build/lib/syntax/Parser.java

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Parser.java b/src/main/java/com/google/devtools/build/lib/syntax/Parser.java
index 8f59047..6334673 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Parser.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Parser.java
@@ -134,6 +134,7 @@
           .put(TokenKind.PERCENT, Operator.PERCENT)
           .put(TokenKind.SLASH, Operator.DIVIDE)
           .put(TokenKind.PLUS, Operator.PLUS)
+          .put(TokenKind.PIPE, Operator.PIPE)
           .put(TokenKind.STAR, Operator.MULT)
           .build();
 
@@ -151,6 +152,7 @@
       EnumSet.of(Operator.NOT),
       EnumSet.of(Operator.EQUALS_EQUALS, Operator.NOT_EQUALS, Operator.LESS, Operator.LESS_EQUALS,
           Operator.GREATER, Operator.GREATER_EQUALS, Operator.IN, Operator.NOT_IN),
+      EnumSet.of(Operator.PIPE),
       EnumSet.of(Operator.MINUS, Operator.PLUS),
       EnumSet.of(Operator.DIVIDE, Operator.MULT, Operator.PERCENT));