jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for duplicate names (function parser)

Browse Source
This commit is contained in:
jp9000 2014-03-02 19:44:22 -07:00
parent 9db52da6a1
commit f91b4ef98e
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libobs/callback/decl.c
View File

@ -20,7 +20,7 @@
static inline void err_specifier_exists(struct cf_parser *cfp, static inline void err_specifier_exists(struct cf_parser *cfp,
const char *storage) const char *storage)
{ {
cf_adderror(cfp, "'$1' specifier already exists", LEX_WARNING, cf_adderror(cfp, "'$1' specifier already exists", LEX_ERROR,
storage, NULL, NULL); storage, NULL, NULL);
} }
@ -30,6 +30,11 @@ static inline void err_reserved_name(struct cf_parser *cfp, const char *name)
name, NULL, NULL); name, NULL, NULL);
} }
static inline void err_existing_name(struct cf_parser *cfp, const char *name)
{
cf_adderror(cfp, "'$1' already exists", LEX_ERROR, name, NULL, NULL);
}
static bool is_in_out_specifier(struct cf_parser *cfp, struct strref *name, static bool is_in_out_specifier(struct cf_parser *cfp, struct strref *name,
uint32_t *type) uint32_t *type)
{ {
@ -86,6 +91,18 @@ static bool is_reserved_name(const char *str)
(strcmp(str, "return") == 0); (strcmp(str, "return") == 0);
} }
static bool name_exists(struct decl_info *decl, const char *name)
{
for (size_t i = 0; i < decl->params.num; i++) {
const char *param_name = decl->params.array[i].name;
if (strcmp(name, param_name) == 0)
return true;
}
return false;
}
static int parse_param(struct cf_parser *cfp, struct decl_info *decl) static int parse_param(struct cf_parser *cfp, struct decl_info *decl)
{ {
struct strref ref; struct strref ref;
@ -118,6 +135,9 @@ static int parse_param(struct cf_parser *cfp, struct decl_info *decl)
if (code != PARSE_SUCCESS) if (code != PARSE_SUCCESS)
return code; return code;
if (name_exists(decl, param.name))
err_existing_name(cfp, param.name);
if (is_reserved_name(param.name)) if (is_reserved_name(param.name))
err_reserved_name(cfp, param.name); err_reserved_name(cfp, param.name);