From f90eb871932751b4fe95aee57e6bec197b6c5c5f Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Sat, 8 Apr 2017 16:08:22 +0200 Subject: Revert "Make inline blocks in GDScript more pythonic" This reverts commit 0c650c2511a69dc8af1069546aad4ff4d989923d. Fixes #8315. --- modules/gdscript/gd_parser.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'modules/gdscript/gd_parser.cpp') diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp index 971bcc4b5..d9f1835b4 100644 --- a/modules/gdscript/gd_parser.cpp +++ b/modules/gdscript/gd_parser.cpp @@ -77,7 +77,7 @@ bool GDParser::_enter_indent_block(BlockNode *p_block) { // be more python-like int current = tab_level.back()->get(); - tab_level.push_back(current); + tab_level.push_back(current + 1); return true; //_set_error("newline expected after ':'."); //return false; @@ -1610,15 +1610,7 @@ void GDParser::_parse_block(BlockNode *p_block, bool p_static) { p_block->statements.push_back(nl); #endif - bool is_first_line = true; - while (true) { - 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(); - return; - } - is_first_line = false; GDTokenizer::Token token = tokenizer->get_token(); if (error_set) -- cgit v1.2.3-70-g09d2