X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser_proc_grammar.y;h=56b261248a03403da1be4ed7cc85e629914a9326;hp=7f76e4f7c1c92fe431e8ceb60a5868c5d1efd215;hb=ef40ce43c98a00823e06c14f5cf7a8241f637ab1;hpb=35ae2559447092572209f8b237460ceb551293ff diff --git a/src/parser_proc_grammar.y b/src/parser_proc_grammar.y index 7f76e4f..56b2612 100644 --- a/src/parser_proc_grammar.y +++ b/src/parser_proc_grammar.y @@ -8,6 +8,7 @@ #include "plist.h" #include "parser.h" + #define YYDEBUG 1 #define PSI_PARSER_PROC_DEBUG 1 @@ -38,12 +39,37 @@ static inline void psi_parser_proc_add_enum(struct psi_parser *P, struct psi_dec } P->enums = psi_plist_add(P->enums, &e); } +static inline void psi_parser_proc_deanon_typedef(struct psi_decl_arg *def) +{ + switch (def->type->type) { + case PSI_T_STRUCT: + if (!psi_decl_type_is_anon(def->type->name, "struct")) { + return; + } + break; + case PSI_T_UNION: + if (!psi_decl_type_is_anon(def->type->name, "union")) { + return; + } + break; + case PSI_T_ENUM: + if (!psi_decl_type_is_anon(def->type->name, "enum")) { + return; + } + break; + default: + return; + } + free(def->type->name); + def->type->name = strdup(def->var->name); +} static inline void psi_parser_proc_add_typedef(struct psi_parser *P, struct psi_decl_arg *def) { assert(def); if (!P->types) { P->types = psi_plist_init((psi_plist_dtor) psi_decl_arg_free); } + psi_parser_proc_deanon_typedef(def); P->types = psi_plist_add(P->types, &def); } static inline void psi_parser_proc_add_const(struct psi_parser *P, struct psi_const *cnst) { @@ -56,6 +82,12 @@ static inline void psi_parser_proc_add_const(struct psi_parser *P, struct psi_co } static inline void psi_parser_proc_add_decl(struct psi_parser *P, struct psi_decl *decl) { assert(decl); + + if (psi_decl_is_blacklisted(decl->func->var->name)) { + psi_decl_free(&decl); + return; + } + if (!P->decls) { P->decls = psi_plist_init((psi_plist_dtor) psi_decl_free); } @@ -76,6 +108,11 @@ static inline void psi_parser_proc_add_impl(struct psi_parser *P, struct psi_imp #include "plist.h" #include "types/layout.h" +#define yytokentype psi_token_type + +#define PSI_T_CAST PSI_T_EQUALS +#define PSI_T_POINTER PSI_T_ASTERISK + struct psi_parser; } @@ -117,14 +154,6 @@ struct psi_parser; %token CALLABLE %token VOID %token ZVAL -%token INT8 -%token UINT8 -%token INT16 -%token UINT16 -%token INT32 -%token UINT32 -%token INT64 -%token UINT64 %token NULL %token TRUE %token FALSE @@ -207,6 +236,7 @@ struct psi_parser; %token TEMP %token FREE %token RETURN +%token AS %token PRE_ASSERT %token POST_ASSERT %token BOOLVAL @@ -237,6 +267,21 @@ struct psi_parser; %token CPP_RESTRICT %token CPP_ASM +/* virtual tokens */ +%token BSLASH +%token LONG_DOUBLE +%token INT8 +%token UINT8 +%token INT16 +%token UINT16 +%token INT32 +%token UINT32 +%token INT64 +%token UINT64 +%token INT128 +%token UINT128 + + %precedence IIF COLON %precedence OR %precedence AND @@ -289,17 +334,14 @@ struct psi_parser; %type decl_real_type decl_int_type decl_type_simple %destructor {psi_token_free(&$$);} decl_real_type decl_int_type decl_type_simple -%type decl_stdint_type -%destructor {} decl_stdint_type - %type decl_type qualified_decl_type decl_type_complex %destructor {psi_decl_type_free(&$$);} decl_type qualified_decl_type decl_type_complex %type decl_stmt decl decl_body decl_func_body decl_functor_body %destructor {psi_decl_free(&$$);} decl_stmt decl decl_body decl_func_body decl_functor_body %type decl_typedef decl_func decl_functor decl_arg decl_anon_arg typedef typedef_decl typedef_anon typedef_anon_decl %destructor {psi_decl_arg_free(&$$);} decl_typedef decl_func decl_functor decl_arg decl_anon_arg typedef typedef_decl typedef_anon typedef_anon_decl -%type decl_var anon_var -%destructor {psi_decl_var_free(&$$);} decl_var anon_var +%type decl_var +%destructor {psi_decl_var_free(&$$);} decl_var %type decl_struct %destructor {psi_decl_struct_free(&$$);} decl_struct %type decl_union @@ -308,8 +350,8 @@ struct psi_parser; %destructor {psi_decl_enum_free(&$$);} decl_enum %type decl_enum_item %destructor {psi_decl_enum_item_free(&$$);} decl_enum_item -%type decl_args decl_struct_args struct_args_block struct_args struct_arg_var_list decl_enum_items decl_vars decl_vars_with_layout -%destructor {psi_plist_free($$);} decl_args decl_struct_args struct_args_block struct_args struct_arg_var_list decl_enum_items decl_vars decl_vars_with_layout +%type decl_args decl_arg_list decl_struct_args struct_args_block struct_args struct_arg_var_list decl_enum_items decl_vars decl_vars_with_layout call_decl_vars +%destructor {psi_plist_free($$);} decl_args decl_arg_list decl_struct_args struct_args_block struct_args struct_arg_var_list decl_enum_items decl_vars decl_vars_with_layout call_decl_vars %type align_and_size %destructor {} align_and_size @@ -350,6 +392,8 @@ struct psi_parser; %destructor {psi_assert_stmt_free(&$$);} assert_stmt %type return_stmt %destructor {psi_return_stmt_free(&$$);} return_stmt +%type return_exp +%destructor {psi_return_exp_free(&$$);} return_exp %type free_stmt %destructor {psi_free_stmt_free(&$$);} free_stmt %type free_exp @@ -379,9 +423,9 @@ struct psi_parser; binary_op_token: PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | RCHEVR | LCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE ; unary_op_token: TILDE | NOT | PLUS | MINUS ; -name_token: NAME | FUNCTION | TEMP | FREE | SET | LET | CALLOC | CALLBACK | LIB | BOOL | STRING | ERROR | WARNING | LINE | PRAGMA_ONCE | PRAGMA | let_func_token | set_func_token; -any_noeol_token: BOOL | CHAR | SHORT | INT | SIGNED | UNSIGNED | LONG | FLOAT | DOUBLE | STRING | MIXED | ARRAY | OBJECT | CALLABLE | VOID | ZVAL | INT8 | UINT8 | INT16 | UINT16 | INT32 | UINT32 | INT64 | UINT64 | NULL | TRUE | FALSE | NAME | NSNAME | DOLLAR_NAME | NUMBER | QUOTED_STRING | QUOTED_CHAR | EOF | EOS | LPAREN | RPAREN | COMMA | COLON | LBRACE | RBRACE | LBRACKET | RBRACKET | EQUALS | HASH | PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | LCHEVR | RCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE | TILDE | NOT | PERIOD | BACKSLASH | ELLIPSIS | ERROR | WARNING | LINE | PRAGMA | PRAGMA_ONCE | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | LIB | STATIC | CALLBACK | FUNCTION | LET | SET | TEMP | FREE | RETURN | PRE_ASSERT | POST_ASSERT | BOOLVAL | INTVAL | STRVAL | PATHVAL | STRLEN | FLOATVAL | ARRVAL | OBJVAL | COUNT | CALLOC | TO_BOOL | TO_INT | TO_STRING | TO_FLOAT | TO_ARRAY | TO_OBJECT | COMMENT | CPP_HEADER | CPP_PASTE | CPP_INLINE | CPP_RESTRICT | CPP_EXTENSION | CPP_ASM | SIZEOF | VOLATILE; -any_nobrace_token: BOOL | CHAR | SHORT | INT | SIGNED | UNSIGNED | LONG | FLOAT | DOUBLE | STRING | MIXED | ARRAY | OBJECT | CALLABLE | VOID | ZVAL | INT8 | UINT8 | INT16 | UINT16 | INT32 | UINT32 | INT64 | UINT64 | NULL | TRUE | FALSE | NAME | NSNAME | DOLLAR_NAME | NUMBER | QUOTED_STRING | QUOTED_CHAR | EOF | EOS | LPAREN | RPAREN | COMMA | COLON | LBRACKET | RBRACKET | EQUALS | HASH | PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | LCHEVR | RCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE | TILDE | NOT | PERIOD | BACKSLASH | ELLIPSIS | ERROR | WARNING | LINE | PRAGMA | PRAGMA_ONCE | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | LIB | STATIC | CALLBACK | FUNCTION | LET | SET | TEMP | FREE | RETURN | PRE_ASSERT | POST_ASSERT | BOOLVAL | INTVAL | STRVAL | PATHVAL | STRLEN | FLOATVAL | ARRVAL | OBJVAL | COUNT | CALLOC | TO_BOOL | TO_INT | TO_STRING | TO_FLOAT | TO_ARRAY | TO_OBJECT | COMMENT | CPP_HEADER | CPP_PASTE | CPP_INLINE | CPP_RESTRICT | CPP_EXTENSION | CPP_ASM | SIZEOF | VOLATILE; +name_token: NAME | FUNCTION | TEMP | FREE | SET | LET | CALLOC | CALLBACK | LIB | BOOL | STRING | ERROR | WARNING | LINE | PRAGMA_ONCE | PRAGMA | AS | let_func_token | set_func_token; +any_noeol_token: BOOL | CHAR | SHORT | INT | SIGNED | UNSIGNED | LONG | FLOAT | DOUBLE | STRING | MIXED | ARRAY | OBJECT | CALLABLE | VOID | ZVAL | NULL | TRUE | FALSE | NAME | NSNAME | DOLLAR_NAME | NUMBER | QUOTED_STRING | QUOTED_CHAR | EOF | EOS | LPAREN | RPAREN | COMMA | COLON | LBRACE | RBRACE | LBRACKET | RBRACKET | EQUALS | HASH | PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | LCHEVR | RCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE | TILDE | NOT | PERIOD | BACKSLASH | ELLIPSIS | ERROR | WARNING | LINE | PRAGMA | PRAGMA_ONCE | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | LIB | STATIC | CALLBACK | FUNCTION | LET | SET | TEMP | FREE | RETURN | PRE_ASSERT | POST_ASSERT | BOOLVAL | INTVAL | STRVAL | PATHVAL | STRLEN | FLOATVAL | ARRVAL | OBJVAL | COUNT | CALLOC | TO_BOOL | TO_INT | TO_STRING | TO_FLOAT | TO_ARRAY | TO_OBJECT | COMMENT | CPP_HEADER | CPP_PASTE | CPP_INLINE | CPP_RESTRICT | CPP_EXTENSION | CPP_ASM | SIZEOF | VOLATILE | AS; +any_nobrace_token: BOOL | CHAR | SHORT | INT | SIGNED | UNSIGNED | LONG | FLOAT | DOUBLE | STRING | MIXED | ARRAY | OBJECT | CALLABLE | VOID | ZVAL | NULL | TRUE | FALSE | NAME | NSNAME | DOLLAR_NAME | NUMBER | QUOTED_STRING | QUOTED_CHAR | EOF | EOS | LPAREN | RPAREN | COMMA | COLON | LBRACKET | RBRACKET | EQUALS | HASH | PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | LCHEVR | RCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE | TILDE | NOT | PERIOD | BACKSLASH | ELLIPSIS | ERROR | WARNING | LINE | PRAGMA | PRAGMA_ONCE | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | LIB | STATIC | CALLBACK | FUNCTION | LET | SET | TEMP | FREE | RETURN | PRE_ASSERT | POST_ASSERT | BOOLVAL | INTVAL | STRVAL | PATHVAL | STRLEN | FLOATVAL | ARRVAL | OBJVAL | COUNT | CALLOC | TO_BOOL | TO_INT | TO_STRING | TO_FLOAT | TO_ARRAY | TO_OBJECT | COMMENT | CPP_HEADER | CPP_PASTE | CPP_INLINE | CPP_RESTRICT | CPP_EXTENSION | CPP_ASM | SIZEOF | VOLATILE | AS; file: @@ -716,7 +760,7 @@ impl_def_val[val]: %empty { $val = NULL; } -| num_exp[num] { +| num_exp[num] %dprec 1 { if (psi_num_exp_validate(PSI_DATA(P), $num, NULL, NULL, NULL, NULL, NULL)) { impl_val res = {0}; token_t type = psi_num_exp_exec($num, &res, NULL, &P->preproc->defs); @@ -747,7 +791,7 @@ impl_def_val[val]: } psi_num_exp_free(&$num); } -| impl_def_val_token[token] { +| impl_def_val_token[token] %dprec 2 { $val = psi_impl_def_val_init($token->type, $token->text); $val->token = psi_token_copy($token); } @@ -835,16 +879,11 @@ typedef_decl[def]: $def->type->real.unn->size = $as.len; psi_parser_proc_add_union(P, $def->type->real.unn); } -| qualified_decl_type[type] decl_stdint_type[stdint] { - $stdint->type = PSI_T_NAME; - $def = psi_decl_arg_init($type, psi_decl_var_init($stdint->text, 0, 0)); - $def->var->token = psi_token_copy($stdint); -} ; typedef_anon_decl[def]: - typedef_decl -| qualified_decl_type[type] { + typedef_decl %dprec 2 +| qualified_decl_type[type] %dprec 1 { $def = psi_decl_arg_init($type, psi_decl_var_init(NULL, 0, 0)); $def->var->token = psi_token_copy($type->token); } @@ -917,9 +956,6 @@ decl_type_complex[type]: decl_type_simple[type]: decl_int_type | decl_real_type -| decl_stdint_type[type_] { - $type = psi_token_copy($type_); -} | NAME[type_] { $type = psi_token_copy($type_); } @@ -937,17 +973,6 @@ decl_real_type[type]: } ; -decl_stdint_type[type]: - INT8 -| UINT8 -| INT16 -| UINT16 -| INT32 -| UINT32 -| INT64 -| UINT64 -; - int_signed[i]: SIGNED | UNSIGNED @@ -995,6 +1020,9 @@ int_signed_types[type]: %empty { $type = NULL; } +| NAME { + $type = psi_token_copy($NAME); +} | CHAR { $type = psi_token_copy($CHAR); } @@ -1232,20 +1260,26 @@ decl_args[args]: | VOID { $args = NULL; } -| decl_anon_arg[arg] { +| decl_arg_list[args_] { + $args = $args_; +} +; + +decl_arg_list[args]: + decl_anon_arg[arg] { $args = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &$arg); } -| decl_args[args_] COMMA decl_anon_arg[arg] { +| decl_arg_list[args_] COMMA decl_anon_arg[arg] { $args = psi_plist_add($args_, &$arg); } ; decl_anon_arg[arg]: /* FIXME decl_functor_body_anon */ - decl_arg { + decl_arg %dprec 2 { $arg = $decl_arg; } -| qualified_decl_type[type] indirection { +| qualified_decl_type[type] indirection %dprec 1 { $arg = psi_decl_arg_init( $type, psi_decl_var_init(NULL, $indirection, 0) @@ -1318,15 +1352,6 @@ decl_var[var]: } ; -anon_var[var]: - %empty { - $var = psi_decl_var_init(NULL, 0, 0); -} -| decl_var { - $var = $decl_var; -} -; - decl_union[union]: UNION name_token align_and_size[as] decl_struct_args[args] { $name_token->type = PSI_T_NAME; @@ -1418,7 +1443,7 @@ decl_vars_with_layout[vars]: ; decl_enum[enum]: - enum_name LBRACE decl_enum_items[list] RBRACE { + enum_name LBRACE decl_enum_items[list] optional_comma RBRACE { $enum = psi_decl_enum_init($enum_name->text, $list); $enum->token = $enum_name; } @@ -1486,6 +1511,10 @@ number[num]: $num = psi_number_init($token->type, $token->text, 0); $num->token = psi_token_copy($token); } +| NULL[token] { + $num = psi_number_init($token->type, $token->text, 0); + $num->token = psi_token_copy($token); +} | decl_var { $num = psi_number_init(PSI_T_NAME, $decl_var, 0); $num->token = psi_token_copy($decl_var->token); @@ -1514,6 +1543,7 @@ sizeof_body[sizeof]: if ($indirection) { int8_t sizeof_void_p = sizeof(void *); $sizeof = psi_number_init(PSI_T_INT8, &sizeof_void_p, 0); + psi_decl_type_free(&$decl_type); } else { $sizeof = psi_number_init(PSI_T_SIZEOF, $decl_type, 0); } @@ -1583,6 +1613,11 @@ optional_name[name]: } ; +optional_comma: + %empty +| COMMA +; + decl_layout[l]: %empty { $l = NULL; @@ -1616,12 +1651,16 @@ array_size[as]: | LBRACKET RBRACKET { $as = 0; } +| LBRACKET CPP_RESTRICT RBRACKET { + $as = 0; +} | LBRACKET num_exp RBRACKET { if (psi_num_exp_validate(PSI_DATA(P), $num_exp, NULL, NULL, NULL, NULL, NULL)) { $as = psi_long_num_exp($num_exp, NULL, &P->preproc->defs); } else { $as = 0; } + psi_num_exp_free(&$num_exp); } ; @@ -1787,9 +1826,12 @@ let_exp[exp]: ; let_exp_byref[exp]: - NULL { + NULL %dprec 2 { $exp = psi_let_exp_init(PSI_LET_NULL, NULL); } +| num_exp[num] %dprec 1 { + $exp = psi_let_exp_init_ex(NULL, PSI_LET_NUMEXP, $num); +} | let_calloc[calloc] { $exp = psi_let_exp_init(PSI_LET_CALLOC, $calloc); } @@ -1803,9 +1845,6 @@ let_exp_byref[exp]: | let_func[func] { $exp = psi_let_exp_init_ex(NULL, PSI_LET_FUNC, $func); } -| num_exp[num] { - $exp = psi_let_exp_init_ex(NULL, PSI_LET_NUMEXP, $num); -} ; let_exp_assign[exp]: @@ -1828,8 +1867,8 @@ let_calloc[calloc]: ; let_callback[callback]: - CALLBACK callback_rval[func] LPAREN impl_var[var] LPAREN callback_arg_list[args] RPAREN RPAREN { - $callback = psi_let_callback_init(psi_let_func_init($func->type, $func->text, $var), $args); + CALLBACK LPAREN call_decl_vars[cb_args] RPAREN AS callback_rval[func] LPAREN impl_var[var] LPAREN callback_arg_list[args] RPAREN RPAREN { + $callback = psi_let_callback_init(psi_let_func_init($func->type, $func->text, $var), $args, $cb_args); $callback->func->token = psi_token_copy($func); $callback->token = psi_token_copy($CALLBACK); } @@ -1898,12 +1937,35 @@ callback_args[args]: ; return_stmt[return]: - RETURN set_func[func] EOS { - $return = psi_return_stmt_init(psi_set_exp_init(PSI_SET_FUNC, $func)); + RETURN return_exp EOS { + $return = psi_return_stmt_init($return_exp); $return->token = psi_token_copy($RETURN); } ; +return_exp: + decl_var[func] LPAREN call_decl_vars[args] RPAREN AS set_func { + $return_exp = psi_return_exp_init($func, $args, psi_set_exp_init(PSI_SET_FUNC, $set_func)); + $return_exp->token = psi_token_copy($func->token); +} +| set_func { + $return_exp = psi_return_exp_init(NULL, NULL, psi_set_exp_init(PSI_SET_FUNC, $set_func)); + $return_exp->token = psi_token_copy($set_func->token); +} +; + +call_decl_vars[args]: + %empty { + $args = NULL; +} +| VOID { + $args = NULL; +} +| decl_vars[vars] { + $args = $vars; +} +; + set_stmt[set]: SET set_exp[exp] EOS { $set = psi_set_stmt_init($exp);