Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
24275b26
Unverified
Commit
24275b26
authored
May 15, 2020
by
Rémi Verschelde
Committed by
GitHub
May 15, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #36726 from ThakeeNathees/invalid-break-parsing
Fix: break, continue outside of a loop, match statement handled when parsing
parents
f06c44a0
c076a2b7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
0 deletions
+37
-0
gdscript_parser.cpp
modules/gdscript/gdscript_parser.cpp
+35
-0
gdscript_parser.h
modules/gdscript/gdscript_parser.h
+2
-0
No files found.
modules/gdscript/gdscript_parser.cpp
View file @
24275b26
...
...
@@ -3151,6 +3151,8 @@ void GDScriptParser::_parse_block(BlockNode *p_block, bool p_static) {
cf_while
->
body
=
alloc_node
<
BlockNode
>
();
cf_while
->
body
->
parent_block
=
p_block
;
cf_while
->
body
->
can_break
=
true
;
cf_while
->
body
->
can_continue
=
true
;
p_block
->
sub_blocks
.
push_back
(
cf_while
->
body
);
if
(
!
_enter_indent_block
(
cf_while
->
body
))
{
...
...
@@ -3278,6 +3280,8 @@ void GDScriptParser::_parse_block(BlockNode *p_block, bool p_static) {
cf_for
->
body
=
alloc_node
<
BlockNode
>
();
cf_for
->
body
->
parent_block
=
p_block
;
cf_for
->
body
->
can_break
=
true
;
cf_for
->
body
->
can_continue
=
true
;
p_block
->
sub_blocks
.
push_back
(
cf_for
->
body
);
if
(
!
_enter_indent_block
(
cf_for
->
body
))
{
...
...
@@ -3308,6 +3312,21 @@ void GDScriptParser::_parse_block(BlockNode *p_block, bool p_static) {
p_block
->
statements
.
push_back
(
cf_for
);
}
break
;
case
GDScriptTokenizer
:
:
TK_CF_CONTINUE
:
{
BlockNode
*
upper_block
=
p_block
;
bool
is_continue_valid
=
false
;
while
(
upper_block
)
{
if
(
upper_block
->
can_continue
)
{
is_continue_valid
=
true
;
break
;
}
upper_block
=
upper_block
->
parent_block
;
}
if
(
!
is_continue_valid
)
{
_set_error
(
"Unexpected keyword
\"
continue
\"
outside a loop."
);
return
;
}
_mark_line_as_safe
(
tokenizer
->
get_token_line
());
tokenizer
->
advance
();
ControlFlowNode
*
cf_continue
=
alloc_node
<
ControlFlowNode
>
();
...
...
@@ -3319,6 +3338,21 @@ void GDScriptParser::_parse_block(BlockNode *p_block, bool p_static) {
}
}
break
;
case
GDScriptTokenizer
:
:
TK_CF_BREAK
:
{
BlockNode
*
upper_block
=
p_block
;
bool
is_break_valid
=
false
;
while
(
upper_block
)
{
if
(
upper_block
->
can_break
)
{
is_break_valid
=
true
;
break
;
}
upper_block
=
upper_block
->
parent_block
;
}
if
(
!
is_break_valid
)
{
_set_error
(
"Unexpected keyword
\"
break
\"
outside a loop."
);
return
;
}
_mark_line_as_safe
(
tokenizer
->
get_token_line
());
tokenizer
->
advance
();
ControlFlowNode
*
cf_break
=
alloc_node
<
ControlFlowNode
>
();
...
...
@@ -3384,6 +3418,7 @@ void GDScriptParser::_parse_block(BlockNode *p_block, bool p_static) {
BlockNode
*
compiled_branches
=
alloc_node
<
BlockNode
>
();
compiled_branches
->
parent_block
=
p_block
;
compiled_branches
->
parent_class
=
p_block
->
parent_class
;
compiled_branches
->
can_continue
=
true
;
p_block
->
sub_blocks
.
push_back
(
compiled_branches
);
...
...
modules/gdscript/gdscript_parser.h
View file @
24275b26
...
...
@@ -231,6 +231,8 @@ public:
List
<
Node
*>
statements
;
Map
<
StringName
,
LocalVarNode
*>
variables
;
bool
has_return
=
false
;
bool
can_break
=
false
;
bool
can_continue
=
false
;
Node
*
if_condition
=
nullptr
;
//tiny hack to improve code completion on if () blocks
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment