Merge branch 'develop' of lirent/libcjsonp into master
This commit is contained in:
commit
2dfc7b6411
@ -1 +1 @@
|
|||||||
Subproject commit bdebf872671e58bd475d37a266751fe1f778e5dd
|
Subproject commit d079bb1a615fd15bd63353e0050765a96a376924
|
@ -126,7 +126,7 @@ static bool libcjsonp_builtin_parse_map(vtype_map* x, reader_t* s) {
|
|||||||
|
|
||||||
switch (s->cur) {
|
switch (s->cur) {
|
||||||
case ',':
|
case ',':
|
||||||
libcdsb_map_inject(x, &name, VTYPE_STRING, value.value, value.type);
|
libcdsb_map_inject(x, &name, VTYPE_STRING, value.value, value.type, 0, 0);
|
||||||
next_sign(s);
|
next_sign(s);
|
||||||
break;
|
break;
|
||||||
case '}':
|
case '}':
|
||||||
@ -156,7 +156,7 @@ static bool libcjsonp_builtin_parse_list(vtype_list* x, reader_t* s) {
|
|||||||
|
|
||||||
switch (s->cur) {
|
switch (s->cur) {
|
||||||
case ',':
|
case ',':
|
||||||
libcdsb_list_attach(x, -1, value.value, value.type, 1);
|
libcdsb_list_attach(x, -1, value.value, value.type, 1, 0, 0);
|
||||||
next_sign(s);
|
next_sign(s);
|
||||||
break;
|
break;
|
||||||
case ']':
|
case ']':
|
||||||
|
@ -99,7 +99,7 @@ static const char* libcjsonp_builtin_parse_map(vtype_map* x, const char* s) {
|
|||||||
} else goto bad_;
|
} else goto bad_;
|
||||||
|
|
||||||
if (*s == ',' || *s == '}') {
|
if (*s == ',' || *s == '}') {
|
||||||
libcdsb_map_inject(x, &name, VTYPE_STRING, value.value, value.type);
|
libcdsb_map_inject(x, &name, VTYPE_STRING, value.value, value.type, 0, 0);
|
||||||
|
|
||||||
if (*s++ == '}')
|
if (*s++ == '}')
|
||||||
return s;
|
return s;
|
||||||
@ -132,7 +132,7 @@ static const char* libcjsonp_builtin_parse_list(vtype_list* x, const char* s) {
|
|||||||
} else return 0;
|
} else return 0;
|
||||||
|
|
||||||
if (*s == ',' || *s == ']') {
|
if (*s == ',' || *s == ']') {
|
||||||
libcdsb_list_attach(x, -1, value.value, value.type, 1);
|
libcdsb_list_attach(x, -1, value.value, value.type, 1, 0, 0);
|
||||||
|
|
||||||
if (*s++ == ']')
|
if (*s++ == ']')
|
||||||
return s;
|
return s;
|
||||||
|
Loading…
Reference in New Issue
Block a user