X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser_proc_grammar.y;h=22733b78c6c19bae89eb6c547973b5cf8e28a0ad;hp=feff14a23cdaaec27bc183191da012652a59dc38;hb=77d63a537de5430f5f8f177c842fa99d65f685bf;hpb=b09850fb2c28c23547fed5ac83faf0fa2d3e6b8b

diff --git a/src/parser_proc_grammar.y b/src/parser_proc_grammar.y
index feff14a..22733b7 100644
--- a/src/parser_proc_grammar.y
+++ b/src/parser_proc_grammar.y
@@ -311,8 +311,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 typedef
-%destructor	{psi_decl_arg_free(&$$);}			decl_typedef decl_func decl_functor decl_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
@@ -391,7 +391,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;
 
 
@@ -715,6 +715,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 +754,6 @@ impl_def_val[val]:
 
 impl_def_val_token:
 	NULL
-|	NUMBER
 |	TRUE
 |	FALSE
 |	QUOTED_STRING
@@ -733,6 +763,9 @@ decl_typedef[def]:
 	TYPEDEF typedef[def_] EOS {
 	$def = $def_;
 }
+|	CPP_EXTENSION TYPEDEF typedef[def_] EOS {
+	$def = $def_;
+}
 ;
 
 typedef[def]:
@@ -1102,14 +1135,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(
@@ -1569,6 +1633,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);
 }