diff options
author | Tim Felgentreff <timfelgentreff@gmail.com> | 2011-08-09 14:58:23 -0700 |
---|---|---|
committer | Tim Felgentreff <timfelgentreff@gmail.com> | 2011-08-09 14:58:23 -0700 |
commit | cc178803a1e38c7f03b0d23984ba50042d40dcb5 (patch) | |
tree | 438d1e8b6f8b273299872c1b6b051383052cc923 /lib/json/pure/parser.rb | |
parent | 7d9458ed616719e105bf347458195de1b87f2bb5 (diff) | |
parent | f7f78896607b6f6226cdee4ae76de922d4583d32 (diff) | |
download | json-cc178803a1e38c7f03b0d23984ba50042d40dcb5.tar.gz |
Merge remote-tracking branch 'json/master'
Conflicts:
ext/json/ext/parser/parser.c
ext/json/ext/parser/parser.rl
json.gemspec
json_pure.gemspec
Diffstat (limited to 'lib/json/pure/parser.rb')
-rw-r--r-- | lib/json/pure/parser.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/json/pure/parser.rb b/lib/json/pure/parser.rb index 8043e67..d612018 100644 --- a/lib/json/pure/parser.rb +++ b/lib/json/pure/parser.rb @@ -41,7 +41,7 @@ module JSON [^*/]| # normal chars /[^*]| # slashes that do not start a nested comment \*[^/]| # asterisks that do not end this comment - /(?=\*/) # single slash before this comment's end + /(?=\*/) # single slash before this comment's end )* \*/ # the End of this comment |[ \t\r\n]+ # whitespaces: space, horicontal tab, lf, cr @@ -162,12 +162,12 @@ module JSON ?n => "\n", ?r => "\r", ?t => "\t", - ?u => nil, + ?u => nil, }) EMPTY_8BIT_STRING = '' if ::String.method_defined?(:encode) - EMPTY_8BIT_STRING.force_encoding Encoding::ASCII_8BIT + EMPTY_8BIT_STRING.force_encoding Encoding::ASCII_8BIT end def parse_string |