Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

regenerated

This commit is contained in:
Frank Celler 2012-04-23 18:19:09 +02:00
parent 4c85b65857
commit 985c6f3c70
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
JsonParser/json-parser.c
View File

@ -2392,6 +2392,11 @@ static TRI_json_t* ParseList (yyscan_t scanner) {
int c; int c;
list = TRI_CreateListJson(); list = TRI_CreateListJson();
if (list == NULL) {
return NULL;
}
c = tri_jsp_lex(scanner); c = tri_jsp_lex(scanner);
comma = false; comma = false;
@ -2422,8 +2427,7 @@ static TRI_json_t* ParseList (yyscan_t scanner) {
return NULL; return NULL;
} }
TRI_PushBackListJson(list, sub); TRI_PushBack3ListJson(list, sub);
TRI_FreeJson(sub); // TODO remove unnecessary copying
c = tri_jsp_lex(scanner); c = tri_jsp_lex(scanner);
} }
@ -2504,9 +2508,8 @@ static TRI_json_t* ParseArray (yyscan_t scanner) {
return NULL; return NULL;
} }
TRI_InsertArrayJson(array, name, sub); TRI_Insert3ArrayJson(array, name, sub);
TRI_FreeString(name); TRI_FreeString(name);
TRI_FreeJson(sub); // TODO remove unnecessary copying
c = tri_jsp_lex(scanner); c = tri_jsp_lex(scanner);
} }
@ -2524,13 +2527,6 @@ static TRI_json_t* ParseArray (yyscan_t scanner) {
static TRI_json_t* ParseObject (yyscan_t scanner, int c) { static TRI_json_t* ParseObject (yyscan_t scanner, int c) {
struct yyguts_t * yyg = (struct yyguts_t*) scanner; struct yyguts_t * yyg = (struct yyguts_t*) scanner;
char buffer[1024];
char* ep;
char* ptr;
double d;
size_t outLength;
switch (c) { switch (c) {
case END_OF_FILE: case END_OF_FILE:
yyextra.message = "expecting atom, got end-of-file"; yyextra.message = "expecting atom, got end-of-file";
@ -2545,7 +2541,11 @@ static TRI_json_t* ParseObject (yyscan_t scanner, int c) {
case NULL_CONSTANT: case NULL_CONSTANT:
return TRI_CreateNullJson(); return TRI_CreateNullJson();
case NUMBER_CONSTANT: case NUMBER_CONSTANT: {
char buffer[512];
char* ep;
double d;
if ((size_t) yyleng >= sizeof(buffer)) { if ((size_t) yyleng >= sizeof(buffer)) {
yyextra.message = "number too big"; yyextra.message = "number too big";
return NULL; return NULL;
@ -2572,11 +2572,16 @@ static TRI_json_t* ParseObject (yyscan_t scanner, int c) {
} }
return TRI_CreateNumberJson(d); return TRI_CreateNumberJson(d);
}
case STRING_CONSTANT: {
char* ptr;
size_t outLength;
case STRING_CONSTANT:
ptr = TRI_UnescapeUtf8String(yytext + 1, yyleng - 2, &outLength); ptr = TRI_UnescapeUtf8String(yytext + 1, yyleng - 2, &outLength);
return TRI_CreateString2Json(ptr, outLength); return TRI_CreateString2Json(ptr, outLength);
}
case OPEN_BRACE: case OPEN_BRACE:
return ParseArray(scanner); return ParseArray(scanner);