diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-11-26 10:13:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-26 10:13:00 +0100 |
| commit | 7b2ac2832659c2c64e3ad3c8b077dfa72b7daf15 (patch) | |
| tree | 20b82c8ba174019aa62b615cceb32668374ef4b2 /modules/gdscript/gdscript_compiler.h | |
| parent | 815557c81228efc9e74097b50590b2d091387059 (diff) | |
| parent | 06b6cea62ec8c413389c7d9543e2c0eb587d527a (diff) | |
Merge pull request #23959 from RandomShaper/fix-dangling-script-fix
Fix dangling script fix
Diffstat (limited to 'modules/gdscript/gdscript_compiler.h')
| -rw-r--r-- | modules/gdscript/gdscript_compiler.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/gdscript/gdscript_compiler.h b/modules/gdscript/gdscript_compiler.h index 23c6450aa7..55f5e2b48e 100644 --- a/modules/gdscript/gdscript_compiler.h +++ b/modules/gdscript/gdscript_compiler.h @@ -148,17 +148,17 @@ class GDScriptCompiler { int _parse_assign_right_expression(CodeGen &codegen, const GDScriptParser::OperatorNode *p_expression, int p_stack_level); int _parse_expression(CodeGen &codegen, const GDScriptParser::Node *p_expression, int p_stack_level, bool p_root = false, bool p_initializer = false); Error _parse_block(CodeGen &codegen, const GDScriptParser::BlockNode *p_block, int p_stack_level = 0, int p_break_addr = -1, int p_continue_addr = -1); - Error _parse_function(Ref<GDScript> p_script, const GDScriptParser::ClassNode *p_class, const GDScriptParser::FunctionNode *p_func, bool p_for_ready = false); - Error _parse_class_level(Ref<GDScript> p_script, Ref<GDScript> p_owner, const GDScriptParser::ClassNode *p_class, bool p_keep_state); - Error _parse_class_blocks(Ref<GDScript> p_script, const GDScriptParser::ClassNode *p_class, bool p_keep_state); - void _make_scripts(const Ref<GDScript> p_script, const GDScriptParser::ClassNode *p_class, bool p_keep_state); + Error _parse_function(GDScript *p_script, const GDScriptParser::ClassNode *p_class, const GDScriptParser::FunctionNode *p_func, bool p_for_ready = false); + Error _parse_class_level(GDScript *p_script, GDScript *p_owner, const GDScriptParser::ClassNode *p_class, bool p_keep_state); + Error _parse_class_blocks(GDScript *p_script, const GDScriptParser::ClassNode *p_class, bool p_keep_state); + void _make_scripts(const GDScript *p_script, const GDScriptParser::ClassNode *p_class, bool p_keep_state); int err_line; int err_column; StringName source; String error; public: - Error compile(const GDScriptParser *p_parser, Ref<GDScript> p_script, bool p_keep_state = false); + Error compile(const GDScriptParser *p_parser, GDScript *p_script, bool p_keep_state = false); String get_error() const; int get_error_line() const; |