commit 0ddcba2d0148e662cca8487d91d8ae797a9a89e6
author Laurent Le Brun <laurentlb@google.com> Mon Mar 23 16:48:01 2015 +0000
committer Han-Wen Nienhuys <hanwen@google.com> Tue Mar 24 16:41:37 2015 +0000
tree 74e365e899e8b1a1876d62580e99ef3f7f7a4869
parent 4ccfb20f52d2d178d002bc4a71777e9e698a86dd

Parser: Useful error messages when a Python keyword is used.

--
MOS_MIGRATED_REVID=89307831

src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java b/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java
index afca4b3..683f2c7 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java
@@ -316,8 +316,16 @@
   public void testAssignKeyword() {
     syntaxEvents.setFailFast(false);
     parseExpr("with = 4");
+    syntaxEvents.assertContainsEvent("keyword 'with' not supported");
     syntaxEvents.assertContainsEvent("syntax error at 'with': expected expression");
-    syntaxEvents.collector().clear();
+  }
+
+  @Test
+  public void testTry() {
+    syntaxEvents.setFailFast(false);
+    parseExpr("try: 1 + 1");
+    syntaxEvents.assertContainsEvent("'try' not supported, all exceptions are fatal");
+    syntaxEvents.assertContainsEvent("syntax error at 'try': expected expression");
   }
 
   @Test
@@ -754,6 +762,21 @@
   }
 
   @Test
+  public void testFunctionDefinitionIgnoredEvenWithUnsupportedKeyword() throws Exception {
+    // Parser skips over entire function definitions without reporting error,
+    // when parsePython is set to true.
+    List<Statement> stmts = parseFile(
+        "x = 1;\n"
+        + "def foo(x, y, **z):\n"
+        + "  try:\n"
+        + "    x = 2\n"
+        + "  with: pass\n"
+        + "  return 2\n"
+        + "x = 3", true /* parsePython */);
+    assertThat(stmts).hasSize(2);
+  }
+
+  @Test
   public void testFunctionDefinitionIgnored() throws Exception {
     // Parser skips over entire function definitions without reporting error,
     // when parsePython is set to true.