Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 12d6e841c686
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0187e706e1d1
Choose a head ref
  • 8 commits
  • 9 files changed
  • 1 contributor

Commits on May 22, 2016

  1. Copy the full SHA
    0125673 View commit details
  2. Copy the full SHA
    4952579 View commit details
  3. Copy the full SHA
    268bc81 View commit details
  4. Copy the full SHA
    bb1c3d3 View commit details
  5. Copy the full SHA
    16a088d View commit details
  6. [Truffle] Whitespace.

    chrisseaton committed May 22, 2016
    Copy the full SHA
    72128fa View commit details
  7. [Truffle] Typo.

    chrisseaton committed May 22, 2016
    Copy the full SHA
    782b92c View commit details
  8. Copy the full SHA
    0187e70 View commit details
30 changes: 0 additions & 30 deletions truffle/src/main/ruby/core.rb
Original file line number Diff line number Diff line change
@@ -7,17 +7,7 @@
# GNU Lesser General Public License version 2.1

Truffle::Boot.require_core 'core/pre'

# Rubinius primitives written in Ruby

Truffle::Boot.require_core 'core/primitives'

# Load alpha.rb

Truffle::Boot.require_core 'core/alpha'

# Load bootstrap

Truffle::Boot.require_core 'core/tuple'
Truffle::Boot.require_core 'core/lookuptable'
Truffle::Boot.require_core 'core/atomic'
@@ -37,19 +27,11 @@
Truffle::Boot.require_core 'core/true'
Truffle::Boot.require_core 'core/type'
Truffle::Boot.require_core 'core/weakref'

# Load platform

Truffle::Boot.require_core 'core/library'

Truffle::Boot.require_core 'core/ffi'
Truffle::Boot.require_core 'core/pointer_accessors'
Truffle::Boot.require_core 'core/pointer'
Truffle::Boot.require_core 'core/ffi_file'
Truffle::Boot.require_core 'core/ffi_struct'

# Load common

Truffle::Boot.require_core 'core/io'
Truffle::Boot.require_core 'core/immediate'
Truffle::Boot.require_core 'core/string_mirror'
@@ -101,27 +83,15 @@
Truffle::Boot.require_core 'core/complex'
Truffle::Boot.require_core 'core/complexifier'
Truffle::Boot.require_core 'core/class'

# Load JRuby+Truffle classes

Truffle::Boot.require_core 'core/binding'
Truffle::Boot.require_core 'core/math'
Truffle::Boot.require_core 'core/method'
Truffle::Boot.require_core 'core/unbound_method'

# Dirty fixes we'd like to get rid of soon
Truffle::Boot.require_core 'core/shims'

# Load JRuby+Truffle specific classes

Truffle::Boot.require_core 'core/truffle/attachments'
Truffle::Boot.require_core 'core/truffle/debug'
Truffle::Boot.require_core 'core/truffle/cext'
Truffle::Boot.require_core 'core/truffle/interop'

# Start running Ruby code outside classes

Truffle::Boot.require_core 'core/rbconfig'
Truffle::Boot.require_core 'core/main'

Truffle::Boot.require_core 'core/post'
85 changes: 0 additions & 85 deletions truffle/src/main/ruby/core/alpha.rb

This file was deleted.

2 changes: 1 addition & 1 deletion truffle/src/main/ruby/core/false.rb
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ def to_s

def inspect
# Call #to_s rather than alias it so that people can change #to_s if they
# wish. Yes, sounds dumb.
# wish.
to_s
end

Loading