X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser_proc_grammar.y;h=db96b0147b30ea3d95abb293ded0ccaac7a95973;hp=f4c1bc0a3d7045abc53995affff4e851ea0202cd;hb=4e221dbe150560ad8847606164b80020249f136e;hpb=ba906e039ffe9e57842ce5135aa43efa00b8a4c6

diff --git a/src/parser_proc_grammar.y b/src/parser_proc_grammar.y
index f4c1bc0..db96b01 100644
--- a/src/parser_proc_grammar.y
+++ b/src/parser_proc_grammar.y
@@ -192,7 +192,8 @@ struct psi_parser;
 %token <struct psi_token *> IIF			"?"
 
 %token <struct psi_token *> PRAGMA
-%token <struct psi_token *> ONCE
+%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
@@ -246,6 +247,10 @@ struct psi_parser;
 %token <struct psi_token *> NO_WHITESPACE
 %token <struct psi_token *> CPP_HEADER
 %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
@@ -265,8 +270,8 @@ struct psi_parser;
 %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
@@ -304,10 +309,10 @@ struct psi_parser;
 
 %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 decl_anon_arg typedef
+%destructor	{psi_decl_arg_free(&$$);}			decl_typedef decl_func decl_functor decl_arg decl_anon_arg typedef
 %type		<struct psi_decl_var *>				decl_var
 %destructor	{psi_decl_var_free(&$$);}			decl_var
 %type		<struct psi_decl_struct *>			decl_struct
@@ -318,8 +323,8 @@ struct psi_parser;
 %destructor	{psi_decl_enum_free(&$$);}			decl_enum
 %type		<struct psi_decl_enum_item *>		decl_enum_item
 %destructor	{psi_decl_enum_item_free(&$$);}		decl_enum_item
-%type		<struct psi_plist *>				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		<struct psi_plist *>				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		<struct psi_layout>					align_and_size
 %destructor	{}									align_and_size
@@ -374,13 +379,11 @@ struct psi_parser;
 %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 */
@@ -388,8 +391,8 @@ 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 | ZVAL | LIB | STRING | COUNT | ERROR | WARNING | ONCE | PRAGMA | 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 | 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;
+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;
 
 
 file:
@@ -413,9 +416,9 @@ block:
 |	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 {
@@ -424,6 +427,7 @@ block:
 |	decl_stmt {
 	psi_parser_proc_add_decl(P, $decl_stmt);
 }
+|	decl_ext_var_stmt
 |	decl_typedef[def] {
 	psi_parser_proc_add_typedef(P, $def);
 }
@@ -448,7 +452,10 @@ lib:
 ;
 
 cpp:
-	HASH cpp_exp[exp] EOL {
+	HASH EOL {
+	$cpp = NULL;
+}
+|	HASH cpp_exp[exp] EOL {
 	$cpp = $exp;
 }
 ;
@@ -485,12 +492,7 @@ cpp_exp[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);
@@ -503,16 +505,21 @@ cpp_exp[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($ONCE->type, NULL);
-	$exp->token = psi_token_copy($ONCE);
+| 	PRAGMA_ONCE {
+	$exp = psi_cpp_exp_init($PRAGMA_ONCE->type, NULL);
+	$exp->token = psi_token_copy($PRAGMA_ONCE);
 }
-|	PRAGMA cpp_macro_decl_tokens[tokens] {
+|	cpp_ignored_token cpp_macro_decl_tokens[tokens] {
 	psi_plist_free($tokens);
 	$exp = NULL;
 }
 ;
 
+cpp_ignored_token:
+	LINE
+|	PRAGMA
+;
+
 cpp_message_token: 
 	ERROR
 |	WARNING
@@ -545,18 +552,22 @@ cpp_exp_arg_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);
@@ -672,7 +683,7 @@ cpp_macro_call_args[args]:
 
 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 {
@@ -722,11 +733,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)
@@ -935,36 +949,91 @@ int_width_types[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_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;
@@ -973,19 +1042,16 @@ decl:
 }
 ;
 
-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),
@@ -995,7 +1061,8 @@ decl_functor[arg]:
 	$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),
@@ -1005,7 +1072,8 @@ decl_functor[arg]:
 	$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),
@@ -1037,16 +1105,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] {
@@ -1118,19 +1225,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);
+	}
 }
 ;
 
@@ -1262,8 +1409,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));
 }
 ;
 
@@ -1297,11 +1450,18 @@ indirection[i]:
 ;
 
 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;
 }
 ;
 
@@ -1648,15 +1808,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;