X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.re;h=50d15aadd86d0b9ae7dfb35a1b445277afdbf554;hp=70ab698ab88bf1b69f0a209c4eb333f4033181d2;hb=6a459a08a40a2c243b0211ceb0cb263d29302627;hpb=772c1e688a51b32331fae7993429b3a03d766d8d diff --git a/src/parser.re b/src/parser.re index 70ab698..50d15aa 100644 --- a/src/parser.re +++ b/src/parser.re @@ -1,5 +1,8 @@ +#include #include #include +#include +#include #include "parser.h" #include "parser_proc.h" @@ -13,15 +16,11 @@ PSI_Parser *PSI_ParserInit(PSI_Parser *P, const char *filename, psi_error_cb err { FILE *fp; - if (!P) { - P = malloc(sizeof(*P)); - } - memset(P, 0, sizeof(*P)); - fp = fopen(filename, "r"); if (!fp) { - perror(filename); + error(NULL, PSI_WARNING, "Could not open '%s' for reading: %s", + filename, strerror(errno)); return NULL; } @@ -285,6 +284,7 @@ token_t PSI_ParserScan(PSI_Parser *P) 'FUNCTION' {RETURN(PSI_T_FUNCTION);} 'TYPEDEF' {RETURN(PSI_T_TYPEDEF);} 'STRUCT' {RETURN(PSI_T_STRUCT);} + 'ENUM' {RETURN(PSI_T_ENUM);} 'CONST' {RETURN(PSI_T_CONST);} 'LIB' {RETURN(PSI_T_LIB);} 'LET' {RETURN(PSI_T_LET);}