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: 62c76ac68d63
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bd7e5b07d7b8
Choose a head ref
  • 12 commits
  • 125 files changed
  • 2 contributors

Commits on Mar 14, 2015

  1. [Truffle] Import stringio from RubySL.

    @chrisseaton
    chrisseaton committed Mar 14, 2015
    Copy the full SHA
    e09e135 View commit details

  2. [Truffle] String#byte_append.

    @chrisseaton
    chrisseaton committed Mar 14, 2015
    Copy the full SHA
    cf89fd2 View commit details

  3. [Truffle] String#num_bytes= and primitive :string_resize_capacity

    @chrisseaton
    chrisseaton committed Mar 14, 2015
    11
    Copy the full SHA
    4feca49 View commit details

  4. [Truffle] Refactoring Array#+ to handle more cases and adding #to_ary

    @bjfish
    bjfish committed Mar 14, 2015
    Copy the full SHA
    4260ce0 View commit details

  5. [Truffle] TaintResultNode has to be able to handle arguments that wer… 

    …en't full objects.
    @chrisseaton
    chrisseaton committed Mar 14, 2015
    3
    Copy the full SHA
    ffb5b80 View commit details

  6. [Truffle] String#<<(Fixnum)

    @chrisseaton
    chrisseaton committed Mar 14, 2015
    Copy the full SHA
    ba3219a View commit details

  7. [Truffle] Tag failing stringio spec.

    @chrisseaton
    chrisseaton committed Mar 14, 2015
    Copy the full SHA
    1d72dee View commit details

  8. [Truffle] Some IO constants.

    @chrisseaton
    chrisseaton committed Mar 14, 2015
    Copy the full SHA
    6edb3ab View commit details

  9. Merge pull request #2702 from bjfish/truffle_array_plus_refactoring 

    [Truffle] Refactoring Array#+ to handle more cases and adding #to_ary
    @chrisseaton
    chrisseaton committed Mar 14, 2015
    Copy the full SHA
    8ce42e4 View commit details

  10. Revert "[Truffle] Make notDesignedForCompilation use bailout rather t… 

    …han an assert."

This reverts commit a19cd4a.
    @chrisseaton
    chrisseaton committed Mar 14, 2015
    Copy the full SHA
    143279b View commit details

  11. Merge branch 'master' into truffle-head 

    Conflicts:
	truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
	truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
	truffle/src/main/ruby/core/shims.rb
    @chrisseaton
    chrisseaton committed Mar 14, 2015
    Copy the full SHA
    d80b601 View commit details

  12. [Truffle] Update for the new instrument API.

    @chrisseaton
    chrisseaton committed Mar 14, 2015
    Copy the full SHA
    bd7e5b0 View commit details
Showing with 4,864 additions and 59 deletions.
  1. +1 −0 lib/ruby/truffle/rubysl/README.md
  2. +25 −0 lib/ruby/truffle/rubysl/rubysl-stringio/LICENSE
  3. +2 −0 lib/ruby/truffle/rubysl/rubysl-stringio/lib/rubysl/stringio.rb
  4. +742 −0 lib/ruby/truffle/rubysl/rubysl-stringio/lib/rubysl/stringio/stringio.rb
  5. +5 −0 lib/ruby/truffle/rubysl/rubysl-stringio/lib/rubysl/stringio/version.rb
  6. +1 −0 lib/ruby/truffle/rubysl/rubysl-stringio/lib/stringio.rb
  7. +1 −0 spec/truffle/spec/rubysl/README.md
  8. +25 −0 spec/truffle/spec/rubysl/rubysl-stringio/LICENSE
  9. +83 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/append_spec.rb
  10. +8 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/binmode_spec.rb
  11. +12 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/bytes_spec.rb
  12. +12 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/chars_spec.rb
  13. +30 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/close_read_spec.rb
  14. +22 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/close_spec.rb
  15. +30 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/close_write_spec.rb
  16. +11 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/closed_read_spec.rb
  17. +15 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/closed_spec.rb
  18. +11 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/closed_write_spec.rb
  19. +10 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/codepoints_spec.rb
  20. +10 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/each_byte_spec.rb
  21. +12 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/each_char_spec.rb
  22. +11 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/each_codepoint_spec.rb
  23. +14 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/each_line_spec.rb
  24. +14 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/each_spec.rb
  25. +10 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/eof_spec.rb
  26. +11 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/external_encoding_spec.rb
  27. +7 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/fcntl_spec.rb
  28. +8 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/fileno_spec.rb
  29. +15 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/fixtures/classes.rb
  30. +8 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/flush_spec.rb
  31. +8 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/fsync_spec.rb
  32. +25 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/getbyte_spec.rb
  33. +30 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/getc_spec.rb
  34. +245 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/gets_spec.rb
  35. +95 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/initialize_copy_spec.rb
  36. +193 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/initialize_spec.rb
  37. +11 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/internal_encoding_spec.rb
  38. +6 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/isatty_spec.rb
  39. +6 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/length_spec.rb
  40. +29 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/lineno_spec.rb
  41. +16 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/lines_spec.rb
  42. +215 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/open_spec.rb
  43. +15 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/path_spec.rb
  44. +7 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/pid_spec.rb
  45. +27 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/pos_spec.rb
  46. +113 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/print_spec.rb
  47. +60 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/printf_spec.rb
  48. +104 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/putc_spec.rb
  49. +172 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/puts_spec.rb
  50. +29 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/read_nonblock_spec.rb
  51. +61 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/read_spec.rb
  52. +21 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/readbyte_spec.rb
  53. +19 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/readchar_spec.rb
  54. +127 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/readline_spec.rb
  55. +124 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/readlines_spec.rb
  56. +29 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/readpartial_spec.rb
  57. +303 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/reopen_spec.rb
  58. +23 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/rewind_spec.rb
  59. +75 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/seek_spec.rb
  60. +38 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/set_encoding_spec.rb
  61. +45 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/shared/codepoints.rb
  62. +162 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/shared/each.rb
  63. +60 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/shared/each_byte.rb
  64. +50 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/shared/each_char.rb
  65. +24 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/shared/eof.rb
  66. +43 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/shared/getc.rb
  67. +5 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/shared/isatty.rb
  68. +12 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/shared/length.rb
  69. +186 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/shared/read.rb
  70. +29 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/shared/readchar.rb
  71. +27 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/shared/sysread.rb
  72. +12 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/shared/tell.rb
  73. +134 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/shared/write.rb
  74. +6 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/size_spec.rb
  75. +49 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/string_spec.rb
  76. +8 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/stringio_spec.rb
  77. +18 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/sync_spec.rb
  78. +27 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/sysread_spec.rb
  79. +18 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/syswrite_spec.rb
  80. +6 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/tell_spec.rb
  81. +69 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/truncate_spec.rb
  82. +6 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/tty_spec.rb
  83. +87 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/ungetbyte_spec.rb
  84. +98 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/ungetc_spec.rb
  85. +20 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/write_nonblock_spec.rb
  86. +18 −0 spec/truffle/spec/rubysl/rubysl-stringio/spec/write_spec.rb
  87. +0 −4 spec/truffle/tags/core/array/plus_tags.txt
  88. +2 −0 spec/truffle/tags/language/predefined_tags.txt
  89. +2 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/append_tags.txt
  90. +2 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/bytes_tags.txt
  91. +4 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/chars_tags.txt
  92. +5 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/codepoints_tags.txt
  93. +2 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/each_byte_tags.txt
  94. +4 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/each_char_tags.txt
  95. +5 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/each_codepoint_tags.txt
  96. +1 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/each_line_tags.txt
  97. +1 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/each_tags.txt
  98. +1 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/getbyte_tags.txt
  99. +19 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/gets_tags.txt
  100. +1 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/lineno_tags.txt
  101. +1 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/lines_tags.txt
  102. +1 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/open_tags.txt
  103. +1 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/path_tags.txt
  104. +7 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/print_tags.txt
  105. +1 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/printf_tags.txt
  106. +5 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/read_nonblock_tags.txt
  107. +3 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/read_tags.txt
  108. +7 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/readline_tags.txt
  109. +5 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/readpartial_tags.txt
  110. +1 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/reopen_tags.txt
  111. +9 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/seek_tags.txt
  112. +1 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/string_tags.txt
  113. +5 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/sysread_tags.txt
  114. +3 −0 spec/truffle/tags/rubysl/rubysl-stringio/spec/ungetc_tags.txt
  115. +2 −1 spec/truffle/truffle.mspec
  116. +4 −1 truffle/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java
  117. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
  118. +6 −3 truffle/src/main/java/org/jruby/truffle/nodes/cast/TaintResultNode.java
  119. +8 −0 truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayGuards.java
  120. +30 −39 truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
  121. +34 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
  122. +23 −2 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java
  123. +15 −6 truffle/src/main/java/org/jruby/truffle/runtime/subsystems/AttachmentsManager.java
  124. +5 −0 truffle/src/main/ruby/core/rubinius/bootstrap/string.rb
  125. +26 −0 truffle/src/main/ruby/core/shims.rb
1 change: 1 addition & 0 deletions lib/ruby/truffle/rubysl/README.md
View file
Original file line number Diff line number Diff line change
@@ -5,3 +5,4 @@ was written by Brian Shirai, et al.
Commits for each library are:

* rubysl-strscan `efab0248119cbb10b2b0ce2561eae269e052cdfe`
* rubysl-stringio `4b2977296eceef83084146c73d9ddef8d7e8f1af`
25 changes: 25 additions & 0 deletions lib/ruby/truffle/rubysl/rubysl-stringio/LICENSE
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Copyright (c) 2013, Brian Shirai
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. 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.
3. Neither the name of the library 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 <COPYRIGHT HOLDER> 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.
2 changes: 2 additions & 0 deletions lib/ruby/truffle/rubysl/rubysl-stringio/lib/rubysl/stringio.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
require "rubysl/stringio/version"
require "rubysl/stringio/stringio"
Loading