LuaJIT
/
LuaJIT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FFI: Stricter parsing of declaration specifiers.

master
Mike Pall 2013-02-03 12:47:52 +01:00
parent fe9934feea
commit 8b46013fdd
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/lj_cparse.c
View File

@ -1469,43 +1469,50 @@ static CPscl cp_decl_spec(CPState *cp, CPDecl *decl, CPscl scl)
for (;;) { /* Parse basic types. */ for (;;) { /* Parse basic types. */
cp_decl_attributes(cp, decl); cp_decl_attributes(cp, decl);
if (cp->tok >= CTOK_FIRSTDECL && cp->tok <= CTOK_LASTDECLFLAG) {
uint32_t cbit;
if (cp->ct->size) {
if (sz) goto end_decl;
sz = cp->ct->size;
}
cbit = (1u << (cp->tok - CTOK_FIRSTDECL));
cds = cds | cbit | ((cbit & cds & CDF_LONG) << 1);
if (cp->tok >= CTOK_FIRSTSCL) {
if (!(scl & cbit)) cp_errmsg(cp, cp->tok, LJ_ERR_FFI_BADSCL);
} else if (tdef) {
goto end_decl;
}
cp_next(cp);
continue;
}
if (sz || tdef ||
(cds & (CDF_SHORT|CDF_LONG|CDF_SIGNED|CDF_UNSIGNED|CDF_COMPLEX)))
break;
switch (cp->tok) { switch (cp->tok) {
case CTOK_STRUCT: case CTOK_STRUCT:
tdef = cp_decl_struct(cp, decl, CTINFO(CT_STRUCT, 0)); tdef = cp_decl_struct(cp, decl, CTINFO(CT_STRUCT, 0));
break; continue;
case CTOK_UNION: case CTOK_UNION:
tdef = cp_decl_struct(cp, decl, CTINFO(CT_STRUCT, CTF_UNION)); tdef = cp_decl_struct(cp, decl, CTINFO(CT_STRUCT, CTF_UNION));
break; continue;
case CTOK_ENUM: case CTOK_ENUM:
tdef = cp_decl_enum(cp, decl); tdef = cp_decl_enum(cp, decl);
break; continue;
case CTOK_IDENT: case CTOK_IDENT:
if (!ctype_istypedef(cp->ct->info) || sz || tdef || if (ctype_istypedef(cp->ct->info)) {
(cds & (CDF_SHORT|CDF_LONG|CDF_SIGNED|CDF_UNSIGNED|CDF_COMPLEX))) tdef = ctype_cid(cp->ct->info); /* Get typedef. */
goto end_decl; cp_next(cp);
tdef = ctype_cid(cp->ct->info); /* Get typedef. */ continue;
cp_next(cp); }
break; break;
case '$': case '$':
tdef = cp->val.id; tdef = cp->val.id;
cp_next(cp); cp_next(cp);
break; continue;
default: default:
if (cp->tok >= CTOK_FIRSTDECL && cp->tok <= CTOK_LASTDECLFLAG) { break;
uint32_t cbit;
if (cp->ct->size) {
if (sz) goto end_decl;
sz = cp->ct->size;
}
cbit = (1u << (cp->tok - CTOK_FIRSTDECL));
cds = cds | cbit | ((cbit & cds & CDF_LONG) << 1);
if (cp->tok >= CTOK_FIRSTSCL && !(scl & cbit))
cp_errmsg(cp, cp->tok, LJ_ERR_FFI_BADSCL);
cp_next(cp);
break;
}
goto end_decl;
} }
break;
} }
end_decl: end_decl: