1berry/pawn-compiler
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support of 'static enum' and 'enum static'

Browse Source 
Signed-off-by: VVWVV <d0u61ev@gmail.com>
This commit is contained in:
VVWVV 2017-01-23 18:24:52 +03:00
parent 6d2aa15a3f
commit 0dd5a652aa
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source/compiler/sc1.c
View File

@ -89,7 +89,7 @@ static void declglb(char *firstname,int firsttag,int fpublic,int fstatic,
int stock,int fconst); int stock,int fconst);
static int declloc(int fstatic); static int declloc(int fstatic);
static void decl_const(int table); static void decl_const(int table);
static void decl_enum(int table); static void decl_enum(int table,int enum_static);
static cell needsub(int *tag,constvalue **enumroot); static cell needsub(int *tag,constvalue **enumroot);
static void initials(int ident,int tag,cell *size,int dim[],int numdim, static void initials(int ident,int tag,cell *size,int dim[],int numdim,
constvalue *enumroot); constvalue *enumroot);
@ -1600,22 +1600,26 @@ static void parse(void)
declglb(NULL,0,fpublic,fstatic,fstock,fconst); declglb(NULL,0,fpublic,fstatic,fstock,fconst);
break; break;
case tSTATIC: case tSTATIC:
/* This can be a static function or a static global variable; we know if (matchtoken(tENUM)) {
* which of the two as soon as we have parsed up to the point where an decl_enum(sGLOBAL,TRUE);
* opening paranthesis of a function would be expected. To back out after } else {
* deciding it was a declaration of a static variable after all, we have /* This can be a static function or a static global variable; we know
* to store the symbol name and tag. * which of the two as soon as we have parsed up to the point where an
*/ * opening paranthesis of a function would be expected. To back out after
if (getclassspec(tok,&fpublic,&fstatic,&fstock,&fconst)) { * deciding it was a declaration of a static variable after all, we have
assert(!fpublic); * to store the symbol name and tag.
declfuncvar(fpublic,fstatic,fstock,fconst); */
if (getclassspec(tok,&fpublic,&fstatic,&fstock,&fconst)) {
assert(!fpublic);
declfuncvar(fpublic,fstatic,fstock,fconst);
} /* if */
} /* if */ } /* if */
break; break;
case tCONST: case tCONST:
decl_const(sGLOBAL); decl_const(sGLOBAL);
break; break;
case tENUM: case tENUM:
decl_enum(sGLOBAL); decl_enum(sGLOBAL,matchtoken(tSTATIC));
break; break;
case tPUBLIC: case tPUBLIC:
/* This can be a public function or a public variable; see the comment /* This can be a public function or a public variable; see the comment
@ -2768,7 +2772,7 @@ static void decl_const(int vclass)
/* decl_enum - declare enumerated constants /* decl_enum - declare enumerated constants
* *
*/ */
static void decl_enum(int vclass) static void decl_enum(int vclass,int enum_static)
{ {
char enumname[sNAMEMAX+1],constname[sNAMEMAX+1]; char enumname[sNAMEMAX+1],constname[sNAMEMAX+1];
cell val,value,size; cell val,value,size;
@ -2777,11 +2781,10 @@ static void decl_enum(int vclass)
cell increment,multiplier; cell increment,multiplier;
constvalue *enumroot; constvalue *enumroot;
symbol *enumsym; symbol *enumsym;
int static_token=matchtoken(tSTATIC);
short filenum; short filenum;
filenum=fcurrent; filenum=fcurrent;
if (static_token && vclass==sLOCAL) if (enum_static && vclass==sLOCAL)
error(92); error(92);
/* get an explicit tag, if any (we need to remember whether an explicit /* get an explicit tag, if any (we need to remember whether an explicit
@ -2830,7 +2833,7 @@ static void decl_enum(int vclass)
enumsym->usage |= uENUMROOT; enumsym->usage |= uENUMROOT;
/* for enum static */ /* for enum static */
if (static_token) if (enum_static)
enumsym->fnumber=filenum; enumsym->fnumber=filenum;
} }
/* start a new list for the element names */ /* start a new list for the element names */
@ -2882,7 +2885,7 @@ static void decl_enum(int vclass)
sym->parent=enumsym; sym->parent=enumsym;
/* for enum static */ /* for enum static */
if (static_token) if (enum_static)
sym->fnumber=filenum; sym->fnumber=filenum;
/* add the constant to a separate list as well */ /* add the constant to a separate list as well */
@ -5070,7 +5073,7 @@ static void statement(int *lastindent,int allow_decl)
decl_const(sLOCAL); decl_const(sLOCAL);
break; break;
case tENUM: case tENUM:
decl_enum(sLOCAL); decl_enum(sLOCAL,FALSE);
break; break;
default: /* non-empty expression */ default: /* non-empty expression */
sc_allowproccall=optproccall; sc_allowproccall=optproccall;