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

Commits on Mar 1, 2015

  1. Copy the full SHA
    ddced14 View commit details
  2. Copy the full SHA
    2cdf77e View commit details
  3. Copy the full SHA
    86681e5 View commit details
Showing with 1,828 additions and 6 deletions.
  1. +3 −0 COPYING
  2. +7 −0 lib/ruby/truffle/rubysl/README.md
  3. +25 −0 lib/ruby/truffle/rubysl/rubysl-strscan/LICENSE
  4. +28 −0 lib/ruby/truffle/rubysl/rubysl-strscan/lib/rubysl/strscan.rb
  5. +312 −0 lib/ruby/truffle/rubysl/rubysl-strscan/lib/rubysl/strscan/strscan.rb
  6. +31 −0 lib/ruby/truffle/rubysl/rubysl-strscan/lib/rubysl/strscan/version.rb
  7. +27 −0 lib/ruby/truffle/rubysl/rubysl-strscan/lib/strscan.rb
  8. +1 −0 spec/truffle/spec/rubysl/README.md
  9. +25 −0 spec/truffle/spec/rubysl/rubysl-strscan/LICENSE
  10. +10 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/append_spec.rb
  11. +6 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/beginning_of_line_spec.rb
  12. +6 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/bol_spec.rb
  13. +15 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/check_spec.rb
  14. +14 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/check_until_spec.rb
  15. +24 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/clear_spec.rb
  16. +10 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/concat_spec.rb
  17. +38 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/dup_spec.rb
  18. +48 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/element_reference_spec.rb
  19. +24 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/empty_spec.rb
  20. +6 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/eos_spec.rb
  21. +23 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/exist_spec.rb
  22. +6 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/get_byte_spec.rb
  23. +27 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/getbyte_spec.rb
  24. +43 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/getch_spec.rb
  25. +27 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/initialize_spec.rb
  26. +19 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/inspect_spec.rb
  27. +27 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/match_spec.rb
  28. +6 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/matched_size_spec.rb
  29. +40 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/matched_spec.rb
  30. +26 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/matchedsize_spec.rb
  31. +7 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/must_C_version_spec.rb
  32. +7 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/peek_spec.rb
  33. +24 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/peep_spec.rb
  34. +10 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/pointer_spec.rb
  35. +10 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/pos_spec.rb
  36. +27 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/post_match_spec.rb
  37. +40 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/pre_match_spec.rb
  38. +9 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/rbx.2.1.mspec
  39. +14 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/reset_spec.rb
  40. +6 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/rest_size_spec.rb
  41. +47 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/rest_spec.rb
  42. +24 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/restsize_spec.rb
  43. +29 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/scan_full_spec.rb
  44. +80 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/scan_spec.rb
  45. +22 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/scan_until_spec.rb
  46. +29 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/search_full_spec.rb
  47. +25 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/shared/bol.rb
  48. +30 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/shared/concat.rb
  49. +17 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/shared/eos.rb
  50. +22 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/shared/extract_range.rb
  51. +22 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/shared/extract_range_matched.rb
  52. +28 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/shared/get_byte.rb
  53. +21 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/shared/matched_size.rb
  54. +44 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/shared/peek.rb
  55. +83 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/shared/pos.rb
  56. +18 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/shared/rest_size.rb
  57. +17 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/shared/terminate.rb
  58. +17 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/skip_spec.rb
  59. +17 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/skip_until_spec.rb
  60. +39 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/string_spec.rb
  61. +6 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/terminate_spec.rb
  62. +28 −0 spec/truffle/spec/rubysl/rubysl-strscan/spec/unscan_spec.rb
  63. +1 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/beginning_of_line_tags.txt
  64. +1 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/bol_tags.txt
  65. +1 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/check_tags.txt
  66. +1 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/check_until_tags.txt
  67. +1 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/dup_tags.txt
  68. +6 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/element_reference_tags.txt
  69. +3 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/exist_tags.txt
  70. +3 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/get_byte_tags.txt
  71. +6 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/getbyte_tags.txt
  72. +5 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/getch_tags.txt
  73. +1 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/inspect_tags.txt
  74. +3 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/match_tags.txt
  75. +2 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/matched_size_tags.txt
  76. +6 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/matched_tags.txt
  77. +3 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/matchedsize_tags.txt
  78. +2 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/peek_tags.txt
  79. +2 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/peep_tags.txt
  80. +2 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/pointer_tags.txt
  81. +2 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/pos_tags.txt
  82. +4 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/post_match_tags.txt
  83. +6 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/pre_match_tags.txt
  84. +1 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/reset_tags.txt
  85. +2 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/rest_size_tags.txt
  86. +4 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/rest_tags.txt
  87. +2 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/restsize_tags.txt
  88. +4 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/scan_full_tags.txt
  89. +9 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/scan_tags.txt
  90. +3 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/scan_until_tags.txt
  91. +4 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/search_full_tags.txt
  92. +2 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/skip_tags.txt
  93. +2 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/skip_until_tags.txt
  94. +3 −0 spec/truffle/tags/rubysl/rubysl-strscan/spec/unscan_tags.txt
  95. +4 −6 spec/truffle/truffle.mspec
  96. +1 −0 tool/jt.rb
  97. +3 −0 truffle/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java
3 changes: 3 additions & 0 deletions COPYING
Original file line number Diff line number Diff line change
@@ -114,6 +114,9 @@ lib/ruby/1.9, and lib/ruby/site_ruby/1.8/rubygems*.
copyright (c) 2007-2014, Evan Phoenix and contributors,
and released under the 3-clause BSD license.

Some parts of the RubySL implementations of the stdlib in lib/ruby/truffle/rubysl
are copyright (c) 2013 Brian Shirai and are licensed under the 3-clause BSD license.

The complete text of the Eclipse Public License is as follows:

Eclipse Public License - v 1.0
7 changes: 7 additions & 0 deletions lib/ruby/truffle/rubysl/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
This directory contains Ruby implementations from the RubySL project. We've
removed everything except the licenses and the Ruby files themselves. The code
was written by Brian Shirai, et al.

Commits for each library are:

* rubysl-strscan `efab0248119cbb10b2b0ce2561eae269e052cdfe`
25 changes: 25 additions & 0 deletions lib/ruby/truffle/rubysl/rubysl-strscan/LICENSE
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.
28 changes: 28 additions & 0 deletions lib/ruby/truffle/rubysl/rubysl-strscan/lib/rubysl/strscan.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# 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.

require "rubysl/strscan/strscan"
require "rubysl/strscan/version"
312 changes: 312 additions & 0 deletions lib/ruby/truffle/rubysl/rubysl-strscan/lib/rubysl/strscan/strscan.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,312 @@
# 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.

class ScanError < StandardError; end

class StringScanner
Id = "None$Id".freeze
Version = "1.0.0".freeze

attr_reader :pos, :match, :prev_pos

def pos=(n)
n = Integer(n)

n += @string.bytesize if n < 0

if n < 0 or n > @string.bytesize
raise RangeError, "index out of range (#{n})"
end

@pos = n
end

alias_method :pointer, :pos
alias_method :pointer=, :pos=

def [](n)
raise TypeError, "Bad argument #{n.inspect}" unless n.respond_to? :to_int
@match[n] if @match
end

def bol?
@pos == 0 or @string.getbyte(pos-1) == 10
end

alias_method :beginning_of_line?, :bol?

def check(pattern)
_scan pattern, false, true, true
end

def check_until(pattern)
_scan pattern, false, true, false
end

def clear
warn "StringScanner#clear is obsolete; use #terminate instead" if $VERBOSE
terminate
end

def concat(str)
@string << StringValue(str)
self
end
alias_method :<<, :concat

def empty?
warn "StringScanner#empty? is obsolete; use #eos? instead?" if $VERBOSE
eos?
end

def eos?
@pos >= @string.bytesize
end

def exist?(pattern)
_scan pattern, false, false, false
end

def get_byte
scan(/./mn)
end

def getbyte
warn "StringScanner#getbyte is obsolete; use #get_byte instead" if $VERBOSE
get_byte
end

def getch
scan(/./m)
end

def initialize(string, dup=false)
if string.instance_of? String
@original = string
@string = string
else
@original = StringValue(string)
@string = String.new @original
end

reset_state
end

def inspect
if defined? @string
if eos?
str = "#<StringScanner fin>"
else
if string.bytesize - pos > 5
rest = "#{string[pos..pos+4]}..."
else
rest = string[pos..string.bytesize]
end

if pos > 0
if pos > 5
prev = "...#{string[pos-5...pos]}"
else
prev = string[0...pos]
end

str = "#<StringScanner #{pos}/#{string.bytesize} #{prev.inspect} @ #{rest.inspect}>"
else
str = "#<StringScanner #{pos}/#{string.bytesize} @ #{rest.inspect}>"
end
end

str.taint if @string.tainted?
return str
else
"#<StringScanner (uninitialized)>"
end
end

def match?(pattern)
_scan pattern, false, false, true
end

def matched
@match.to_s if @match
end

def matched?
!!@match
end

def matched_size
@match.to_s.bytesize if @match
end

def matchedsize
warn "StringScanner#matchedsize is obsolete; use #matched_size instead" if $VERBOSE
matched_size
end

def post_match
@match.post_match if @match
end

def pre_match
@string.byteslice(0, match.full.at(0)) if @match
end

def reset_state
@prev_pos = @pos = 0
@match = nil
end
private :reset_state

def reset
reset_state
self
end

def rest
@string.byteslice(@pos, @string.bytesize - @pos)
end

def rest?
return !eos?
end

def rest_size
@string.bytesize - @pos
end

def restsize
warn "StringScanner#restsize is obsolete; use #rest_size instead" if $VERBOSE
rest_size
end

def scan(pattern)
_scan pattern, true, true, true
end

def scan_until(pattern)
_scan pattern, true, true, false
end

def scan_full(pattern, advance_pos, getstr)
_scan pattern, advance_pos, getstr, true
end

def search_full(pattern, advance_pos, getstr)
_scan pattern, advance_pos, getstr, false
end

def self.must_C_version
self
end

def skip(pattern)
_scan pattern, true, false, true
end

def skip_until(pattern)
_scan pattern, true, false, false
end

def string
@original
end

def string=(string)
reset_state

if string.instance_of? String
@original = string
@string = string
else
@original = StringValue(string)
@string = String.new @original
end
end

def terminate
@match = nil
@pos = string.bytesize
self
end

def unscan
raise ScanError if @match.nil?
@pos = @prev_pos
@prev_pos = nil
@match = nil
self
end

def peek(len)
raise ArgumentError if len < 0
return "" if len.zero?

begin
return @string[pos, len]
rescue TypeError
raise RangeError, "offset outside of possible range"
end
end

def peep(len)
warn "StringScanner#peep is obsolete; use #peek instead" if $VERBOSE
peek len
end

def _scan(pattern, advance_pos, getstr, headonly)
unless pattern.kind_of? Regexp
raise TypeError, "bad pattern argument: #{pattern.inspect}"
end

@match = nil

if headonly
# NOTE - match_start is an Oniguruma feature that Rubinius exposes.
# We use it here to avoid creating a new Regexp with '^' prepended.
@match = pattern.match_start @string, @pos
else
# NOTE - search_from is an Oniguruma feature that Rubinius exposes.
# We use it so we can begin the search in the middle of the string
@match = pattern.search_from @string, @pos
end

return nil unless @match

fin = @match.full.at(1)

@prev_pos = @pos

@pos = fin if advance_pos

width = fin - @prev_pos

return width unless getstr

@string.byteslice(@prev_pos, width)
end
private :_scan
end
Loading