UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve error messages when we can't find a typeexpr on a method.

Browse Source
This commit is contained in:
David Anderson 2014-10-30 21:15:48 -07:00
parent 97c3a2bc6e
commit 613b06f6c0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sourcepawn/compiler/sc1.cpp
View File

@ -3742,6 +3742,7 @@ methodmap_method_t *parse_property(methodmap_t *map)
methodmap_method_t *parse_method(methodmap_t *map) methodmap_method_t *parse_method(methodmap_t *map)
{ {
int maybe_ctor = 0;
int is_ctor = 0; int is_ctor = 0;
int is_dtor = 0; int is_dtor = 0;
int is_bind = 0; int is_bind = 0;
@ -3803,7 +3804,7 @@ methodmap_method_t *parse_method(methodmap_t *map)
// ::= ident '(' // ::= ident '('
// Push the '(' token back for declargs(). // Push the '(' token back for declargs().
is_ctor = TRUE; maybe_ctor = TRUE;
lexpush(); lexpush();
} else { } else {
// The first token of the type expression is either the symbol we // The first token of the type expression is either the symbol we
@ -3839,8 +3840,10 @@ methodmap_method_t *parse_method(methodmap_t *map)
strcpy(ident.name, "~"); strcpy(ident.name, "~");
strcat(ident.name, map->name); strcat(ident.name, map->name);
check_name_length(ident.name); check_name_length(ident.name);
} else if (is_ctor) { } else if (maybe_ctor) {
if (strcmp(ident.name, map->name) != 0) if (strcmp(ident.name, map->name) == 0)
is_ctor = TRUE;
else
error(114, "constructor", spectype, map->name); error(114, "constructor", spectype, map->name);
} }