Compare commits
3 commits
93da2c9ca6
...
3557cca19c
| Author | SHA1 | Date | |
|---|---|---|---|
| 3557cca19c | |||
| 721a840908 | |||
| 14adc54215 |
18 changed files with 109 additions and 58 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,2 +1,3 @@
|
|||
build
|
||||
obj
|
||||
.config
|
||||
14
Makefile
14
Makefile
|
|
@ -17,6 +17,11 @@ TESTS_SRCS = $(wildcard $(TESTS_DIR)/*.c)
|
|||
TESTS_OBJS = $(patsubst $(TESTS_DIR)/%.c,$(OBJ_DIR)/%.test.o,$(TESTS_SRCS))
|
||||
TESTS_BINS = $(patsubst $(TESTS_DIR)/%.c,$(BUILD_DIR)/%_test,$(TESTS_SRCS))
|
||||
|
||||
# Flags for configuration
|
||||
CONFIG_FLAGS := $(shell grep -E '^[a-zA-Z0-9_]+=' .config | sed 's/\([A-Za-z0-9_]*\)=y/-D\1=1/;s/\([A-Za-z0-9_]*\)=n/-D\1=0/')
|
||||
CFLAGS += $(CONFIG_FLAGS)
|
||||
|
||||
|
||||
all: $(LIBRARY)
|
||||
|
||||
$(OBJ_DIR) $(BUILD_DIR):
|
||||
|
|
@ -59,3 +64,12 @@ fclean: clean
|
|||
re: fclean all
|
||||
|
||||
.PHONY: all clean fclean re tests
|
||||
|
||||
CONFIG_FILE := .config
|
||||
|
||||
genconfig:
|
||||
@echo -e " C\t${CONFIG_FILE}"
|
||||
@echo "USE_SLIST=y" > $(CONFIG_FILE)
|
||||
@echo "USE_DLIST=y" >> $(CONFIG_FILE)
|
||||
@echo "USE_STACK=y" >> $(CONFIG_FILE)
|
||||
|
||||
|
|
|
|||
48
hdrs/libft.h
48
hdrs/libft.h
|
|
@ -1,7 +1,14 @@
|
|||
#ifndef LIBFT_H
|
||||
#define LIBFT_H
|
||||
|
||||
#include <stdlib.h>
|
||||
#if DEBUG
|
||||
#include <stdio.h>
|
||||
#define DEBUG_PRINT(fmt, ...) \
|
||||
fprintf(stderr, "[DEBUG] %s:%d:%s(): " fmt "\n", \
|
||||
__FILE__, __LINE__, __func__, ##__VA_ARGS__)
|
||||
#else
|
||||
#define DEBUG_PRINT(fmt, ...) ((void)0)
|
||||
#endif
|
||||
|
||||
void *ft_realloc(void *ptr, size_t old_size, size_t new_size);
|
||||
|
||||
|
|
@ -49,29 +56,30 @@ typedef struct s_string
|
|||
char *data;
|
||||
} t_string;
|
||||
|
||||
/* List */
|
||||
typedef struct s_list
|
||||
/* Single Linked List */
|
||||
#if USE_SLIST
|
||||
typedef struct s_slist
|
||||
{
|
||||
void *data;
|
||||
struct s_list *next;
|
||||
} t_list;
|
||||
struct s_slist *next;
|
||||
} t_slist;
|
||||
|
||||
/* List functions */
|
||||
t_list *ft_lstnew(void *data);
|
||||
void ft_lstpush(t_list **lst, t_list *node);
|
||||
void ft_lstunshift(t_list **lst, t_list *node);
|
||||
t_list *ft_lstpop(t_list **lst);
|
||||
t_list *ft_lstshift(t_list **lst);
|
||||
int ft_lstsize(t_list *lst);
|
||||
void ft_lstclear(t_list **lst);
|
||||
void ft_lstreverse(t_list **lst);
|
||||
int ft_lstempty(t_list *lst);
|
||||
void ft_lstiter(t_list *lst, void (*f)(void *));
|
||||
void ft_lstrm(t_list **lst, void *data, int (*cmp)(void *, void *), void (*del)(void *));
|
||||
t_list *ft_lstfind(t_list *lst, void *data, int (*cmp)(void *, void *));
|
||||
int ft_lstinsert(t_list **lst, t_list *node, int index);
|
||||
t_list *ft_lstget(t_list *lst, int index);
|
||||
t_slist *ft_slist_new(void *data);
|
||||
void ft_slist_push(t_slist **lst, t_slist *node);
|
||||
void ft_slist_unshift(t_slist **lst, t_slist *node);
|
||||
t_slist *ft_slist_pop(t_slist **lst);
|
||||
t_slist *ft_slist_shift(t_slist **lst);
|
||||
int ft_slist_size(t_slist *lst);
|
||||
void ft_slist_clear(t_slist **lst);
|
||||
void ft_slist_reverse(t_slist **lst);
|
||||
int ft_slist_empty(t_slist *lst);
|
||||
void ft_slist_iter(t_slist *lst, void (*f)(void *));
|
||||
void ft_slist_rm(t_slist **lst, void *data, int (*cmp)(void *, void *), void (*del)(void *));
|
||||
t_slist *ft_slist_find(t_slist *lst, void *data, int (*cmp)(void *, void *));
|
||||
int ft_slist_insert(t_slist **lst, t_slist *node, int index);
|
||||
t_slist *ft_slist_get(t_slist *lst, int index);
|
||||
|
||||
#endif
|
||||
/* Vector */
|
||||
typedef struct s_vec
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
#include "libft.h"
|
||||
|
||||
int ft_lstempty(t_list *lst)
|
||||
{
|
||||
return (lst == NULL);
|
||||
}
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
#if USE_SLIST
|
||||
#include "libft.h"
|
||||
#include <stdlib.h>
|
||||
|
||||
void ft_lstclear(t_list **lst)
|
||||
void ft_slist_clear(t_slist **lst)
|
||||
{
|
||||
t_list *tmp;
|
||||
t_slist *tmp;
|
||||
while (lst && *lst)
|
||||
{
|
||||
tmp = (*lst)->next;
|
||||
|
|
@ -11,3 +12,4 @@ void ft_lstclear(t_list **lst)
|
|||
*lst = tmp;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
8
srcs/slist/ft_slist_empty.c
Normal file
8
srcs/slist/ft_slist_empty.c
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
#if USE_SLIST
|
||||
#include "libft.h"
|
||||
|
||||
int ft_slist_empty(t_slist *lst)
|
||||
{
|
||||
return (lst == NULL);
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
#if USE_SLIST
|
||||
#include "libft.h"
|
||||
|
||||
t_list *ft_lstfind(t_list *lst, void *data, int (*cmp)(void *, void *))
|
||||
t_slist *ft_slist_find(t_slist *lst, void *data, int (*cmp)(void *, void *))
|
||||
{
|
||||
while (lst)
|
||||
{
|
||||
|
|
@ -10,3 +11,4 @@ t_list *ft_lstfind(t_list *lst, void *data, int (*cmp)(void *, void *))
|
|||
}
|
||||
return (NULL);
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
#if USE_SLIST
|
||||
#include "libft.h"
|
||||
|
||||
t_list *ft_lstget(t_list *lst, int index)
|
||||
t_slist *ft_slist_get(t_slist *lst, int index)
|
||||
{
|
||||
int i = 0;
|
||||
while (lst && i < index)
|
||||
|
|
@ -10,3 +11,4 @@ t_list *ft_lstget(t_list *lst, int index)
|
|||
}
|
||||
return ((i == index) ? lst : NULL);
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
#if USE_SLIST
|
||||
#include "libft.h"
|
||||
|
||||
int ft_lstinsert(t_list **lst, t_list *node, int index)
|
||||
int ft_slist_insert(t_slist **lst, t_slist *node, int index)
|
||||
{
|
||||
t_list *curr = *lst;
|
||||
t_list *prev = NULL;
|
||||
t_slist *curr = *lst;
|
||||
t_slist *prev = NULL;
|
||||
int i = 0;
|
||||
|
||||
if (index < 0 || !node)
|
||||
|
|
@ -28,3 +29,4 @@ int ft_lstinsert(t_list **lst, t_list *node, int index)
|
|||
}
|
||||
return (-1);
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
#if USE_SLIST
|
||||
#include "libft.h"
|
||||
|
||||
void ft_lstiter(t_list *lst, void (*f)(void *))
|
||||
void ft_slist_iter(t_slist *lst, void (*f)(void *))
|
||||
{
|
||||
while (lst)
|
||||
{
|
||||
|
|
@ -8,3 +9,4 @@ void ft_lstiter(t_list *lst, void (*f)(void *))
|
|||
lst = lst->next;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,8 +1,9 @@
|
|||
#if USE_SLIST
|
||||
#include "libft.h"
|
||||
|
||||
t_list *ft_lstnew(void *data)
|
||||
t_slist *ft_slist_new(void *data)
|
||||
{
|
||||
t_list *node = (t_list *)malloc(sizeof(t_list));
|
||||
t_slist *node = (t_slist *)malloc(sizeof(t_slist));
|
||||
|
||||
if (!node)
|
||||
return (NULL);
|
||||
|
|
@ -12,3 +13,4 @@ t_list *ft_lstnew(void *data)
|
|||
|
||||
return node;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
#if USE_SLIST
|
||||
#include "libft.h"
|
||||
|
||||
t_list *ft_lstpop(t_list **lst)
|
||||
t_slist *ft_list_pop(t_slist **lst)
|
||||
{
|
||||
t_list *current;
|
||||
t_list *prev;
|
||||
t_slist *current;
|
||||
t_slist *prev;
|
||||
|
||||
if (!lst || !*lst)
|
||||
return NULL;
|
||||
|
|
@ -21,3 +22,4 @@ t_list *ft_lstpop(t_list **lst)
|
|||
prev->next = NULL;
|
||||
return current;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,8 +1,9 @@
|
|||
#if USE_SLIST
|
||||
#include "libft.h"
|
||||
|
||||
void ft_lstpush(t_list **lst, t_list *node)
|
||||
void ft_slist_push(t_slist **lst, t_slist *node)
|
||||
{
|
||||
t_list *current;
|
||||
t_slist *current;
|
||||
|
||||
if (!lst || !node)
|
||||
return;
|
||||
|
|
@ -20,3 +21,4 @@ void ft_lstpush(t_list **lst, t_list *node)
|
|||
current = current->next;
|
||||
current->next = node;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,10 +1,11 @@
|
|||
#if USE_SLIST
|
||||
#include "libft.h"
|
||||
|
||||
void ft_lstreverse(t_list **lst)
|
||||
void ft_slist_reverse(t_slist **lst)
|
||||
{
|
||||
t_list *prev = NULL;
|
||||
t_list *curr = *lst;
|
||||
t_list *next;
|
||||
t_slist *prev = NULL;
|
||||
t_slist *curr = *lst;
|
||||
t_slist *next;
|
||||
|
||||
while (curr)
|
||||
{
|
||||
|
|
@ -15,3 +16,4 @@ void ft_lstreverse(t_list **lst)
|
|||
}
|
||||
*lst = prev;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
#if USE_SLIST
|
||||
#include "libft.h"
|
||||
|
||||
void ft_lstrm(t_list **lst, void *data, int (*cmp)(void *, void *), void (*del)(void *))
|
||||
void ft_slist_rm(t_slist **lst, void *data, int (*cmp)(void *, void *), void (*del)(void *))
|
||||
{
|
||||
t_list *curr = *lst;
|
||||
t_list *prev = NULL;
|
||||
t_slist *curr = *lst;
|
||||
t_slist *prev = NULL;
|
||||
|
||||
while (curr)
|
||||
{
|
||||
|
|
@ -22,3 +23,4 @@ void ft_lstrm(t_list **lst, void *data, int (*cmp)(void *, void *), void (*del)(
|
|||
curr = curr->next;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,8 +1,9 @@
|
|||
#if USE_SLIST
|
||||
#include "libft.h"
|
||||
|
||||
t_list *ft_lstshift(t_list **lst)
|
||||
t_slist *ft_slist_shift(t_slist **lst)
|
||||
{
|
||||
t_list *first;
|
||||
t_slist *first;
|
||||
|
||||
if (!lst || !*lst)
|
||||
return NULL;
|
||||
|
|
@ -11,3 +12,4 @@ t_list *ft_lstshift(t_list **lst)
|
|||
first->next = NULL;
|
||||
return first;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
#if USE_SLIST
|
||||
#include "libft.h"
|
||||
|
||||
int ft_lstsize(t_list *lst)
|
||||
int ft_slist_size(t_slist *lst)
|
||||
{
|
||||
int size = 0;
|
||||
while (lst)
|
||||
|
|
@ -10,3 +11,4 @@ int ft_lstsize(t_list *lst)
|
|||
}
|
||||
return size;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,9 +1,11 @@
|
|||
#if USE_SLIST
|
||||
#include "libft.h"
|
||||
|
||||
void ft_lstunshift(t_list **lst, t_list *node)
|
||||
void ft_slist_unshift(t_slist **lst, t_slist *node)
|
||||
{
|
||||
if (!lst || !node)
|
||||
return;
|
||||
node->next = *lst;
|
||||
*lst = node;
|
||||
}
|
||||
#endif
|
||||
Loading…
Add table
Add a link
Reference in a new issue