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

Commits on Apr 15, 2016

  1. Copy the full SHA
    0384576 View commit details
  2. Copy the full SHA
    5dc7054 View commit details
  3. Copy the full SHA
    a7a7e29 View commit details
  4. [Truffle] support format '%p'

    pitr-ch committed Apr 15, 2016
    Copy the full SHA
    b1ab3c3 View commit details
  5. Copy the full SHA
    443bc79 View commit details
  6. Copy the full SHA
    1efb430 View commit details
Showing with 72 additions and 124 deletions.
  1. +1 −0 spec/truffle/tags/core/io/reopen_tags.txt
  2. +1 −0 spec/truffle/tags/truffle/array/element_set_tags.txt
  3. +1 −1 test/truffle/integration/long-tests.txt
  4. +1 −1 test/truffle/integration/{rails.sh → rails-app.sh}
  5. 0 test/truffle/integration/{rails → rails-app}/.gitignore
  6. 0 test/truffle/integration/{rails → rails-app}/.jruby+truffle.yaml
  7. 0 test/truffle/integration/{rails → rails-app}/Gemfile
  8. 0 test/truffle/integration/{rails → rails-app}/Gemfile.lock
  9. 0 test/truffle/integration/{rails → rails-app}/Rakefile
  10. 0 test/truffle/integration/{rails → rails-app}/app/assets/images/.keep
  11. 0 test/truffle/integration/{rails → rails-app}/app/assets/stylesheets/application.css
  12. 0 test/truffle/integration/{rails → rails-app}/app/controllers/application_controller.rb
  13. 0 test/truffle/integration/{rails → rails-app}/app/controllers/concerns/.keep
  14. 0 test/truffle/integration/{rails → rails-app}/app/controllers/people_controller.rb
  15. 0 test/truffle/integration/{rails → rails-app}/app/helpers/application_helper.rb
  16. 0 test/truffle/integration/{rails → rails-app}/app/models/concerns/.keep
  17. 0 test/truffle/integration/{rails → rails-app}/app/models/person.rb
  18. 0 test/truffle/integration/{rails → rails-app}/app/views/layouts/application.html.erb
  19. 0 test/truffle/integration/{rails → rails-app}/app/views/people/index.erb
  20. 0 test/truffle/integration/{rails → rails-app}/bin/bundle
  21. 0 test/truffle/integration/{rails → rails-app}/bin/rails
  22. 0 test/truffle/integration/{rails → rails-app}/bin/rake
  23. 0 test/truffle/integration/{rails → rails-app}/bin/setup
  24. 0 test/truffle/integration/{rails → rails-app}/config.ru
  25. 0 test/truffle/integration/{rails → rails-app}/config/application.rb
  26. 0 test/truffle/integration/{rails → rails-app}/config/boot.rb
  27. 0 test/truffle/integration/{rails → rails-app}/config/database.yml
  28. 0 test/truffle/integration/{rails → rails-app}/config/environment.rb
  29. 0 test/truffle/integration/{rails → rails-app}/config/environments/development.rb
  30. 0 test/truffle/integration/{rails → rails-app}/config/environments/production.rb
  31. 0 test/truffle/integration/{rails → rails-app}/config/environments/test.rb
  32. 0 test/truffle/integration/{rails → rails-app}/config/initializers/backtrace_silencers.rb
  33. 0 test/truffle/integration/{rails → rails-app}/config/initializers/cookies_serializer.rb
  34. 0 test/truffle/integration/{rails → rails-app}/config/initializers/filter_parameter_logging.rb
  35. 0 test/truffle/integration/{rails → rails-app}/config/initializers/inflections.rb
  36. 0 test/truffle/integration/{rails → rails-app}/config/initializers/mime_types.rb
  37. 0 test/truffle/integration/{rails → rails-app}/config/initializers/session_store.rb
  38. 0 test/truffle/integration/{rails → rails-app}/config/initializers/wrap_parameters.rb
  39. 0 test/truffle/integration/{rails → rails-app}/config/locales/en.yml
  40. 0 test/truffle/integration/{rails → rails-app}/config/routes.rb
  41. 0 test/truffle/integration/{rails → rails-app}/config/secrets.yml
  42. 0 test/truffle/integration/{rails → rails-app}/lib/assets/.keep
  43. 0 test/truffle/integration/{rails → rails-app}/lib/tasks/.keep
  44. 0 test/truffle/integration/{rails → rails-app}/log/.keep
  45. 0 test/truffle/integration/{rails → rails-app}/public/404.html
  46. 0 test/truffle/integration/{rails → rails-app}/public/422.html
  47. 0 test/truffle/integration/{rails → rails-app}/public/500.html
  48. 0 test/truffle/integration/{rails → rails-app}/public/favicon.ico
  49. 0 test/truffle/integration/{rails → rails-app}/public/robots.txt
  50. 0 test/truffle/integration/{rails → rails-app}/public/stylesheets/application.css
  51. 0 test/truffle/integration/{rails → rails-app}/public/stylesheets/kube.css
  52. 0 test/truffle/integration/{rails → rails-app}/test/controllers/.keep
  53. 0 test/truffle/integration/{rails → rails-app}/test/fixtures/.keep
  54. 0 test/truffle/integration/{rails → rails-app}/test/helpers/.keep
  55. 0 test/truffle/integration/{rails → rails-app}/test/integration/.keep
  56. 0 test/truffle/integration/{rails → rails-app}/test/mailers/.keep
  57. 0 test/truffle/integration/{rails → rails-app}/test/models/.keep
  58. 0 test/truffle/integration/{rails → rails-app}/test/test_helper.rb
  59. 0 test/truffle/integration/{rails → rails-app}/vendor/assets/javascripts/.keep
  60. 0 test/truffle/integration/{rails → rails-app}/vendor/assets/stylesheets/.keep
  61. +13 −16 truffle/src/main/java/org/jruby/truffle/core/format/printf/PrintfTreeBuilder.java
  62. +55 −106 truffle/src/main/java/org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java
1 change: 1 addition & 0 deletions spec/truffle/tags/core/io/reopen_tags.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
fails:IO#reopen with a String effects exec/system/fork performed after it
fails:IO#reopen with a String opens a path after writing to the original file descriptor
fails:IO#reopen with a String positions an instance that has been read from at the beginning of the new stream
slow:IO#reopen with a String effects exec/system/fork performed after it
1 change: 1 addition & 0 deletions spec/truffle/tags/truffle/array/element_set_tags.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:Array#[]= keeps the same storage if compatible and in bounds
2 changes: 1 addition & 1 deletion test/truffle/integration/long-tests.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
rails.sh
rails-app.sh
gem-testing.sh
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

set -e

cd test/truffle/integration/rails
cd test/truffle/integration/rails-app

JRUBY_BIN=../../../../bin
JRUBY=$JRUBY_BIN/jruby
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -139,25 +139,22 @@ public void exitFormat(PrintfParser.FormatContext ctx) {

switch (type) {
case 's':
case 'p':
final String conversionMethodName = type == 's' ? "to_s" : "inspect";
final FormatNode conversionNode;

if (ctx.ANGLE_KEY() == null) {
if (spacePadding == DEFAULT) {
node = WriteBytesNodeGen.create(context, ReadStringNodeGen.create(
context, true, "to_s", false, EMPTY_BYTES,
new SourceNode()));
} else {
node = WritePaddedBytesNodeGen.create(context, spacePadding, leftJustified,
ReadStringNodeGen.create(context, true, "to_s", false, EMPTY_BYTES,
new SourceNode()));
}
conversionNode = ReadStringNodeGen.create(context, true, conversionMethodName, false, EMPTY_BYTES, new SourceNode());
} else {
if (spacePadding == DEFAULT) {
node = WriteBytesNodeGen.create(context, ToStringNodeGen.create(
context, true, "to_s", false, EMPTY_BYTES, valueNode));
} else {
node = WritePaddedBytesNodeGen.create(context, spacePadding, leftJustified,
ToStringNodeGen.create(context, true, "to_s", false, EMPTY_BYTES, valueNode));
}
conversionNode = ToStringNodeGen.create(context, true, conversionMethodName, false, EMPTY_BYTES, valueNode);
}

if (spacePadding == DEFAULT) {
node = WriteBytesNodeGen.create(context, conversionNode);
} else {
node = WritePaddedBytesNodeGen.create(context, spacePadding, leftJustified, conversionNode);
}

break;
case 'd':
case 'i':

Large diffs are not rendered by default.