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

Gracefully error on newly reserved keywords.

Browse Source
This commit is contained in:
David Anderson 2014-12-09 23:18:11 -08:00
parent 94bed806fe
commit 1ee3067575
2 changed files with 62 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
sourcepawn/compiler/sc2.cpp
View File

@ -2053,6 +2053,55 @@ const char *sc_tokens[] = {
"-label-", "-string-", "-string-" "-label-", "-string-", "-string-"
}; };
static inline bool
IsUnimplementedKeyword(int token)
{
switch (token) {
case tACQUIRE:
case tAS:
case tCATCH:
case tCAST_TO:
case tDOUBLE:
case tEXPLICIT:
case tFINALLY:
case tFOREACH:
case tIMPLICIT:
case tIMPORT:
case tIN:
case tINT8:
case tINT16:
case tINT32:
case tINT64:
case tINTERFACE:
case tINTN:
case tLET:
case tNAMESPACE:
case tPACKAGE:
case tPRIVATE:
case tPROTECTED:
case tREADONLY:
case tSEALED:
case tTHROW:
case tTRY:
case tTYPEOF:
case tUINT8:
case tUINT16:
case tUINT32:
case tUINT64:
case tUINTN:
case tUNION:
case tUSING:
case tVAR:
case tVARIANT:
case tVIRTUAL:
case tVOLATILE:
case tWITH:
return true;
default:
return false;
}
}
static full_token_t *advance_token_ptr() static full_token_t *advance_token_ptr()
{ {
assert(sTokenBuffer->depth == 0); assert(sTokenBuffer->depth == 0);
@ -2150,10 +2199,18 @@ int lex(cell *lexvalue,char **lexsym)
} /* while */ } /* while */
while (i<=tLAST) { /* match reserved words and compiler directives */ while (i<=tLAST) { /* match reserved words and compiler directives */
if (*lptr==**tokptr && match(*tokptr,TRUE)) { if (*lptr==**tokptr && match(*tokptr,TRUE)) {
tok->id = i; if (IsUnimplementedKeyword(i)) {
errorset(sRESET,0); /* reset error flag (clear the "panic mode")*/ // Try to gracefully error.
if (pc_docexpr) /* optionally concatenate to documentation string */ error(173, sc_tokens[i - tFIRST]);
insert_autolist(*tokptr); tok->id = tSYMBOL;
strcpy(tok->str, sc_tokens[i - tFIRST]);
tok->len = strlen(tok->str);
} else {
tok->id = i;
errorset(sRESET,0); /* reset error flag (clear the "panic mode")*/
if (pc_docexpr) /* optionally concatenate to documentation string */
insert_autolist(*tokptr);
}
tok->end.line = fline; tok->end.line = fline;
tok->end.col = (int)(lptr - pline); tok->end.col = (int)(lptr - pline);
return tok->id; return tok->id;

1
sourcepawn/compiler/sc5-in.scp
View File

@ -216,6 +216,7 @@ static const char *errmsg[] = {
/*170*/ "creating new object '%s' requires using 'new' before its constructor\n", /*170*/ "creating new object '%s' requires using 'new' before its constructor\n",
/*171*/ "cannot use 'new' with non-object-like methodmap '%s'\n", /*171*/ "cannot use 'new' with non-object-like methodmap '%s'\n",
/*172*/ "methodmap '%s' does not have a constructor\n", /*172*/ "methodmap '%s' does not have a constructor\n",
/*173*/ "'%s' is a newly reserved keyword that may be used in the future; use a different name as an identifier\n",
#else #else
"\315e\306\227\266k\217:\235\277bu\201fo\220\204\223\012", "\315e\306\227\266k\217:\235\277bu\201fo\220\204\223\012",
"\202l\224\250s\205g\346\356e\233\201(\243\315\214\267\202) \253 f\255low ea\305 \042c\353e\042\012", "\202l\224\250s\205g\346\356e\233\201(\243\315\214\267\202) \253 f\255low ea\305 \042c\353e\042\012",