Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Shaders] Disallow trailing commas in function declarations #87075

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −1
Open

[Shaders] Disallow trailing commas in function declarations #87075

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion servers/rendering/shader_language.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10585,7 +10585,13 @@ Error ShaderLanguage::_parse_shader(const HashMap<StringName, FunctionInfo> &p_f

if (tk.type == TK_COMMA) {
tk = _get_token();
//do none and go on
#ifdef DISABLE_DEPRECATED
// Disallow trailing comma.
if (tk.type == TK_PARENTHESIS_CLOSE) {
_set_error(RTR("Expected a valid data type for argument. Trailing commas are not allowed."));
return ERR_PARSE_ERROR;
}
#endif
} else if (tk.type != TK_PARENTHESIS_CLOSE) {
_set_expected_error(",", ")");
return ERR_PARSE_ERROR;
Expand Down