X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser_proc_grammar.y;h=570af95fd3f11ad362e234061be2449f522a9d1b;hp=b3e20d334c0e397c4bdf85c57c23d8f03a668c28;hb=4fd6435041048363289eb7b9243cee39b6901e4e;hpb=440ff658995f1378fd74c0101ff6c2b4951ffdf9

diff --git a/src/parser_proc_grammar.y b/src/parser_proc_grammar.y
index b3e20d3..570af95 100644
--- a/src/parser_proc_grammar.y
+++ b/src/parser_proc_grammar.y
@@ -39,12 +39,37 @@ 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_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) {
@@ -83,6 +108,11 @@ static inline void psi_parser_proc_add_impl(struct psi_parser *P, struct psi_imp
 #include "plist.h"
 #include "types/layout.h"
 
+#define yytokentype psi_token_type
+
+#define PSI_T_CAST			PSI_T_EQUALS
+#define PSI_T_POINTER		PSI_T_ASTERISK
+
 struct psi_parser;
 
 }
@@ -206,6 +236,7 @@ struct psi_parser;
 %token <struct psi_token *> TEMP
 %token <struct psi_token *> FREE
 %token <struct psi_token *> RETURN
+%token <struct psi_token *> AS
 %token <struct psi_token *> PRE_ASSERT
 %token <struct psi_token *> POST_ASSERT
 %token <struct psi_token *> BOOLVAL
@@ -236,6 +267,21 @@ struct psi_parser;
 %token <struct psi_token *> CPP_RESTRICT
 %token <struct psi_token *> CPP_ASM
 
+/* virtual tokens */
+%token <struct psi_token *> BSLASH
+%token <struct psi_token *> LONG_DOUBLE
+%token <struct psi_token *> INT8
+%token <struct psi_token *> UINT8
+%token <struct psi_token *> INT16
+%token <struct psi_token *> UINT16
+%token <struct psi_token *> INT32
+%token <struct psi_token *> UINT32
+%token <struct psi_token *> INT64
+%token <struct psi_token *> UINT64
+%token <struct psi_token *> INT128
+%token <struct psi_token *> UINT128
+
+
 %precedence IIF COLON
 %precedence OR
 %precedence AND
@@ -304,8 +350,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 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_plist *>				decl_args decl_arg_list decl_struct_args struct_args_block struct_args struct_arg_var_list decl_enum_items decl_vars decl_vars_with_layout call_decl_vars
+%destructor	{psi_plist_free($$);}				decl_args decl_arg_list decl_struct_args struct_args_block struct_args struct_arg_var_list decl_enum_items decl_vars decl_vars_with_layout call_decl_vars
 
 %type		<struct psi_layout>					align_and_size
 %destructor	{}									align_and_size
@@ -346,6 +392,8 @@ struct psi_parser;
 %destructor	{psi_assert_stmt_free(&$$);}		assert_stmt
 %type		<struct psi_return_stmt *>			return_stmt
 %destructor	{psi_return_stmt_free(&$$);}		return_stmt
+%type		<struct psi_return_exp *>			return_exp
+%destructor	{psi_return_exp_free(&$$);}			return_exp
 %type		<struct psi_free_stmt *>			free_stmt
 %destructor	{psi_free_stmt_free(&$$);}			free_stmt
 %type		<struct psi_free_exp *>				free_exp
@@ -375,9 +423,9 @@ 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 | 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 | 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;
-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;
+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;
 
 
 file:
@@ -712,7 +760,7 @@ impl_def_val[val]:
 	%empty {
 	$val = NULL;
 }
-|	num_exp[num] {
+|	num_exp[num] %dprec 1 {
 	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);
@@ -743,7 +791,7 @@ impl_def_val[val]:
 	}
 	psi_num_exp_free(&$num);
 }
-|	impl_def_val_token[token] {
+|	impl_def_val_token[token] %dprec 2 {
 	$val = psi_impl_def_val_init($token->type, $token->text);
 	$val->token = psi_token_copy($token);
 }
@@ -834,8 +882,8 @@ typedef_decl[def]:
 ;
 
 typedef_anon_decl[def]:
-	typedef_decl
-|	qualified_decl_type[type] {
+	typedef_decl %dprec 2
+|	qualified_decl_type[type] %dprec 1 {
 	$def = psi_decl_arg_init($type, psi_decl_var_init(NULL, 0, 0));
 	$def->var->token = psi_token_copy($type->token);
 }
@@ -972,6 +1020,9 @@ int_signed_types[type]:
 	%empty {
 	$type = NULL;
 }
+|	NAME {
+	$type = psi_token_copy($NAME);
+}
 |	CHAR {
 	$type = psi_token_copy($CHAR);
 }
@@ -1209,20 +1260,26 @@ decl_args[args]:
 |	VOID {
 	$args = NULL;
 }
-|	decl_anon_arg[arg] {
+|	decl_arg_list[args_] {
+	$args = $args_;
+}
+;
+
+decl_arg_list[args]:
+	decl_anon_arg[arg] {
 	$args = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &$arg);
 }
-|	decl_args[args_] COMMA decl_anon_arg[arg] {
+|	decl_arg_list[args_] COMMA decl_anon_arg[arg] {
 	$args = psi_plist_add($args_, &$arg);
 }
 ;
 
 decl_anon_arg[arg]:
 /* FIXME decl_functor_body_anon */
-	decl_arg {
+	decl_arg %dprec 2 {
 	$arg = $decl_arg;
 }
-|	qualified_decl_type[type] indirection {
+|	qualified_decl_type[type] indirection %dprec 1 {
 	$arg = psi_decl_arg_init(
 		$type, 
 		psi_decl_var_init(NULL, $indirection, 0)
@@ -1386,7 +1443,7 @@ decl_vars_with_layout[vars]:
 ;
 
 decl_enum[enum]:
-	enum_name LBRACE decl_enum_items[list] RBRACE {
+	enum_name LBRACE decl_enum_items[list] optional_comma RBRACE {
 	$enum = psi_decl_enum_init($enum_name->text, $list);
 	$enum->token = $enum_name;
 }
@@ -1454,6 +1511,10 @@ number[num]:
 	$num = psi_number_init($token->type, $token->text, 0);
 	$num->token = psi_token_copy($token);
 }
+|	NULL[token] {
+	$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, 0);
 	$num->token = psi_token_copy($decl_var->token);
@@ -1482,6 +1543,7 @@ sizeof_body[sizeof]:
 	if ($indirection) {
 		int8_t sizeof_void_p = sizeof(void *);
 		$sizeof = psi_number_init(PSI_T_INT8, &sizeof_void_p, 0);
+		psi_decl_type_free(&$decl_type);
 	} else {
 		$sizeof = psi_number_init(PSI_T_SIZEOF, $decl_type, 0);
 	}
@@ -1551,6 +1613,11 @@ optional_name[name]:
 }
 ;
 
+optional_comma:
+	%empty
+|	COMMA
+;
+
 decl_layout[l]:
 	%empty {
 	$l = NULL;
@@ -1584,12 +1651,16 @@ array_size[as]:
 |	LBRACKET RBRACKET {
 	$as = 0;
 }
+|	LBRACKET CPP_RESTRICT RBRACKET {
+	$as = 0;
+}
 |	LBRACKET num_exp RBRACKET {
 	if (psi_num_exp_validate(PSI_DATA(P), $num_exp, NULL, NULL, NULL, NULL, NULL)) {
 		$as = psi_long_num_exp($num_exp, NULL, &P->preproc->defs);
 	} else {
 		$as = 0;
 	}
+	psi_num_exp_free(&$num_exp);
 }
 ;
 
@@ -1755,9 +1826,12 @@ let_exp[exp]:
 ;
 
 let_exp_byref[exp]:
-	NULL {
+	NULL %dprec 2 {
 	$exp = psi_let_exp_init(PSI_LET_NULL, NULL);
 }
+|	num_exp[num] %dprec 1 {
+	$exp = psi_let_exp_init_ex(NULL, PSI_LET_NUMEXP, $num);
+}
 |	let_calloc[calloc] {
 	$exp = psi_let_exp_init(PSI_LET_CALLOC, $calloc);
 }
@@ -1771,9 +1845,6 @@ let_exp_byref[exp]:
 |	let_func[func] {
 	$exp = psi_let_exp_init_ex(NULL, PSI_LET_FUNC, $func);
 }
-|	num_exp[num] {
-	$exp = psi_let_exp_init_ex(NULL, PSI_LET_NUMEXP, $num);
-}
 ;
 
 let_exp_assign[exp]: 
@@ -1797,7 +1868,12 @@ let_calloc[calloc]:
 
 let_callback[callback]:
 	CALLBACK callback_rval[func] LPAREN impl_var[var] LPAREN callback_arg_list[args] RPAREN RPAREN {
-	$callback = psi_let_callback_init(psi_let_func_init($func->type, $func->text, $var), $args);
+	$callback = psi_let_callback_init(psi_let_func_init($func->type, $func->text, $var), $args, NULL);
+	$callback->func->token = psi_token_copy($func);
+	$callback->token = psi_token_copy($CALLBACK);
+}
+|	CALLBACK LPAREN call_decl_vars[cb_args] RPAREN AS callback_rval[func] LPAREN impl_var[var] LPAREN callback_arg_list[args] RPAREN RPAREN {
+	$callback = psi_let_callback_init(psi_let_func_init($func->type, $func->text, $var), $args, $cb_args);
 	$callback->func->token = psi_token_copy($func);
 	$callback->token = psi_token_copy($CALLBACK);
 }
@@ -1866,12 +1942,35 @@ callback_args[args]:
 ;
 
 return_stmt[return]:
-	RETURN set_func[func] EOS {
-	$return = psi_return_stmt_init(psi_set_exp_init(PSI_SET_FUNC, $func));
+	RETURN return_exp EOS {
+	$return = psi_return_stmt_init($return_exp);
 	$return->token = psi_token_copy($RETURN);
 }
 ;
 
+return_exp:
+	decl_var[func] LPAREN call_decl_vars[args] RPAREN AS set_func {
+	$return_exp = psi_return_exp_init($func, $args, psi_set_exp_init(PSI_SET_FUNC, $set_func));
+	$return_exp->token = psi_token_copy($func->token);
+}
+|	set_func {
+	$return_exp = psi_return_exp_init(NULL, NULL, psi_set_exp_init(PSI_SET_FUNC, $set_func));
+	$return_exp->token = psi_token_copy($set_func->token);
+}
+;
+
+call_decl_vars[args]:
+	%empty {
+	$args = NULL;
+}
+|	VOID {
+	$args = NULL;
+}
+|	decl_vars[vars] {
+	$args = $vars;
+}
+;
+
 set_stmt[set]:
 	SET set_exp[exp] EOS {
 	$set = psi_set_stmt_init($exp);