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: 4fdc0d491620
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 69450b9a4a89
Choose a head ref
  • 16 commits
  • 28 files changed
  • 1 contributor

Commits on May 21, 2016

  1. Ignore did_you_mean.

    chrisseaton committed May 21, 2016
    Copy the full SHA
    4b61e06 View commit details
  2. Copy the full SHA
    17a73bf View commit details
  3. [Truffle] Put out type stuff in post as it can't be folded in, and mo…

    …ve the common type to core.
    chrisseaton committed May 21, 2016
    Copy the full SHA
    287f951 View commit details
  4. Copy the full SHA
    efc0d92 View commit details
  5. Copy the full SHA
    9d03961 View commit details
  6. Copy the full SHA
    be079c0 View commit details
  7. Copy the full SHA
    57c43ae View commit details
  8. Copy the full SHA
    086b7f5 View commit details
  9. Copy the full SHA
    973ed2b View commit details
  10. Copy the full SHA
    a8b047d View commit details
  11. Copy the full SHA
    c5160db View commit details
  12. Copy the full SHA
    97aeebd View commit details
  13. Copy the full SHA
    acce0ee View commit details
  14. Copy the full SHA
    2cdfa16 View commit details
  15. Copy the full SHA
    8c4189a View commit details
  16. Copy the full SHA
    69450b9 View commit details
Showing with 5,608 additions and 5,842 deletions.
  1. +5 −5 truffle/src/main/java/org/jruby/truffle/language/parser/jruby/BodyTranslator.java
  2. +13 −24 truffle/src/main/ruby/core.rb
  3. +0 −78 truffle/src/main/ruby/core/bootstrap/dir.rb
  4. +0 −193 truffle/src/main/ruby/core/bootstrap/io.rb
  5. +0 −92 truffle/src/main/ruby/core/bootstrap/regexp.rb
  6. +0 −129 truffle/src/main/ruby/core/bootstrap/stat.rb
  7. +0 −113 truffle/src/main/ruby/core/bootstrap/string.rb
  8. +0 −246 truffle/src/main/ruby/core/bootstrap/thread.rb
  9. +0 −289 truffle/src/main/ruby/core/bootstrap/type.rb
  10. +0 −1,059 truffle/src/main/ruby/core/common/kernel.rb
  11. +0 −937 truffle/src/main/ruby/core/common/module.rb
  12. +0 −252 truffle/src/main/ruby/core/common/stat.rb
  13. +0 −1,787 truffle/src/main/ruby/core/common/string.rb
  14. +0 −595 truffle/src/main/ruby/core/common/type.rb
  15. +51 −0 truffle/src/main/ruby/core/{common → }/dir.rb
  16. 0 truffle/src/main/ruby/core/{common → }/file.rb
  17. +164 −0 truffle/src/main/ruby/core/{common → }/io.rb
  18. +1,050 −2 truffle/src/main/ruby/core/kernel.rb
  19. +928 −2 truffle/src/main/ruby/core/module.rb
  20. +15 −0 truffle/src/main/ruby/core/post.rb
  21. +62 −0 truffle/src/main/ruby/core/{common → }/regexp.rb
  22. 0 truffle/src/main/ruby/core/{bootstrap → }/rubinius.rb
  23. +352 −0 truffle/src/main/ruby/core/stat.rb
  24. +1,867 −1 truffle/src/main/ruby/core/string.rb
  25. +0 −14 truffle/src/main/ruby/core/{common → }/struct.rb
  26. +246 −0 truffle/src/main/ruby/core/thread.rb
  27. +12 −14 truffle/src/main/ruby/core/{common/thread.rb → tms.rb}
  28. +843 −10 truffle/src/main/ruby/core/type.rb
Original file line number Diff line number Diff line change
@@ -1291,7 +1291,7 @@ public RubyNode visitDefnNode(org.jruby.ast.DefnNode node) {
rename = methodName.equals("each") || methodName.equals("step") || methodName.equals("to_a");
} else if (path.equals(coreRubiniusPath + "integer.rb")) {
rename = methodName.equals("downto") || methodName.equals("upto");
} else if (path.equals(coreRubiniusPath + "common/string.rb")) {
} else if (path.equals(coreRubiniusPath + "string.rb")) {
rename = methodName.equals("<<");
}

@@ -1706,7 +1706,7 @@ public RubyNode visitGlobalVarNode(org.jruby.ast.GlobalVarNode node) {
RubyNode readNode = environment.findLocalVarNode(name, sourceSection);

if (name.equals("$_")) {
if (getSourcePath(sourceSection).equals(context.getCoreLibrary().getCoreLoadPath() + "/core/common/regexp.rb")) {
if (getSourcePath(sourceSection).equals(context.getCoreLibrary().getCoreLoadPath() + "/core/regexp.rb")) {
readNode = new RubiniusLastStringReadNode(context, sourceSection);
} else {
readNode = GetFromThreadLocalNodeGen.create(context, sourceSection, readNode);
@@ -1821,7 +1821,7 @@ public RubyNode visitInstAsgnNode(org.jruby.ast.InstAsgnNode node) {
setSourceSection(ret, sourceSection);
return addNewlineIfNeeded(node, ret);
}
} else if (path.equals(corePath + "bootstrap/string.rb") || path.equals(corePath + "common/string.rb")) {
} else if (path.equals(corePath + "string.rb")) {
if (name.equals("@hash")) {
ret = StringNodesFactory.ModifyBangNodeFactory.create(new RubyNode[]{});
setSourceSection(ret, sourceSection);
@@ -1841,7 +1841,7 @@ public RubyNode visitInstAsgnNode(org.jruby.ast.InstAsgnNode node) {
setSourceSection(ret, sourceSection);
return addNewlineIfNeeded(node, ret);
}
} else if (path.equals(corePath + "common/io.rb")) {
} else if (path.equals(corePath + "io.rb")) {
// TODO (pitr 08-Aug-2015): values of predefined OM properties should be casted to defined types automatically
if (name.equals("@used") || name.equals("@total") || name.equals("@lineno")) {
// Cast int-fitting longs back to int
@@ -1881,7 +1881,7 @@ public RubyNode visitInstVarNode(org.jruby.ast.InstVarNode node) {
ret = new IntegerFixnumLiteralNode(context, sourceSection, 0);
return addNewlineIfNeeded(node, ret);
}
} else if (path.equals(corePath + "common/regexp.rb")) {
} else if (path.equals(corePath + "regexp.rb")) {
if (name.equals("@source")) {
ret = MatchDataNodesFactory.RubiniusSourceNodeGen.create(self);
setSourceSection(ret, sourceSection);
37 changes: 13 additions & 24 deletions truffle/src/main/ruby/core.rb
Original file line number Diff line number Diff line change
@@ -27,18 +27,15 @@
Truffle::Boot.require_core 'core/channel'
Truffle::Boot.require_core 'core/character'
Truffle::Boot.require_core 'core/configuration'
Truffle::Boot.require_core 'core/bootstrap/dir'
Truffle::Boot.require_core 'core/false'
Truffle::Boot.require_core 'core/gc'
Truffle::Boot.require_core 'core/bootstrap/io'
Truffle::Boot.require_core 'core/nil'
Truffle::Boot.require_core 'core/bootstrap/regexp'
Truffle::Boot.require_core 'core/bootstrap/rubinius'
Truffle::Boot.require_core 'core/bootstrap/stat'
Truffle::Boot.require_core 'core/bootstrap/string'
Truffle::Boot.require_core 'core/bootstrap/thread'
Truffle::Boot.require_core 'core/rubinius'
Truffle::Boot.require_core 'core/stat'
Truffle::Boot.require_core 'core/string'
Truffle::Boot.require_core 'core/thread'
Truffle::Boot.require_core 'core/true'
Truffle::Boot.require_core 'core/bootstrap/type'
Truffle::Boot.require_core 'core/type'
Truffle::Boot.require_core 'core/weakref'

# Load platform
@@ -53,20 +50,20 @@

# Load common

Truffle::Boot.require_core 'core/io'
Truffle::Boot.require_core 'core/immediate'
Truffle::Boot.require_core 'core/string_mirror'
Truffle::Boot.require_core 'core/common/module'
Truffle::Boot.require_core 'core/module'
Truffle::Boot.require_core 'core/proc'
Truffle::Boot.require_core 'core/enumerable_helper'
Truffle::Boot.require_core 'core/enumerable'
Truffle::Boot.require_core 'core/enumerator'
Truffle::Boot.require_core 'core/argf'
Truffle::Boot.require_core 'core/exception'
Truffle::Boot.require_core 'core/undefined'
Truffle::Boot.require_core 'core/common/type'
Truffle::Boot.require_core 'core/hash'
Truffle::Boot.require_core 'core/array'
Truffle::Boot.require_core 'core/common/kernel'
Truffle::Boot.require_core 'core/kernel'
Truffle::Boot.require_core 'core/identity_map'
Truffle::Boot.require_core 'core/comparable'
Truffle::Boot.require_core 'core/numeric_mirror'
@@ -75,31 +72,28 @@
Truffle::Boot.require_core 'core/integer'
Truffle::Boot.require_core 'core/fixnum'
Truffle::Boot.require_core 'core/lru_cache'
Truffle::Boot.require_core 'core/regexp'
Truffle::Boot.require_core 'core/encoding'
Truffle::Boot.require_core 'core/env'
Truffle::Boot.require_core 'core/errno'
Truffle::Boot.require_core 'core/common/io'
Truffle::Boot.require_core 'core/common/file'
Truffle::Boot.require_core 'core/common/dir'
Truffle::Boot.require_core 'core/file'
Truffle::Boot.require_core 'core/dir'
Truffle::Boot.require_core 'core/dir_glob'
Truffle::Boot.require_core 'core/file_test'
Truffle::Boot.require_core 'core/common/stat'
Truffle::Boot.require_core 'core/float'
Truffle::Boot.require_core 'core/marshal'
Truffle::Boot.require_core 'core/object_space'
Truffle::Boot.require_core 'core/common/string'
Truffle::Boot.require_core 'core/range_mirror'
Truffle::Boot.require_core 'core/range'
Truffle::Boot.require_core 'core/common/struct'
Truffle::Boot.require_core 'core/struct'
Truffle::Boot.require_core 'core/tms'
Truffle::Boot.require_core 'core/process'
Truffle::Boot.require_core 'core/process_mirror'
Truffle::Boot.require_core 'core/random'
Truffle::Boot.require_core 'core/common/regexp'
Truffle::Boot.require_core 'core/signal'
Truffle::Boot.require_core 'core/splitter'
Truffle::Boot.require_core 'core/symbol'
Truffle::Boot.require_core 'core/mutex'
Truffle::Boot.require_core 'core/common/thread'
Truffle::Boot.require_core 'core/throw_catch'
Truffle::Boot.require_core 'core/time'
Truffle::Boot.require_core 'core/rational'
@@ -111,14 +105,9 @@
# Load JRuby+Truffle classes

Truffle::Boot.require_core 'core/binding'
Truffle::Boot.require_core 'core/kernel'
Truffle::Boot.require_core 'core/math'
Truffle::Boot.require_core 'core/method'
Truffle::Boot.require_core 'core/module'
Truffle::Boot.require_core 'core/string'
Truffle::Boot.require_core 'core/thread'
Truffle::Boot.require_core 'core/unbound_method'
Truffle::Boot.require_core 'core/type'

# Dirty fixes we'd like to get rid of soon
Truffle::Boot.require_core 'core/shims'
78 changes: 0 additions & 78 deletions truffle/src/main/ruby/core/bootstrap/dir.rb

This file was deleted.

Loading