kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/json: Merge JSON 1.7.1.

Browse source 
e5b9a9465c

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-05-07 16:00:49 +00:00
parent 5f7be3150f
commit 5a00be2bf7
18 changed files with 79 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

35
ext/json/parser/parser.c
View file

@ -1721,6 +1721,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
source = convert_encoding(StringValue(source));
}
json->current_nesting = 0;
StringValue(source);
json->len = RSTRING_LEN(source);
json->source = RSTRING_PTR(source);;
json->Vsource = source;
@ -1728,7 +1729,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
}
#line 1732 "parser.c"
#line 1733 "parser.c"
static const int JSON_start = 1;
static const int JSON_first_final = 10;
static const int JSON_error = 0;
@ -1736,7 +1737,7 @@ static const int JSON_error = 0;
static const int JSON_en_main = 1;
#line 739 "parser.rl"
#line 740 "parser.rl"
static VALUE cParser_parse_strict(VALUE self)
@ -1747,16 +1748,16 @@ static VALUE cParser_parse_strict(VALUE self)
GET_PARSER;
#line 1751 "parser.c"
#line 1752 "parser.c"
{
cs = JSON_start;
}
#line 749 "parser.rl"
#line 750 "parser.rl"
p = json->source;
pe = p + json->len;
#line 1760 "parser.c"
#line 1761 "parser.c"
{
if ( p == pe )
goto _test_eof;
@ -1812,7 +1813,7 @@ case 5:
goto st1;
goto st5;
tr3:
#line 728 "parser.rl"
#line 729 "parser.rl"
{
char *np;
json->current_nesting = 1;
@ -1821,7 +1822,7 @@ tr3:
}
goto st10;
tr4:
#line 721 "parser.rl"
#line 722 "parser.rl"
{
char *np;
json->current_nesting = 1;
@ -1833,7 +1834,7 @@ st10:
if ( ++p == pe )
goto _test_eof10;
case 10:
#line 1837 "parser.c"
#line 1838 "parser.c"
switch( (*p) ) {
case 13: goto st10;
case 32: goto st10;
@ -1890,7 +1891,7 @@ case 9:
_out: {}
}
#line 752 "parser.rl"
#line 753 "parser.rl"
if (cs >= JSON_first_final && p == pe) {
return result;
@ -1902,7 +1903,7 @@ case 9:
#line 1906 "parser.c"
#line 1907 "parser.c"
static const int JSON_quirks_mode_start = 1;
static const int JSON_quirks_mode_first_final = 10;
static const int JSON_quirks_mode_error = 0;
@ -1910,7 +1911,7 @@ static const int JSON_quirks_mode_error = 0;
static const int JSON_quirks_mode_en_main = 1;
#line 777 "parser.rl"
#line 778 "parser.rl"
static VALUE cParser_parse_quirks_mode(VALUE self)
@ -1921,16 +1922,16 @@ static VALUE cParser_parse_quirks_mode(VALUE self)
GET_PARSER;
#line 1925 "parser.c"
#line 1926 "parser.c"
{
cs = JSON_quirks_mode_start;
}
#line 787 "parser.rl"
#line 788 "parser.rl"
p = json->source;
pe = p + json->len;
#line 1934 "parser.c"
#line 1935 "parser.c"
{
if ( p == pe )
goto _test_eof;
@ -1964,7 +1965,7 @@ st0:
cs = 0;
goto _out;
tr2:
#line 769 "parser.rl"
#line 770 "parser.rl"
{
char *np = JSON_parse_value(json, p, pe, &result);
if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
@ -1974,7 +1975,7 @@ st10:
if ( ++p == pe )
goto _test_eof10;
case 10:
#line 1978 "parser.c"
#line 1979 "parser.c"
switch( (*p) ) {
case 13: goto st10;
case 32: goto st10;
@ -2063,7 +2064,7 @@ case 9:
_out: {}
}
#line 790 "parser.rl"
#line 791 "parser.rl"
if (cs >= JSON_quirks_mode_first_final && p == pe) {
return result;