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
78e22356
Unverified
Commit
78e22356
authored
May 21, 2020
by
Rémi Verschelde
Committed by
GitHub
May 21, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #33689 from jbuck3/signal-error
Trigger an error when trying to define a preexisting signal in GDScript
parents
af366c7a
9e447393
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
49 additions
and
0 deletions
+49
-0
gdscript_parser.cpp
modules/gdscript/gdscript_parser.cpp
+49
-0
No files found.
modules/gdscript/gdscript_parser.cpp
View file @
78e22356
...
...
@@ -4121,6 +4121,14 @@ void GDScriptParser::_parse_class(ClassNode *p_class) {
sig
.
name
=
tokenizer
->
get_token_identifier
();
sig
.
emissions
=
0
;
sig
.
line
=
tokenizer
->
get_token_line
();
for
(
int
i
=
0
;
i
<
current_class
->
_signals
.
size
();
i
++
)
{
if
(
current_class
->
_signals
[
i
].
name
==
sig
.
name
)
{
_set_error
(
"The signal
\"
"
+
sig
.
name
+
"
\"
already exists in this class (at line: "
+
itos
(
current_class
->
_signals
[
i
].
line
)
+
")."
);
return
;
}
}
tokenizer
->
advance
();
if
(
tokenizer
->
get_token
()
==
GDScriptTokenizer
::
TK_PARENTHESIS_OPEN
)
{
...
...
@@ -7946,6 +7954,47 @@ void GDScriptParser::_check_class_level_types(ClassNode *p_class) {
}
}
// Signals
DataType
base
=
p_class
->
base_type
;
while
(
base
.
kind
==
DataType
::
CLASS
)
{
ClassNode
*
base_class
=
base
.
class_type
;
for
(
int
i
=
0
;
i
<
p_class
->
_signals
.
size
();
i
++
)
{
for
(
int
j
=
0
;
j
<
base_class
->
_signals
.
size
();
j
++
)
{
if
(
p_class
->
_signals
[
i
].
name
==
base_class
->
_signals
[
j
].
name
)
{
_set_error
(
"The signal
\"
"
+
p_class
->
_signals
[
i
].
name
+
"
\"
already exists in a parent class."
,
p_class
->
_signals
[
i
].
line
);
return
;
}
}
}
base
=
base_class
->
base_type
;
}
StringName
native
;
if
(
base
.
kind
==
DataType
::
GDSCRIPT
||
base
.
kind
==
DataType
::
SCRIPT
)
{
Ref
<
Script
>
scr
=
base
.
script_type
;
if
(
scr
.
is_valid
()
&&
scr
->
is_valid
())
{
native
=
scr
->
get_instance_base_type
();
for
(
int
i
=
0
;
i
<
p_class
->
_signals
.
size
();
i
++
)
{
if
(
scr
->
has_script_signal
(
p_class
->
_signals
[
i
].
name
))
{
_set_error
(
"The signal
\"
"
+
p_class
->
_signals
[
i
].
name
+
"
\"
already exists in a parent class."
,
p_class
->
_signals
[
i
].
line
);
return
;
}
}
}
}
else
if
(
base
.
kind
==
DataType
::
NATIVE
)
{
native
=
base
.
native_type
;
}
if
(
native
!=
StringName
())
{
for
(
int
i
=
0
;
i
<
p_class
->
_signals
.
size
();
i
++
)
{
if
(
ClassDB
::
has_signal
(
native
,
p_class
->
_signals
[
i
].
name
))
{
_set_error
(
"The signal
\"
"
+
p_class
->
_signals
[
i
].
name
+
"
\"
already exists in a parent class."
,
p_class
->
_signals
[
i
].
line
);
return
;
}
}
}
// Inner classes
for
(
int
i
=
0
;
i
<
p_class
->
subclasses
.
size
();
i
++
)
{
current_class
=
p_class
->
subclasses
[
i
];
...
...
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