Changeset: a55b388139cf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a55b388139cf
Modified Files:
monetdb5/modules/atoms/json_atom.c
Branch: default
Log Message:
Ran indent.
diffs (truncated from 2296 to 300 lines):
diff --git a/monetdb5/modules/atoms/json_atom.c
b/monetdb5/modules/atoms/json_atom.c
--- a/monetdb5/modules/atoms/json_atom.c
+++ b/monetdb5/modules/atoms/json_atom.c
@@ -37,7 +37,8 @@ int TYPE_json;
static str JSONparse(char *j);
-int JSONfromString(str src, int *len, json *j)
+int
+JSONfromString(str src, int *len, json *j)
{
ssize_t slen = (ssize_t) strlen(src);
if ((ssize_t) *len < slen)
@@ -52,40 +53,42 @@ int JSONfromString(str src, int *len, js
return *len;
}
-int JSONtoString(str *s, int *len, json src)
+int
+JSONtoString(str *s, int *len, json src)
{
- size_t ll;
- int l,cnt=0;
+ size_t ll;
+ int l, cnt = 0;
char *c, *dst;
- if (GDK_STRNIL(src)) {
- *s = GDKstrdup("null");
- return 0;
- }
- for (c =src; *c; c++)
- switch(*c){
+ if (GDK_STRNIL(src)) {
+ *s = GDKstrdup("null");
+ return 0;
+ }
+ for (c = src; *c; c++)
+ switch (*c) {
case '"':
case '\\':
case '\n':
cnt++;
}
- ll = strlen(src);
- assert(ll <= (size_t) INT_MAX);
- l = (int) ll + cnt+3;
+ ll = strlen(src);
+ assert(ll <= (size_t) INT_MAX);
+ l = (int) ll + cnt + 3;
- if (l >= *len) {
- GDKfree(*s);
- *s = (str) GDKmalloc(l);
- if (*s == NULL)
- return 0;
- }
+ if (l >= *len) {
+ GDKfree(*s);
+ *s = (str) GDKmalloc(l);
+ if (*s == NULL)
+ return 0;
+ }
dst = *s;
*dst++ = '"';
- for (c =src; *c; c++)
- switch(*c){
+ for (c = src; *c; c++)
+ switch (*c) {
case '"':
case '\\':
*dst++ = '\\';
+ /* fall through */
default:
*dst++ = *c;
break;
@@ -96,27 +99,29 @@ int JSONtoString(str *s, int *len, json
}
*dst++ = '"';
*dst = 0;
- *len = l-1;
- return *len;
+ *len = l - 1;
+ return *len;
}
-str JSONjson2str(str *ret, json *j)
+str
+JSONjson2str(str *ret, json *j)
{
char *s = *j;
if (*s == '"')
s++;
s = GDKstrdup(s);
- if ( s[strlen(s)-1] == '"')
- s[strlen(s)-1] =0;
+ if (s[strlen(s) - 1] == '"')
+ s[strlen(s) - 1] = 0;
*ret = s;
return MAL_SUCCEED;
}
-str JSONstr2json(str *ret, json *j)
+str
+JSONstr2json(str *ret, json *j)
{
str msg = JSONparse(*j);
- if ( msg){
+ if (msg) {
*ret = 0;
return msg;
}
@@ -124,38 +129,45 @@ str JSONstr2json(str *ret, json *j)
return MAL_SUCCEED;
}
-str JSONisvalid(int *ret, json *j)
+str
+JSONisvalid(int *ret, json *j)
{
str msg = JSONparse(*j);
*ret = 1;
- if ( msg){
+ if (msg) {
*ret = 0;
GDKfree(msg);
}
return MAL_SUCCEED;
}
-str JSONisobject(int *ret, json *j)
+str
+JSONisobject(int *ret, json *j)
{
char *s;
- for( s= *j; *s; s++)
- if ( *s !=' ' && *s != '\n' && *s != '\t') break;
+ for (s = *j; *s; s++)
+ if (*s != ' ' && *s != '\n' && *s != '\t')
+ break;
- *ret = *s =='{';
- return MAL_SUCCEED;
-}
-str JSONisarray(int *ret, json *j)
-{
- char *s;
- for( s= *j; *s; s++)
- if ( *s !=' ' && *s != '\n' && *s != '\t') break;
-
- *ret = *s =='[';
+ *ret = *s == '{';
return MAL_SUCCEED;
}
-str JSONprelude(int *ret)
+str
+JSONisarray(int *ret, json *j)
+{
+ char *s;
+ for (s = *j; *s; s++)
+ if (*s != ' ' && *s != '\n' && *s != '\t')
+ break;
+
+ *ret = *s == '[';
+ return MAL_SUCCEED;
+}
+
+str
+JSONprelude(int *ret)
{
(void) ret;
TYPE_json = ATOMindex("json");
@@ -168,58 +180,71 @@ static str JSONarrayParser(char *j, char
static str
JSONstringParser(char *j, char **next)
{
- for(j++;*j; j++)
- switch(*j){
- case '\\':
- // parse all escapes
- j++;
- switch(*j){
- case '"': case '\\': case '/': case 'b': case 'f':
- case 'n': case 'r': case 't':
+ for (j++; *j; j++)
+ switch (*j) {
+ case '\\':
+ // parse all escapes
+ j++;
+ switch (*j) {
+ case '"':
+ case '\\':
+ case '/':
+ case 'b':
+ case 'f':
+ case 'n':
+ case 'r':
+ case 't':
+ break;
+ case 'u':
+ j++;
+ hex;
+ hex;
+ hex;
+ hex;
+ break;
+ default:
+ throw(MAL, "json.parser", "illegal escape
char");
+ }
break;
- case 'u':
- j++; hex;hex;hex;hex;
- break;
- default:
- throw(MAL,"json.parser","illegal escape char");
+ case '"':
+ j++;
+ *next = j;
+ return MAL_SUCCEED;
}
- break;
- case '"':
- j++;
- *next = j;
- return MAL_SUCCEED;
- }
- throw(MAL,"json.parser","Nonterminated string");
+ throw(MAL, "json.parser", "Nonterminated string");
}
static str
JSONnumberParser(char *j, char **next)
{
- if ( *j == '-')
+ if (*j == '-')
j++;
skipblancs;
- if (*j <'0' || *j >'9')
- throw(MAL,"json.parser","Number expected");
- if (*j == '0' && *(j+1) != '.')
- throw(MAL,"json.parser","Decimal expected");
- for(;*j;j++)
- if (*j <'0' || *j >'9') break;
+ if (*j < '0' || *j > '9')
+ throw(MAL, "json.parser", "Number expected");
+ if (*j == '0' && *(j + 1) != '.')
+ throw(MAL, "json.parser", "Decimal expected");
+ for (; *j; j++)
+ if (*j < '0' || *j > '9')
+ break;
skipblancs;
- if ( *j == '.' ){
+ if (*j == '.') {
j++;
skipblancs;
- for(;*j;j++)
- if (*j <'0' || *j >'9') break;
+ for (; *j; j++)
+ if (*j < '0' || *j > '9')
+ break;
skipblancs;
}
- if ( *j == 'e' || *j == 'E' ){
+ if (*j == 'e' || *j == 'E') {
j++;
skipblancs;
- if ( *j == '-')
+ if (*j == '-')
j++;
skipblancs;
- for(;*j;j++)
- if (*j <'0' || *j >'9') break;
+ for (; *j; j++)
+ if (*j < '0' || *j > '9')
+ break;
}
*next = j;
return MAL_SUCCEED;
@@ -230,42 +255,42 @@ JSONvalueParser(char *j, char **next)
{
str msg = MAL_SUCCEED;
- switch(*j){
+ switch (*j) {
case '{':
- msg = JSONobjectParser(j+1,&j);
- break;
+ msg = JSONobjectParser(j + 1, &j);
+ break;
case '[':
- msg = JSONarrayParser(j+1,&j);
- break;
+ msg = JSONarrayParser(j + 1, &j);
+ break;
case '"':
- msg = JSONstringParser(j+1,&j);
- break;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
