summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBojidar Marinov <bojidar.marinov.bg@gmail.com>2017-04-08 19:41:08 +0300
committerBojidar Marinov <bojidar.marinov.bg@gmail.com>2017-04-08 19:42:37 +0300
commit7cc561fe0e2d2bdece2485f38d68d6c9a6d6fd88 (patch)
treef521e96e61392f6bb89c9bf6926e7866273ae3d0
parentfce779a4ef02f1b14f95cab6a06e75db170f3448 (diff)
Fixup #8123, seems like I forgot a few things
Should close #8315 Please test, I'm still unsure I did it correctly...
-rw-r--r--modules/gdscript/gd_parser.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp
index 9033b51d28..cd16fef6b3 100644
--- a/modules/gdscript/gd_parser.cpp
+++ b/modules/gdscript/gd_parser.cpp
@@ -2265,6 +2265,7 @@ void GDParser::_parse_block(BlockNode *p_block, bool p_static) {
if (!is_first_line && tab_level.back()->prev() && tab_level.back()->prev()->get() == indent_level) {
// pythonic single-line expression, don't parse future lines
tab_level.pop_back();
+ p_block->end_line = tokenizer->get_token_line();
return;
}
is_first_line = false;
@@ -2436,9 +2437,8 @@ void GDParser::_parse_block(BlockNode *p_block, bool p_static) {
while (true) {
- while (tokenizer->get_token() == GDTokenizer::TK_NEWLINE) {
- tokenizer->advance();
- }
+ while (tokenizer->get_token() == GDTokenizer::TK_NEWLINE && _parse_newline())
+ ;
if (tab_level.back()->get() < indent_level) { //not at current indent level
p_block->end_line = tokenizer->get_token_line();