summaryrefslogtreecommitdiff
path: root/lib/json/pure/parser.rb
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2011-01-05 00:12:51 +0100
committerFlorian Frank <flori@ping.de>2011-01-05 00:12:51 +0100
commit0b15820e245f4048d1bcd29cd60693e4e211ab43 (patch)
treeabffda1af3d23b47739d88fd089609cffa378ed7 /lib/json/pure/parser.rb
parentc87f6f3022f9b7c1b1317e958976e2ed6d4f4ae4 (diff)
downloadjson-0b15820e245f4048d1bcd29cd60693e4e211ab43.tar.gz
renamed :match argument to :match_stringv1.5.0
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 6a0192c..8043e67 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
- @json_match = opts[:match] # @match is an ivar in rbx's strscan
+ @match_string = opts[:match_string]
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 @json_match
- for (regexp, klass) in @json_match
+ if @create_additions and @match_string
+ for (regexp, klass) in @match_string
klass.json_creatable? or next
string =~ regexp and return klass.json_create(string)
end