summaryrefslogtreecommitdiff
path: root/lib/json/pure/parser.rb
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2011-01-02 23:37:10 +0100
committerFlorian Frank <flori@ping.de>2011-01-02 23:42:29 +0100
commit6dc725aee27ddf514593ffafc9a98e3b20e698d3 (patch)
tree1bce6e88780fec52afadb60135e4a12f7f8b5456 /lib/json/pure/parser.rb
parentcfa34b24853078f5b91bbed97d8da84fffac0077 (diff)
downloadjson-6dc725aee27ddf514593ffafc9a98e3b20e698d3.tar.gz
Rubinius' strscan already has a @match ivar
Diffstat (limited to 'lib/json/pure/parser.rb')
-rw-r--r--lib/json/pure/parser.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/json/pure/parser.rb b/lib/json/pure/parser.rb
index cb531f4..6a0192c 100644
--- a/lib/json/pure/parser.rb
+++ b/lib/json/pure/parser.rb
@@ -119,7 +119,7 @@ module JSON
@create_id = opts[:create_id] || JSON.create_id
@object_class = opts[:object_class] || Hash
@array_class = opts[:array_class] || Array
- @match = opts[:match]
+ @json_match = opts[:match] # @match is an ivar in rbx's strscan
end
alias source string
@@ -189,8 +189,8 @@ module JSON
if string.respond_to?(:force_encoding)
string.force_encoding(::Encoding::UTF_8)
end
- if @create_additions and @match
- for (regexp, klass) in @match
+ if @create_additions and @json_match
+ for (regexp, klass) in @json_match
klass.json_creatable? or next
string =~ regexp and return klass.json_create(string)
end