From 18ab88b3f1000cbcab5704402e402e1cdf65862f Mon Sep 17 00:00:00 2001 From: Bojidar Marinov Date: Thu, 23 Mar 2017 20:07:02 +0200 Subject: [PATCH] Make inline blocks in GDScript more pythonic Fixes #8001 --- modules/gdscript/gd_parser.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp index 86b97e27a9..b37181bf3f 100644 --- a/modules/gdscript/gd_parser.cpp +++ b/modules/gdscript/gd_parser.cpp @@ -76,7 +76,7 @@ bool GDParser::_enter_indent_block(BlockNode *p_block) { // be more python-like int current = tab_level.back()->get(); - tab_level.push_back(current + 1); + tab_level.push_back(current); return true; //_set_error("newline expected after ':'."); //return false; @@ -2258,7 +2258,15 @@ 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)