mirror of
https://github.com/DavidGailleton/42-Push_Swap.git
synced 2026-01-27 00:41:57 +00:00
finish the bonus just need to verify some files i guess
This commit is contained in:
40
Makefile
40
Makefile
@@ -18,7 +18,7 @@ COMPLEX_DIR = radix
|
|||||||
|
|
||||||
FLAGS_DIR = flags
|
FLAGS_DIR = flags
|
||||||
|
|
||||||
CHECKER_DIR = checker
|
CHECKER_DIR = check_error
|
||||||
|
|
||||||
INCLUDES = includes
|
INCLUDES = includes
|
||||||
|
|
||||||
@@ -32,7 +32,7 @@ INSERTION = insertion.c
|
|||||||
|
|
||||||
FLAGS_FILES = algorithms_sort.c flag.c bench.c
|
FLAGS_FILES = algorithms_sort.c flag.c bench.c
|
||||||
|
|
||||||
PARSING = ft_atoi.c parsing.c ft_strncmp.c ft_split.c ft_strlen.c ft_substr.c checker.c ft_itoa.c ft_isdigit.c \
|
PARSING = ft_atoi.c parsing.c ft_strncmp.c ft_split.c ft_strlen.c ft_substr.c ft_itoa.c ft_isdigit.c \
|
||||||
ft_strjoin.c ft_strlcat.c ft_strlcpy.c parsing_2.c disorder.c
|
ft_strjoin.c ft_strlcat.c ft_strlcpy.c parsing_2.c disorder.c
|
||||||
|
|
||||||
CHECKER_FILES = check_error.c verif_flag.c verif_is_digit.c verif_overflow.c verif_double.c
|
CHECKER_FILES = check_error.c verif_flag.c verif_is_digit.c verif_overflow.c verif_double.c
|
||||||
@@ -71,19 +71,27 @@ DEP = $(OBJ:.o=.d)
|
|||||||
|
|
||||||
BONUS_DIR = bonus
|
BONUS_DIR = bonus
|
||||||
|
|
||||||
|
GNL_D = GNL
|
||||||
|
|
||||||
GNL_DIR = bonus/GNL
|
GNL_DIR = bonus/GNL
|
||||||
|
|
||||||
BONUS_FILES = $(BONUS_DIR)/ft_bzero.c $(BONUS_DIR)/checker_bonus.c
|
BONUS_FILES = checker_bonus.c
|
||||||
|
|
||||||
GNL_FILES = $(GNL_DIR)/get_next_line.c $(GNL_DIR)/get_next_line_utils.c
|
GNL_FILES = get_next_line.c get_next_line_utils.c
|
||||||
|
|
||||||
ALL_BONUS_FILES = $(BONUS_FILES) $(GNL_FILES)
|
SRC_FOR_BONUS = ft_putnbr.c secure_write.c
|
||||||
|
|
||||||
|
ALL_BONUS_FILES = $(SRC_FOR_BONUS) $(BONUS_DIR)/$(BONUS_FILES) $(BONUS_DIR)/$(GNL_D)/$(GNL_FILES) \
|
||||||
|
$(STACK_UTILS_DIR)/$(STACK_UTILS) $(PARS_DIR)/$(PARSING) \
|
||||||
|
$(ALGO_DIR)/$(MEDIUM_DIR)/$(MEDIUM_ALGO) $(ALGO_UTILS_DIR)/$(ALGO_UTILS) \
|
||||||
|
$(INSERT_DIR)/$(INSERTION) $(ALGO_DIR)/$(COMPLEX_DIR)/$(COMPLEX_ALGO) \
|
||||||
|
$(FLAGS_DIR)/$(FLAGS_FILES) $(CHECKER_DIR)/$(CHECKER_FILES)
|
||||||
|
|
||||||
BONUS_OBJ = $(addprefix $(OBJ_DIR)/, $(notdir $(ALL_BONUS_FILES:.c=.o)))
|
BONUS_OBJ = $(addprefix $(OBJ_DIR)/, $(notdir $(ALL_BONUS_FILES:.c=.o)))
|
||||||
|
|
||||||
BONUS = checker
|
NAME_BONUS = checker
|
||||||
|
|
||||||
.PHONY: all clean fclean re
|
.PHONY: all clean fclean re bonus
|
||||||
|
|
||||||
all: $(NAME)
|
all: $(NAME)
|
||||||
|
|
||||||
@@ -93,8 +101,8 @@ $(NAME): $(OBJ)
|
|||||||
@echo "======= PUSH SWAP COMPILED ========="
|
@echo "======= PUSH SWAP COMPILED ========="
|
||||||
@echo "===================================="
|
@echo "===================================="
|
||||||
|
|
||||||
$(BONUS): $(BONUS_OBJ)
|
$(NAME_BONUS): $(BONUS_OBJ)
|
||||||
@$(CC) $(CFLAGS) -I$(GNL_DIR) $(BONUS_OBJ) -o $(BONUS)
|
@$(CC) $(CFLAGS) $(BONUS_OBJ) -o $(NAME_BONUS)
|
||||||
@echo "===================================="
|
@echo "===================================="
|
||||||
@echo "======= PUSH SWAP COMPILED ========="
|
@echo "======= PUSH SWAP COMPILED ========="
|
||||||
@echo "===================================="
|
@echo "===================================="
|
||||||
@@ -126,13 +134,16 @@ $(OBJ_DIR)/%.o: $(FLAGS_DIR)/%.c | $(OBJ_DIR)
|
|||||||
$(OBJ_DIR)/%.o: $(CHECKER_DIR)/%.c | $(OBJ_DIR)
|
$(OBJ_DIR)/%.o: $(CHECKER_DIR)/%.c | $(OBJ_DIR)
|
||||||
$(CC) $(CFLAGS) -MMD -MP -c $< -o $@
|
$(CC) $(CFLAGS) -MMD -MP -c $< -o $@
|
||||||
|
|
||||||
|
$(OBJ_DIR)/%.o: $(BONUS_DIR)/%.c | $(OBJ_DIR)
|
||||||
|
$(CC) $(CFLAGS) -MMD -MP -c $< -o $@
|
||||||
|
|
||||||
|
$(OBJ_DIR)/%.o: $(BONUS_DIR)/$(GNL_D)/%.c | $(OBJ_DIR)
|
||||||
|
$(CC) $(CFLAGS) -MMD -MP -c $< -o $@
|
||||||
|
|
||||||
$(OBJ_DIR)/%.o: %.c | $(OBJ_DIR)
|
$(OBJ_DIR)/%.o: %.c | $(OBJ_DIR)
|
||||||
$(CC) $(CFLAGS) -MMD -MP -c $< -o $@
|
$(CC) $(CFLAGS) -MMD -MP -c $< -o $@
|
||||||
|
|
||||||
$(OBJ_DIR)/%.o: $(BONUS_DIR)%.c | $(OBJ_DIR)
|
$(OBJ_DIR_BONUS)/%.o: %.c | $(OBJ_DIR_BONUS)
|
||||||
$(CC) $(CFLAGS) -MMD -MP -c $< -o $@
|
|
||||||
|
|
||||||
$(OBJ_DIR)/%.o: $(GNL_DIR)%.c | $(OBJ_DIR)
|
|
||||||
$(CC) $(CFLAGS) -MMD -MP -c $< -o $@
|
$(CC) $(CFLAGS) -MMD -MP -c $< -o $@
|
||||||
|
|
||||||
$(OBJ_DIR):
|
$(OBJ_DIR):
|
||||||
@@ -146,9 +157,12 @@ clean:
|
|||||||
|
|
||||||
fclean: clean
|
fclean: clean
|
||||||
@rm -f $(NAME)
|
@rm -f $(NAME)
|
||||||
|
@rm -f $(NAME_BONUS)
|
||||||
@echo "========== EXEC DELETED ============"
|
@echo "========== EXEC DELETED ============"
|
||||||
@echo "===================================="
|
@echo "===================================="
|
||||||
|
|
||||||
re: fclean all
|
re: fclean all
|
||||||
|
|
||||||
|
bonus: $(NAME_BONUS)
|
||||||
|
|
||||||
-include $(DEP)
|
-include $(DEP)
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
#include "get_next_line.h"
|
#include "get_next_line.h"
|
||||||
|
#include "parsing.h"
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
static int del_before_nl(char buf[BUFFER_SIZE])
|
static int del_before_nl(char buf[BUFFER_SIZE])
|
||||||
@@ -22,7 +23,7 @@ static int del_before_nl(char buf[BUFFER_SIZE])
|
|||||||
nl_i = index_of_nl(buf, BUFFER_SIZE);
|
nl_i = index_of_nl(buf, BUFFER_SIZE);
|
||||||
if (nl_i >= 0)
|
if (nl_i >= 0)
|
||||||
{
|
{
|
||||||
temp = ft_substr(buf, nl_i + 1, BUFFER_SIZE - nl_i);
|
temp = ft_substr_gnl(buf, nl_i + 1, BUFFER_SIZE - nl_i);
|
||||||
if (!temp)
|
if (!temp)
|
||||||
return (-1);
|
return (-1);
|
||||||
ft_bzero(buf, BUFFER_SIZE);
|
ft_bzero(buf, BUFFER_SIZE);
|
||||||
@@ -51,7 +52,7 @@ static char *ft_read_one(char buf[BUFFER_SIZE], int fd, char *str)
|
|||||||
free(str);
|
free(str);
|
||||||
return (NULL);
|
return (NULL);
|
||||||
}
|
}
|
||||||
if ((!str || ft_strlen(str) == 0) && temp == 0)
|
if ((!str || ft_strlen_1(str) == 0) && temp == 0)
|
||||||
{
|
{
|
||||||
free(str);
|
free(str);
|
||||||
return (NULL);
|
return (NULL);
|
||||||
@@ -73,7 +74,7 @@ static char *extract_all_nl(char buf[BUFFER_SIZE], int fd, char *str, int nl_i)
|
|||||||
if (!str)
|
if (!str)
|
||||||
return (NULL);
|
return (NULL);
|
||||||
nl_i = index_of_nl(buf, BUFFER_SIZE);
|
nl_i = index_of_nl(buf, BUFFER_SIZE);
|
||||||
if (nl_i < 0 && !ft_strlen(buf))
|
if (nl_i < 0 && !ft_strlen_1(buf))
|
||||||
return (str);
|
return (str);
|
||||||
}
|
}
|
||||||
str = ft_strjoin_new(str, buf, nl_i);
|
str = ft_strjoin_new(str, buf, nl_i);
|
||||||
@@ -100,12 +101,12 @@ char *get_next_line(int fd)
|
|||||||
nl_i = index_of_nl(buf, BUFFER_SIZE);
|
nl_i = index_of_nl(buf, BUFFER_SIZE);
|
||||||
if (nl_i >= 0)
|
if (nl_i >= 0)
|
||||||
{
|
{
|
||||||
str = ft_substr(buf, 0, nl_i + 1);
|
str = ft_substr_gnl(buf, 0, nl_i + 1);
|
||||||
temp = del_before_nl(buf);
|
temp = del_before_nl(buf);
|
||||||
if (temp < 0)
|
if (temp < 0)
|
||||||
return (free(str), NULL);
|
return (free(str), NULL);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
str = extract_all_nl(buf, fd, ft_substr("", 0, 1), nl_i);
|
str = extract_all_nl(buf, fd, ft_substr_gnl("", 0, 1), nl_i);
|
||||||
return (str);
|
return (str);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ int index_of_nl(char *str, int limit)
|
|||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t ft_strlen(const char *s)
|
size_t ft_strlen_1(const char *s)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
@@ -45,7 +45,7 @@ char *ft_strjoin_new(char const *s1, char const *s2, size_t limit)
|
|||||||
size_t i;
|
size_t i;
|
||||||
size_t j;
|
size_t j;
|
||||||
|
|
||||||
str = malloc(sizeof(char) * (ft_strlen(s1) + ft_strlen(s2) + 1));
|
str = malloc(sizeof(char) * (ft_strlen_1(s1) + ft_strlen_1(s2) + 1));
|
||||||
if (!str)
|
if (!str)
|
||||||
return (NULL);
|
return (NULL);
|
||||||
i = 0;
|
i = 0;
|
||||||
@@ -65,7 +65,7 @@ char *ft_strjoin_new(char const *s1, char const *s2, size_t limit)
|
|||||||
return (str);
|
return (str);
|
||||||
}
|
}
|
||||||
|
|
||||||
char *ft_substr(char const *s, unsigned int start, size_t len)
|
char *ft_substr_gnl(char const *s, unsigned int start, size_t len)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
char *sub_str;
|
char *sub_str;
|
||||||
@@ -73,7 +73,7 @@ char *ft_substr(char const *s, unsigned int start, size_t len)
|
|||||||
|
|
||||||
if (!s)
|
if (!s)
|
||||||
return (NULL);
|
return (NULL);
|
||||||
s_len = ft_strlen(s);
|
s_len = ft_strlen_1(s);
|
||||||
if (start > s_len)
|
if (start > s_len)
|
||||||
len = 0;
|
len = 0;
|
||||||
else if (s_len < (start + len))
|
else if (s_len < (start + len))
|
||||||
|
|||||||
@@ -13,8 +13,8 @@
|
|||||||
#include "push_swap.h"
|
#include "push_swap.h"
|
||||||
#include "parsing.h"
|
#include "parsing.h"
|
||||||
#include "get_next_line.h"
|
#include "get_next_line.h"
|
||||||
|
#include "check_error.h"
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
static int apply_operation(t_stacks *stacks, char buf[1024])
|
static int apply_operation(t_stacks *stacks, char buf[1024])
|
||||||
{
|
{
|
||||||
@@ -43,7 +43,14 @@ static int apply_operation(t_stacks *stacks, char buf[1024])
|
|||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void tester(t_stacks *stacks)
|
static int is_stacks_b_empty(t_stacks *stacks)
|
||||||
|
{
|
||||||
|
if (stacks->b != NULL)
|
||||||
|
return (0);
|
||||||
|
return (1);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int tester(t_stacks *stacks)
|
||||||
{
|
{
|
||||||
char *buf;
|
char *buf;
|
||||||
|
|
||||||
@@ -55,12 +62,43 @@ static void tester(t_stacks *stacks)
|
|||||||
free(buf);
|
free(buf);
|
||||||
buf = get_next_line(0);
|
buf = get_next_line(0);
|
||||||
}
|
}
|
||||||
if ()
|
if (!is_stacks_b_empty(stacks))
|
||||||
|
return (write(1, "KO\n", 3));
|
||||||
|
if (!check_order(stacks->a))
|
||||||
|
return (write(1, "KO\n", 3));
|
||||||
|
write(1, "OK\n", 3);
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int bonus(char **tab)
|
||||||
|
{
|
||||||
|
t_stacks *stacks;
|
||||||
|
int len;
|
||||||
|
|
||||||
|
stacks = NULL;
|
||||||
|
len = len_split(tab);
|
||||||
|
stacks = init_stacks(len, tab, 0);
|
||||||
|
stacks->print = 0;
|
||||||
|
if (!stacks)
|
||||||
|
return (0);
|
||||||
|
tester(stacks);
|
||||||
|
free_all(stacks);
|
||||||
|
return (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
t_stacks *stacks;
|
char **tab;
|
||||||
|
|
||||||
|
if (argc < 2)
|
||||||
|
return (write(2, "Error\n", 7));
|
||||||
|
tab = split_all(join_all(argc, argv));
|
||||||
|
if (!tab)
|
||||||
|
return (0);
|
||||||
|
if (!check_error_bonus(tab))
|
||||||
|
write(2, "Error\n", 7);
|
||||||
|
else
|
||||||
|
bonus(tab);
|
||||||
|
free_tab(tab);
|
||||||
|
return (0);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
/* ************************************************************************** */
|
|
||||||
/* */
|
|
||||||
/* ::: :::::::: */
|
|
||||||
/* ft_bzero.c :+: :+: :+: */
|
|
||||||
/* +:+ +:+ +:+ */
|
|
||||||
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
|
|
||||||
/* +#+#+#+#+#+ +#+ */
|
|
||||||
/* Created: 2026/01/09 11:59:20 by dgaillet #+# #+# */
|
|
||||||
/* Updated: 2026/01/09 11:59:46 by dgaillet ### ########lyon.fr */
|
|
||||||
/* */
|
|
||||||
/* ************************************************************************** */
|
|
||||||
|
|
||||||
void ft_bzero(void *s, unsigned int n)
|
|
||||||
{
|
|
||||||
while (n > 0)
|
|
||||||
{
|
|
||||||
*((unsigned char *) s) = '\0';
|
|
||||||
s++;
|
|
||||||
n--;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -23,6 +23,17 @@ int verif_is_number(char **tab)
|
|||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int check_error_bonus(char **tab)
|
||||||
|
{
|
||||||
|
if (!verif_is_digit(tab, 0))
|
||||||
|
return (0);
|
||||||
|
if (!verif_overflow(tab, 0))
|
||||||
|
return (0);
|
||||||
|
if (!verif_double(tab, 0))
|
||||||
|
return (0);
|
||||||
|
return (1);
|
||||||
|
}
|
||||||
|
|
||||||
int check_error(char **tab, int mod)
|
int check_error(char **tab, int mod)
|
||||||
{
|
{
|
||||||
if (!verif_flag(tab, mod))
|
if (!verif_flag(tab, mod))
|
||||||
@@ -19,5 +19,6 @@ int verif_is_digit(char **tab, int mod);
|
|||||||
int verif_overflow(char **tab, int mod);
|
int verif_overflow(char **tab, int mod);
|
||||||
int verif_double(char **tab, int mod);
|
int verif_double(char **tab, int mod);
|
||||||
int scan_str_is_digit(char *tab);
|
int scan_str_is_digit(char *tab);
|
||||||
|
int check_error_bonus(char **tab);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -21,10 +21,10 @@
|
|||||||
|
|
||||||
char *get_next_line(int fd);
|
char *get_next_line(int fd);
|
||||||
|
|
||||||
size_t ft_strlen(const char *s);
|
size_t ft_strlen_1(const char *s);
|
||||||
char *ft_strjoin_new(char const *s1, char const *s2, size_t limit);
|
char *ft_strjoin_new(char const *s1, char const *s2, size_t limit);
|
||||||
void ft_bzero(void *s, size_t n);
|
void ft_bzero(void *s, size_t n);
|
||||||
int index_of_nl(char *str, int limit);
|
int index_of_nl(char *str, int limit);
|
||||||
char *ft_substr(char const *s, unsigned int start, size_t len);
|
char *ft_substr_gnl(char const *s, unsigned int start, size_t len);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
@@ -26,6 +26,7 @@ typedef struct s_stacks
|
|||||||
t_stack *b;
|
t_stack *b;
|
||||||
int algo;
|
int algo;
|
||||||
int bench;
|
int bench;
|
||||||
|
int print;
|
||||||
float disorder;
|
float disorder;
|
||||||
unsigned int ra;
|
unsigned int ra;
|
||||||
unsigned int rb;
|
unsigned int rb;
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ static void set_t_stacks(t_stacks *stacks)
|
|||||||
stacks->algo = 0;
|
stacks->algo = 0;
|
||||||
stacks->bench = 0;
|
stacks->bench = 0;
|
||||||
stacks->disorder = 0;
|
stacks->disorder = 0;
|
||||||
|
stacks->print = 1;
|
||||||
stacks->sa = 0;
|
stacks->sa = 0;
|
||||||
stacks->sb = 0;
|
stacks->sb = 0;
|
||||||
stacks->ss = 0;
|
stacks->ss = 0;
|
||||||
|
|||||||
@@ -31,7 +31,8 @@ void pa(t_stacks *stacks)
|
|||||||
}
|
}
|
||||||
stack_add_front(&(stacks->a), b_push);
|
stack_add_front(&(stacks->a), b_push);
|
||||||
stacks->pa++;
|
stacks->pa++;
|
||||||
write(1, "pa\n", 3);
|
if (stacks->print)
|
||||||
|
write(1, "pa\n", 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
void pb(t_stacks *stacks)
|
void pb(t_stacks *stacks)
|
||||||
@@ -51,5 +52,6 @@ void pb(t_stacks *stacks)
|
|||||||
}
|
}
|
||||||
stack_add_front(&(stacks->b), a_push);
|
stack_add_front(&(stacks->b), a_push);
|
||||||
stacks->pb++;
|
stacks->pb++;
|
||||||
write(1, "pb\n", 3);
|
if (stacks->print)
|
||||||
|
write(1, "pb\n", 3);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,8 @@ void rrb(t_stacks *stacks)
|
|||||||
if (stacks && stacks->b && stacks->b->previous)
|
if (stacks && stacks->b && stacks->b->previous)
|
||||||
stacks->b = stacks->b->previous;
|
stacks->b = stacks->b->previous;
|
||||||
stacks->rrb++;
|
stacks->rrb++;
|
||||||
write(1, "rrb\n", 4);
|
if (stacks->print)
|
||||||
|
write(1, "rrb\n", 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
void rrr(t_stacks *stacks)
|
void rrr(t_stacks *stacks)
|
||||||
@@ -36,5 +37,6 @@ void rrr(t_stacks *stacks)
|
|||||||
if (stacks && stacks->a && stacks->a->previous)
|
if (stacks && stacks->a && stacks->a->previous)
|
||||||
stacks->a = stacks->a->previous;
|
stacks->a = stacks->a->previous;
|
||||||
stacks->rrr++;
|
stacks->rrr++;
|
||||||
write(1, "rrr\n", 4);
|
if (stacks->print)
|
||||||
|
write(1, "rrr\n", 4);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,8 @@ void ra(t_stacks *stacks)
|
|||||||
if (stacks && stacks->a && stacks->a->next)
|
if (stacks && stacks->a && stacks->a->next)
|
||||||
stacks->a = stacks->a->next;
|
stacks->a = stacks->a->next;
|
||||||
stacks->ra++;
|
stacks->ra++;
|
||||||
write(1, "ra\n", 3);
|
if (stacks->print)
|
||||||
|
write(1, "ra\n", 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
void rb(t_stacks *stacks)
|
void rb(t_stacks *stacks)
|
||||||
@@ -26,7 +27,8 @@ void rb(t_stacks *stacks)
|
|||||||
if (stacks && stacks->b && stacks->b->next)
|
if (stacks && stacks->b && stacks->b->next)
|
||||||
stacks->b = stacks->b->next;
|
stacks->b = stacks->b->next;
|
||||||
stacks->rb++;
|
stacks->rb++;
|
||||||
write(1, "rb\n", 3);
|
if (stacks->print)
|
||||||
|
write(1, "rb\n", 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
void rr(t_stacks *stacks)
|
void rr(t_stacks *stacks)
|
||||||
@@ -36,5 +38,6 @@ void rr(t_stacks *stacks)
|
|||||||
if (stacks && stacks->b && stacks->b->next)
|
if (stacks && stacks->b && stacks->b->next)
|
||||||
stacks->b = stacks->b->next;
|
stacks->b = stacks->b->next;
|
||||||
stacks->rr++;
|
stacks->rr++;
|
||||||
write(1, "rr\n", 3);
|
if (stacks->print)
|
||||||
|
write(1, "rr\n", 3);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,8 @@ void sa(t_stacks *stacks)
|
|||||||
a->value = a->next->value;
|
a->value = a->next->value;
|
||||||
a->next->value = stock;
|
a->next->value = stock;
|
||||||
stacks->sa++;
|
stacks->sa++;
|
||||||
write(1, "sa\n", 3);
|
if (stacks->print)
|
||||||
|
write(1, "sa\n", 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sb(t_stacks *stacks)
|
void sb(t_stacks *stacks)
|
||||||
@@ -40,7 +41,8 @@ void sb(t_stacks *stacks)
|
|||||||
b->value = b->next->value;
|
b->value = b->next->value;
|
||||||
b->next->value = stock;
|
b->next->value = stock;
|
||||||
stacks->sb++;
|
stacks->sb++;
|
||||||
write(1, "sb\n", 3);
|
if (stacks->print)
|
||||||
|
write(1, "sb\n", 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ss(t_stacks *stacks)
|
void ss(t_stacks *stacks)
|
||||||
@@ -66,5 +68,6 @@ void ss(t_stacks *stacks)
|
|||||||
a->next->value = stock;
|
a->next->value = stock;
|
||||||
}
|
}
|
||||||
stacks->ss++;
|
stacks->ss++;
|
||||||
write(1, "ss\n", 3);
|
if (stacks->print)
|
||||||
|
write(1, "ss\n", 3);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user