X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser_proc.y;h=8c6018fc4d3f784ab1fc41d7a8e86dcb96325274;hp=66d884485260160f2d07dcc3a41b7b5c8d27f304;hb=ef48feab1da9d7a419980294bcbf03ceefd81d1c;hpb=3b0b651ea1b555d8d023e45b43e5eb93b23d00a1

diff --git a/src/parser_proc.y b/src/parser_proc.y
index 66d8844..8c6018f 100644
--- a/src/parser_proc.y
+++ b/src/parser_proc.y
@@ -6,28 +6,56 @@
 
 #include "plist.h"
 #include "parser.h"
+
+/* rename lemon symbols, works better than DEF(%name) */
+#define ParseAlloc psi_parser_proc_init_ex
+#define Parse psi_parser_proc_parse
+#define ParseTrace psi_parser_proc_trace
+#define ParseFree psi_parser_proc_free_ex
+
+/* fwd decls */
+void *ParseAlloc(void *(*mallocProc)(size_t));
+void ParseFree(void *p, void (*freeProc)(void*));
+
+/* wrappers */
+void *psi_parser_proc_init(void)
+{
+	return ParseAlloc(malloc);
+}
+
+void psi_parser_proc_free(void **parser_proc)
+{
+	if (*parser_proc) {
+		ParseFree(*parser_proc, free);
+		*parser_proc = NULL;
+	}
+}
+
 }
-%name psi_parser_proc_
 %token_prefix PSI_T_
 %token_type {struct psi_token *}
 %token_destructor {free($$);}
 %default_destructor {(void)P;}
 %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->file.fn, P->line, "PSI syntax error: Unexpected end of input"); } }
-%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 number_token NUMBER NSNAME.
-%token_class num_exp_binary_op_token PIPE CARET AMPERSAND LSHIFT RSHIFT PLUS MINUS ASTERISK SLASH MODULO.
-%token_class num_exp_unary_op_token TILDE NOT PLUS MINUS.
-%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.
+%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 number_token NUMBER NSNAME .
+%token_class 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 .
+%token_class unary_op_token TILDE NOT PLUS MINUS .
+%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 .
+%token_class assert_stmt_token PRE_ASSERT POST_ASSERT .
 %nonassoc NAME.
 %right NOT TILDE.
+%left AND OR.
 %left PIPE.
 %left CARET.
 %left AMPERSAND.
+%left CMP_EQ CMP_NE.
+%left LCHEVR CMP_LE RCHEVR CMP_GE.
 %left LSHIFT RSHIFT.
 %left PLUS MINUS.
 %left ASTERISK SLASH MODULO.
@@ -121,6 +149,8 @@
 %destructor let_exp {psi_let_exp_free(&$$);}
 %type let_exps {struct psi_plist*}
 %destructor let_exps {psi_plist_free($$);}
+%type assert_stmt {struct psi_assert_stmt*}
+%destructor assert_stmt {psi_assert_stmt_free(&$$);}
 %type set_stmt {struct psi_set_stmt*}
 %destructor set_stmt {psi_set_stmt_free(&$$);}
 %type set_exp {struct psi_set_exp*}
@@ -476,8 +506,12 @@ decl_arg(arg_) ::= CONST VOID(T) pointers(p) NAME(N). {
  arg_->var->token = N;
  arg_->token = N;
 }
-decl_args ::= .
-decl_args ::= VOID.
+decl_args(args) ::= . {
+ args = NULL;
+}
+decl_args(args) ::= VOID. {
+ args = NULL;
+}
 decl_args(args) ::= decl_arg(arg). {
  args = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free),
    &arg);
@@ -700,6 +734,9 @@ impl_stmt(i) ::= let_stmt(l). {
 impl_stmt(i) ::= set_stmt(s). {
  i = (struct psi_token**) s;
 }
+impl_stmt(i) ::= assert_stmt(s). {
+ i = (struct psi_token **) s;
+}
 impl_stmt(i) ::= free_stmt(f). {
  i = (struct psi_token**) f;
 }
@@ -719,11 +756,11 @@ num_exp(exp) ::= LPAREN(L) num_exp(exp_) RPAREN. {
  exp = psi_num_exp_init_unary(PSI_T_LPAREN, exp_);
  exp->token = L;
 }
-num_exp(exp) ::= num_exp(lhs_) num_exp_binary_op_token(OP) num_exp(rhs_). {
+num_exp(exp) ::= num_exp(lhs_) binary_op_token(OP) num_exp(rhs_). {
  exp = psi_num_exp_init_binary(OP->type, lhs_, rhs_);
  exp->token = OP;
 }
-num_exp(exp) ::= num_exp_unary_op_token(OP) num_exp(exp_). {
+num_exp(exp) ::= unary_op_token(OP) num_exp(exp_). {
  exp = psi_num_exp_init_unary(OP->type, exp_);
  exp->token = OP;
 }
@@ -796,7 +833,9 @@ let_exps(exps) ::= let_exp(exp). {
 let_exps(exps) ::= let_exps(exps_) COMMA let_exp(exp). {
  exps = psi_plist_add(exps_, &exp);
 }
-callback_arg_list ::= .
+callback_arg_list(args) ::= . {
+ args = NULL;
+}
 callback_arg_list(args) ::= callback_args(args_). {
  args = args_;
 }
@@ -867,6 +906,10 @@ free_exp(call) ::= NAME(F) LPAREN decl_vars(vars) RPAREN. {
  call = psi_free_exp_init(F->text, vars);
  call->token = F;
 }
+assert_stmt(ass) ::= assert_stmt_token(T) num_exp(exp) EOS. {
+ ass = psi_assert_stmt_init(T->type, exp);
+ ass->token = T;
+}
 reference(r) ::= . {
  r = false;
 }