diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-08-10 12:57:20 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-10 12:57:20 -0300 |
| commit | c76f444c4ec6971d5797568787b346ffde411c4a (patch) | |
| tree | 125ee147aa053cc4299a92772a8a7a313fea8f5d /modules/gdscript/gdscript_parser.cpp | |
| parent | b4006f68b35d4270a0f3555d9baa2d8622bfc1e5 (diff) | |
| parent | ba974b8d1e245818d819791bd628e70ec3b92de3 (diff) | |
| download | redot-engine-c76f444c4ec6971d5797568787b346ffde411c4a.tar.gz | |
Merge pull request #14704 from poke1024/colorconstants
Allow some non-integer built-in constants in gdscript
Diffstat (limited to 'modules/gdscript/gdscript_parser.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_parser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index 852d465206..15ee4f4219 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -607,7 +607,7 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s _set_error("Built-in type constant or static function expected after '.'"); return NULL; } - if (!Variant::has_numeric_constant(bi_type, identifier)) { + if (!Variant::has_constant(bi_type, identifier)) { if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_OPEN && Variant::is_method_const(bi_type, identifier) && @@ -642,7 +642,7 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s } else { ConstantNode *cn = alloc_node<ConstantNode>(); - cn->value = Variant::get_numeric_constant_value(bi_type, identifier); + cn->value = Variant::get_constant_value(bi_type, identifier); cn->datatype = _type_from_variant(cn->value); expr = cn; } |