jruby · Oct 16, 2015 · Oct 17, 2015 · Oct 17, 2015
diff --git a/.gitignore b/.gitignore
@@ -53,6 +53,7 @@ lib/ruby/stdlib/org/
 lib/ruby/stdlib/readline/*readline*.jar
 lib/ruby/stdlib/ripper.jar
 lib/ruby/stdlib/rubygems/defaults/jruby_native.rb
+lib/ruby/stdlib/racc*
 lib/ruby/stdlib/rake*
 lib/ruby/stdlib/rdoc*
 lib/ruby/stdlib/test*

diff --git a/lib/pom.rb b/lib/pom.rb
@@ -28,7 +28,8 @@ def version
    ImportedGem.new( 'power_assert', 'power_assert.version', true ),
    ImportedGem.new( 'psych', '2.0.15', true ),
    ImportedGem.new( 'json', 'json.version', true ),
-   ImportedGem.new( 'jar-dependencies', '0.1.15', true )
+   ImportedGem.new( 'jar-dependencies', '0.1.15', true ),
+   ImportedGem.new( 'racc', 'racc.version', true)
   ]
 
 project 'JRuby Lib Setup' do

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -161,6 +161,19 @@ DO NOT MODIFIY - GENERATED CODE
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>racc</artifactId>
+      <version>${racc.version}</version>
+      <type>gem</type>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>jar-dependencies</artifactId>
+          <groupId>rubygems</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>ruby-maven</artifactId>

diff --git a/lib/ruby/stdlib/racc/parser.rb b/lib/ruby/stdlib/racc/parser.rb
diff --git a/lib/ruby/stdlib/racc/rdoc/grammar.en.rdoc b/lib/ruby/stdlib/racc/rdoc/grammar.en.rdoc
diff --git a/pom.rb b/pom.rb
@@ -79,7 +79,8 @@
               'main.basedir' => '${project.basedir}',
               'joda.time.version' => '2.8.2',
               'test-unit.version' => '3.0.3',
-              'power_assert.version' => '0.2.3' )
+              'power_assert.version' => '0.2.3',
+              'racc.version' => '1.4.13' )
 
   modules [ 'truffle', 'core', 'lib' ]
 

diff --git a/pom.xml b/pom.xml
@@ -107,6 +107,7 @@ DO NOT MODIFIY - GENERATED CODE
   <properties>
     <rspec-core.version>3.3.2</rspec-core.version>
     <polyglot.dump.readonly>true</polyglot.dump.readonly>
+    <racc.version>1.4.13</racc.version>
     <its.j2ee>j2ee*/pom.xml</its.j2ee>
     <jruby.basedir>${project.basedir}</jruby.basedir>
     <minitest.version>5.4.1</minitest.version>

diff --git a/tool/globals_2_2_2.rb b/tool/globals_2_2_2.rb
@@ -42,7 +42,6 @@
   profile.rb
   profiler.rb
   pstore.rb
-  racc
   rbconfig
   resolv-replace.rb
   resolv.rb

diff --git a/tool/truffle/jruby_truffle_runner/lib/jruby+truffle_runner.rb b/tool/truffle/jruby_truffle_runner/lib/jruby+truffle_runner.rb
@@ -18,7 +18,8 @@
 class JRubyTruffleRunner
   attr_reader :options
 
-  EXECUTABLE        = 'jruby+truffle'
+  EXECUTABLE        = File.basename($PROGRAM_NAME)
+  BRANDING          = EXECUTABLE.include?('jruby') ? 'JRuby+Truffle' : 'RubyTruffle'
   LOCAL_CONFIG_FILE = '.jruby+truffle.yaml'
 
   begin
@@ -47,7 +48,7 @@ class JRubyTruffleRunner
             debug_option:        ['--debug-option OPTION', 'Debug JVM option', assign_new_value,
                                   '-J-agentlib:jdwp=transport=dt_socket,server=y,address=%d,suspend=y'],
             truffle_bundle_path: ['--truffle-bundle-path NAME', 'Bundle path', assign_new_value, '.jruby+truffle_bundle'],
-            jruby_truffle_path:  ['--jruby-truffle-path PATH', 'Path to JRuby+Truffle bin/jruby', assign_new_value,
+            interpreter_path:    ['--interpreter-path PATH', "Path to #{BRANDING} interpreter executable", assign_new_value,
                                   '../jruby/bin/jruby'],
             graal_path:          ['--graal-path PATH', 'Path to Graal', assign_new_value, '../graalvm-jdk1.8.0/bin/java'],
             mock_load_path:      ['--mock-load-path PATH', 'Path of mocks & monkey-patches (prepended in $:, relative to --truffle_bundle_path)',
@@ -61,10 +62,10 @@ class JRubyTruffleRunner
         },
         run:    {
             help:            ['-h', '--help', 'Show this message', assign_new_value, false],
-            test:            ['-t', '--test', 'Do not use Truffle use plain JRuby', assign_new_value, false],
+            test:            ['-t', '--test', "Use conventional JRuby instead of #{BRANDING}", assign_new_value, false],
             graal:           ['-g', '--graal', 'Run on graal', assign_new_value, false],
-            build:           ['-b', '--build', 'Run `jt build` in JRuby', assign_new_value, false],
-            rebuild:         ['--rebuild', 'Run `jt rebuild` in JRuby', assign_new_value, false],
+            build:           ['-b', '--build', 'Run `jt build` using conventional JRuby', assign_new_value, false],
+            rebuild:         ['--rebuild', 'Run `jt rebuild` using conventional JRuby', assign_new_value, false],
             debug:           ['-d', '--debug', 'JVM remote debugging', assign_new_value, false],
             require:         ['-r', '--require FILE', 'Files to require, same as Ruby\'s -r', add_to_array, []],
             require_pattern: ['--require-pattern DIR_GLOB_PATTERN', 'Files matching the pattern will be required', apply_pattern, nil],
@@ -87,7 +88,7 @@ class JRubyTruffleRunner
       Usage: #{EXECUTABLE} [options] [subcommand [subcommand-options]]
       Subcommands are: #{(OPTION_DEFINITIONS.keys - [:global]).map(&:to_s).join(', ')}
 
-      Allows to execute gem/app on JRuby+Truffle until it's more complete. Environment
+      Allows to execute gem/app on #{BRANDING} until it's more complete. Environment
       has to be set up first with setup subcommand then run subcommand can be used.
 
       Run #{EXECUTABLE} readme to see README.
@@ -99,15 +100,15 @@ class JRubyTruffleRunner
 
       Usage: #{EXECUTABLE} [options] setup [subcommand-options]
 
-      Creates environment for running gem/app on JRuby+Truflle.
+      Creates environment for running gem/app on #{BRANDING}.
 
     TXT
 
     run_help = <<-TXT.gsub(/^ {6}/, '')
 
       Usage: #{EXECUTABLE} [options] run [subcommand-options] -- [ruby-options]
 
-      Runs file, -e expr, etc in setup environment on JRuby+Truffle
+      Runs file, -e expr, etc in setup environment on #{BRANDING}
       (options after -- are interpreted by ruby not by this tool)
       Examples: #{EXECUTABLE} run -- a_file.rb
                 #{EXECUTABLE} run -- -S irb
@@ -301,7 +302,7 @@ def subcommand_setup(vm_options, rest)
   end
 
   def subcommand_run(vm_options, rest)
-    jruby_path = Pathname("#{@options[:global][:jruby_truffle_path]}/../..")
+    jruby_path = Pathname("#{@options[:global][:interpreter_path]}/../..")
 
     unless jruby_path.absolute?
       jruby_path = jruby_path.relative_path_from(Pathname('.'))
@@ -336,7 +337,7 @@ def subcommand_run(vm_options, rest)
     env['JAVACMD'] = @options[:global][:graal_path] if @options[:run][:graal]
 
     cmd = [(env unless env.empty?),
-           @options[:global][:jruby_truffle_path],
+           @options[:global][:interpreter_path],
            *cmd_options,
            executable,
            *rest