Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-20 16:33:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

GDScript: Allow enum values to be set to constant expressions

Browse source 
Also allow them to access previous values wihout referencing the enum.
This commit is contained in:
George Marques 2020-08-18 17:44:20 -03:00
parent 99d4ea8c79
commit 35176247af
No known key found for this signature in database
GPG key ID: 046BD46A3201E43D
4 changed files with 96 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/gdscript/gdscript_parser.cpp
View file

@ -1022,8 +1022,6 @@ GDScriptParser::EnumNode *GDScriptParser::parse_enum() {
push_multiline(true);
consume(GDScriptTokenizer::Token::BRACE_OPEN, vformat(R"(Expected "{" after %s.)", named ? "enum name" : R"("enum")"));
int current_value = 0;
do {
if (check(GDScriptTokenizer::Token::BRACE_CLOSE)) {
break; // Allow trailing comma.
@ -1031,6 +1029,9 @@ GDScriptParser::EnumNode *GDScriptParser::parse_enum() {
if (consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected identifer for enum key.)")) {
EnumNode::Value item;
item.identifier = parse_identifier();
item.parent_enum = enum_node;
item.line = previous.start_line;
item.leftmost_column = previous.leftmost_column;
if (!named) {
// TODO: Abstract this recursive member check.
@ -1045,18 +1046,15 @@ GDScriptParser::EnumNode *GDScriptParser::parse_enum() {
}
if (match(GDScriptTokenizer::Token::EQUAL)) {
if (consume(GDScriptTokenizer::Token::LITERAL, R"(Expected integer value after "=".)")) {
item.custom_value = parse_literal();
if (item.custom_value->value.get_type() != Variant::INT) {
push_error(R"(Expected integer value after "=".)");
item.custom_value = nullptr;
} else {
current_value = item.custom_value->value;
}
ExpressionNode *value = parse_expression(false);
if (value == nullptr) {
push_error(R"(Expected expression value after "=".)");
}
item.custom_value = value;
}
item.value = current_value++;
item.rightmost_column = previous.rightmost_column;
item.index = enum_node->values.size();
enum_node->values.push_back(item);
if (!named) {
// Add as member of current class.