X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser_proc_grammar.y;h=22733b78c6c19bae89eb6c547973b5cf8e28a0ad;hp=442f93d84f070bf037e73d216e831ac48a694c77;hb=5bf418f9c241e653f2e1825eef2ce850cf65db96;hpb=c101a4de2983791d5892e60d765b73b6b3ccf6f8 diff --git a/src/parser_proc_grammar.y b/src/parser_proc_grammar.y index 442f93d..22733b7 100644 --- a/src/parser_proc_grammar.y +++ b/src/parser_proc_grammar.y @@ -309,10 +309,10 @@ struct psi_parser; %type decl_type const_decl_type decl_type_complex %destructor {psi_decl_type_free(&$$);} decl_type const_decl_type decl_type_complex -%type decl_stmt decl -%destructor {psi_decl_free(&$$);} decl_stmt decl -%type decl_typedef decl_fn decl_func decl_functor decl_arg struct_arg typedef -%destructor {psi_decl_arg_free(&$$);} decl_typedef decl_fn decl_func decl_functor decl_arg struct_arg typedef +%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 +%destructor {psi_decl_arg_free(&$$);} decl_typedef decl_func decl_functor decl_arg decl_anon_arg typedef %type decl_var %destructor {psi_decl_var_free(&$$);} decl_var %type decl_struct @@ -323,8 +323,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 decl_enum_items decl_vars -%destructor {psi_plist_free($$);} decl_args decl_struct_args struct_args_block struct_args decl_enum_items decl_vars +%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 align_and_size %destructor {} align_and_size @@ -391,7 +391,7 @@ 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 | TEMP | FREE | SET | LET | CALLOC | CALLBACK | LIB | BOOL | STRING | ERROR | WARNING | LINE | PRAGMA_ONCE | PRAGMA | let_func_token | set_func_token; +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_RESTRICT | CPP_EXTENSION | CPP_ASM; @@ -715,6 +715,37 @@ impl_def_val[val]: %empty { $val = NULL; } +| num_exp[num] { + 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); + + if (type == PSI_T_FLOAT || type == PSI_T_DOUBLE) { + $val = psi_impl_def_val_init(type, NULL); + } else { + $val = psi_impl_def_val_init(PSI_T_INT, NULL); + } + + switch (type) { + case PSI_T_UINT8: $val->ival.zend.lval = res.u8; break; + case PSI_T_UINT16: $val->ival.zend.lval = res.u16; break; + case PSI_T_UINT32: $val->ival.zend.lval = res.u32; break; + case PSI_T_UINT64: $val->ival.zend.lval = res.u64; break; /* FIXME */ + case PSI_T_INT8: $val->ival.zend.lval = res.i8; break; + case PSI_T_INT16: $val->ival.zend.lval = res.i16; break; + case PSI_T_INT32: $val->ival.zend.lval = res.i32; break; + case PSI_T_INT64: $val->ival.zend.lval = res.i64; break; + case PSI_T_FLOAT: $val->ival.dval = res.fval; break; + case PSI_T_DOUBLE: $val->ival.dval = res.dval; break; + default: + assert(0); + + } + } else { + $val = NULL; + } + psi_num_exp_free(&$num); +} | impl_def_val_token[token] { $val = psi_impl_def_val_init($token->type, $token->text); $val->token = psi_token_copy($token); @@ -723,7 +754,6 @@ impl_def_val[val]: impl_def_val_token: NULL -| NUMBER | TRUE | FALSE | QUOTED_STRING @@ -733,11 +763,14 @@ decl_typedef[def]: TYPEDEF typedef[def_] EOS { $def = $def_; } +| CPP_EXTENSION TYPEDEF typedef[def_] EOS { + $def = $def_; +} ; typedef[def]: decl_arg -| decl { +| decl_func_body[decl] { $def = psi_decl_arg_init( psi_decl_type_init(PSI_T_FUNCTION, $decl->func->var->name), psi_decl_var_copy($decl->func->var) @@ -981,31 +1014,56 @@ decl_ext_var_list: } ; +decl_vars[vars]: + decl_var[var] { + $vars = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_var_free), &$var); +} +| decl_vars[vars_] COMMA decl_var[var] { + $vars = psi_plist_add($vars_, &$var); +} +; + decl: - decl_fn[func] LPAREN decl_args[args] RPAREN array_size[as] { - $decl = psi_decl_init(psi_decl_abi_init("default"), $func, $args); + decl_body +| NAME[abi] decl_body { + $decl = $decl_body; + $decl->abi = psi_decl_abi_init($abi->text); +} +; + +decl_body: + decl_func_body +| decl_functor_body +; + +decl_func_body[decl]: + decl_func[func] LPAREN decl_args[args] RPAREN array_size[as] { + $decl = psi_decl_init($func, $args); if ($as) { $decl->func->var->pointer_level += 1; $decl->func->var->array_size = $as; } } -| decl_fn[func] LPAREN decl_args[args] COMMA ELLIPSIS RPAREN array_size[as] { - $decl = psi_decl_init(psi_decl_abi_init("default"), $func, $args); +| decl_func[func] LPAREN decl_args[args] COMMA ELLIPSIS RPAREN array_size[as] { + $decl = psi_decl_init($func, $args); $decl->varargs = 1; if ($as) { $decl->func->var->pointer_level += 1; $decl->func->var->array_size = $as; } } -| NAME[abi] decl_fn[func] LPAREN decl_args[args] RPAREN array_size[as] { - $decl = psi_decl_init(psi_decl_abi_init($abi->text), $func, $args); +; + +decl_functor_body[decl]: + decl_functor[func] LPAREN decl_args[args] RPAREN array_size[as] { + $decl = psi_decl_init($func, $args); if ($as) { $decl->func->var->pointer_level += 1; $decl->func->var->array_size = $as; } } -| NAME[abi] decl_fn[func] LPAREN decl_args[args] COMMA ELLIPSIS RPAREN array_size[as] { - $decl = psi_decl_init(psi_decl_abi_init($abi->text), $func, $args); +| decl_functor[func] LPAREN decl_args[args] COMMA ELLIPSIS RPAREN array_size[as] { + $decl = psi_decl_init($func, $args); $decl->varargs = 1; if ($as) { $decl->func->var->pointer_level += 1; @@ -1014,11 +1072,6 @@ decl: } ; -decl_fn: - decl_func -| decl_functor -; - decl_functor[arg]: const_decl_type[type] indirection[i] LPAREN indirection[unused1] name_token[NAME] RPAREN { (void) $unused1; @@ -1082,16 +1135,55 @@ decl_args[args]: | VOID { $args = NULL; } -| decl_arg[arg] { +| decl_anon_arg[arg] { $args = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &$arg); } -| decl_args[args_] COMMA decl_arg[arg] { +| decl_args[args_] COMMA decl_anon_arg[arg] { $args = psi_plist_add($args_, &$arg); } ; +decl_anon_arg[arg]: +/* FIXME decl_functor_body_anon */ + decl_arg { + $arg = $decl_arg; +} +| const_decl_type[type] indirection { + $arg = psi_decl_arg_init( + $type, + psi_decl_var_init(NULL, $indirection, 0) + ); +} +| CONST VOID pointers { + $arg = psi_decl_arg_init( + psi_decl_type_init($VOID->type, $VOID->text), + psi_decl_var_init(NULL, $pointers, 0) + ); + $arg->type->token = psi_token_copy($VOID); + $arg->var->token = psi_token_copy($VOID); + $arg->token = psi_token_copy($VOID); +} +| VOID pointers { + $arg = psi_decl_arg_init( + psi_decl_type_init($VOID->type, $VOID->text), + psi_decl_var_init(NULL, $pointers, 0) + ); + $arg->type->token = psi_token_copy($VOID); + $arg->var->token = psi_token_copy($VOID); + $arg->token = psi_token_copy($VOID); +} +; + decl_arg[arg]: - const_decl_type[type] decl_var[var] { + decl_functor_body[decl] { + $arg = psi_decl_arg_init( + psi_decl_type_init(PSI_T_FUNCTION, $decl->func->var->name), + psi_decl_var_copy($decl->func->var) + ); + $arg->type->token = psi_token_copy($decl->func->token); + $arg->type->real.func = $decl; +} +| const_decl_type[type] decl_var[var] { $arg = psi_decl_arg_init($type, $var); } | CONST VOID pointers name_token[NAME] { @@ -1163,19 +1255,59 @@ struct_args_block[args]: ; struct_args[args]: - struct_arg[arg] { + typedef[arg] decl_layout[layout] struct_arg_var_list[vars] EOS { + $arg->layout = $layout; $args = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &$arg); + if ($vars) { + size_t i = 0; + struct psi_decl_arg *arg; + + while (psi_plist_get($vars, i++, &arg)) { + arg->type = psi_decl_type_copy($arg->type); + $args = psi_plist_add($args, &arg); + } + free($vars); + } } -| struct_args[args_] struct_arg[arg] { +| struct_args[args_] typedef[arg] decl_layout[layout] struct_arg_var_list[vars] EOS { + $arg->layout = $layout; $args = psi_plist_add($args_, &$arg); + if ($vars) { + size_t i = 0; + struct psi_decl_arg *arg; + + while (psi_plist_get($vars, i++, &arg)) { + arg->type = psi_decl_type_copy($arg->type); + $args = psi_plist_add($args, &arg); + } + free($vars); + } } ; -struct_arg[arg]: - typedef[arg_] decl_layout[layout] EOS { - $arg = $arg_; - $arg->layout = $layout; - psi_parser_proc_add_from_typedef(P, $arg); +struct_arg_var_list[vars]: + %empty { + $vars = NULL; +} +| COMMA decl_vars_with_layout[vars_] { + $vars = $vars_; +} +; + +decl_vars_with_layout[vars]: + decl_var[var] decl_layout[layout] { + { + struct psi_decl_arg *arg = psi_decl_arg_init(NULL, $var); + arg->layout = $layout; + $vars = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &arg); + } +} +| decl_vars_with_layout[vars_] COMMA decl_var[var] decl_layout[layout] { + { + struct psi_decl_arg *arg = psi_decl_arg_init(NULL, $var); + arg->layout = $layout; + $vars = psi_plist_add($vars_, &arg); + } } ; @@ -1307,8 +1439,14 @@ decl_layout[l]: %empty { $l = NULL; } +| COLON NUMBER[width] { + $l = psi_layout_init(0, 0, psi_layout_init(0, atol($width->text), NULL)); +} | COLON COLON LPAREN NUMBER[align] COMMA NUMBER[size] RPAREN { - $l = psi_layout_init(atol($align->text), atol($size->text)); + $l = psi_layout_init(atol($align->text), atol($size->text), NULL); +} +| COLON NUMBER[width] COLON COLON LPAREN NUMBER[align] COMMA NUMBER[size] RPAREN { + $l = psi_layout_init(atol($align->text), atol($size->text), psi_layout_init(0, atol($width->text), NULL)); } ; @@ -1495,6 +1633,10 @@ let_exp_byref[exp]: | let_calloc[calloc] { $exp = psi_let_exp_init(PSI_LET_CALLOC, $calloc); } +| STATIC let_calloc[calloc] { + $exp = psi_let_exp_init(PSI_LET_CALLOC, $calloc); + $calloc->static_memory = 1; +} | let_callback[callback] { $exp = psi_let_exp_init(PSI_LET_CALLBACK, $callback); } @@ -1700,15 +1842,6 @@ free_exp[exp]: } ; -decl_vars[vars]: - decl_var[var] { - $vars = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_var_free), &$var); -} -| decl_vars[vars_] COMMA decl_var[var] { - $vars = psi_plist_add($vars_, &$var); -} -; - reference: %empty { $reference = false;