%code top {
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
}
%code {
}
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) {
}
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)) {
+
+ if (psi_decl_is_blacklisted(decl->func->var->name->val)) {
psi_decl_free(&decl);
return;
}
%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 *> UNION
%token <struct psi_token *> ENUM
%token <struct psi_token *> CONST
-%token <struct psi_token *> LIB
%token <struct psi_token *> STATIC
%token <struct psi_token *> CALLBACK
%token <struct psi_token *> FUNCTION
%precedence BINARY
%precedence UNARY
-%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 *> optional_name enum_name struct_name union_name
+%destructor {psi_token_free(&$$);} 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_macro_decl_arg_token
+%destructor {} cpp_message_token cpp_include_token cpp_header_token cpp_no_arg_token cpp_name_arg_token cpp_exp_arg_token cpp_macro_decl_arg_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 *> decl_stmt decl decl_body decl_func_body decl_functor_body decl_anon_functor_body ignored_decl
%destructor {psi_decl_free(&$$);} decl_stmt decl decl_body decl_func_body decl_functor_body decl_anon_functor_body ignored_decl
%type <struct psi_decl_arg *> decl_typedef decl_func decl_functor decl_anon_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_anon_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_anon_functor decl_arg decl_anon_arg typedef typedef_decl typedef_anon typedef_anon_decl
%type <struct psi_decl_var *> decl_var
%destructor {psi_decl_var_free(&$$);} decl_var
%type <struct psi_decl_struct *> decl_struct
%destructor {psi_free_stmt_free(&$$);} free_stmt
%type <struct psi_free_exp *> free_exp
%destructor {psi_free_exp_free(&$$);} free_exp
-
+
%type <struct psi_token **> impl_stmt
%destructor {psi_impl_stmt_free(&$$);} impl_stmt
%type <struct psi_token *> impl_type_token impl_type_restricted_token impl_type_extended_token callback_rval let_func_token set_func_token assert_stmt_token
-%destructor {psi_token_free(&$$);} impl_type_token impl_type_restricted_token impl_type_extended_token callback_rval let_func_token set_func_token assert_stmt_token
+%destructor {} impl_type_token impl_type_restricted_token impl_type_extended_token callback_rval let_func_token set_func_token assert_stmt_token
%type <struct psi_plist *> impl_args impl_stmts let_exps let_func_exps callback_arg_list callback_args set_exps set_func_exps free_exps
%destructor {psi_plist_free($$);} impl_args impl_stmts let_exps let_func_exps callback_arg_list callback_args set_exps set_func_exps free_exps
/* 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 ;
+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 | 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;
+name_token: NAME | FUNCTION | TEMP | FREE | SET | LET | CALLOC | CALLBACK | BOOL | STRING | MIXED | ARRAY | OBJECT | ERROR | WARNING | LINE | 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 | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | 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 | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | 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:
psi_cpp_exp_free(&$cpp);
}
}
-| lib {
- if (P->file.ln) {
- P->error(PSI_DATA(P), $lib, PSI_WARNING,
- "Extra 'lib \"%s\"' statement has no effect", $lib->text);
- } else {
- P->file.ln = strndup($lib->text, $lib->size);
- }
-}
| constant {
psi_parser_proc_add_const(P, $constant);
}
}
| ignored_decl {
if (P->flags & PSI_DEBUG) {
- P->error(PSI_DATA(P), $ignored_decl->func->token, PSI_NOTICE, "Ignored decl: %s", $ignored_decl->func->var->name);
+ P->error(PSI_DATA(P), $ignored_decl->func->token, PSI_NOTICE, "Ignored decl: %s", $ignored_decl->func->var->name->val);
}
psi_decl_free(&$ignored_decl);
}
}
;
-lib:
- LIB QUOTED_STRING EOS {
- $lib = $QUOTED_STRING;
-}
-;
-
cpp:
HASH EOL {
$cpp = NULL;
cpp_message_token cpp_macro_decl_tokens[tokens] {
if ($tokens) {
struct psi_token *msg = NULL;
-
+
if (psi_plist_get($tokens, 0, &msg)) {
size_t index = 1;
struct psi_token *next;
- msg = psi_token_copy(msg);
+ msg = psi_token_copy(msg);
while (psi_plist_get($tokens, index++, &next)) {
struct psi_token *old = msg;
msg = psi_token_cat(" ", 2, msg, next);
- free(old);
+ psi_token_free(&old);
}
}
psi_plist_free($tokens);
-
+
$exp = psi_cpp_exp_init($cpp_message_token->type, msg);
} else {
$exp = psi_cpp_exp_init($cpp_message_token->type, NULL);
$exp = psi_cpp_exp_init($cpp_name_arg_token->type, psi_token_copy($name_token));
$exp->token = psi_token_copy($cpp_name_arg_token);
}
-| DEFINE cpp_macro_decl {
- $exp = psi_cpp_exp_init($DEFINE->type, $cpp_macro_decl);
- $exp->token = psi_token_copy($DEFINE);
+| cpp_macro_decl_arg_token cpp_macro_decl {
+ $exp = psi_cpp_exp_init($cpp_macro_decl_arg_token->type, $cpp_macro_decl);
+ $exp->token = psi_token_copy($cpp_macro_decl_arg_token);
}
| cpp_exp_arg_token cpp_macro_exp {
$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_macro_decl_arg_token:
+ DEFINE
+| PRAGMA
+
+;
+
cpp_ignored_token:
LINE
-| PRAGMA
;
-cpp_message_token:
+cpp_message_token:
ERROR
| WARNING
;
| UNDEF
;
-cpp_exp_arg_token:
+cpp_exp_arg_token:
IF
| ELIF
;
$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, 0));
+ $exp = psi_num_exp_init_num(psi_number_init(PSI_T_DEFINED, &exists, 0));
$exp->token = psi_token_copy($DEFINED);
$exp->data.n->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, 0));
+ $exp = psi_num_exp_init_num(psi_number_init(PSI_T_DEFINED, &exists, 0));
$exp->token = psi_token_copy($DEFINED);
$exp->data.n->token = psi_token_copy($name_token);
}
psi_cpp_macro_call_init($name_token->text, $cpp_macro_call_args), 0));
$exp->token = psi_token_copy($name_token);
$exp->data.n->token = psi_token_copy($name_token);
+ $exp->data.n->data.call->token = psi_token_copy($name_token);
}
;
;
cpp_macro_call_arg_list[args]:
- cpp_macro_exp {
- $args = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_num_exp_free),
+ CPP_HEADER {
+ /* TODO: clang include test macros */
+ uint8_t no = 1;
+ struct psi_num_exp *exp = psi_num_exp_init_num(psi_number_init(PSI_T_UINT8, &no, 0));
+ exp->token = psi_token_copy($CPP_HEADER);
+ exp->data.n->token = psi_token_copy($CPP_HEADER);
+ $args = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_num_exp_free), &exp);
+}
+| cpp_macro_exp {
+ $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 {
$const = psi_const_init($type, $NSNAME->text, $impl_def_val);
$const->token = psi_token_copy($NSNAME);
}
+| CONST NSNAME EQUALS impl_def_val EOS {
+ $const = psi_const_init(NULL, $NSNAME->text, $impl_def_val);
+ $const->token = psi_token_copy($NSNAME);
+}
;
impl_def_val[val]:
}
| quoted_strings[token] {
$val = psi_impl_def_val_init($token->type, $token->text);
- $val->token = psi_token_copy($token);
+ $val->token = $token;
}
;
}
;
-decl_real_type[type]:
+decl_real_type[type]: /* allocated, so free, if set */
FLOAT[type_] {
$type = psi_token_copy($type_);
}
| UNSIGNED
;
-int_width[i]:
+int_width[i]: /* allocated, so free, if set */
SHORT {
$i = psi_token_copy($SHORT);
}
}
;
-decl_int_type[type]:
+decl_int_type[type]: /* allocated, so free, if set */
CHAR {
$type = psi_token_copy($CHAR);
}
| int_signed int_signed_types {
if ($2) {
$type = psi_token_cat(" ", 2, $1, $2);
- free($2);
+ psi_token_free(&$2);
} else {
$type = psi_token_copy($1);
}
| int_width int_width_types {
if ($2) {
$type = psi_token_cat(" ", 2, $1, $2);
- free($1);
- free($2);
+ psi_token_free(&$1);
+ psi_token_free(&$2);
} else {
$type = $1;
}
}
;
-int_signed_types[type]:
+int_signed_types[type]: /* allocated, so free, if set */
%empty {
$type = NULL;
}
| LONG INT
;
-int_width_types[type]:
+int_width_types[type]: /* allocated, so free, if set */
%empty {
$type = NULL;
}
| int_signed int_signed_types {
if ($2) {
$type = psi_token_cat(" ", 2, $1, $2);
- free($2);
+ psi_token_free(&$2);
} else {
$type = psi_token_copy($1);
}
decl decl_asm EOS {
$decl_stmt = $decl;
if ($decl_asm) {
- $decl->redir = strdup($decl_asm->text);
- free($decl_asm);
+ $decl->redir = zend_string_copy($decl_asm->text);
+ psi_token_free(&$decl_asm);
}
}
| CPP_EXTENSION decl decl_asm EOS {
$decl_stmt = $decl;
if ($decl_asm) {
- $decl->redir = strdup($decl_asm->text);
- free($decl_asm);
+ $decl->redir = zend_string_copy($decl_asm->text);
+ psi_token_free(&$decl_asm);
}
}
;
}
| quoted_strings[strings_] QUOTED_STRING {
$strings = psi_token_cat("", 2, $strings_, $QUOTED_STRING);
- free($strings_);
+ psi_token_free(&$strings_);
}
;
decl_extvar_stmt[list]:
- NAME decl_arg decl_extvar_list[vars] EOS {
+ NAME decl_arg decl_extvar_list[vars] decl_asm EOS {
struct psi_plist *list = psi_plist_init((psi_plist_dtor) psi_decl_extvar_free);
-
+
if ($vars) {
size_t i = 0;
struct psi_decl_var *var;
-
+
while (psi_plist_get($vars, i++, &var)) {
- if (psi_decl_extvar_is_blacklisted(var->name)) {
+ if (psi_decl_extvar_is_blacklisted(var->name->val)) {
psi_decl_var_free(&var);
} else {
- list = psi_plist_add(list, psi_decl_extvar_init(
- psi_decl_arg_init(psi_decl_type_copy($decl_arg->type), var)));
- }
+ struct psi_decl_extvar *evar = psi_decl_extvar_init(
+ psi_decl_arg_init(psi_decl_type_copy($decl_arg->type), var));
+ list = psi_plist_add(list, &evar);
+ }
}
free($vars);
}
-
- if (psi_decl_extvar_is_blacklisted($decl_arg->var->name)) {
+
+ if (psi_decl_extvar_is_blacklisted($decl_arg->var->name->val)) {
psi_decl_arg_free(&$decl_arg);
} else {
struct psi_decl_extvar *evar = psi_decl_extvar_init($decl_arg);
+
+ if ($decl_asm) {
+ evar->redir = zend_string_copy($decl_asm->text);
+ psi_token_free(&$decl_asm);
+ }
list = psi_plist_add(list, &evar);
}
-
+
$list = list;
}
;
;
ignored_decl:
- STATIC decl_body ignored_decl_body {
- $ignored_decl = $decl_body;
-}
-| STATIC CPP_INLINE decl_body ignored_decl_body {
- $ignored_decl = $decl_body;
-}
-| CPP_INLINE decl_body ignored_decl_body {
- $ignored_decl = $decl_body;
-}
-| NAME CPP_INLINE decl_body ignored_decl_body {
+ ignored_decl_qualifiers decl_body ignored_decl_body {
$ignored_decl = $decl_body;
}
;
+ignored_decl_qualifiers:
+ STATIC
+| STATIC CPP_INLINE
+| CPP_EXTENSION CPP_INLINE
+| CPP_EXTENSION STATIC CPP_INLINE
+| CPP_INLINE
+| NAME CPP_INLINE
+;
+
ignored_decl_body:
LBRACE ignored_decl_body_stmts RBRACE
;
| qualified_decl_type[rval_type] indirection[i] LPAREN indirection[unused1] name_token[NAME] LPAREN decl_args[args] RPAREN RPAREN LPAREN decl_args[rval_args] RPAREN array_size[as] {
(void) $unused1;
$NAME->type = PSI_T_NAME;
-
+
struct psi_token *type_token = psi_token_append("@", psi_token_copy($NAME), 1, "rval");
struct psi_decl_arg *rval_func = psi_decl_arg_init($rval_type, psi_decl_var_init(type_token->text, $i, 0));
struct psi_decl *rval_decl = psi_decl_init(rval_func, $rval_args);
-
+
rval_func->var->token = psi_token_copy(type_token);
rval_func->token = psi_token_copy(type_token);
if ($as) {
rval_func->var->pointer_level += 1;
rval_func->var->array_size = $as;
}
-
+
struct psi_decl_type *type = psi_decl_type_init(PSI_T_FUNCTION, type_token->text);
struct psi_decl_arg *func = psi_decl_arg_init(type, psi_decl_var_init($NAME->text, 1, 0));
-
+
type->real.func = rval_decl;
func->var->token = psi_token_copy($NAME);
func->token = psi_token_copy($NAME);
-
+
$decl = psi_decl_init(func, $args);
}
| qualified_decl_type[rval_type] indirection[i] LPAREN indirection[unused1] LPAREN indirection[unused2] name_token[NAME] RPAREN LPAREN decl_args[args] RPAREN RPAREN LPAREN decl_args[rval_args] RPAREN array_size[as] {
(void) $unused1;
(void) $unused2;
$NAME->type = PSI_T_NAME;
-
+
struct psi_token *type_token = psi_token_append("@", psi_token_copy($NAME), 1, "rval");
struct psi_decl_arg *rval_func = psi_decl_arg_init($rval_type, psi_decl_var_init(type_token->text, $i, 0));
struct psi_decl *rval_decl = psi_decl_init(rval_func, $rval_args);
-
+
rval_func->var->token = psi_token_copy(type_token);
rval_func->token = psi_token_copy(type_token);
if ($as) {
rval_func->var->pointer_level += 1;
rval_func->var->array_size = $as;
}
-
+
struct psi_decl_type *type = psi_decl_type_init(PSI_T_FUNCTION, type_token->text);
struct psi_decl_arg *func = psi_decl_arg_init(type, psi_decl_var_init($NAME->text, 1, 0));
-
+
type->real.func = rval_decl;
func->var->token = psi_token_copy($NAME);
func->token = psi_token_copy($NAME);
-
+ type->token = type_token;
+
$decl = psi_decl_init(func, $args);
}
;
char digest[17];
struct psi_token *name;
- psi_token_hash($decl->func ->token, digest);
+ psi_token_hash($decl->func->token, digest);
name = psi_token_append("@", psi_token_copy($decl->func->token), 2, "funct", digest);
-
+
$arg = psi_decl_arg_init(
psi_decl_type_init(PSI_T_FUNCTION, name->text),
psi_decl_var_copy($decl->func->var)
| decl_arg %dprec 2 {
$arg = $decl_arg;
}
-| qualified_decl_type[type] indirection %dprec 1 {
+| qualified_decl_type[type] indirection array_size[as] %dprec 1 {
$arg = psi_decl_arg_init(
- $type,
- psi_decl_var_init(NULL, $indirection, 0)
+ $type,
+ psi_decl_var_init(NULL, $indirection, $as)
);
}
/*
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);
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);
$vars = psi_plist_add($vars_, &arg);
}
}
+| decl_layout[layout] {
+ {
+ struct psi_decl_var *var = psi_decl_var_init(NULL, 0, 0);
+ 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_layout[layout] {
+ {
+ struct psi_decl_var *var = psi_decl_var_init(NULL, 0, 0);
+ struct psi_decl_arg *arg = psi_decl_arg_init(NULL, var);
+ arg->layout = $layout;
+ $vars = psi_plist_add($vars_, &arg);
+ }
+}
;
decl_enum[enum]:
$sizeof = psi_number_init(PSI_T_INT8, &sizeof_a, 0);
}
| QUOTED_STRING {
- uint64_t len = $QUOTED_STRING->size + 1;
+ uint64_t len = $QUOTED_STRING->text->len + 1;
$sizeof = psi_number_init(PSI_T_UINT64, &len, 0);
}
;
$l = NULL;
}
| COLON NUMBER[width] {
- $l = psi_layout_init(0, 0, psi_layout_init(0, atol($width->text), NULL));
+ $l = psi_layout_init(0, 0, psi_layout_init(0, atol($width->text->val), NULL));
}
| COLON COLON LPAREN NUMBER[align] COMMA NUMBER[size] RPAREN {
- $l = psi_layout_init(atol($align->text), atol($size->text), NULL);
+ $l = psi_layout_init(atol($align->text->val), atol($size->text->val), 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));
+ $l = psi_layout_init(atol($align->text->val), atol($size->text->val), psi_layout_init(0, atol($width->text->val), NULL));
}
;
$as.len = 0;
}
| COLON COLON LPAREN NUMBER[align] COMMA NUMBER[size] RPAREN {
- $as.pos = atol($align->text);
- $as.len = atol($size->text);
+ $as.pos = atol($align->text->val);
+ $as.len = atol($size->text->val);
}
;
| LBRACKET num_exp RBRACKET {
struct psi_validate_scope scope = {0};
psi_validate_scope_ctor(&scope);
- scope.defs = &P->preproc->defs;
+ scope.cpp = P->preproc;
if (psi_num_exp_validate(PSI_DATA(P), $num_exp, &scope)) {
- $as = psi_num_exp_get_long($num_exp, NULL, &P->preproc->defs);
+ $as = psi_num_exp_get_long($num_exp, NULL, P->preproc);
} else {
$as = 0;
}
;
impl_type_restricted_token:
- BOOL
+ BOOL
| INT
| FLOAT
| STRING
+| MIXED
;
impl_type_extended_token:
VOID
-| MIXED
| ARRAY
| OBJECT
| CALLABLE
}
;
-let_exp_assign[exp]:
+let_exp_assign[exp]:
decl_var[var] EQUALS let_exp_byref[exp_] {
$exp = $exp_;
$exp->var = $var;
;
let_func_token:
- ZVAL
-| OBJVAL
-| ARRVAL
-| PATHVAL
-| STRLEN
-| STRVAL
-| FLOATVAL
-| INTVAL
-| BOOLVAL
-| COUNT
+ ZVAL
+| OBJVAL
+| ARRVAL
+| PATHVAL
+| STRLEN
+| STRVAL
+| FLOATVAL
+| INTVAL
+| BOOLVAL
+| COUNT
;
let_func_exps[exps]:
/* epilogue */
+#define PSI_DEBUG_LEX 0
static int psi_parser_proc_lex(YYSTYPE *lvalp, struct psi_parser *P, struct psi_plist *tokens, size_t *index)
{
struct psi_token *token;
-
- if (psi_plist_get(tokens, (*index)++, &token)) {
- if (P->flags & PSI_DEBUG) {
- psi_token_dump(2, token);
- }
-
+#if PSI_DEBUG_LEX
+ PSI_DEBUG_PRINT(P, "PSI: LEX index %4zu ", *index);
+#endif
+ if (psi_plist_get(tokens, (*index)++, &token) && token) {
+#if PSI_DEBUG_LEX
+ PSI_DEBUG_DUMP(P, psi_token_dump, token);
+#endif
*((struct psi_token **)lvalp) = token;
return token->type;
} else {
+#if PSI_DEBUG_LEX
+ PSI_DEBUG_PRINT(P, "EOF\n");
+#endif
(*index)--;
- PSI_DEBUG_PRINT(P, "EOF(%d)\n", PSI_T_EOF);
}
return PSI_T_EOF;
{
struct psi_token *T = NULL;
size_t last;
-
+
if (*index == 0) {
last = 0;
- } else {
+ } else {
last = --(*index);
}
-
+
psi_plist_get(tokens, last, &T);
if (T) {
+ size_t i = (last >= 5) ? last - 5 : 0;
+
P->error(PSI_DATA(P), T, PSI_WARNING, "PSI %s at col %u", msg, T->col);
+ while (i <= last || T->type != PSI_T_EOS) {
+ const char *pos;
+
+ if (!psi_plist_get(tokens, i++, &T)) {
+ break;
+ }
+
+ if (i < last + 1) {
+ pos = "preceding";
+ } else if (i > last + 1) {
+ pos = "following";
+ } else {
+ pos = "offending";
+ }
+
+ P->error(PSI_DATA(P), T, PSI_WARNING, "PSI %s token '%s' at col %u",
+ pos, T ? T->text->val : "<deleted>", T ? T->col : 0);
+ }
} else {
P->error(PSI_DATA(P), NULL, PSI_WARNING, "PSI %s", msg);
}