Start of arithmetic
This commit is contained in:
Maieul BOYER
parent
102b41d170
commit
54f010969f
2 changed files with 95 additions and 54 deletions
|
|
@ -6,7 +6,7 @@
|
|||
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/07/26 13:27:30 by rparodi #+# #+# */
|
||||
/* Updated: 2024/07/26 13:33:00 by rparodi ### ########.fr */
|
||||
/* Updated: 2024/07/27 13:50:17 by maiboyer ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
|
|
@ -56,35 +56,6 @@ void ast_print_node_program(t_ast_node self)
|
|||
}
|
||||
}
|
||||
|
||||
// void ast_print_node_compound_statement(t_ast_node self)
|
||||
// {
|
||||
// t_usize i;
|
||||
|
||||
// if (self == NULL)
|
||||
// return ;
|
||||
// if (self->kind != AST_COMPOUND_STATEMENT)
|
||||
// return ;
|
||||
// i = 0;
|
||||
// if (self->data.compound_statement.bang)
|
||||
// printf("! ");
|
||||
// printf("{ ");
|
||||
// while (i < self->data.compound_statement.body.len)
|
||||
// {
|
||||
// ast_print_node(self->data.compound_statement.body.buffer[i++]);
|
||||
// printf(" ");
|
||||
// }
|
||||
// printf("}");
|
||||
// i = 0;
|
||||
// while (i < self->data.compound_statement.suffixes_redirections.len)
|
||||
// {
|
||||
// printf(" ");
|
||||
// ast_print_node \
|
||||
// (self->data.compound_statement.suffixes_redirections.buffer[i++]);
|
||||
// }
|
||||
// printf(" ");
|
||||
// _print_term(self->data.compound_statement.term);
|
||||
// }
|
||||
|
||||
void ast_print_node_compound_statement(t_ast_node self)
|
||||
{
|
||||
t_usize i;
|
||||
|
|
|
|||
118
exec/src/arith.c
118
exec/src/arith.c
|
|
@ -6,7 +6,7 @@
|
|||
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/07/26 15:14:50 by maiboyer #+# #+# */
|
||||
/* Updated: 2024/07/27 12:44:46 by rparodi ### ########.fr */
|
||||
/* Updated: 2024/07/27 14:43:31 by maiboyer ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
|
|
@ -14,6 +14,7 @@
|
|||
#include "ast/ast.h"
|
||||
#include "exec/run.h"
|
||||
#include "me/convert/numbers_to_str.h"
|
||||
#include "me/convert/str_to_numbers.h"
|
||||
#include "me/hashmap/hashmap_env.h"
|
||||
#include "me/mem/mem.h"
|
||||
#include "me/os/pipe.h"
|
||||
|
|
@ -23,38 +24,107 @@
|
|||
#include "me/types.h"
|
||||
#include "me/vec/vec_estr.h"
|
||||
#include "me/vec/vec_str.h"
|
||||
#include "me/convert/str_to_numbers.h"
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#pragma clang diagnostic ignored "-Wunused-parameter"
|
||||
#pragma clang diagnostic ignored "-Wunused-variable"
|
||||
|
||||
t_error run_arithmetic_binary(t_ast_arithmetic_binary *arithmetic_binary, t_state *state, void *out);
|
||||
t_error run_arithmetic_literal(t_ast_arithmetic_literal *arithmetic_literal, t_state *state, void *out);
|
||||
t_error run_arithmetic_postfix(t_ast_arithmetic_postfix *arithmetic_postfix, t_state *state, void *out);
|
||||
t_error run_arithmetic_ternary(t_ast_arithmetic_ternary *arithmetic_ternary, t_state *state, void *out);
|
||||
t_error run_arithmetic_unary(t_ast_arithmetic_unary *arithmetic_unary, t_state *state, void *out);
|
||||
t_error run_arithmetic_expansion(t_ast_arithmetic_expansion *arithmetic_expansion, t_state *state, void *out);
|
||||
typedef t_error (*t_arith_op_func)(t_ast_node self, t_state *state, t_i64 *out);
|
||||
|
||||
t_error run_arithmetic_binary(t_ast_arithmetic_binary *arithmetic_binary, t_state *state, void *out)
|
||||
t_error run_arithmetic_binary(t_ast_arithmetic_binary *arithmetic_binary, t_state *state, t_i64 *out);
|
||||
t_error run_arithmetic_literal(t_ast_arithmetic_literal *arithmetic_literal, t_state *state, t_i64 *out);
|
||||
t_error run_arithmetic_postfix(t_ast_arithmetic_postfix *arithmetic_postfix, t_state *state, t_i64 *out);
|
||||
t_error run_arithmetic_ternary(t_ast_arithmetic_ternary *arithmetic_ternary, t_state *state, t_i64 *out);
|
||||
t_error run_arithmetic_unary(t_ast_arithmetic_unary *arithmetic_unary, t_state *state, t_i64 *out);
|
||||
t_error run_arithmetic_expansion(t_ast_arithmetic_expansion *arithmetic_expansion, t_state *state, t_i64 *out);
|
||||
|
||||
t_error _get_node_number(t_ast_node self, t_state *state, t_i64 *out);
|
||||
|
||||
t_error _binary_op_add(t_ast_node self, t_state *state, t_i64 *out);
|
||||
t_error _binary_op_sub(t_ast_node self, t_state *state, t_i64 *out);
|
||||
t_error _binary_op_mul(t_ast_node self, t_state *state, t_i64 *out);
|
||||
t_error _binary_op_div(t_ast_node self, t_state *state, t_i64 *out);
|
||||
t_error _binary_op_mod(t_ast_node self, t_state *state, t_i64 *out);
|
||||
|
||||
t_error _binary_op_add(t_ast_node self, t_state *state, t_i64 *out)
|
||||
{
|
||||
t_i64 ret;
|
||||
t_i64 left;
|
||||
t_i64 right;
|
||||
t_i64 lhs;
|
||||
t_i64 rhs;
|
||||
|
||||
if (str_to_i64(arithmetic_binary->lhs->data, 10, &left))
|
||||
if (self == NULL || state == NULL || out == NULL || self->kind == AST_ARITHMETIC_BINARY)
|
||||
return (ERROR);
|
||||
if (str_to_i64(arithmetic_binary->rhs->data, 10, &right))
|
||||
if (_get_node_number(self->data.arithmetic_binary.lhs, state, &lhs))
|
||||
return (ERROR);
|
||||
if (arithmetic_binary->op == ARITH_PLUS)
|
||||
ret = arithmetic_binary->lhs->data + arithmetic_binary->rhs->data;
|
||||
if (arithmetic_binary->op == ARITH_MINUS)
|
||||
ret = arithmetic_binary->lhs->data - arithmetic_binary->rhs->data;
|
||||
if (arithmetic_binary->op == ARITH_MULT)
|
||||
ret = arithmetic_binary->lhs->data * arithmetic_binary->rhs->data;
|
||||
if (arithmetic_binary->op == ARITH_MOD)
|
||||
ret = arithmetic_binary->lhs->data % arithmetic_binary->rhs->data;
|
||||
if (arithmetic_binary->op == ARITH_DIVIDE)
|
||||
ret = arithmetic_binary->lhs->data / arithmetic_binary->rhs->data;
|
||||
if (_get_node_number(self->data.arithmetic_binary.rhs, state, &rhs))
|
||||
return (ERROR);
|
||||
// do check for invalid values here (like rhs == 0 for div/mod)
|
||||
*out = lhs + rhs;
|
||||
return (NO_ERROR);
|
||||
}
|
||||
|
||||
t_error _binary_get_op(t_ast_arithmetic_operator op, t_arith_op_func *out)
|
||||
{
|
||||
if (out == NULL)
|
||||
return (ERROR);
|
||||
if (op == ARITH_PLUS)
|
||||
return (*out = _binary_op_add, NO_ERROR);
|
||||
if (op == ARITH_MINUS)
|
||||
return (*out = _binary_op_sub, NO_ERROR);
|
||||
if (op == ARITH_MULT)
|
||||
return (*out = _binary_op_mul, NO_ERROR);
|
||||
if (op == ARITH_DIVIDE)
|
||||
return (*out = _binary_op_div, NO_ERROR);
|
||||
if (op == ARITH_MOD)
|
||||
return (*out = _binary_op_mod, NO_ERROR);
|
||||
/// add remaining;
|
||||
return (ERROR);
|
||||
}
|
||||
|
||||
t_error _get_node_number(t_ast_node self, t_state *state, t_i64 *out)
|
||||
{
|
||||
if (self == NULL || state == NULL || out == NULL)
|
||||
return (ERROR);
|
||||
if (self->kind == AST_ARITHMETIC_LITTERAL)
|
||||
return (run_arithmetic_literal(&self->data.arithmetic_literal, state, out));
|
||||
if (self->kind == AST_ARITHMETIC_BINARY)
|
||||
return (run_arithmetic_binary(&self->data.arithmetic_binary, state, out));
|
||||
// ADD OTHER STUFF HERE
|
||||
return (ERROR);
|
||||
}
|
||||
|
||||
// this is black magic don't worry
|
||||
t_ast_node _arith_binary_to_ast_node(t_ast_arithmetic_binary *self)
|
||||
{
|
||||
t_u8 *ptr;
|
||||
|
||||
ptr = (void *)(self);
|
||||
return ((void *)(ptr - offsetof(struct s_ast_node, data.arithmetic_binary)));
|
||||
}
|
||||
|
||||
t_error run_arithmetic_literal(t_ast_arithmetic_literal *arithmetic_literal, t_state *state, t_i64 *out)
|
||||
{
|
||||
|
||||
if (arithmetic_literal == NULL || state == NULL || out == NULL)
|
||||
return (ERROR);
|
||||
/// the from node needs to change
|
||||
/// if they find a raw_string, it is a variable expansion, so create a AST_EXPANSION
|
||||
if (arithmetic_literal->value->kind == AST_RAW_STRING)
|
||||
return (str_to_i64(arithmetic_literal->value->data.raw_string.str, 10, out));
|
||||
// probably an variable expansion i guess
|
||||
return (ERROR);
|
||||
}
|
||||
|
||||
t_error run_arithmetic_binary(t_ast_arithmetic_binary *arithmetic_binary, t_state *state, t_i64 *out)
|
||||
{
|
||||
t_arith_op_func func;
|
||||
|
||||
if (arithmetic_binary == NULL || state == NULL || out == NULL)
|
||||
return (ERROR);
|
||||
if (_binary_get_op(arithmetic_binary->op, &func))
|
||||
return (ERROR);
|
||||
if (func(_arith_binary_to_ast_node(arithmetic_binary), state, out))
|
||||
return (ERROR);
|
||||
return (NO_ERROR);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue