raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changed stuff

Browse source
This commit is contained in:
Maieul BOYER 2024-07-17 17:57:19 +02:00
parent 74336f37a3
commit 8d76630152
No known key found for this signature in database
7 changed files with 31 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

23
exec/src/run_ast.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */ /* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/11 17:22:29 by maiboyer #+# #+# */ /* Created: 2024/07/11 17:22:29 by maiboyer #+# #+# */
/* Updated: 2024/07/16 13:27:18 by maiboyer ### ########.fr */ /* Updated: 2024/07/17 16:42:19 by maiboyer ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -28,6 +28,11 @@ struct s_expansion_result
t_str str; t_str str;
}; };
#ifdef ERROR
# undef ERROR
#endif
#define ERROR ((void)printf("ERROR HERE: " __FILE__ ":%d in %s\n", __LINE__, __func__), 1)
#define NOT_DONE \ #define NOT_DONE \
{ \ { \
printf("function `%s` isn't done !\n", __func__); \ printf("function `%s` isn't done !\n", __func__); \
@ -61,9 +66,9 @@ t_error _run_expansion_special_var(t_ast_expansion *self, t_state *state, t_expa
name = self->var_name[0]; name = self->var_name[0];
*out = (t_expansion_result){.exists = false, .str = NULL}; *out = (t_expansion_result){.exists = false, .str = NULL};
if (name == '*') if (name == '*')
; // return all args exept argv[0]
if (name == '@')
; // return all args with argv[0] ; // return all args with argv[0]
if (name == '@')
; // return all args without argv[0]
if (name == '?') if (name == '?')
; // return exit code of last run program ; // return exit code of last run program
if (name == '!') if (name == '!')
@ -95,7 +100,7 @@ t_error _get_expansion_value(t_ast_expansion *self, t_state *state, t_expansion_
return (NO_ERROR); return (NO_ERROR);
} }
#include "me/convert/itoa.h" #include "me/convert/numbers_to_str.h"
t_error _handle_len_operator(t_ast_expansion *self, t_state *state, t_expansion_result *value) t_error _handle_len_operator(t_ast_expansion *self, t_state *state, t_expansion_result *value)
{ {
@ -106,7 +111,8 @@ t_error _handle_len_operator(t_ast_expansion *self, t_state *state, t_expansion_
len = str_len(value->str); len = str_len(value->str);
else else
len = 0; len = 0;
len_str = me_itoa(len); if (u64_to_str(len, &len_str))
return (ERROR);
mem_free(value->str); mem_free(value->str);
value->exists = true; value->exists = true;
value->str = len_str; value->str = len_str;
@ -186,8 +192,8 @@ t_error _handle_expansion_operator(t_ast_expansion *self, t_state *state, t_expa
// End Internals funcs // End Internals funcs
t_error run_expansion(t_ast_expansion *self, t_state *state, t_expansion_result *out); t_error run_expansion(t_ast_expansion *self, t_state *state, t_expansion_result *out);
t_error run_command(t_ast_command *command, t_state *state, void *out);
t_error run_command(t_ast_command *command, t_state *state, void *out) NOT_DONE;
t_error run_arithmetic_expansion(t_ast_arithmetic_expansion *arithmetic_expansion, t_state *state, void *out) NOT_DONE; t_error run_arithmetic_expansion(t_ast_arithmetic_expansion *arithmetic_expansion, t_state *state, void *out) NOT_DONE;
t_error run_case_(t_ast_case *case_, t_state *state, void *out) NOT_DONE; t_error run_case_(t_ast_case *case_, t_state *state, void *out) NOT_DONE;
t_error run_case_item(t_ast_case_item *case_item, t_state *state, void *out) NOT_DONE; t_error run_case_item(t_ast_case_item *case_item, t_state *state, void *out) NOT_DONE;
@ -236,6 +242,11 @@ t_error run_expansion(t_ast_expansion *self, t_state *state, t_expansion_result
return (*out = ret, NO_ERROR); return (*out = ret, NO_ERROR);
} }
t_error run_command(t_ast_command *command, t_state *state, void *out)
{
return (ERROR);
}
// FUNCTIONS // FUNCTIONS
/* /*

21
stdme/include/me/convert/atoi.h
View file

@ -1,21 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* atoi.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/11/06 14:14:00 by maiboyer #+# #+# */
/* Updated: 2024/01/11 15:36:12 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef ATOI_H
# define ATOI_H
# include "me/types.h"
t_i32 me_atoi(t_const_str str);
t_i64 me_atoi_64(t_const_str str);
#endif

20
stdme/include/me/convert/itoa.h
View file

@ -1,20 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* itoa.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/08/03 21:05:46 by maiboyer #+# #+# */
/* Updated: 2023/12/09 16:48:37 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef ITOA_H
# define ITOA_H
# include "me/types.h"
t_str me_itoa(t_i32 nb);
#endif

2
stdme/src.list
View file

@ -25,8 +25,6 @@ char/isspace
char/isupper char/isupper
char/tolower char/tolower
char/toupper char/toupper
convert/atoi
convert/itoa
convert/numbers_to_str convert/numbers_to_str
fs/close fs/close
fs/fs_internal fs/fs_internal

61
stdme/src/convert/atoi.c
View file

@ -1,61 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* atoi.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/11/06 14:14:00 by maiboyer #+# #+# */
/* Updated: 2024/01/11 15:37:28 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "me/char/char.h"
#include "me/char/char.h"
#include "me/convert/atoi.h"
t_i32 me_atoi(t_const_str str)
{
t_u64 out;
t_u64 sign;
t_usize i;
out = 0;
i = 0;
sign = 1;
while (me_isspace(str[i]))
i++;
if (str[i] == '+' || str[i] == '-')
if (str[i++] == '-')
sign = -1;
while (me_isdigit(str[i]))
{
out *= 10;
out += str[i] - '0';
i++;
}
return ((t_i32)(out * sign));
}
t_i64 me_atoi_64(t_const_str str)
{
t_u64 out;
t_u64 sign;
t_usize i;
out = 0;
i = 0;
sign = 1;
while (me_isspace(str[i]))
i++;
if (str[i] == '+' || str[i] == '-')
if (str[i++] == '-')
sign = -1;
while (me_isdigit(str[i]))
{
out *= 10;
out += str[i] - '0';
i++;
}
return ((t_i64)(out * sign));
}

69
stdme/src/convert/itoa.c
View file

@ -1,69 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* itoa.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maiboyer <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/08/03 21:05:46 by maiboyer #+# #+# */
/* Updated: 2023/11/10 14:56:42 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "me/convert/itoa.h"
#include "me/mem/mem.h"
#include "me/str/str.h"
#include <stdlib.h>
static void me_itoa_inner(t_u64 nb, t_str out)
{
t_i32 modulus;
bool need_print;
char c;
t_usize idx;
need_print = false;
modulus = 1000000000;
idx = 0;
while (modulus)
{
c = (char)(nb / modulus) + '0';
if (c != '0' || need_print)
{
out[idx++] = c;
need_print = true;
}
nb = nb % modulus;
modulus /= 10;
}
}
t_str me_itoa(t_i32 nb)
{
char out[12];
t_u64 n;
n = (t_u64)nb;
mem_set(out, 0, 12);
if (nb < 0)
{
out[0] = '-';
me_itoa_inner(-n, out + 1);
}
else if (nb == 0)
out[0] = '0';
else
me_itoa_inner(n, out);
return (str_clone(out));
}
/*R
int main(void)
{
me_putnbr(-2147483648);
write(1, "\n", 1);
me_putnbr(0);
write(1, "\n", 1);
me_putnbr(12345);
return (0);
}
R*/

25
stdme/src/printf/formatter/utils.c
View file

@ -6,12 +6,12 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */ /* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/11/16 17:57:04 by maiboyer #+# #+# */ /* Created: 2023/11/16 17:57:04 by maiboyer #+# #+# */
/* Updated: 2024/07/07 17:40:18 by maiboyer ### ########.fr */ /* Updated: 2024/07/17 15:38:55 by maiboyer ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "me/convert/str_to_numbers.h"
#include "me/mem/mem.h" #include "me/mem/mem.h"
#include "me/convert/atoi.h"
#include "me/printf/formatter/utils.h" #include "me/printf/formatter/utils.h"
#include "me/printf/matchers/matchers.h" #include "me/printf/matchers/matchers.h"
#include "me/str/str.h" #include "me/str/str.h"
@ -23,27 +23,28 @@
bool handle_atoi_stuff(t_const_str fmt, t_usize *c_idx, t_usize *nxt, bool handle_atoi_stuff(t_const_str fmt, t_usize *c_idx, t_usize *nxt,
t_printf_arg *c_arg) t_printf_arg *c_arg)
{ {
t_i32 atoi_res; t_str str;
t_usize i;
atoi_res = me_atoi(&fmt[*c_idx]); i = 0;
if (atoi_res < 0) while (fmt[*c_idx + i] != '\0' && fmt[*c_idx + i] >= '0' && \
fmt[*c_idx + i] <= '9')
i++;
str = str_substring(fmt, *c_idx, i);
if (str == NULL)
{ {
*c_idx = *nxt; *c_idx = *nxt;
*nxt = (t_usize)(str_find_chr(fmt + *nxt + 1, '%') - fmt); *nxt = (t_usize)(str_find_chr(fmt + *nxt + 1, '%') - fmt);
return (false); return (false);
} }
advance_atoi(fmt, c_idx); if (str_to_u64(str, 10, &c_arg->extra.precision))
c_arg->extra.align = (t_u64)atoi_res;
handle_prec_and_align(fmt, c_idx, c_arg);
atoi_res = atoi(&fmt[*c_idx]);
if (atoi_res < 0)
{ {
*c_idx = *nxt; *c_idx = *nxt;
*nxt = (t_usize)(str_find_chr(fmt + *nxt + 1, '%') - fmt); *nxt = (t_usize)(str_find_chr(fmt + *nxt + 1, '%') - fmt);
return (false); return (mem_free(str), false);
} }
mem_free(str);
advance_atoi(fmt, c_idx); advance_atoi(fmt, c_idx);
c_arg->extra.precision = (t_u64)atoi_res;
return (true); return (true);
} }