[Truffle] Hide ambiguous argument warning.

jruby · Jan 30, 2015 · 7156dac · 7156dac
1 parent e217033
commit 7156dac
Showing 11 changed files with 27 additions and 31 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -532,7 +532,7 @@
         <artifactId>maven-shade-plugin</artifactId>
         <executions>
           <execution>
-            <id>pack lib/jruby.jar</id>
+            <id>create lib/jruby.jar</id>
             <phase>package</phase>
             <goals>
               <goal>shade</goal>

diff --git a/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java b/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
@@ -819,7 +819,9 @@ private int hereDocumentIdentifier() throws IOException {
     }
 
     private void arg_ambiguous() {
-        if (warnings.isVerbose()) warnings.warning(ID.AMBIGUOUS_ARGUMENT, getPosition(), "Ambiguous first argument; make sure.");
+        if (warnings.isVerbose() && Options.PARSER_AMBIGUOUS_ARGUMENTS.load()) {
+            warnings.warning(ID.AMBIGUOUS_ARGUMENT, getPosition(), "Ambiguous first argument; make sure.");
+        }
     }
 
 

diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -65,6 +65,7 @@ public class Options {
     public static final Option<Boolean> PARSER_WARN_LOCAL_SHADOWING = bool(PARSER, "parser.warn.shadowing_local", true, "Warn about shadowing local variables.");
     public static final Option<Boolean> PARSER_WARN_REGEX_CONDITION = bool(PARSER, "parser.warn.regex_condition", true, "Warn about regex literals in conditions.");
     public static final Option<Boolean> PARSER_WARN_ARGUMENT_PREFIX = bool(PARSER, "parser.warn.argument_prefix", true, "Warn about splat operators being interpreted as argument prefixes.");
+    public static final Option<Boolean> PARSER_AMBIGUOUS_ARGUMENTS = bool(PARSER, "parser.warn.ambiguous_argument", true, "Warn about ambiguous arguments.");
 
     public static final Option<CompileMode> COMPILE_MODE = enumeration(COMPILER, "compile.mode", CompileMode.class, CompileMode.JIT, "Set compilation mode. JIT = at runtime; FORCE = before execution.");
     public static final Option<Boolean> COMPILE_DUMP = bool(COMPILER, "compile.dump", false, "Dump to console all bytecode generated at runtime.");

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -22,11 +22,6 @@
       <artifactId>jruby-core</artifactId>
       <version>9.0.0.0-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>org.jruby</groupId>
-      <artifactId>jruby-truffle</artifactId>
-      <version>9.0.0.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jruby-openssl</artifactId>

diff --git a/maven/jruby-dist/pom.xml b/maven/jruby-dist/pom.xml
@@ -12,7 +12,7 @@
   <name>JRuby Dist</name>
   <properties>
     <tesla.dump.readonly>true</tesla.dump.readonly>
-    <jruby.plugins.version>1.0.7</jruby.plugins.version>
+    <jruby.plugins.version>1.0.3</jruby.plugins.version>
     <main.basedir>${project.parent.parent.basedir}</main.basedir>
     <tesla.dump.pom>pom.xml</tesla.dump.pom>
     <tesla.version>0.1.1</tesla.version>

diff --git a/maven/jruby-jars/pom.xml b/maven/jruby-jars/pom.xml
@@ -18,18 +18,12 @@ freezing to) a specific jruby-complete jar version.</description>
   <licenses>
     <license>
       <name>EPL-1.0</name>
-      <url>http://opensource.org/licenses/EPL-1.0</url>
-      <comments>Eclipse Public License 1.0</comments>
     </license>
     <license>
       <name>GPL-2.0</name>
-      <url>http://opensource.org/licenses/GPL-2.0</url>
-      <comments>GNU General Public License version 2.0</comments>
     </license>
     <license>
       <name>LGPL-2.1</name>
-      <url>http://opensource.org/licenses/LGPL-2.1</url>
-      <comments>GNU Library or "Lesser" General Public License version 2.1</comments>
     </license>
   </licenses>
   <developers>
@@ -47,6 +41,7 @@ freezing to) a specific jruby-complete jar version.</description>
     <gem.home>${jruby.home}/lib/ruby/gems/shared</gem.home>
     <jruby.plugins.version>1.0.7</jruby.plugins.version>
     <tesla.dump.pom>pom.xml</tesla.dump.pom>
+    <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
     <jruby_home>${basedir}/../../</jruby_home>
     <tesla.version>0.1.1</tesla.version>
   </properties>

diff --git a/spec/truffle/spec-wrapper b/spec/truffle/spec-wrapper
@@ -9,4 +9,5 @@ bin/jruby -X+T \
   -Xparser.warn.shadowing_local=false \
   -Xparser.warn.regex_condition=false \
   -Xparser.warn.argument_prefix=false \
+  -Xparser.warn.ambiguous_argument=false \
   -J-ea -J-Xmx2G "$@"
diff --git a/spec/truffle/spec-wrapper.bat b/spec/truffle/spec-wrapper.bat
@@ -5,4 +5,5 @@
   -Xparser.warn.shadowing_local=false ^
   -Xparser.warn.regex_condition=false ^
   -Xparser.warn.argument_prefix=false ^
-  -J-ea -J-Xmx2G %*
+  -Xparser.warn.ambiguous_argument=false ^
+  -J-ea -J-Xmx2G %*
diff --git a/test/pom.rb b/test/pom.rb
@@ -235,6 +235,7 @@
                           '<arg value="-Xparser.warn.shadowing_local=false" />' +
                           '<arg value="-Xparser.warn.regex_condition=false" />' +
                           '<arg value="-Xparser.warn.argument_prefix=false" />' +
+                          '<arg value="-Xparser.warn.ambiguous_argument=false" />' +
                           '<arg value="-J-ea" />' +
                           '<arg value="-J-Xmx1G" />' +
                           '<arg value="spec/mspec/bin/mspec" />' +
@@ -258,6 +259,8 @@
                           #'<arg value="-T" />' +
                           #'<arg value="-Xparser.warn.argument_prefix=false" />' +
                           #'<arg value="-T" />' +
+                          #'<arg value="-Xparser.warn.ambiguous_argument=false" />' +
+                          #'<arg value="-T" />' +
                           #'<arg value="-J-ea" />' +
                           '<arg value="--config" />' +
                           '<arg value="spec/truffle/truffle.mspec" />' +
@@ -286,6 +289,7 @@
                           '<arg value="-Xparser.warn.shadowing_local=false" />' +
                           '<arg value="-Xparser.warn.regex_condition=false" />' +
                           '<arg value="-Xparser.warn.argument_prefix=false" />' +
+                          '<arg value="-Xparser.warn.ambiguous_argument=false" />' +
                           '<arg value="-J-ea" />' +
                           '<arg value="-J-Xmx1G" />' +
                           '<arg value="spec/mspec/bin/mspec" />' +
@@ -309,6 +313,8 @@
                           #'<arg value="-T" />' +
                           #'<arg value="-Xparser.warn.argument_prefix=false" />' +
                           #'<arg value="-T" />' +
+                          #'<arg value="-Xparser.warn.ambiguous_argument=false" />' +
+                          #'<arg value="-T" />' +
                           #'<arg value="-J-ea" />' +
                           '<arg value="--config" />' +
                           '<arg value="spec/truffle/truffle.mspec" />' +

diff --git a/test/pom.xml b/test/pom.xml
@@ -34,19 +34,12 @@
       <version>2.0.7</version>
       <scope>test</scope>
     </dependency>
-    <!-- FIXME: only depend on lib, ideally -->
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.jruby</groupId>
-      <artifactId>jruby-truffle</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
@@ -247,7 +240,7 @@
                 </goals>
                 <configuration>
                   <target>
-                    <exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">
+                    <exec failonerror="true" dir="${jruby.home}" executable="${jruby.home}/bin/jruby">
                       <env value="" key="JRUBY_OPTS" />
                       <arg value="-S" />
                       <arg value="rake" />
@@ -276,7 +269,7 @@
                 </goals>
                 <configuration>
                   <target>
-                    <exec dir="${jruby.home}" executable="java" failonerror="true">
+                    <exec failonerror="true" dir="${jruby.home}" executable="java">
                       <arg value="-cp" />
                       <arg value="core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-${project.version}.jar" />
                       <arg value="org.jruby.Main" />
@@ -517,7 +510,7 @@
                 </goals>
                 <configuration>
                   <target>
-                    <exec dir="${jruby.home}" executable="java" failonerror="true">
+                    <exec failonerror="true" dir="${jruby.home}" executable="java">
                       <arg value="-cp" />
                       <arg value="core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-${project.version}.jar" />
                       <arg value="org.jruby.Main" />
@@ -635,7 +628,7 @@
                 </goals>
                 <configuration>
                   <target>
-                    <exec dir="${jruby.home}" executable="java" failonerror="true">
+                    <exec failonerror="true" dir="${jruby.home}" executable="java">
                       <arg value="-cp" />
                       <arg value="core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-${project.version}.jar" />
                       <arg value="org.jruby.Main" />
@@ -680,7 +673,7 @@
                 </goals>
                 <configuration>
                   <target>
-                    <exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">
+                    <exec failonerror="true" dir="${jruby.home}" executable="${jruby.home}/bin/jruby">
                       <arg value="-X+T" />
                       <arg value="-Xparser.warn.useless_use_of=false" />
                       <arg value="-Xparser.warn.not_reached=false" />
@@ -723,14 +716,15 @@
                 </goals>
                 <configuration>
                   <target>
-                    <exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">
+                    <exec failonerror="true" dir="${jruby.home}" executable="${jruby.home}/bin/jruby">
                       <arg value="-X+T" />
                       <arg value="-Xparser.warn.useless_use_of=false" />
                       <arg value="-Xparser.warn.not_reached=false" />
                       <arg value="-Xparser.warn.grouped_expressions=false" />
                       <arg value="-Xparser.warn.shadowing_local=false" />
                       <arg value="-Xparser.warn.regex_condition=false" />
                       <arg value="-Xparser.warn.argument_prefix=false" />
+                      <arg value="-Xparser.warn.ambiguous_argument=false" />
                       <arg value="-J-ea" />
                       <arg value="-J-Xmx1G" />
                       <arg value="spec/mspec/bin/mspec" />
@@ -766,14 +760,15 @@
                 </goals>
                 <configuration>
                   <target>
-                    <exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">
+                    <exec failonerror="true" dir="${jruby.home}" executable="${jruby.home}/bin/jruby">
                       <arg value="-X+T" />
                       <arg value="-Xparser.warn.useless_use_of=false" />
                       <arg value="-Xparser.warn.not_reached=false" />
                       <arg value="-Xparser.warn.grouped_expressions=false" />
                       <arg value="-Xparser.warn.shadowing_local=false" />
                       <arg value="-Xparser.warn.regex_condition=false" />
                       <arg value="-Xparser.warn.argument_prefix=false" />
+                      <arg value="-Xparser.warn.ambiguous_argument=false" />
                       <arg value="-J-ea" />
                       <arg value="-J-Xmx1G" />
                       <arg value="spec/mspec/bin/mspec" />
@@ -809,7 +804,7 @@
                 </goals>
                 <configuration>
                   <target>
-                    <exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">
+                    <exec failonerror="true" dir="${jruby.home}" executable="${jruby.home}/bin/jruby">
                       <arg value="-J-server" />
                       <arg value="-J-G:+TruffleCompilationExceptionsAreThrown" />
                       <arg value="-X+T" />

diff --git a/truffle/pom.xml b/truffle/pom.xml
@@ -76,7 +76,7 @@
         <artifactId>maven-shade-plugin</artifactId>
         <executions>
           <execution>
-            <id>pack lib/jruby-truffle.jar</id>
+            <id>create lib/jruby-truffle.jar</id>
             <phase>package</phase>
             <goals>
               <goal>shade</goal>