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

Merge pull request #27867 from bojidar-bg/27489-as-self-fail 

Fix as operator generating opcode 38 errors
This commit is contained in:
Rémi Verschelde 2019-04-11 23:23:35 +02:00 committed by GitHub
parent c1dcdf6109 f04f127680
commit da65d54649
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
main/tests/test_gdscript.cpp
View File

@ -288,6 +288,11 @@ static String _parser_expr(const GDScriptParser::Node *p_expr) {
}
}
} break;
case GDScriptParser::Node::TYPE_CAST: {
const GDScriptParser::CastNode *cast_node = static_cast<const GDScriptParser::CastNode *>(p_expr);
txt = _parser_expr(cast_node->source_node) + " as " + cast_node->cast_type.to_string();
} break;
case GDScriptParser::Node::TYPE_NEWLINE: {
@ -668,6 +673,17 @@ static void _disassemble_class(const Ref<GDScript> &p_class, const Vector<String
txt += "= false";
incr += 2;
} break;
case GDScriptFunction::OPCODE_CAST_TO_SCRIPT: {
txt += " cast ";
txt += DADDR(3);
txt += "=";
txt += DADDR(1);
txt += " as ";
txt += DADDR(2);
incr += 4;
} break;
case GDScriptFunction::OPCODE_CONSTRUCT: {
@ -1018,19 +1034,17 @@ MainLoop *test(TestType p_type) {
return NULL;
}
GDScript *script = memnew(GDScript);
Ref<GDScript> gds;
gds.instance();
GDScriptCompiler gdc;
err = gdc.compile(&parser, script);
err = gdc.compile(&parser, gds.ptr());
if (err) {
print_line("Compile Error:\n" + itos(gdc.get_error_line()) + ":" + itos(gdc.get_error_column()) + ":" + gdc.get_error());
memdelete(script);
return NULL;
}
Ref<GDScript> gds = Ref<GDScript>(script);
Ref<GDScript> current = gds;
while (current.is_valid()) {

23
modules/gdscript/gdscript_compiler.cpp
View File

@ -480,16 +480,16 @@ int GDScriptCompiler::_parse_expression(CodeGen &codegen, const GDScriptParser::
switch (cast_type.kind) {
case GDScriptDataType::BUILTIN: {
codegen.opcodes.push_back(GDScriptFunction::OPCODE_CAST_TO_BUILTIN);
codegen.opcodes.push_back(cn->cast_type.builtin_type);
codegen.opcodes.push_back(cast_type.builtin_type);
} break;
case GDScriptDataType::NATIVE: {
int class_idx;
if (GDScriptLanguage::get_singleton()->get_global_map().has(cn->cast_type.native_type)) {
if (GDScriptLanguage::get_singleton()->get_global_map().has(cast_type.native_type)) {
class_idx = GDScriptLanguage::get_singleton()->get_global_map()[cn->cast_type.native_type];
class_idx = GDScriptLanguage::get_singleton()->get_global_map()[cast_type.native_type];
class_idx |= (GDScriptFunction::ADDR_TYPE_GLOBAL << GDScriptFunction::ADDR_BITS); //argument (stack root)
} else {
_set_error("Invalid native class type '" + String(cn->cast_type.native_type) + "'.", cn);
_set_error("Invalid native class type '" + String(cast_type.native_type) + "'.", cn);
return -1;
}
codegen.opcodes.push_back(GDScriptFunction::OPCODE_CAST_TO_NATIVE); // perform operator
@ -498,7 +498,7 @@ int GDScriptCompiler::_parse_expression(CodeGen &codegen, const GDScriptParser::
case GDScriptDataType::SCRIPT:
case GDScriptDataType::GDSCRIPT: {
Variant script = cn->cast_type.script_type;
Variant script = cast_type.script_type;
int idx = codegen.get_constant_pos(script);
idx |= GDScriptFunction::ADDR_TYPE_LOCAL_CONSTANT << GDScriptFunction::ADDR_BITS; //make it a local constant (faster access)
@ -1863,6 +1863,19 @@ Error GDScriptCompiler::_parse_class_level(GDScript *p_script, const GDScriptPar
p_script->base = base;
p_script->_base = base.ptr();
p_script->member_indices = base->member_indices;
if (p_class->base_type.kind == GDScriptParser::DataType::CLASS) {
if (!parsed_classes.has(p_script->_base)) {
if (parsing_classes.has(p_script->_base)) {
_set_error("Cyclic class reference for '" + String(p_class->name) + "'.", p_class);
return ERR_PARSE_ERROR;
}
Error err = _parse_class_level(p_script->_base, p_class->base_type.class_type, p_keep_state);
if (err) {
return err;
}
}
}
} break;
default: {
_set_error("Parser bug: invalid inheritance.", p_class);