godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Move inheritance resolution to the parser

Browse Source
This commit is contained in:
George Marques
2018-05-29 23:16:52 -03:00
parent 8aab9a06d4
commit b7a00aead0
5 changed files with 396 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gdscript/gdscript_parser.h
View File

@@ -107,6 +107,7 @@ public:
struct FunctionNode;
struct BlockNode;
struct ConstantNode;
struct ClassNode : public Node {
@@ -115,6 +116,7 @@ public:
bool extends_used;
StringName extends_file;
Vector<StringName> extends_class;
DataType base_type;
struct Member {
PropertyInfo _export;
@@ -446,6 +448,7 @@ private:
ClassNode *current_class;
FunctionNode *current_function;
BlockNode *current_block;
Map<StringName, ClassNode *> class_map;
bool _get_completable_identifier(CompletionType p_type, StringName &identifier);
void _make_completable_call(int p_arg);
@@ -487,6 +490,7 @@ private:
void _parse_class(ClassNode *p_class);
bool _end_statement();
void _determine_inheritance(ClassNode *p_class);
bool _parse_type(DataType &r_type, bool p_can_be_void = false);
Error _parse(const String &p_base_path);