godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add enum naming, by assinging a given enum's values to a Dict

Browse Source 
(cherry picked from commit 88430f0962)
This commit is contained in:
Bojidar Marinov 2016-08-27 15:56:51 +03:00 committed by Fabio Alessandrelli
parent ed80f4563a
commit dad8e04139
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/gdscript/gd_parser.cpp
View File

@ -3157,8 +3157,14 @@ void GDParser::_parse_class(ClassNode *p_class) {
//mutiple constant declarations.. //mutiple constant declarations..
int last_assign = -1; // Incremented by 1 right before the assingment. int last_assign = -1; // Incremented by 1 right before the assingment.
String enum_name;
Dictionary enum_dict;
tokenizer->advance(); tokenizer->advance();
if (tokenizer->get_token() == GDTokenizer::TK_IDENTIFIER) {
enum_name = tokenizer->get_token_identifier();
tokenizer->advance();
}
if (tokenizer->get_token() != GDTokenizer::TK_CURLY_BRACKET_OPEN) { if (tokenizer->get_token() != GDTokenizer::TK_CURLY_BRACKET_OPEN) {
_set_error("Expected '{' in enum declaration"); _set_error("Expected '{' in enum declaration");
return; return;
@ -3227,10 +3233,24 @@ void GDParser::_parse_class(ClassNode *p_class) {
tokenizer->advance(); tokenizer->advance();
} }
if (enum_name != "") {
const ConstantNode *cn = static_cast<const ConstantNode *>(constant.expression);
enum_dict[constant.identifier] = cn->value;
}
p_class->constant_expressions.push_back(constant); p_class->constant_expressions.push_back(constant);
} }
} }
if (enum_name != "") {
ClassNode::Constant enum_constant;
enum_constant.identifier = enum_name;
ConstantNode *cn = alloc_node<ConstantNode>();
cn->value = enum_dict;
enum_constant.expression = cn;
p_class->constant_expressions.push_back(enum_constant);
}
if (!_end_statement()) { if (!_end_statement()) {
_set_error("Expected end of statement (enum)"); _set_error("Expected end of statement (enum)");
return; return;