Fix bug of calc expr with + - * /

One-Language · Jun 13, 2021 · 4c07353 · 4c07353
1 parent 234229b
commit 4c07353
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/input.one b/input.one
@@ -4,6 +4,7 @@ fn test {
     _ 1
     _ 2, 4, 6, 8
     _ 5+8
+    _ (2 + 15 * ( 25 - 13 ) / 1 - 4) + 10 / 2
 }
 /*
 fn main {

diff --git a/src/parser.c b/src/parser.c
@@ -876,7 +876,7 @@ AstExpression *parser_parse_expression_term()
 	{
 		TokenType op = PARSER_CURRENT->type;
 		parser_next();
-		expr = ast_make_expression_2(op, -1, expr, parser_parse_expression_term());
+		expr = ast_make_expression_2(op, -1, expr, parser_parse_expression_factor());
 	}
 	return expr;
 }

diff --git a/src/tree.c b/src/tree.c
@@ -157,31 +157,37 @@ void tree_show_statement_expression(FILE* f, AstStatement* stmt)
 
 void tree_show_expression(FILE* f, AstExpression* expr)
 {
-	tree_show_ident();
-	if(expr->operator == TOKEN_OPERATOR_NONE) {
+	if (expr->operator== TOKEN_OPERATOR_NONE)
+	{
+		tree_show_ident();
 		print_tree(f, BOLDBLUE TREE_PREFIX "Expression Direct: %s\n" RESET, expr->vstring == NULL ? "" : expr->vstring);
+//		tree_show_ident();
+//		print_tree(f, BOLDBLUE TREE_PREFIX "Expression Direct: %d\n" RESET, expr->vint);
 	}
-	else {
+	else
+	{
+		tree_show_ident();
 		print_tree(f, BOLDBLUE TREE_PREFIX "Expression %s\n" RESET, token_name(expr->operator));
 
 		ident++;
-		if(expr->left != NULL) {
+		if (expr->left != NULL)
+		{
 			tree_show_ident();
 			print_tree(f, BOLDBLUE TREE_PREFIX "Expression Left\n" RESET);
 			ident++;
 			tree_show_expression(f, expr->left);
 			ident--;
 		}
-		if(expr->right != NULL) {
+		if (expr->right != NULL)
+		{
 			tree_show_ident();
-			print_tree(f, BOLDBLUE TREE_PREFIX "Expression Right\n" RESET );
+			print_tree(f, BOLDBLUE TREE_PREFIX "Expression Right\n" RESET);
 			ident++;
 			tree_show_expression(f, expr->right);
 			ident--;
 		}
 		ident--;
 	}
-
 }
 
 void tree_show_expressions(FILE* f, AstExpressions exprs)