P->types = psi_plist_init((psi_plist_dtor) psi_decl_arg_free);
}
P->types = psi_plist_add(P->types, &def);
-
psi_parser_proc_add_from_typedef(P, def);
}
static inline void psi_parser_proc_add_const(struct psi_parser *P, struct psi_const *cnst) {
%token <struct psi_token *> PERIOD "."
%token <struct psi_token *> BACKSLASH "\\"
%token <struct psi_token *> ELLIPSIS "..."
+%token <struct psi_token *> IIF "?"
+%token <struct psi_token *> PRAGMA
+%token <struct psi_token *> PRAGMA_ONCE
+%token <struct psi_token *> LINE
%token <struct psi_token *> ERROR
%token <struct psi_token *> WARNING
%token <struct psi_token *> IF
%token <struct psi_token *> WHITESPACE
%token <struct psi_token *> NO_WHITESPACE
%token <struct psi_token *> CPP_HEADER
-
-//%destructor {psi_token_free((struct psi_token **) &$$);} <>
-
-%precedence AND OR
+%token <struct psi_token *> CPP_ATTRIBUTE
+%token <struct psi_token *> CPP_EXTENSION
+%token <struct psi_token *> CPP_PASTE
+%token <struct psi_token *> CPP_RESTRICT
+%token <struct psi_token *> CPP_ASM
+
+%precedence IIF COLON
+%precedence OR
+%precedence AND
%precedence PIPE
%precedence CARET
%precedence AMPERSAND
%type <struct psi_token *> lib optional_name enum_name struct_name union_name
%destructor {psi_token_free(&$$);} lib optional_name enum_name struct_name union_name
-%type <struct psi_token *> cpp_message_token cpp_include_token cpp_header_token cpp_no_arg_token cpp_name_arg_token cpp_exp_arg_token
-%destructor {} cpp_message_token cpp_include_token cpp_header_token cpp_no_arg_token cpp_name_arg_token cpp_exp_arg_token
+%type <struct psi_token *> cpp_message_token cpp_include_token cpp_header_token cpp_no_arg_token cpp_name_arg_token cpp_exp_arg_token cpp_special_name_token
+%destructor {} cpp_message_token cpp_include_token cpp_header_token cpp_no_arg_token cpp_name_arg_token cpp_exp_arg_token cpp_special_name_token
%type <struct psi_token *> name_token any_noeol_token binary_op_token unary_op_token
%destructor {} name_token any_noeol_token binary_op_token unary_op_token
%type <struct psi_decl_type *> decl_type const_decl_type decl_type_complex
%destructor {psi_decl_type_free(&$$);} decl_type const_decl_type decl_type_complex
-%type <struct psi_decl *> decl_stmt decl
-%destructor {psi_decl_free(&$$);} decl_stmt decl
-%type <struct psi_decl_arg *> 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 <struct psi_decl *> 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 <struct psi_decl_arg *> decl_typedef decl_func decl_functor decl_arg struct_arg typedef
+%destructor {psi_decl_arg_free(&$$);} decl_typedef decl_func decl_functor decl_arg struct_arg typedef
%type <struct psi_decl_var *> decl_var
%destructor {psi_decl_var_free(&$$);} decl_var
%type <struct psi_decl_struct *> decl_struct
%type <struct psi_number *> number
%destructor {psi_number_free(&$$);} number
-%type <size_t> indirection pointers array_size
-%destructor {} indirection pointers array_size
+%type <size_t> indirection pointers asterisks array_size
+%destructor {} indirection pointers asterisks array_size
%type <bool> reference
%destructor {} reference
-//%destructor {} file blocks block
-
%%
/* rules */
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 | ZVAL | LIB | STRING | COUNT | ERROR | WARNING | BOOL ;
-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 | 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 ;
+name_token: NAME | 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;
file:
| lib {
if (P->file.ln) {
P->error(PSI_DATA(P), $lib, PSI_WARNING,
- "Extra 'lib %s' statement has no effect", $lib->text);
+ "Extra 'lib \"%s\"' statement has no effect", $lib->text);
} else {
- P->file.ln = strndup($lib->text + 1, $lib->size - 2);
+ P->file.ln = strndup($lib->text, $lib->size);
}
}
| constant {
| decl_stmt {
psi_parser_proc_add_decl(P, $decl_stmt);
}
+| decl_ext_var_stmt
| decl_typedef[def] {
psi_parser_proc_add_typedef(P, $def);
}
;
cpp:
- HASH cpp_exp[exp] EOL {
+ HASH EOL {
+ $cpp = NULL;
+}
+| HASH cpp_exp[exp] EOL {
$cpp = $exp;
}
;
$exp = psi_cpp_exp_init($cpp_no_arg_token->type, NULL);
$exp->token = psi_token_copy($cpp_no_arg_token);
}
-| cpp_name_arg_token name_token {
- $name_token->type = PSI_T_NAME;
- $exp = psi_cpp_exp_init($cpp_name_arg_token->type, psi_token_copy($name_token));
- $exp->token = psi_token_copy($cpp_name_arg_token);
-}
-| cpp_name_arg_token NULL[name_token] {
+| cpp_name_arg_token cpp_special_name_token[name_token] {
$name_token->type = PSI_T_NAME;
$exp = psi_cpp_exp_init($cpp_name_arg_token->type, psi_token_copy($name_token));
$exp->token = psi_token_copy($cpp_name_arg_token);
$exp = psi_cpp_exp_init($cpp_exp_arg_token->type, $cpp_macro_exp);
$exp->token = psi_token_copy($cpp_exp_arg_token);
}
+| PRAGMA_ONCE {
+ $exp = psi_cpp_exp_init($PRAGMA_ONCE->type, NULL);
+ $exp->token = psi_token_copy($PRAGMA_ONCE);
+}
+| cpp_ignored_token cpp_macro_decl_tokens[tokens] {
+ psi_plist_free($tokens);
+ $exp = NULL;
+}
+;
+
+cpp_ignored_token:
+ LINE
+| PRAGMA
;
cpp_message_token:
| ELIF
;
+cpp_special_name_token:
+ name_token
+| NULL
+| TRUE
+| FALSE
+| CPP_RESTRICT
+| CPP_EXTENSION
+;
+
cpp_macro_decl[macro]:
name_token NO_WHITESPACE LPAREN cpp_macro_sig RPAREN cpp_macro_decl_tokens {
$name_token->type = PSI_T_NAME;
$macro = psi_cpp_macro_decl_init($cpp_macro_sig, $cpp_macro_decl_tokens, NULL);
$macro->token = psi_token_copy($name_token);
}
-| name_token cpp_macro_decl_tokens {
- $name_token->type = PSI_T_NAME;
- $macro = psi_cpp_macro_decl_init(NULL, $cpp_macro_decl_tokens, NULL);
- $macro->token = psi_token_copy($name_token);
-}
-| NULL[name_token] cpp_macro_decl_tokens {
+| cpp_special_name_token[name_token] cpp_macro_decl_tokens {
$name_token->type = PSI_T_NAME;
$macro = psi_cpp_macro_decl_init(NULL, $cpp_macro_decl_tokens, NULL);
$macro->token = psi_token_copy($name_token);
$exp = psi_num_exp_init_binary($binary_op_token->type, $lhs, $rhs);
$exp->token = psi_token_copy($binary_op_token);
}
+| cpp_macro_exp[cond] IIF cpp_macro_exp[truthy] COLON cpp_macro_exp[falsy] {
+ $exp = psi_num_exp_init_ternary($IIF->type, $cond, $truthy, $falsy);
+ $exp->token = psi_token_copy($IIF);
+}
+
| DEFINED name_token {
{
uint8_t exists;
$name_token->type = PSI_T_NAME;
exists = psi_cpp_defined(P->preproc, $name_token);
- $exp = psi_num_exp_init_num(psi_number_init(PSI_T_UINT8, &exists));
+ $exp = psi_num_exp_init_num(psi_number_init(PSI_T_UINT8, &exists, 0));
$exp->token = psi_token_copy($name_token);
}
}
$name_token->type = PSI_T_NAME;
exists = psi_cpp_defined(P->preproc, $name_token);
- $exp = psi_num_exp_init_num(psi_number_init(PSI_T_UINT8, &exists));
+ $exp = psi_num_exp_init_num(psi_number_init(PSI_T_UINT8, &exists, 0));
$exp->token = psi_token_copy($name_token);
}
}
| NUMBER {
- $exp = psi_num_exp_init_num(psi_number_init($NUMBER->type, $NUMBER->text));
+ $exp = psi_num_exp_init_num(psi_number_init($NUMBER->type, $NUMBER->text, $NUMBER->flags));
$exp->token = psi_token_copy($NUMBER);
$exp->data.n->token = psi_token_copy($NUMBER);
}
| QUOTED_CHAR {
- $exp = psi_num_exp_init_num(psi_number_init($QUOTED_CHAR->type, $QUOTED_CHAR->text));
+ $exp = psi_num_exp_init_num(psi_number_init($QUOTED_CHAR->type, $QUOTED_CHAR->text, 0));
$exp->token = psi_token_copy($QUOTED_CHAR);
$exp->data.n->token = psi_token_copy($QUOTED_CHAR);
}
| name_token {
$name_token->type = PSI_T_NAME;
- $exp = psi_num_exp_init_num(psi_number_init(PSI_T_DEFINE, $name_token->text));
+ $exp = psi_num_exp_init_num(psi_number_init(PSI_T_DEFINE, $name_token->text, 0));
$exp->token = psi_token_copy($name_token);
$exp->data.n->token = psi_token_copy($name_token);
}
| name_token LPAREN cpp_macro_call_args RPAREN {
$name_token->type = PSI_T_NAME;
$exp = psi_num_exp_init_num(psi_number_init(PSI_T_FUNCTION,
- psi_cpp_macro_call_init($name_token->text, $cpp_macro_call_args)));
+ psi_cpp_macro_call_init($name_token->text, $cpp_macro_call_args), 0));
$exp->token = psi_token_copy($name_token);
}
;
cpp_macro_call_arg_list[args]:
cpp_macro_exp {
- $args = psi_plist_add(psi_plist_init((void (*)(void *)) psi_num_exp_free),
+ $args = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_num_exp_free),
&$cpp_macro_exp);
}
| cpp_macro_call_arg_list[args_] COMMA cpp_macro_exp {
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)
$def->type->real.unn->align = $as.pos;
$def->type->real.unn->size = $as.len;
}
+| const_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);
+}
;
const_decl_type[type]:
;
decl_stmt:
- decl EOS {
+ decl decl_asm EOS {
+ $decl_stmt = $decl;
+}
+| CPP_EXTENSION decl decl_asm EOS {
$decl_stmt = $decl;
}
;
+decl_asm:
+ %empty
+| CPP_ASM LPAREN ignored_quoted_strings RPAREN
+;
+
+ignored_quoted_strings:
+ QUOTED_STRING
+| ignored_quoted_strings QUOTED_STRING
+;
+
+decl_ext_var_stmt:
+ decl_ext_var EOS
+;
+
+decl_ext_var:
+ NAME decl_arg decl_ext_var_list {
+ psi_decl_arg_free(&$decl_arg);
+}
+;
+
+decl_ext_var_list:
+ %empty
+| COMMA decl_vars {
+ psi_plist_free($decl_vars);
+}
+;
+
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;
}
;
-decl_fn:
- decl_func
-| decl_functor
-;
-
decl_functor[arg]:
- const_decl_type[type] indirection[i] LPAREN indirection name_token[NAME] RPAREN {
+ const_decl_type[type] indirection[i] LPAREN indirection[unused1] name_token[NAME] RPAREN {
+ (void) $unused1;
$NAME->type = PSI_T_NAME;
$arg = psi_decl_arg_init($type, psi_decl_var_init($NAME->text, $i, 0));
$arg->var->token = psi_token_copy($NAME);
$arg->token = psi_token_copy($NAME);
}
-| CONST VOID pointers LPAREN indirection name_token[NAME] RPAREN {
+| CONST VOID pointers LPAREN indirection[unused1] name_token[NAME] RPAREN {
+ (void) $unused1;
$NAME->type = PSI_T_NAME;
$arg = psi_decl_arg_init(
psi_decl_type_init($VOID->type, $VOID->text),
$arg->var->token = psi_token_copy($NAME);
$arg->token = psi_token_copy($NAME);
}
-| VOID pointers LPAREN indirection name_token[NAME] RPAREN {
+| VOID pointers LPAREN indirection[unused1] name_token[NAME] RPAREN {
+ (void) $unused1;
$NAME->type = PSI_T_NAME;
$arg = psi_decl_arg_init(
psi_decl_type_init($VOID->type, $VOID->text),
$arg->var->token = psi_token_copy($NAME);
$arg->token = psi_token_copy($NAME);
}
-| VOID LPAREN indirection name_token[NAME] RPAREN {
+| VOID LPAREN indirection[unused1] name_token[NAME] RPAREN {
+ (void) $unused1;
$NAME->type = PSI_T_NAME;
$arg = psi_decl_arg_init(
psi_decl_type_init($VOID->type, $VOID->text),
;
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] {
$exp = psi_num_exp_init_unary($op->type, $exp_);
$exp->token = psi_token_copy($op);
}
+| num_exp[cond] IIF num_exp[truthy] COLON num_exp[falsy] {
+ $exp = psi_num_exp_init_ternary($IIF->type, $cond, $truthy, $falsy);
+ $exp->token = psi_token_copy($IIF);
+}
;
number[num]:
NUMBER[token] {
- $num = psi_number_init($token->type, $token->text);
+ $num = psi_number_init($token->type, $token->text, $token->flags);
$num->token = psi_token_copy($token);
}
| NSNAME[token] {
- $num = psi_number_init($token->type, $token->text);
+ $num = psi_number_init($token->type, $token->text, 0);
$num->token = psi_token_copy($token);
}
| QUOTED_CHAR[token] {
- $num = psi_number_init($token->type, $token->text);
+ $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);
+ $num = psi_number_init(PSI_T_NAME, $decl_var, 0);
$num->token = psi_token_copy($decl_var->token);
}
;
;
pointers[p]:
+ asterisks
+| asterisks[a] CPP_RESTRICT {
+ $p = $a;
+}
+;
+
+asterisks[a]:
ASTERISK {
- $p = 1;
+ $a = 1;
}
-| pointers[p_] ASTERISK {
- $p = $p_ + 1;
+| asterisks[a_] ASTERISK {
+ $a = $a_ + 1;
}
;
projects / m6w6 / ext-psi / blobdiff