diff options
author | Florian Frank <flori@ping.de> | 2011-07-08 16:29:21 +0200 |
---|---|---|
committer | Florian Frank <flori@ping.de> | 2011-07-08 16:32:06 +0200 |
commit | f7f78896607b6f6226cdee4ae76de922d4583d32 (patch) | |
tree | fb8b18ce241984a125d881c29fd317a007358bd9 /lib/json/pure/parser.rb | |
parent | dcfa15b6a1179a29d4ee7b3ff16807fa9b1f96a4 (diff) | |
parent | 24f84d63beef15eafd2e59df3d809f1928774d00 (diff) | |
download | ruby-json-f7f78896607b6f6226cdee4ae76de922d4583d32.tar.gz |
Merge branch 'master' of https://github.com/nobu/json into development
Conflicts: ext/json/ext/parser/parser.c
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 |