diff options
| author | volzhs <volzhs@gmail.com> | 2015-06-28 22:28:02 +0900 |
|---|---|---|
| committer | volzhs <volzhs@gmail.com> | 2015-06-28 22:28:02 +0900 |
| commit | 584dd4db878d0a9ebf44dc529dad35bf8dd4796b (patch) | |
| tree | c601222ba20cacc80fba7ff43b5de425db13519c /modules/gdscript/gd_parser.h | |
| parent | 81a1f32f0c1e4f64bb102c6aa46bcbb4e18bcd55 (diff) | |
| parent | 2b64f73b0459190d20b2f6de39275ee7979317c4 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'modules/gdscript/gd_parser.h')
| -rw-r--r-- | modules/gdscript/gd_parser.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/modules/gdscript/gd_parser.h b/modules/gdscript/gd_parser.h index bf2c8c9ef2..fd8a2576fa 100644 --- a/modules/gdscript/gd_parser.h +++ b/modules/gdscript/gd_parser.h @@ -76,6 +76,7 @@ public: StringName extends_file; Vector<StringName> extends_class; + struct Member { PropertyInfo _export; #ifdef TOOLS_ENABLED @@ -92,11 +93,17 @@ public: Node *expression; }; + struct Signal { + StringName name; + Vector<StringName> arguments; + }; + Vector<ClassNode*> subclasses; Vector<Member> variables; Vector<Constant> constant_expressions; Vector<FunctionNode*> functions; Vector<FunctionNode*> static_functions; + Vector<Signal> _signals; BlockNode *initializer; ClassNode *owner; //Vector<Node*> initializers; @@ -380,6 +387,7 @@ private: T* alloc_node(); bool validating; + bool for_completion; int parenthesis; bool error_set; String error; @@ -436,7 +444,7 @@ public: String get_error() const; int get_error_line() const; int get_error_column() const; - Error parse(const String& p_code, const String& p_base_path="", bool p_just_validate=false,const String& p_self_path=""); + Error parse(const String& p_code, const String& p_base_path="", bool p_just_validate=false,const String& p_self_path="",bool p_for_completion=false); Error parse_bytecode(const Vector<uint8_t> &p_bytecode,const String& p_base_path="",const String& p_self_path=""); const Node *get_parse_tree() const; |