X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fparser_proc.y;h=a5696b51711abc984e2419f53abaf3631b7c4b39;hb=5e240548ba570610ce0dbc248a2b7654a0e080fa;hp=409987729a8a1dca3f20f46a8ce3df03aebe14d6;hpb=04a60b34fc18ea3a2638893eaf24514177692eeb;p=m6w6%2Fext-psi

diff --git a/src/parser_proc.y b/src/parser_proc.y
index 4099877..a5696b5 100644
--- a/src/parser_proc.y
+++ b/src/parser_proc.y
@@ -1,4 +1,10 @@
 %include {
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
+
 #include <stddef.h>
 #include <assert.h>
 #include <stdlib.h>
@@ -7,24 +13,24 @@
 
 #include "parser.h"
 }
-%include { void psi_error(int, const char *, int, const char *, ...); }
-%name PSI_ParserProc
+%name psi_parser_proc_
 %token_prefix PSI_T_
-%token_type {PSI_Token *}
+%token_type {struct psi_token *}
 %token_destructor {free($$);}
 %default_destructor {(void)P;}
-%extra_argument {PSI_Parser *P}
-%syntax_error { ++P->errors; if (TOKEN && TOKEN->type != PSI_T_EOF) { psi_error(PSI_WARNING, TOKEN->file, TOKEN->line, "PSI syntax error: Unexpected token '%s'", TOKEN->text); } else { psi_error(PSI_WARNING, P->psi.file.fn, P->line, "PSI syntax error: Unexpected end of input"); } }
+%extra_argument {struct psi_parser *P}
+%syntax_error { ++P->errors; if (TOKEN && TOKEN->type != PSI_T_EOF) { psi_error(PSI_WARNING, TOKEN->file, TOKEN->line, "PSI syntax error: Unexpected token '%s' at pos %u", TOKEN->text, TOKEN->col); } else { psi_error(PSI_WARNING, P->psi.file.fn, P->line, "PSI syntax error: Unexpected end of input"); } }
 %nonassoc NAME.
 %left PLUS MINUS.
-%left SLASH ASTERISK.
-%fallback NAME TEMP FREE SET LET RETURN CALLOC CALLBACK ZVAL LIB STRING.
+%left ASTERISK SLASH.
+%nonassoc AMPERSAND.
+%fallback NAME TEMP FREE SET LET RETURN CALLOC CALLBACK ZVAL LIB STRING COUNT.
 %token_class const_type_token BOOL INT FLOAT STRING.
 %token_class decl_type_token FLOAT DOUBLE INT8 UINT8 INT16 UINT16 INT32 UINT32 INT64 UINT64 NAME.
 %token_class impl_def_val_token NULL NUMBER TRUE FALSE QUOTED_STRING.
 %token_class num_exp_token NUMBER NSNAME.
 %token_class num_exp_op_token PLUS MINUS ASTERISK SLASH.
-%token_class let_func_token ZVAL OBJVAL ARRVAL PATHVAL STRLEN STRVAL FLOATVAL INTVAL BOOLVAL.
+%token_class let_func_token ZVAL OBJVAL ARRVAL PATHVAL STRLEN STRVAL FLOATVAL INTVAL BOOLVAL COUNT.
 %token_class set_func_token TO_OBJECT TO_ARRAY TO_STRING TO_INT TO_FLOAT TO_BOOL ZVAL VOID.
 %token_class impl_type_token VOID MIXED BOOL INT FLOAT STRING ARRAY OBJECT CALLABLE.
 %type decl_enum {decl_enum *}
@@ -112,6 +118,8 @@
 %destructor callback_args {free_set_values($$);}
 %type let_val {let_val*}
 %destructor let_val {free_let_val($$);}
+%type let_vals {let_vals*}
+%destructor let_vals {free_let_vals($$);}
 %type set_stmt {set_stmt*}
 %destructor set_stmt {free_set_stmt($$);}
 %type set_value {set_value*}
@@ -197,8 +205,8 @@ enum_name(n) ::= ENUM(E) optional_name(N). {
   free(E);
  } else {
   char digest[17];
-  PSI_TokenHash(E, digest);
-  n = PSI_TokenTranslit(PSI_TokenAppend(E, 1, digest), " ", "@");
+  psi_token_hash(E, digest);
+  n = psi_token_translit(psi_token_append(E, 1, digest), " ", "@");
  }
 }
 decl_enum(e) ::= enum_name(N) LBRACE decl_enum_items(list) RBRACE. {
@@ -225,8 +233,8 @@ union_name(n) ::= UNION(U) optional_name(N). {
   free(U);
  } else {
   char digest[17];
-  PSI_TokenHash(U, digest);
-  n = PSI_TokenTranslit(PSI_TokenAppend(U, 1, digest), " ", "@");
+  psi_token_hash(U, digest);
+  n = psi_token_translit(psi_token_append(U, 1, digest), " ", "@");
  }
 }
 struct_name(n) ::= STRUCT(S) optional_name(N). {
@@ -235,8 +243,8 @@ struct_name(n) ::= STRUCT(S) optional_name(N). {
   free(S);
  } else {
   char digest[17];
-  PSI_TokenHash(S, digest);
-  n = PSI_TokenTranslit(PSI_TokenAppend(S, 1, digest), " ", "@");
+  psi_token_hash(S, digest);
+  n = psi_token_translit(psi_token_append(S, 1, digest), " ", "@");
  }
 }
 decl_struct_args_block(args_) ::= LBRACE struct_args(args) RBRACE. {
@@ -284,7 +292,7 @@ decl_typedef(def) ::= TYPEDEF(T) decl_typedef_body(def_) EOS. {
 }
 decl_typedef_body_ex(def) ::= struct_name(N) align_and_size(as) decl_struct_args_block(args) decl_var(var). {
  def = init_decl_arg(init_decl_type(PSI_T_STRUCT, N->text), var);
- def->type->token = PSI_TokenCopy(N);
+ def->type->token = psi_token_copy(N);
  def->type->real.strct = init_decl_struct(N->text, args);
  def->type->real.strct->token = N;
  def->type->real.strct->align = as.pos;
@@ -292,7 +300,7 @@ decl_typedef_body_ex(def) ::= struct_name(N) align_and_size(as) decl_struct_args
 }
 decl_typedef_body_ex(def) ::= union_name(N) align_and_size(as) decl_struct_args_block(args) decl_var(var). {
  def = init_decl_arg(init_decl_type(PSI_T_UNION, N->text), var);
- def->type->token = PSI_TokenCopy(N);
+ def->type->token = psi_token_copy(N);
  def->type->real.unn = init_decl_union(N->text, args);
  def->type->real.unn->token = N;
  def->type->real.unn->align = as.pos;
@@ -301,7 +309,7 @@ decl_typedef_body_ex(def) ::= union_name(N) align_and_size(as) decl_struct_args_
 decl_typedef_body_ex(def) ::= decl_enum(e) NAME(ALIAS). {
  def = init_decl_arg(init_decl_type(PSI_T_ENUM, e->name), init_decl_var(ALIAS->text, 0, 0));
  def->var->token = ALIAS;
- def->type->token = PSI_TokenCopy(e->token);
+ def->type->token = psi_token_copy(e->token);
  def->type->real.enm = e;
 }
 decl_typedef_body(def) ::= decl_typedef_body_ex(def_). {
@@ -312,7 +320,7 @@ decl_typedef_body_fn_args(args) ::= LPAREN decl_args(args_) RPAREN. {
 }
 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->token = psi_token_copy(func_->token);
  def->type->real.func = init_decl(init_decl_abi("default"), func_, args);
 }
 decl_typedef_body(def) ::= decl_arg(arg). {
@@ -346,7 +354,7 @@ decl_typedef_body(def) ::= VOID(T) indirection(decl_i) LPAREN indirection(type_i
   copy_decl_var(func_->var)
  );
  def->var->pointer_level = type_i;
- def->type->token = PSI_TokenCopy(func_->token);
+ def->type->token = psi_token_copy(func_->token);
  def->type->real.func = init_decl(init_decl_abi("default"), func_, args);
 }
 decl_typedef_body(def) ::= CONST VOID(T) pointers(decl_i) LPAREN indirection(type_i) NAME(N) RPAREN decl_typedef_body_fn_args(args). {
@@ -362,21 +370,32 @@ decl_typedef_body(def) ::= CONST VOID(T) pointers(decl_i) LPAREN indirection(typ
   copy_decl_var(func_->var)
  );
  def->var->pointer_level = type_i;
- def->type->token = PSI_TokenCopy(func_->token);
+ def->type->token = psi_token_copy(func_->token);
  def->type->real.func = init_decl(init_decl_abi("default"), func_, args);
 }
 decl_abi(abi) ::= NAME(T). {
  abi = init_decl_abi(T->text);
  abi->token = T;
 }
-decl_var(var) ::= indirection(p) NAME(T). {
- var = init_decl_var(T->text, p, 0);
+decl_var(var) ::= NAME(T) decl_var_array_size(as). {
+ var = init_decl_var(T->text, 0, as?atol(as->text):0);
  var->token = T;
+ if (as) {
+  free(as);
+ }
 }
-decl_var(var) ::= indirection(p) NAME(T) LBRACKET NUMBER(D) RBRACKET. {
- var = init_decl_var(T->text, p+1, atol(D->text));
+decl_var(var) ::= pointers(p) NAME(T) decl_var_array_size(as). {
+ var = init_decl_var(T->text, p+!!as, as?atol(as->text):0);
  var->token = T;
- free(D);
+ if (as) {
+  free(as);
+ }
+}
+decl_var_array_size(as) ::= . {
+ as = NULL;
+}
+decl_var_array_size(as) ::= LBRACKET NUMBER(D) RBRACKET. {
+ as = D;
 }
 decl_vars(vars) ::= decl_var(var). {
  vars = init_decl_vars(var);
@@ -399,7 +418,7 @@ decl_typedef_body(def) ::= const_decl_type(type_) indirection(decl_i) LPAREN ind
   copy_decl_var(func_->var)
  );
  def->var->pointer_level = type_i;
- def->type->token = PSI_TokenCopy(func_->token);
+ def->type->token = psi_token_copy(func_->token);
  def->type->real.func = init_decl(init_decl_abi("default"), func_, args);
 }
 decl_arg(arg_) ::= VOID(T) pointers(p) NAME(N). {
@@ -475,7 +494,7 @@ decl_scalar_type(type_) ::= CHAR(C). {
 }
 decl_scalar_type(type_) ::= SHORT(S) decl_scalar_type_short(s). {
  if (s) {
-  type_ = PSI_TokenCat(2, S, s);
+  type_ = psi_token_cat(2, S, s);
   free(S);
   free(s);
  } else {
@@ -493,7 +512,7 @@ decl_scalar_type(type_) ::= INT(I). {
 }
 decl_scalar_type(type_) ::= LONG(L) decl_scalar_type_long(l). {
  if (l) {
-  type_ = PSI_TokenCat(2, L, l);
+  type_ = psi_token_cat(2, L, l);
   free(L);
   free(l);
  } else {
@@ -508,7 +527,7 @@ decl_scalar_type_long(l) ::= DOUBLE(D). {
 }
 decl_scalar_type_long(l) ::= LONG(L) decl_scalar_type_long_long(ll). {
  if (ll) {
-  l = PSI_TokenCat(2, L, ll);
+  l = psi_token_cat(2, L, ll);
   free(L);
   free(ll);
  } else {
@@ -522,14 +541,14 @@ decl_scalar_type_long_long(ll) ::= INT(I). {
  ll = I;
 }
 decl_type(type_) ::= UNSIGNED(U) decl_scalar_type(N). {
- PSI_Token *T = PSI_TokenCat(2, U, N);
+ struct psi_token *T = psi_token_cat(2, U, N);
  type_ = init_decl_type(T->type, T->text);
  type_->token = T;
  free(U);
  free(N);
 }
 decl_type(type_) ::= SIGNED(S) decl_scalar_type(N). {
- PSI_Token *T = PSI_TokenCat(2, S, N);
+ struct psi_token *T = psi_token_cat(2, S, N);
  type_ = init_decl_type(T->type, T->text);
  type_->token = T;
  free(S);
@@ -637,7 +656,7 @@ num_exp(exp) ::= num_exp_token(tok). {
 }
 num_exp(exp) ::= decl_var(var). {
  exp = init_num_exp(PSI_T_NAME, var);
- exp->token = PSI_TokenCopy(var->token);
+ exp->token = psi_token_copy(var->token);
 }
 num_exp(exp) ::= num_exp(exp_) num_exp_op_token(operator_) num_exp(operand_). {
  exp_->operator = operator_->type;
@@ -645,23 +664,82 @@ num_exp(exp) ::= num_exp(exp_) num_exp_op_token(operator_) num_exp(operand_). {
  exp = exp_;
  free(operator_);
 }
-let_stmt(let) ::= LET decl_var(var) EOS. {
- let = init_let_stmt(var, init_let_val(PSI_LET_NULL, NULL));
+%type let_exp {let_val*}
+%destructor let_exp {free_let_val($$);}
+%type let_callback {let_callback*}
+%destructor let_callback {free_let_callback($$);}
+let_val(val) ::= NULL. {
+ val = init_let_val(PSI_LET_NULL, NULL);
+}
+let_val(val) ::= AMPERSAND NULL. {
+ val = init_let_val(PSI_LET_NULL, NULL);
+ val->is_reference = 1;
+}
+let_val(val) ::= let_callback(cb). {
+ val = init_let_val(PSI_LET_CALLBACK, cb);
+}
+let_val(val) ::= let_calloc(ca). {
+ val = init_let_val(PSI_LET_CALLOC, ca);
+}
+let_val(val) ::= AMPERSAND let_calloc(ca). {
+ val = init_let_val(PSI_LET_CALLOC, ca);
+ val->is_reference = 1;
+}
+let_val(val) ::= let_func(fn). {
+ val = init_let_val_ex(NULL, PSI_LET_FUNC, fn);
+}
+let_val(val) ::= AMPERSAND let_func(fn). {
+ val = init_let_val_ex(NULL, PSI_LET_FUNC, fn);
+ val->is_reference = 1;
+}
+let_val(val) ::= num_exp(exp). {
+ val = init_let_val_ex(NULL, PSI_LET_NUMEXP, exp);
+}
+let_val(val) ::= AMPERSAND num_exp(exp). {
+ val = init_let_val_ex(NULL, PSI_LET_NUMEXP, exp);
+ val->is_reference = 1;
 }
-let_stmt(let) ::= LET decl_var(var) EQUALS reference(r) let_val(val) EOS. {
- val->flags.one.is_reference = r ? 1 : 0;
- let = init_let_stmt(var, val);
+let_exp(exp) ::= decl_var(var_) EQUALS let_val(val). {
+ exp = val;
+ exp->var = var_;
 }
-let_stmt(let) ::= TEMP decl_var(var) EQUALS decl_var(val) EOS. {
- let = init_let_stmt(var, init_let_val(PSI_LET_TMP, val));
+let_stmt(let) ::= LET(T) let_exp(val) EOS. {
+ let = init_let_stmt(val);
+ let->token = T;
 }
-let_calloc(alloc) ::= num_exp(nmemb) COMMA num_exp(size). {
+let_stmt(let) ::= TEMP(T) decl_var(var) EQUALS reference(r) decl_var(val_) EOS. {
+ let = init_let_stmt(init_let_val_ex(var, PSI_LET_TMP, val_));
+ let->token = T;
+ let->val->is_reference = r ? 1 : 0;
+}
+let_callback(cb) ::= CALLBACK callback_rval(F) LPAREN impl_var(var) LPAREN callback_arg_list(args_) RPAREN RPAREN. {
+ cb = init_let_callback(init_let_func(F->type, F->text, var), args_);
+ free(F);
+}
+let_calloc(alloc) ::= CALLOC LPAREN num_exp(nmemb) COMMA num_exp(size) RPAREN. {
  alloc = init_let_calloc(nmemb, size);
 }
 let_func(func) ::= let_func_token(T) LPAREN impl_var(var) RPAREN. {
  func = init_let_func(T->type, T->text, var);
  free(T);
 }
+let_func(func) ::= let_func_token(T) LPAREN impl_var(var) COMMA let_vals(vals) RPAREN. {
+ func = init_let_func(T->type, T->text, var);
+ func->inner = vals;
+ free(T);
+}
+let_vals(vals) ::= let_exp(val). {
+ vals = init_let_vals(val);
+}
+let_vals(vals) ::= let_val(val). {
+ vals = init_let_vals(val);
+}
+let_vals(vals) ::= let_vals(vals_) COMMA let_exp(val). {
+ vals = add_let_val(vals_, val);
+}
+let_vals(vals) ::= let_vals(vals_) COMMA let_val(val). {
+ vals = add_let_val(vals_, val);
+}
 callback_arg_list ::= .
 callback_arg_list(args) ::= callback_args(args_). {
  args = args_;
@@ -672,22 +750,11 @@ callback_args(args) ::= set_value(val). {
 callback_args(args) ::= callback_args(args_) COMMA set_value(val). {
  args = add_set_value(args_, val);
 }
-let_val(val) ::= NULL. {
- val = init_let_val(PSI_LET_NULL, NULL);
-}
-let_val(val) ::= num_exp(exp). {
- val = init_let_val(PSI_LET_NUMEXP, exp);
-}
-let_val(val) ::= CALLOC LPAREN let_calloc(alloc) RPAREN. {
- val = init_let_val(PSI_LET_CALLOC, alloc);
+callback_rval(rval) ::= let_func_token(F). {
+ rval = F;
 }
-let_val(val) ::= let_func(func). {
- val = init_let_val(PSI_LET_FUNC, func);
-}
-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);
+callback_rval(rval) ::= VOID(V). {
+ rval = V;
 }
 set_stmt(set) ::= SET impl_var(var) EQUALS set_value(val) EOS. {
  set = init_set_stmt(var, val);