Skip to content

Commit d348367

Browse files
committedMar 30, 2016
Merge remote-tracking branch 'origin' into mcjit
2 parents 1a0d3cb + 40f0f30 commit d348367

File tree

137 files changed

+1817
-2389
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+1817
-2389
lines changed
 

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ $TRAVIS_OS_NAME == linux ]; then travis_retry ./configure --llvm-config=llv
2020
if [ $TRAVIS_OS_NAME == osx ]; then travis_retry ./configure; fi
2121
script: rake ci
2222
after_success:
23-
- if [ $TRAVIS_BRANCH == $TRAVIS_TAG ]; then ./scripts/deploy.sh release github website triggers; fi
23+
- if [ $TRAVIS_BRANCH == $TRAVIS_TAG ]; then ./scripts/deploy.sh release github website triggers docker; fi
2424
branches:
2525
only:
2626
- master

‎core/constant_cache.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ module Rubinius
22
class ConstantCache
33
attr_reader :name
44
attr_reader :value
5-
attr_reader :under
6-
attr_reader :scope
5+
attr_reader :module
6+
attr_reader :constant_scope
77
attr_reader :executable
88

99
def ip
@@ -21,7 +21,7 @@ def location
2121
end
2222

2323
def inspect
24-
"#<#{self.class.name}:0x#{self.object_id.to_s(16)} #{location}##{@name} constant=#{@value} under=#{@under}>"
24+
"#<#{self.class.name}:0x#{self.object_id.to_s(16)} #{location}##{@name} constant=#{@value} module=#{@module} constant_scope=#{@constant_scope}>"
2525
end
2626
end
2727
end

0 commit comments

Comments
 (0)
Please sign in to comment.