pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From the...@apache.org
Subject svn commit: r1147202 - in /pig/trunk: CHANGES.txt src/org/apache/pig/parser/AliasMasker.g src/org/apache/pig/parser/AstPrinter.g src/org/apache/pig/parser/QueryParser.g
Date Fri, 15 Jul 2011 15:48:51 GMT
Author: thejas
Date: Fri Jul 15 15:48:51 2011
New Revision: 1147202

URL: http://svn.apache.org/viewvc?rev=1147202&view=rev
Log:
PIG-2060: Fix errors in pig grammars reported by ANTLRWorks (azaroth via thejas)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/parser/AliasMasker.g
    pig/trunk/src/org/apache/pig/parser/AstPrinter.g
    pig/trunk/src/org/apache/pig/parser/QueryParser.g

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1147202&r1=1147201&r2=1147202&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Jul 15 15:48:51 2011
@@ -75,6 +75,8 @@ PIG-2011: Speed up TestTypedMap.java (dv
 
 BUG FIXES
 
+PIG-2060: Fix errors in pig grammars reported by ANTLRWorks (azaroth via thejas)
+
 PIG-2156: Limit/Sample with variable does not work if the expression starts 
  with an integer/double (azaroth via thejas)
 

Modified: pig/trunk/src/org/apache/pig/parser/AliasMasker.g
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/parser/AliasMasker.g?rev=1147202&r1=1147201&r2=1147202&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/parser/AliasMasker.g (original)
+++ pig/trunk/src/org/apache/pig/parser/AliasMasker.g Fri Jul 15 15:48:51 2011
@@ -598,7 +598,7 @@ eid : rel_str_op
     | CACHE
     | INPUT
     | OUTPUT
-    | ERROR
+    | STDERROR
     | STDIN
     | STDOUT
     | LIMIT

Modified: pig/trunk/src/org/apache/pig/parser/AstPrinter.g
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/parser/AstPrinter.g?rev=1147202&r1=1147201&r2=1147202&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/parser/AstPrinter.g (original)
+++ pig/trunk/src/org/apache/pig/parser/AstPrinter.g Fri Jul 15 15:48:51 2011
@@ -578,7 +578,7 @@ eid : rel_str_op
     | CACHE     { sb.append($CACHE.text); }
     | INPUT     { sb.append($INPUT.text); }
     | OUTPUT    { sb.append($OUTPUT.text); }
-    | ERROR     { sb.append($ERROR.text); }
+    | STDERROR  { sb.append($STDERROR.text); }
     | STDIN     { sb.append($STDIN.text); }
     | STDOUT    { sb.append($STDOUT.text); }
     | LIMIT     { sb.append($LIMIT.text); }

Modified: pig/trunk/src/org/apache/pig/parser/QueryParser.g
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/parser/QueryParser.g?rev=1147202&r1=1147201&r2=1147202&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/parser/QueryParser.g (original)
+++ pig/trunk/src/org/apache/pig/parser/QueryParser.g Fri Jul 15 15:48:51 2011
@@ -67,6 +67,7 @@ tokens {
     MACRO_INLINE;
     NULL;
     IDENTIFIER;
+    ANY;
 }
 
 @header {
@@ -670,7 +671,6 @@ eid : rel_str_op
     | LOAD
     | FILTER
     | FOREACH
-    | MATCHES
     | ORDER
     | DISTINCT
     | COGROUP
@@ -694,7 +694,6 @@ eid : rel_str_op
     | NOT
     | GENERATE
     | FLATTEN
-    | EVAL
     | ASC
     | DESC
     | INT



Mime
View raw message