asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3441 from Hinsbart/preload-constants

Browse source 
can preload constants
This commit is contained in:
Juan Linietsky 2016-01-24 20:10:47 -03:00
commit caff4000a2
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
modules/gdscript/gd_parser.cpp
View file

@ -283,13 +283,23 @@ GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_
return NULL; return NULL;
} }
tokenizer->advance(); tokenizer->advance();
if (tokenizer->get_token()!=GDTokenizer::TK_CONSTANT || tokenizer->get_token_constant().get_type()!=Variant::STRING) {
_set_error("Expected string constant as 'preload' argument."); String path;
bool valid = false;
Node *subexpr = _parse_and_reduce_expression(p_parent, p_static);
if (subexpr) {
if (subexpr->type == Node::TYPE_CONSTANT) {
ConstantNode *cn = static_cast<ConstantNode*>(subexpr);
if (cn->value.get_type() == Variant::STRING) {
valid = true;
path = (String) cn->value;
}
}
}
if (!valid) {
_set_error("expected string constant as 'preload' argument.");
return NULL; return NULL;
} }
String path = tokenizer->get_token_constant();
if (!path.is_abs_path() && base_path!="") if (!path.is_abs_path() && base_path!="")
path=base_path+"/"+path; path=base_path+"/"+path;
path = path.replace("///","//").simplify_path(); path = path.replace("///","//").simplify_path();
@ -322,8 +332,6 @@ GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_
} }
} }
tokenizer->advance();
if (tokenizer->get_token()!=GDTokenizer::TK_PARENTHESIS_CLOSE) { if (tokenizer->get_token()!=GDTokenizer::TK_PARENTHESIS_CLOSE) {
_set_error("Expected ')' after 'preload' path"); _set_error("Expected ')' after 'preload' path");
return NULL; return NULL;