diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-14 23:09:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-14 23:09:03 +0200 |
| commit | 00949f0c5fcc6a4f8382a4a97d5591fd9ec380f8 (patch) | |
| tree | 2b1c31f45add24085b64425ce440f577424c16a1 /modules/gdscript/gdscript_parser.h | |
| parent | 5046f666a1181675b39f156c38346525dc1c444e (diff) | |
| parent | 0ee0fa42e6639b6fa474b7cf6afc6b1a78142185 (diff) | |
| download | redot-engine-00949f0c5fcc6a4f8382a4a97d5591fd9ec380f8.tar.gz | |
Merge pull request #38738 from akien-mga/cause-we-never-go-out-of-style
Style: Remove new line at block start, enforce line between functions, enforce braces in if and loop blocks
Diffstat (limited to 'modules/gdscript/gdscript_parser.h')
| -rw-r--r-- | modules/gdscript/gdscript_parser.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/modules/gdscript/gdscript_parser.h b/modules/gdscript/gdscript_parser.h index 035af30b6a..cfcca9584e 100644 --- a/modules/gdscript/gdscript_parser.h +++ b/modules/gdscript/gdscript_parser.h @@ -100,7 +100,6 @@ public: }; struct Node { - enum Type { TYPE_CLASS, TYPE_FUNCTION, @@ -139,7 +138,6 @@ public: struct OperatorNode; struct ClassNode : public Node { - bool tool; StringName name; bool extends_used; @@ -200,7 +198,6 @@ public: }; struct FunctionNode : public Node { - bool _static; MultiplayerAPI::RPCMode rpc_mode; bool has_yield; @@ -229,7 +226,6 @@ public: }; struct BlockNode : public Node { - ClassNode *parent_class = nullptr; BlockNode *parent_block = nullptr; List<Node *> statements; @@ -316,7 +312,6 @@ public: }; struct DictionaryNode : public Node { - struct Pair { Node *key; Node *value; @@ -406,7 +401,6 @@ public: }; struct PatternNode : public Node { - enum PatternType { PT_CONSTANT, PT_BIND, @@ -647,14 +641,16 @@ private: void _check_block_types(BlockNode *p_block); _FORCE_INLINE_ void _mark_line_as_safe(int p_line) const { #ifdef DEBUG_ENABLED - if (safe_lines) + if (safe_lines) { safe_lines->insert(p_line); + } #endif // DEBUG_ENABLED } _FORCE_INLINE_ void _mark_line_as_unsafe(int p_line) const { #ifdef DEBUG_ENABLED - if (safe_lines) + if (safe_lines) { safe_lines->erase(p_line); + } #endif // DEBUG_ENABLED } |