aboutsummaryrefslogtreecommitdiff
path: root/modules/gdscript/gd_parser.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2014-04-05 18:50:09 -0300
committerJuan Linietsky2014-04-05 18:50:09 -0300
commitb4969373b3475799d6b24cdffeda4659c37f0b8a (patch)
tree5cafdea68a5fe1f79c343c7cdf8def821e7f0b05 /modules/gdscript/gd_parser.cpp
parent9f33134c93ecbadda70e8eefc50563e29b2eb7f2 (diff)
downloadgodot-b4969373b3475799d6b24cdffeda4659c37f0b8a.tar.gz
godot-b4969373b3475799d6b24cdffeda4659c37f0b8a.tar.zst
godot-b4969373b3475799d6b24cdffeda4659c37f0b8a.zip
Diffstat (limited to 'modules/gdscript/gd_parser.cpp')
-rw-r--r--modules/gdscript/gd_parser.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp
index f962f8c5f..f540660cd 100644
--- a/modules/gdscript/gd_parser.cpp
+++ b/modules/gdscript/gd_parser.cpp
@@ -174,10 +174,19 @@ GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_
/* Parse Operand */
/*****************/
+ if (parenthesis>0) {
+ //remove empty space (only allowed if inside parenthesis
+ while(tokenizer->get_token()==GDTokenizer::TK_NEWLINE) {
+ tokenizer->advance();
+ }
+ }
+
if (tokenizer->get_token()==GDTokenizer::TK_PARENTHESIS_OPEN) {
//subexpression ()
tokenizer->advance();
+ parenthesis++;
Node* subexpr = _parse_expression(p_parent,p_static);
+ parenthesis--;
if (!subexpr)
return NULL;
@@ -629,6 +638,12 @@ GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_
/* Parse Operator */
/******************/
+ if (parenthesis>0) {
+ //remove empty space (only allowed if inside parenthesis
+ while(tokenizer->get_token()==GDTokenizer::TK_NEWLINE) {
+ tokenizer->advance();
+ }
+ }
Expression e;
e.is_op=false;
@@ -2475,6 +2490,7 @@ void GDParser::clear() {
tab_level.push_back(0);
error_line=0;
error_column=0;
+ parenthesis=0;
current_export.type=Variant::NIL;
error="";