1 files changed, 16 insertions, 28 deletions

diff --git a/src/parser.c b/src/parser.c
index 516b48b..f51f550 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -99,9 +99,7 @@ parser_literal_integer_node(token_t *token)
   char number_as_str[token->value.size];
   string_view_to_str(&token->value, number_as_str);
 
-  ast_node_t *node = ast_node_new();
-  ast_literal_integer_create(node, atoi(number_as_str));
-  return node;
+  return ast_node_new_literal_integer(atoi(number_as_str));
 }
 
 static ast_binary_operation_kind_t
@@ -156,10 +154,7 @@ parser_parse_factor(parser_t *parser)
         return NULL;
       }
 
-      ast_node_t *node = ast_node_new();
-      ast_node_init_variable(node, &var_node->data.variable_declaration.identifier);
-
-      return node;
+      return ast_node_new_variable(&var_node->data.variable_declaration.identifier);
     }
     default: {
       parser_error_t error;
@@ -175,8 +170,10 @@ static ast_node_t *
 parser_parse_term(parser_t *parser)
 {
   ast_node_t *node = parser_parse_factor(parser);
-  if (node == NULL)
+
+  if (node == NULL) {
     return NULL;
+  }
 
   token_t token;
   lexer_peek_next_token(parser->lexer, &token);
@@ -184,6 +181,7 @@ parser_parse_term(parser_t *parser)
   while (token.kind == TOKEN_STAR || token.kind == TOKEN_SLASH) {
     lexer_drop_next_token(parser->lexer);
 
+    ast_node_t *left = node;
     ast_node_t *right = parser_parse_factor(parser);
 
     if (right == NULL) {
@@ -191,10 +189,7 @@ parser_parse_term(parser_t *parser)
       return NULL;
     }
 
-    ast_node_t *left = ast_node_new();
-    *left = *node;
-
-    ast_node_init_binary_operation(node, token_to_binary_operation_kind(&token), left, right);
+    node = ast_node_new_binary_operation(token_to_binary_operation_kind(&token), left, right);
 
     lexer_peek_next_token(parser->lexer, &token);
   }
@@ -214,8 +209,9 @@ parser_parse_expression(parser_t *parser)
 {
   ast_node_t *node = parser_parse_term(parser);
 
-  if (node == NULL)
+  if (node == NULL) {
     return NULL;
+  }
 
   token_t token;
   lexer_peek_next_token(parser->lexer, &token);
@@ -223,17 +219,15 @@ parser_parse_expression(parser_t *parser)
   while (token.kind == TOKEN_PLUS || token.kind == TOKEN_MINUS) {
     lexer_drop_next_token(parser->lexer);
 
+    ast_node_t *left = node;
     ast_node_t *right = parser_parse_term(parser);
 
     if (right == NULL) {
-      ast_node_destroy(node);
+      ast_node_destroy(left);
       return NULL;
     }
 
-    ast_node_t *left = ast_node_new();
-    *left = *node;
-
-    ast_node_init_binary_operation(node, token_to_binary_operation_kind(&token), left, right);
+    node = ast_node_new_binary_operation(token_to_binary_operation_kind(&token), left, right);
 
     lexer_peek_next_token(parser->lexer, &token);
   }
@@ -258,9 +252,7 @@ parser_parse_return_stmt(parser_t *parser)
     return NULL;
   }
 
-  ast_node_t *node = ast_node_new();
-  ast_node_init_return_stmt(node, argument_token);
-  return node;
+  return ast_node_new_return_stmt(argument_token);
 }
 
 static ast_node_t *
@@ -300,9 +292,7 @@ parser_parse_variable_assignment(parser_t *parser)
 
   assert(variable_declaration_node->kind == AST_VARIABLE_DECLARATION);
 
-  ast_node_t *node = ast_node_new();
-  ast_node_init_variable_assignment(node, &variable_declaration_node->data.variable_declaration.identifier, expression);
-  return node;
+  return ast_node_new_variable_assignment(&variable_declaration_node->data.variable_declaration.identifier, expression);
 }
 
 static ast_node_t *
@@ -338,8 +328,7 @@ parser_parse_variable_definition(parser_t *parser)
     return NULL;
   }
 
-  ast_node_t *node = ast_node_new();
-  ast_node_init_variable_declaration(node, variable_name.value, type, expression);
+  ast_node_t *node = ast_node_new_variable_declaration(variable_name.value, type, expression);
   scope_push(parser->scope, &node->data.variable_declaration.identifier, node);
 
   return node;
@@ -533,8 +522,7 @@ parser_parse_function_declaration(parser_t *parser)
     return NULL;
   }
 
-  ast_node_t *node = ast_node_new();
-  ast_node_init_function_declaration(node, func_name_token.value, return_type, body);
+  ast_node_t *node = ast_node_new_function_declaration(func_name_token.value, return_type, body);
 
   // TODO: When implementing function calls the scope must be pushed before the
   // body to be parsed, otherwise recursion not gonna work.