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

Fix bug in requiring braces for new methods.

Browse Source
This commit is contained in:
David Anderson 2014-06-22 13:28:35 -07:00
parent 354022888f
commit b6eb3b041b
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sourcepawn/compiler/sc.h
View File

@ -235,7 +235,6 @@ typedef struct s_symbol {
#define sGLOBAL 0 /* global variable/constant class (no states) */ #define sGLOBAL 0 /* global variable/constant class (no states) */
#define sLOCAL 1 /* local variable/constant */ #define sLOCAL 1 /* local variable/constant */
#define sSTATIC 2 /* global life, local scope */ #define sSTATIC 2 /* global life, local scope */
#define sPROXY 3 /* only find proxies */
#define sSTATEVAR 3 /* criterion to find variables (sSTATEVAR implies a global variable) */ #define sSTATEVAR 3 /* criterion to find variables (sSTATEVAR implies a global variable) */

4
sourcepawn/compiler/sc1.c
View File

@ -82,6 +82,7 @@ typedef struct funcstub_setup_s {
const char *name; const char *name;
int return_tag; int return_tag;
int this_tag; int this_tag;
int is_new;
} funcstub_setup_t; } funcstub_setup_t;
static void resetglobals(void); static void resetglobals(void);
@ -3559,6 +3560,7 @@ methodmap_method_t *parse_method(methodmap_t *map)
check_name_length(fullname); check_name_length(fullname);
setup.name = fullname; setup.name = fullname;
setup.is_new = TRUE;
if (is_native) { if (is_native) {
target = funcstub(TRUE, &setup); target = funcstub(TRUE, &setup);
@ -4927,7 +4929,7 @@ static int newfunc(const funcstub_setup_t *setup,int fpublic,int fstatic,int sto
lexpush(); lexpush();
} else { } else {
// We require '{' for new methods. // We require '{' for new methods.
if (setup->this_tag != -1) if (setup->is_new)
needtoken('{'); needtoken('{');
/* Insert a separator so that comments following the statement will not /* Insert a separator so that comments following the statement will not

8
sourcepawn/compiler/tests/fail-method-requires-brace.sp Normal file
View File

@ -0,0 +1,8 @@
methodmap Crab {
public Crab() return Crab:5;
};
public main() {
new Crab:crab = Crab();
return _:crab;
}

1
sourcepawn/compiler/tests/fail-method-requires-brace.txt Normal file
View File

@ -0,0 +1 @@
expected token: "{", but found "return"