Fix ARGLIST grammar rule that was entirely optional

alban-auzeill · pynicolas · commit 3cc4e7b33433 · 2017-12-22T17:39:26.000+01:00
diff --git a/python-squid/src/main/java/org/sonar/python/api/PythonGrammar.java b/python-squid/src/main/java/org/sonar/python/api/PythonGrammar.java
@@ -226,7 +226,7 @@ public static void grammar(LexerfulGrammarBuilder b) {
         b.firstOf(COMP_FOR, b.sequence(b.zeroOrMore(",", b.firstOf(b.sequence(TEST, ":", TEST), b.sequence("**", EXPR))), b.optional(",")))),
       b.sequence(b.firstOf(TEST, STAR_EXPR), b.firstOf(COMP_FOR, b.sequence(b.zeroOrMore(",", b.firstOf(TEST, STAR_EXPR)), b.optional(","))))));
 
-    b.rule(ARGLIST).is(b.optional(ARGUMENT, b.zeroOrMore(",", ARGUMENT), b.optional(",")));
+    b.rule(ARGLIST).is(ARGUMENT, b.zeroOrMore(",", ARGUMENT), b.optional(","));
     b.rule(ARGUMENT).is(b.firstOf(
       b.sequence("*", TEST),
       b.sequence("**", TEST),
diff --git a/python-squid/src/test/java/org/sonar/python/parser/expressions/ArgumentListTest.java b/python-squid/src/test/java/org/sonar/python/parser/expressions/ArgumentListTest.java
@@ -0,0 +1,43 @@
+/*
+ * SonarQube Python Plugin
+ * Copyright (C) 2011-2017 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.python.parser.expressions;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.sonar.python.api.PythonGrammar;
+import org.sonar.python.parser.RuleTest;
+
+import static org.sonar.sslr.tests.Assertions.assertThat;
+
+public class ArgumentListTest extends RuleTest {
+
+  @Before
+  public void init() {
+    setRootRule(PythonGrammar.ARGLIST);
+  }
+
+  @Test
+  public void arg_list() {
+    assertThat(p).matches("1");
+    assertThat(p).matches("a, b");
+    assertThat(p).notMatches("");
+  }
+
+}
