X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser_proc_grammar.y;h=4b099632ca04385684b975c305dc05d69378739b;hp=f1205accbc8f509b4ecb8be05a2c1b391e762f41;hb=3d77b5b65efb78c1da9485dfde1fcd417066b803;hpb=c5b2de8ed1d92dd42f910d4347d9175f27e3acbb

diff --git a/src/parser_proc_grammar.y b/src/parser_proc_grammar.y
index f1205ac..4b09963 100644
--- a/src/parser_proc_grammar.y
+++ b/src/parser_proc_grammar.y
@@ -37,24 +37,6 @@ 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_add_from_typedef(struct psi_parser *P, struct psi_decl_arg *def)
-{
-	if (def->type->real.def) {
-		switch (def->type->type) {
-		case PSI_T_STRUCT:
-			psi_parser_proc_add_struct(P, def->type->real.strct);
-			break;
-		case PSI_T_UNION:
-			psi_parser_proc_add_union(P, def->type->real.unn);
-			break;
-		case PSI_T_ENUM:
-			psi_parser_proc_add_enum(P, def->type->real.enm);
-			break;
-		default:
-			break;
-		}
-	}
-}
 static inline void psi_parser_proc_add_typedef(struct psi_parser *P, struct psi_decl_arg *def)
 {
 	assert(def);
@@ -62,7 +44,6 @@ static inline void psi_parser_proc_add_typedef(struct psi_parser *P, struct psi_
 		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) {
 	assert(cnst);
@@ -311,8 +292,8 @@ struct psi_parser;
 %destructor	{psi_decl_type_free(&$$);}			decl_type const_decl_type decl_type_complex
 %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_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
@@ -323,8 +304,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
@@ -391,7 +372,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;
 
 
@@ -578,7 +559,13 @@ cpp_macro_sig[sig]:
 	%empty {
 	$sig = psi_plist_init(NULL);
 }
+|	ELLIPSIS {
+	$sig = psi_plist_init(NULL); /* FIXME */
+}
 |	cpp_macro_sig_args
+|	cpp_macro_sig_args[args] COMMA ELLIPSIS {
+	$sig = $args;
+}
 ;
 
 cpp_macro_sig_args[args]:
@@ -715,6 +702,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 +741,6 @@ impl_def_val[val]:
 
 impl_def_val_token:
 	NULL
-|	NUMBER
 |	TRUE
 |	FALSE
 |	QUOTED_STRING
@@ -733,6 +750,18 @@ decl_typedef[def]:
 	TYPEDEF typedef[def_] EOS {
 	$def = $def_;
 }
+|	TYPEDEF VOID name_token EOS {
+	$def = psi_decl_arg_init(
+		psi_decl_type_init(PSI_T_VOID, $VOID->text),
+		psi_decl_var_init($name_token->text, 0, 0)
+	);
+	$def->token = psi_token_copy($VOID);
+	$def->type->token = psi_token_copy($VOID);
+	$def->var->token = psi_token_copy($name_token);
+}
+|	CPP_EXTENSION TYPEDEF typedef[def_] EOS {
+	$def = $def_;
+}
 ;
 
 typedef[def]:
@@ -754,6 +783,7 @@ typedef[def]:
 	$def->var->token = psi_token_copy($name_token);
 	$def->type->token = psi_token_copy($enum->token);
 	$def->type->real.enm = $enum;
+	psi_parser_proc_add_enum(P, $enum);
 }
 |	struct_name[struct] align_and_size[as] struct_args_block[args] decl_var[var] {
 	$def = psi_decl_arg_init(psi_decl_type_init(PSI_T_STRUCT, $struct->text), $var);
@@ -762,6 +792,7 @@ typedef[def]:
 	$def->type->real.strct->token = psi_token_copy($struct);
 	$def->type->real.strct->align = $as.pos;
 	$def->type->real.strct->size = $as.len;
+	psi_parser_proc_add_struct(P, $def->type->real.strct);
 }
 |	union_name[union] align_and_size[as] struct_args_block[args] decl_var[var] {
 	$def = psi_decl_arg_init(psi_decl_type_init(PSI_T_UNION, $union->text), $var);
@@ -770,6 +801,7 @@ typedef[def]:
 	$def->type->real.unn->token = psi_token_copy($union);
 	$def->type->real.unn->align = $as.pos;
 	$def->type->real.unn->size = $as.len;
+	psi_parser_proc_add_union(P, $def->type->real.unn);
 }
 |	const_decl_type[type] decl_stdint_type[stdint] {
 	$stdint->type = PSI_T_NAME;
@@ -981,6 +1013,15 @@ 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_body
 |	NAME[abi] decl_body {
@@ -1093,14 +1134,45 @@ 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]:
 	decl_functor_body[decl] {
 	$arg = psi_decl_arg_init(
@@ -1182,19 +1254,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);
+	}
 }
 ;
 
@@ -1326,8 +1438,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));
 }
 ;
 
@@ -1346,6 +1464,9 @@ array_size[as]:
 	%empty {
 	$as = 0;
 }
+|	LBRACKET RBRACKET {
+	$as = 0;
+}
 |	LBRACKET NUMBER RBRACKET {
 	$as = atol($NUMBER->text);
 }
@@ -1368,14 +1489,19 @@ pointers[p]:
 ;
 
 asterisks[a]:
-	ASTERISK {
+	asterisk {
 	$a = 1;
 }
-|	asterisks[a_] ASTERISK {
+|	asterisks[a_] asterisk {
 	$a = $a_ + 1;
 }
 ;
 
+asterisk:
+	ASTERISK
+|	ASTERISK CONST
+;
+
 /*
  *
  * impl
@@ -1514,6 +1640,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);
 }
@@ -1719,15 +1849,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;