zval passthru

[m6w6/ext-psi] / src / parser_proc.y

diff --git a/src/parser_proc.y b/src/parser_proc.y
index c28ff5914aeff7dd04b2a0c2c6e9d7decff64493..6a582cba4fffc4157d12383f9b97eb2a9ffbe2c2 100644 (file)
--- a/src/parser_proc.y
+++ b/src/parser_proc.y
@@ -29,7 +29,7 @@ void psi_error(int, const char *, int, const char *, ...);
 %nonassoc NAME.
 %left PLUS MINUS.
 %left SLASH ASTERISK.
-%fallback NAME TEMP FREE SET LET RETURN CALLOC LIB STRING.
+%fallback NAME TEMP FREE SET LET RETURN CALLOC CALLBACK ZVAL LIB STRING.
 
 file ::= blocks.
 
@@ -280,7 +280,12 @@ decl_typedef_body_ex(def) ::= decl_enum(e) NAME(ALIAS). {
 decl_typedef_body(def) ::= decl_typedef_body_ex(def_). {
        def = def_;
 }
-decl_typedef_body(def) ::= decl_func(func_) LPAREN decl_args(args) RPAREN. {
+%type decl_typedef_body_fn_args {decl_args *}
+%destructor decl_typedef_body_fn_args {free_decl_args($$);}
+decl_typedef_body_fn_args(args) ::= LPAREN decl_args(args_) RPAREN. {
+       args = args_;
+}
+decl_typedef_body(def) ::= decl_func(func_) decl_typedef_body_fn_args(args). {
        def = init_decl_arg(init_decl_type(PSI_T_FUNCTION, func_->var->name), copy_decl_var(func_->var));
        def->type->token = PSI_TokenCopy(func_->token);
        def->type->func = init_decl(init_decl_abi("default"), func_, args);
@@ -310,6 +315,30 @@ decl_func(func) ::= VOID(T) NAME(N). {
        func->var->token = N;
        func->token = N;
 }
+decl_typedef_body(def) ::= VOID(T) indirection(i) LPAREN ASTERISK NAME(N) RPAREN decl_typedef_body_fn_args(args). {
+       decl_arg *func_ = init_decl_arg(
+               init_decl_type(T->type, T->text),
+               init_decl_var(N->text, i, 0)
+       );
+       func_->type->token = T;
+       func_->var->token = N;
+       func_->token = N;
+       def = init_decl_arg(init_decl_type(PSI_T_FUNCTION, func_->var->name), copy_decl_var(func_->var));
+       def->type->token = PSI_TokenCopy(func_->token);
+       def->type->func = init_decl(init_decl_abi("default"), func_, args);
+}
+decl_typedef_body(def) ::= CONST VOID(T) pointers(i) LPAREN ASTERISK NAME(N) RPAREN decl_typedef_body_fn_args(args). {
+       decl_arg *func_ = init_decl_arg(
+               init_decl_type(T->type, T->text),
+               init_decl_var(N->text, i, 0)
+       );
+       func_->type->token = T;
+       func_->var->token = N;
+       func_->token = N;
+       def = init_decl_arg(init_decl_type(PSI_T_FUNCTION, func_->var->name), copy_decl_var(func_->var));
+       def->type->token = PSI_TokenCopy(func_->token);
+       def->type->func = init_decl(init_decl_abi("default"), func_, args);
+}
 
 %type decl_abi {decl_abi*}
 %destructor decl_abi {free_decl_abi($$);}
@@ -344,6 +373,18 @@ decl_vars(vars) ::= decl_vars(vars_) COMMA decl_var(var). {
 decl_arg(arg_) ::= const_decl_type(type) decl_var(var). {
        arg_ = init_decl_arg(type, var);
 }
+decl_typedef_body(def) ::= const_decl_type(type_) indirection(i) LPAREN ASTERISK NAME(N) RPAREN decl_typedef_body_fn_args(args). {
+       decl_arg *func_ = init_decl_arg(
+               type_,
+               init_decl_var(N->text, i, 0)
+       );
+       func_->var->token = N;
+       func_->token = N;
+       def = init_decl_arg(init_decl_type(PSI_T_FUNCTION, func_->var->name), copy_decl_var(func_->var));
+       def->type->token = PSI_TokenCopy(func_->token);
+       def->type->func = init_decl(init_decl_abi("default"), func_, args);
+}
+
 /* void pointers need a specific rule */
 decl_arg(arg_) ::= VOID(T) pointers(p) NAME(N). {
        arg_ = init_decl_arg(
@@ -560,7 +601,7 @@ impl_def_val(def) ::= impl_def_val_token(T). {
 
 %type impl_var {impl_var*}
 %destructor impl_var {free_impl_var($$);}
-impl_var(var) ::= reference(r) DOLLAR NAME(T). {
+impl_var(var) ::= reference(r) DOLLAR_NAME(T). {
        var = init_impl_var(T->text, r);
        var->token = T;
 }
@@ -589,7 +630,7 @@ impl_args(args) ::= LPAREN impl_arg_list(args_) COMMA impl_vararg(va) RPAREN. {
 
 %type impl_vararg {impl_arg*}
 %destructor impl_vararg {free_impl_arg($$);}
-impl_vararg(va) ::= impl_type(type) reference(r) ELLIPSIS DOLLAR NAME(T). {
+impl_vararg(va) ::= impl_type(type) reference(r) ELLIPSIS DOLLAR_NAME(T). {
        va = init_impl_arg(type, init_impl_var(T->text, r), NULL);
        free(T);
 }
@@ -659,6 +700,35 @@ let_stmt(let) ::= TEMP decl_var(var) EQUALS decl_var(val) EOS. {
        let = init_let_stmt(var, init_let_val(PSI_LET_TMP, val));
 }
 
+%type let_calloc {let_calloc*}
+%destructor let_calloc {free_let_calloc($$);}
+let_calloc(alloc) ::= num_exp(nmemb) COMMA num_exp(size). {
+       alloc = init_let_calloc(nmemb, size);
+}
+%token_class let_func_token ZVAL OBJVAL ARRVAL PATHVAL STRLEN STRVAL FLOATVAL INTVAL BOOLVAL.
+%type let_func {let_func*}
+%destructor let_func {free_let_func($$);}
+let_func(func) ::= let_func_token(T) LPAREN impl_var(var) RPAREN. {
+       func = init_let_func(T->type, T->text, var);
+       free(T);
+}
+
+%type callback_arg_list {set_values *}
+%destructor callback_arg_list {free_set_values($$);}
+callback_arg_list ::= .
+callback_arg_list(args) ::= callback_args(args_). {
+       args = args_;
+}
+
+%type callback_args {set_values *}
+%destructor callback_args {free_set_values($$);}
+callback_args(args) ::= set_value(val). {
+       args = init_set_values(val);
+}
+callback_args(args) ::= callback_args(args_) COMMA set_value(val). {
+       args = add_set_value(args_, val);
+}
+
 %type let_val {let_val*}
 %destructor let_val {free_let_val($$);}
 let_val(val) ::= NULL. {
@@ -673,21 +743,12 @@ let_val(val) ::= CALLOC LPAREN let_calloc(alloc) RPAREN. {
 let_val(val) ::= let_func(func). {
        val = init_let_val(PSI_LET_FUNC, func);
 }
-
-%type let_calloc {let_calloc*}
-%destructor let_calloc {free_let_calloc($$);}
-let_calloc(alloc) ::= num_exp(nmemb) COMMA num_exp(size). {
-       alloc = init_let_calloc(nmemb, size);
-}
-%token_class let_func_token OBJVAL ARRVAL PATHVAL STRLEN STRVAL FLOATVAL INTVAL BOOLVAL.
-%type let_func {let_func*}
-%destructor let_func {free_let_func($$);}
-let_func(func) ::= let_func_token(T) LPAREN impl_var(var) RPAREN. {
-       func = init_let_func(T->type, T->text, var);
-       free(T);
+let_val(val) ::= CALLBACK let_func_token(F) LPAREN impl_var(var) LPAREN callback_arg_list(args_) RPAREN RPAREN. {
+       val = init_let_val(PSI_LET_CALLBACK, init_let_callback(
+               init_let_func(F->type, F->text, var), args_));
+       free(F);
 }
 
-
 %type set_stmt {set_stmt*}
 %destructor set_stmt {free_set_stmt($$);}
 set_stmt(set) ::= SET impl_var(var) EQUALS set_value(val) EOS. {
@@ -728,7 +789,7 @@ set_vals(vals) ::= set_vals(vals_) COMMA set_value(val). {
        vals = add_inner_set_value(vals_, val);
 }
 
-%token_class set_func_token TO_OBJECT TO_ARRAY TO_STRING TO_INT TO_FLOAT TO_BOOL VOID.
+%token_class set_func_token TO_OBJECT TO_ARRAY TO_STRING TO_INT TO_FLOAT TO_BOOL ZVAL VOID.
 %type set_func {set_func*}
 %destructor set_func {free_set_func($$);}
 set_func(func) ::= set_func_token(T). {
@@ -765,7 +826,7 @@ free_call(call) ::= NAME(F) LPAREN decl_vars(vars) RPAREN. {
        call->token = F;
 }
 
-%token_class impl_type_token VOID MIXED BOOL INT FLOAT STRING ARRAY OBJECT.
+%token_class impl_type_token VOID MIXED BOOL INT FLOAT STRING ARRAY OBJECT CALLABLE.
 %type impl_type {impl_type*}
 %destructor impl_type {free_impl_type($$);}
 impl_type(type_) ::= impl_type_token(T). {