summaryrefslogtreecommitdiff
path: root/core/variant_construct_string.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'core/variant_construct_string.cpp')
-rw-r--r--core/variant_construct_string.cpp286
1 files changed, 131 insertions, 155 deletions
diff --git a/core/variant_construct_string.cpp b/core/variant_construct_string.cpp
index 56aa9891fb..7f176749d3 100644
--- a/core/variant_construct_string.cpp
+++ b/core/variant_construct_string.cpp
@@ -58,22 +58,20 @@ class VariantConstruct {
Variant value;
};
- static const char * tk_name[TK_MAX];
+ static const char *tk_name[TK_MAX];
- static String _print_var(const Variant& p_var);
+ static String _print_var(const Variant &p_var);
- static Error _get_token(const CharType *p_str,int &index, int p_len,Token& r_token,int &line,String &r_err_str);
- static Error _parse_value(Variant &value,Token& token,const CharType *p_str,int &index, int p_len,int &line,String &r_err_str,Variant::ObjectConstruct* p_construct,void* p_ud);
- static Error _parse_array(Array &array,const CharType *p_str,int &index, int p_len,int &line,String &r_err_str,Variant::ObjectConstruct* p_construct,void* p_ud);
- static Error _parse_dict(Dictionary &object,const CharType *p_str,int &index, int p_len,int &line,String &r_err_str,Variant::ObjectConstruct* p_construct,void* p_ud);
+ static Error _get_token(const CharType *p_str, int &index, int p_len, Token &r_token, int &line, String &r_err_str);
+ static Error _parse_value(Variant &value, Token &token, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str, Variant::ObjectConstruct *p_construct, void *p_ud);
+ static Error _parse_array(Array &array, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str, Variant::ObjectConstruct *p_construct, void *p_ud);
+ static Error _parse_dict(Dictionary &object, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str, Variant::ObjectConstruct *p_construct, void *p_ud);
public:
-
- static Error parse(const String& p_string,Variant& r_ret,String &r_err_str,int &r_err_line,Variant::ObjectConstruct* p_construct,void* p_ud);
+ static Error parse(const String &p_string, Variant &r_ret, String &r_err_str, int &r_err_line, Variant::ObjectConstruct *p_construct, void *p_ud);
};
-
-const char * VariantConstruct::tk_name[TK_MAX] = {
+const char *VariantConstruct::tk_name[TK_MAX] = {
"'{'",
"'}'",
"'['",
@@ -86,12 +84,10 @@ const char * VariantConstruct::tk_name[TK_MAX] = {
"EOF",
};
-
-
-Error VariantConstruct::_get_token(const CharType *p_str, int &idx, int p_len, Token& r_token,int &line,String &r_err_str) {
+Error VariantConstruct::_get_token(const CharType *p_str, int &idx, int p_len, Token &r_token, int &line, String &r_err_str) {
while (true) {
- switch(p_str[idx]) {
+ switch (p_str[idx]) {
case '\n': {
@@ -100,42 +96,42 @@ Error VariantConstruct::_get_token(const CharType *p_str, int &idx, int p_len, T
break;
};
case 0: {
- r_token.type=TK_EOF;
+ r_token.type = TK_EOF;
return OK;
} break;
case '{': {
- r_token.type=TK_CURLY_BRACKET_OPEN;
+ r_token.type = TK_CURLY_BRACKET_OPEN;
idx++;
return OK;
};
case '}': {
- r_token.type=TK_CURLY_BRACKET_CLOSE;
+ r_token.type = TK_CURLY_BRACKET_CLOSE;
idx++;
return OK;
};
case '[': {
- r_token.type=TK_BRACKET_OPEN;
+ r_token.type = TK_BRACKET_OPEN;
idx++;
return OK;
};
case ']': {
- r_token.type=TK_BRACKET_CLOSE;
+ r_token.type = TK_BRACKET_CLOSE;
idx++;
return OK;
};
case ':': {
- r_token.type=TK_COLON;
+ r_token.type = TK_COLON;
idx++;
return OK;
};
case ',': {
- r_token.type=TK_COMMA;
+ r_token.type = TK_COMMA;
idx++;
return OK;
};
@@ -143,318 +139,298 @@ Error VariantConstruct::_get_token(const CharType *p_str, int &idx, int p_len, T
idx++;
String str;
- while(true) {
- if (p_str[idx]==0) {
- r_err_str="Unterminated String";
+ while (true) {
+ if (p_str[idx] == 0) {
+ r_err_str = "Unterminated String";
return ERR_PARSE_ERROR;
- } else if (p_str[idx]=='"') {
+ } else if (p_str[idx] == '"') {
idx++;
break;
- } else if (p_str[idx]=='\\') {
+ } else if (p_str[idx] == '\\') {
//escaped characters...
idx++;
CharType next = p_str[idx];
- if (next==0) {
- r_err_str="Unterminated String";
- return ERR_PARSE_ERROR;
+ if (next == 0) {
+ r_err_str = "Unterminated String";
+ return ERR_PARSE_ERROR;
}
- CharType res=0;
-
- switch(next) {
-
- case 'b': res=8; break;
- case 't': res=9; break;
- case 'n': res=10; break;
- case 'f': res=12; break;
- case 'r': res=13; break;
- case '\"': res='\"'; break;
- case '\\': res='\\'; break;
- case '/': res='/'; break;
+ CharType res = 0;
+
+ switch (next) {
+
+ case 'b': res = 8; break;
+ case 't': res = 9; break;
+ case 'n': res = 10; break;
+ case 'f': res = 12; break;
+ case 'r': res = 13; break;
+ case '\"': res = '\"'; break;
+ case '\\': res = '\\'; break;
+ case '/': res = '/'; break;
case 'u': {
//hexnumbarh - oct is deprecated
-
- for(int j=0;j<4;j++) {
- CharType c = p_str[idx+j+1];
- if (c==0) {
- r_err_str="Unterminated String";
+ for (int j = 0; j < 4; j++) {
+ CharType c = p_str[idx + j + 1];
+ if (c == 0) {
+ r_err_str = "Unterminated String";
return ERR_PARSE_ERROR;
}
- if (!((c>='0' && c<='9') || (c>='a' && c<='f') || (c>='A' && c<='F'))) {
+ if (!((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'))) {
- r_err_str="Malformed hex constant in string";
+ r_err_str = "Malformed hex constant in string";
return ERR_PARSE_ERROR;
}
CharType v;
- if (c>='0' && c<='9') {
- v=c-'0';
- } else if (c>='a' && c<='f') {
- v=c-'a';
- v+=10;
- } else if (c>='A' && c<='F') {
- v=c-'A';
- v+=10;
+ if (c >= '0' && c <= '9') {
+ v = c - '0';
+ } else if (c >= 'a' && c <= 'f') {
+ v = c - 'a';
+ v += 10;
+ } else if (c >= 'A' && c <= 'F') {
+ v = c - 'A';
+ v += 10;
} else {
ERR_PRINT("BUG");
- v=0;
+ v = 0;
}
- res<<=4;
- res|=v;
-
-
+ res <<= 4;
+ res |= v;
}
- idx+=4; //will add at the end anyway
-
+ idx += 4; //will add at the end anyway
} break;
default: {
- r_err_str="Invalid escape sequence";
+ r_err_str = "Invalid escape sequence";
return ERR_PARSE_ERROR;
} break;
}
- str+=res;
+ str += res;
} else {
- if (p_str[idx]=='\n')
+ if (p_str[idx] == '\n')
line++;
- str+=p_str[idx];
+ str += p_str[idx];
}
idx++;
}
- r_token.type=TK_STRING;
- r_token.value=str;
+ r_token.type = TK_STRING;
+ r_token.value = str;
return OK;
} break;
default: {
- if (p_str[idx]<=32) {
+ if (p_str[idx] <= 32) {
idx++;
break;
}
- if (p_str[idx]=='-' || (p_str[idx]>='0' && p_str[idx]<='9')) {
+ if (p_str[idx] == '-' || (p_str[idx] >= '0' && p_str[idx] <= '9')) {
//a number
const CharType *rptr;
- double number = String::to_double(&p_str[idx],&rptr);
- idx+=(rptr - &p_str[idx]);
- r_token.type=TK_NUMBER;
- r_token.value=number;
+ double number = String::to_double(&p_str[idx], &rptr);
+ idx += (rptr - &p_str[idx]);
+ r_token.type = TK_NUMBER;
+ r_token.value = number;
return OK;
- } else if ((p_str[idx]>='A' && p_str[idx]<='Z') || (p_str[idx]>='a' && p_str[idx]<='z')) {
+ } else if ((p_str[idx] >= 'A' && p_str[idx] <= 'Z') || (p_str[idx] >= 'a' && p_str[idx] <= 'z')) {
String id;
- while((p_str[idx]>='A' && p_str[idx]<='Z') || (p_str[idx]>='a' && p_str[idx]<='z')) {
+ while ((p_str[idx] >= 'A' && p_str[idx] <= 'Z') || (p_str[idx] >= 'a' && p_str[idx] <= 'z')) {
- id+=p_str[idx];
+ id += p_str[idx];
idx++;
}
- r_token.type=TK_IDENTIFIER;
- r_token.value=id;
+ r_token.type = TK_IDENTIFIER;
+ r_token.value = id;
return OK;
} else {
- r_err_str="Unexpected character.";
+ r_err_str = "Unexpected character.";
return ERR_PARSE_ERROR;
}
}
-
}
}
return ERR_PARSE_ERROR;
}
+Error VariantConstruct::_parse_value(Variant &value, Token &token, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str, Variant::ObjectConstruct *p_construct, void *p_ud) {
-
-Error VariantConstruct::_parse_value(Variant &value,Token& token,const CharType *p_str,int &index, int p_len,int &line,String &r_err_str,Variant::ObjectConstruct* p_construct,void* p_ud) {
-
-
- if (token.type==TK_CURLY_BRACKET_OPEN) {
+ if (token.type == TK_CURLY_BRACKET_OPEN) {
Dictionary d;
- Error err = _parse_dict(d,p_str,index,p_len,line,r_err_str,p_construct,p_ud);
+ Error err = _parse_dict(d, p_str, index, p_len, line, r_err_str, p_construct, p_ud);
if (err)
return err;
- value=d;
+ value = d;
return OK;
- } else if (token.type==TK_BRACKET_OPEN) {
+ } else if (token.type == TK_BRACKET_OPEN) {
Array a;
- Error err = _parse_array(a,p_str,index,p_len,line,r_err_str,p_construct,p_ud);
+ Error err = _parse_array(a, p_str, index, p_len, line, r_err_str, p_construct, p_ud);
if (err)
return err;
- value=a;
+ value = a;
return OK;
- } else if (token.type==TK_IDENTIFIER) {
+ } else if (token.type == TK_IDENTIFIER) {
String id = token.value;
- if (id=="true")
- value=true;
- else if (id=="false")
- value=false;
- else if (id=="null")
- value=Variant();
+ if (id == "true")
+ value = true;
+ else if (id == "false")
+ value = false;
+ else if (id == "null")
+ value = Variant();
else {
- r_err_str="Expected 'true','false' or 'null', got '"+id+"'.";
+ r_err_str = "Expected 'true','false' or 'null', got '" + id + "'.";
return ERR_PARSE_ERROR;
}
return OK;
- } else if (token.type==TK_NUMBER) {
+ } else if (token.type == TK_NUMBER) {
- value=token.value;
+ value = token.value;
return OK;
- } else if (token.type==TK_STRING) {
+ } else if (token.type == TK_STRING) {
- value=token.value;
+ value = token.value;
return OK;
} else {
- r_err_str="Expected value, got "+String(tk_name[token.type])+".";
+ r_err_str = "Expected value, got " + String(tk_name[token.type]) + ".";
return ERR_PARSE_ERROR;
}
return ERR_PARSE_ERROR;
}
-
-Error VariantConstruct::_parse_array(Array &array,const CharType *p_str,int &index, int p_len,int &line,String &r_err_str,Variant::ObjectConstruct* p_construct,void* p_ud) {
+Error VariantConstruct::_parse_array(Array &array, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str, Variant::ObjectConstruct *p_construct, void *p_ud) {
Token token;
- bool need_comma=false;
-
+ bool need_comma = false;
- while(index<p_len) {
+ while (index < p_len) {
- Error err = _get_token(p_str,index,p_len,token,line,r_err_str);
- if (err!=OK)
+ Error err = _get_token(p_str, index, p_len, token, line, r_err_str);
+ if (err != OK)
return err;
- if (token.type==TK_BRACKET_CLOSE) {
+ if (token.type == TK_BRACKET_CLOSE) {
return OK;
}
if (need_comma) {
- if (token.type!=TK_COMMA) {
+ if (token.type != TK_COMMA) {
- r_err_str="Expected ','";
+ r_err_str = "Expected ','";
return ERR_PARSE_ERROR;
} else {
- need_comma=false;
+ need_comma = false;
continue;
}
}
Variant v;
- err = _parse_value(v,token,p_str,index,p_len,line,r_err_str,p_construct,p_ud);
+ err = _parse_value(v, token, p_str, index, p_len, line, r_err_str, p_construct, p_ud);
if (err)
return err;
array.push_back(v);
- need_comma=true;
-
+ need_comma = true;
}
return OK;
-
}
-Error VariantConstruct::_parse_dict(Dictionary &dict,const CharType *p_str,int &index, int p_len,int &line,String &r_err_str,Variant::ObjectConstruct* p_construct,void* p_ud) {
+Error VariantConstruct::_parse_dict(Dictionary &dict, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str, Variant::ObjectConstruct *p_construct, void *p_ud) {
- bool at_key=true;
+ bool at_key = true;
Variant key;
Token token;
- bool need_comma=false;
-
-
- while(index<p_len) {
+ bool need_comma = false;
+ while (index < p_len) {
if (at_key) {
- Error err = _get_token(p_str,index,p_len,token,line,r_err_str);
- if (err!=OK)
+ Error err = _get_token(p_str, index, p_len, token, line, r_err_str);
+ if (err != OK)
return err;
- if (token.type==TK_CURLY_BRACKET_CLOSE) {
+ if (token.type == TK_CURLY_BRACKET_CLOSE) {
return OK;
}
if (need_comma) {
- if (token.type!=TK_COMMA) {
+ if (token.type != TK_COMMA) {
- r_err_str="Expected '}' or ','";
+ r_err_str = "Expected '}' or ','";
return ERR_PARSE_ERROR;
} else {
- need_comma=false;
+ need_comma = false;
continue;
}
}
- err = _parse_value(key,token,p_str,index,p_len,line,r_err_str,p_construct,p_ud);
+ err = _parse_value(key, token, p_str, index, p_len, line, r_err_str, p_construct, p_ud);
-
- if (err!=OK)
+ if (err != OK)
return err;
- err = _get_token(p_str,index,p_len,token,line,r_err_str);
+ err = _get_token(p_str, index, p_len, token, line, r_err_str);
- if (err!=OK)
+ if (err != OK)
return err;
- if (token.type!=TK_COLON) {
+ if (token.type != TK_COLON) {
- r_err_str="Expected ':'";
+ r_err_str = "Expected ':'";
return ERR_PARSE_ERROR;
}
- at_key=false;
+ at_key = false;
} else {
-
- Error err = _get_token(p_str,index,p_len,token,line,r_err_str);
- if (err!=OK)
+ Error err = _get_token(p_str, index, p_len, token, line, r_err_str);
+ if (err != OK)
return err;
Variant v;
- err = _parse_value(v,token,p_str,index,p_len,line,r_err_str,p_construct,p_ud);
+ err = _parse_value(v, token, p_str, index, p_len, line, r_err_str, p_construct, p_ud);
if (err)
return err;
- dict[key]=v;
- need_comma=true;
- at_key=true;
+ dict[key] = v;
+ need_comma = true;
+ at_key = true;
}
}
return OK;
}
-
-Error VariantConstruct::parse(const String& p_string,Variant& r_ret,String &r_err_str,int &r_err_line,Variant::ObjectConstruct* p_construct,void* p_ud) {
-
+Error VariantConstruct::parse(const String &p_string, Variant &r_ret, String &r_err_str, int &r_err_line, Variant::ObjectConstruct *p_construct, void *p_ud) {
const CharType *str = p_string.ptr();
int idx = 0;
int len = p_string.length();
Token token;
- r_err_line=0;
+ r_err_line = 0;
String aux_key;
- Error err = _get_token(str,idx,len,token,r_err_line,r_err_str);
+ Error err = _get_token(str, idx, len, token, r_err_line, r_err_str);
if (err)
return err;
- return _parse_value(r_ret,token,str,idx,len,r_err_line,r_err_str,p_construct,p_ud);
+ return _parse_value(r_ret, token, str, idx, len, r_err_line, r_err_str, p_construct, p_ud);
}
-
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 06:12:10 +0000