X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fparser_def.h;h=1910ebfe9f6e6dab828ecd1d59e9075d2d9eee1e;hb=e976ce142e35c97919717acf52618900477a4ade;hp=de5afe9c559e1253bbdd9a82237cba213bb279a2;hpb=410881ab37d993b0a15d295293a005aa0500ce8d;p=m6w6%2Fext-psi

diff --git a/src/parser_def.h b/src/parser_def.h
index de5afe9..1910ebf 100644
--- a/src/parser_def.h
+++ b/src/parser_def.h
@@ -62,7 +62,6 @@
 # define TOKEN_DTOR(token, dtor)
 #endif
 
-DEF(%name, psi_parser_proc_)
 DEF(%token_prefix, PSI_T_)
 DEF(%token_type, {struct psi_token *})
 DEF(%token_destructor, {free($$);})
@@ -79,21 +78,34 @@ DEF(%syntax_error, {
 	}
 })
 
-DEF(%nonassoc, NAME.)
-DEF(%left, PLUS MINUS.)
-DEF(%left, ASTERISK SLASH.)
-DEF(%nonassoc, AMPERSAND.)
-DEF(%fallback, NAME TEMP FREE SET LET RETURN CALLOC CALLBACK ZVAL LIB STRING COUNT.)
-
 DEF(%token_class, const_type_token BOOL INT FLOAT STRING.)
 DEF(%token_class, decl_type_token FLOAT DOUBLE INT8 UINT8 INT16 UINT16 INT32 UINT32 INT64 UINT64 NAME.)
 DEF(%token_class, impl_def_val_token NULL NUMBER TRUE FALSE QUOTED_STRING.)
-DEF(%token_class, num_exp_token NUMBER NSNAME.)
-DEF(%token_class, num_exp_op_token PLUS MINUS ASTERISK SLASH.)
+DEF(%token_class, number_token NUMBER NSNAME.)
+DEF(%token_class, num_exp_binary_op_token PIPE CARET AMPERSAND LSHIFT RSHIFT PLUS MINUS ASTERISK SLASH MODULO.)
+DEF(%token_class, num_exp_unary_op_token TILDE NOT PLUS MINUS.)
 DEF(%token_class, let_func_token ZVAL OBJVAL ARRVAL PATHVAL STRLEN STRVAL FLOATVAL INTVAL BOOLVAL COUNT.)
 DEF(%token_class, set_func_token TO_OBJECT TO_ARRAY TO_STRING TO_INT TO_FLOAT TO_BOOL ZVAL VOID.)
 DEF(%token_class, impl_type_token VOID MIXED BOOL INT FLOAT STRING ARRAY OBJECT CALLABLE.)
 
+DEF(%nonassoc, NAME.)
+DEF(%right, NOT TILDE.)
+DEF(%left, PIPE.)
+DEF(%left, CARET.)
+DEF(%left, AMPERSAND.)
+DEF(%left, LSHIFT RSHIFT.)
+DEF(%left, PLUS MINUS.)
+DEF(%left, ASTERISK SLASH MODULO.)
+/*
+DEF(%left, ASTERISK SLASH MODULO.)
+DEF(%left, PLUS MINUS.)
+DEF(%left, LSHIFT RSHIFT.)
+DEF(%left, AMPERSAND.)
+DEF(%left, CARET.)
+DEF(%left, PIPE.)
+*/
+DEF(%fallback, NAME TEMP FREE SET LET RETURN CALLOC CALLBACK ZVAL LIB STRING COUNT.)
+
 TOKEN_TYPE(decl_enum, struct psi_decl_enum *)
 TOKEN_DTOR(decl_enum, psi_decl_enum_free(&$$);)
 TOKEN_TYPE(decl_enum_items, struct psi_plist*)
@@ -163,6 +175,8 @@ TOKEN_TYPE(impl_stmts, struct psi_plist*)
 TOKEN_DTOR(impl_stmts, psi_plist_free($$);)
 TOKEN_TYPE(impl_stmt, struct psi_token**)
 TOKEN_DTOR(impl_stmt, psi_impl_stmt_free(&$$);)
+TOKEN_TYPE(number, struct psi_number*)
+TOKEN_DTOR(number, psi_number_free(&$$);)
 TOKEN_TYPE(num_exp, struct psi_num_exp*)
 TOKEN_DTOR(num_exp, psi_num_exp_free(&$$);)
 TOKEN_TYPE(let_stmt, struct psi_let_stmt*)
@@ -866,12 +880,17 @@ PARSE_TYPED(decl_arg, arg_,
 /*
  * decl_args: <empty>
  */
-PASS(decl_args, )
+PARSE_TYPED(decl_args, args, ) {
+	args = NULL;
+}
 
 /*
  * decl_args: VOID
  */
-PASS(decl_args, VOID)
+PARSE_TYPED(decl_args, args,
+		TOKEN(VOID)) {
+	args = NULL;
+}
 
 /*
  * decl_args: decl_arg
@@ -1398,34 +1417,62 @@ PARSE_TYPED(impl_stmt, i,
 }
 
 /*
- * num_exp: num_exp_token
+ * number: number_token
  */
-PARSE_TYPED(num_exp, exp,
-		NAMED(num_exp_token, tok)) {
-	exp = psi_num_exp_init(tok->type, tok->text);
+PARSE_TYPED(number, exp,
+		NAMED(number_token, tok)) {
+	exp = psi_number_init(tok->type, tok->text);
 	exp->token = tok;
 }
 
 /*
  * num_exp: decl_var
  */
-PARSE_TYPED(num_exp, exp,
+PARSE_TYPED(number, exp,
 		TYPED(decl_var, var)) {
-	exp = psi_num_exp_init(PSI_T_NAME, var);
+	exp = psi_number_init(PSI_T_NAME, var);
 	exp->token = psi_token_copy(var->token);
 }
 
 /*
- * num_exp: num_exp num_exp_op_token num_exp
+ * num_exp: num_exp
+ */
+PARSE_TYPED(num_exp, exp,
+		TYPED(number, num)) {
+	exp = psi_num_exp_init_num(num);
+	exp->token = psi_token_copy(num->token);
+}
+
+/*
+ * num_exp: ( num_exp )
  */
 PARSE_TYPED(num_exp, exp,
+		NAMED(LPAREN, L)
 		TYPED(num_exp, exp_)
-		NAMED(num_exp_op_token, operator_)
-		TYPED(num_exp, operand_)) {
-	exp_->op = operator_->type;
-	exp_->operand = operand_;
-	exp = exp_;
-	free(operator_);
+		TOKEN(RPAREN)) {
+	exp = psi_num_exp_init_unary(PSI_T_LPAREN, exp_);
+	exp->token = L;
+}
+
+/*
+ * num_exp: num_exp num_exp_binary_op_token num_exp
+ */
+PARSE_TYPED(num_exp, exp,
+		TYPED(num_exp, lhs_)
+		NAMED(num_exp_binary_op_token, OP)
+		TYPED(num_exp, rhs_)) {
+	exp = psi_num_exp_init_binary(OP->type, lhs_, rhs_);
+	exp->token = OP;
+}
+
+/*
+ * num_exp: num_exp_unary_op_token num_exp
+ */
+PARSE_TYPED(num_exp, exp,
+		NAMED(num_exp_unary_op_token, OP)
+		TYPED(num_exp, exp_)) {
+	exp = psi_num_exp_init_unary(OP->type, exp_);
+	exp->token = OP;
 }
 
 /*
@@ -1622,7 +1669,9 @@ PARSE_TYPED(let_exps, exps,
 /*
  * callback_arg_list: <empty>
  */
-PASS(callback_arg_list, )
+PARSE_TYPED(callback_arg_list, args, ) {
+	args = NULL;
+}
 
 /*
  * callback_arg_list: callback_args
@@ -1782,10 +1831,11 @@ PARSE_TYPED(return_stmt, ret,
  * free_stmt: FREE free_exps ;
  */
 PARSE_TYPED(free_stmt, free,
-		TOKEN(FREE)
+		NAMED(FREE, T)
 		TYPED(free_exps, calls)
 		TOKEN(EOS)) {
 	free = psi_free_stmt_init(calls);
+	free->token = T;
 }
 
 /*