Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

properly handle typed array constructors in VariantParser, closes #3054

2.0
Juan Linietsky 2016-01-10 23:22:48 +07:00
parent 1a9c3a134d
commit 725b61bb6c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/variant_parser.cpp
Unescape Escape View File

@ -448,7 +448,7 @@ Error VariantParser::_parse_construct(Stream *p_stream,Vector<T>& r_construct,in
if (!first) {
get_token(p_stream,token,line,r_err_str);
if (token.type==TK_COMMA) {
//do none
//do none
} else if (token.type==TK_PARENTHESIS_CLOSE) {
break;
} else {
@ -458,7 +458,10 @@ Error VariantParser::_parse_construct(Stream *p_stream,Vector<T>& r_construct,in
}
}
get_token(p_stream,token,line,r_err_str);
if (token.type!=TK_NUMBER) {
if (first && token.type==TK_PARENTHESIS_CLOSE) {
break;
} else if (token.type!=TK_NUMBER) {
r_err_str="Expected float in constructor";
return ERR_PARSE_ERROR;
}