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: 1347d6de2cc0
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1f0930819092
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 24, 2015

  1. Copy the full SHA
    a2f7888 View commit details
  2. [Truffle] Fixed whitespace.

    nirvdrum committed Jun 24, 2015
    Copy the full SHA
    1f09308 View commit details
Showing with 49 additions and 1 deletion.
  1. +1 −0 truffle/src/main/ruby/core.rb
  2. +0 −1 truffle/src/main/ruby/core/rubinius/api/shims/hash.rb
  3. +48 −0 truffle/src/main/ruby/core/rubinius/api/shims/kernel.rb
1 change: 1 addition & 0 deletions truffle/src/main/ruby/core.rb
Original file line number Diff line number Diff line change
@@ -135,6 +135,7 @@ def self.omit(reason)
require_relative 'core/rubinius/common/array'
require_relative 'core/rubinius/api/shims/array'
require_relative 'core/rubinius/common/kernel'
require_relative 'core/rubinius/api/shims/kernel'
require_relative 'core/rubinius/common/identity_map'
#require_relative 'core/rubinius/common/loaded_features'
#require_relative 'core/rubinius/common/global'
1 change: 0 additions & 1 deletion truffle/src/main/ruby/core/rubinius/api/shims/hash.rb
Original file line number Diff line number Diff line change
@@ -24,7 +24,6 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


class Hash

# Renamed version of the Rubinius Hash#[] method
48 changes: 48 additions & 0 deletions truffle/src/main/ruby/core/rubinius/api/shims/kernel.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Copyright (c) 2007-2015, Evan Phoenix and contributors
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright notice
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# * Neither the name of Rubinius nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

module Kernel

def extend(*modules)
raise ArgumentError, "wrong number of arguments (0 for 1+)" if modules.empty?

# Disabled for JRuby+Truffle. The frozen check should be done in `object_extend`.
# Having the check here breaks nil.extend().
#Rubinius.check_frozen

modules.reverse_each do |mod|
Rubinius.privately do
mod.extend_object self
end

Rubinius.privately do
mod.extended self
end
end
self
end

end