42/42_INT_01_libft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lstmap fonctionne

Browse Source
This commit is contained in:
hugodu69
2019-11-30 01:01:52 +01:00
parent 4c1770574c
commit 2d32889d63
2 changed files with 149 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
srcd/bonus/ft_lstmap.c
View File

@@ -16,7 +16,9 @@
*/ */
/* /*
** #include <libc.h> ** #include <stdlib.h>
** #include <unistd.h>
** #include <stdio.h>
** **
** typedef struct s_list ** typedef struct s_list
** { ** {
@@ -57,10 +59,29 @@
** } ** }
** } ** }
** **
** char *ft_strdup(const char *src)
** {
** int i;
** char *str;
**
** i = 0;
** while (src[i] != '\0')
** i++;
** if (!(str = (char*)malloc(sizeof(*str) * (i + 1))))
** return (NULL);
** while (i-- >= 0)
** str[i + 1] = src[i + 1];
** return (str);
** }
**
** void *to_uppercase(void *element) ** void *to_uppercase(void *element)
** { ** {
** *(char*)(((t_list*)element)->content) -= 32; ** char *i;
** return (element); **
** if (!(i = ft_strdup((char*)element)))
** return (NULL);
** *i -= 32;
** return ((void *)i);
** } ** }
** **
** void ft_delete(void *element) ** void ft_delete(void *element)
@@ -76,18 +97,18 @@
** void *(to_uppercase)(void *); ** void *(to_uppercase)(void *);
** void (ft_delete)(void*); ** void (ft_delete)(void*);
** **
** toto = ft_lstnew("a"); ** toto = ft_lstnew("aa");
** toto->next = ft_lstnew("b"); ** toto->next = ft_lstnew("b");
** toto->next->next = ft_lstnew("c"); ** toto->next->next = ft_lstnew("c");
** printf("toto->data :%c\n",*(char*)(toto->content)); ** printf("toto->data :%s\n",(char*)(toto->content));
** printf("toto->nxt->data :%c\n",*(char*)(toto->next->content)); ** printf("toto->nxt->data :%s\n",(char*)(toto->next->content));
** printf("toto->nxt->nxt->data:%c\n",*(char*)(toto->next->next->content)); ** printf("toto->nxt->nxt->data:%s\n",(char*)(toto->next->next->content));
** printf("toto->nxt->nxt->nxt :%s\n",(char*)(toto->next->next->next)); ** printf("toto->nxt->nxt->nxt :%s\n",(char*)(toto->next->next->next));
** ft_lstmap(toto->next, to_uppercase, ft_delete); ** toto = ft_lstmap(toto, to_uppercase, ft_delete);
** printf("----------------------\n"); ** printf("----------------------\n");
** printf("toto->data :%c\n",*(char*)(toto->content)); ** printf("toto->data :%s\n",(char*)(toto->content));
** printf("toto->nxt->data :%c\n",*(char*)(toto->next->content)); ** printf("toto->nxt->data :%s\n",(char*)(toto->next->content));
** printf("toto->nxt->nxt->data:%c\n",*(char*)(toto->next->next->content)); ** printf("toto->nxt->nxt->data:%s\n",(char*)(toto->next->next->content));
** printf("toto->nxt->nxt->nxt :%s\n",(char*)(toto->next->next->next)); ** printf("toto->nxt->nxt->nxt :%s\n",(char*)(toto->next->next->next));
** return (0); ** return (0);
** } ** }
@@ -100,14 +121,17 @@ t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *))
t_list *new; t_list *new;
t_list *tmp; t_list *tmp;
if (!lst) if(!(tmp = ft_lstnew(f(lst->content))))
{
del(tmp->content);
free(tmp);
return (NULL); return (NULL);
tmp = (t_list*)f(lst); }
new = tmp; new = tmp;
while (lst->next) while (lst->next)
{ {
lst = lst->next; lst = lst->next;
if (!(tmp->next = (t_list*)f(lst))) if(!(tmp->next = ft_lstnew(f(lst->content))))
{ {
del(tmp->next->content); del(tmp->next->content);
free(tmp->next); free(tmp->next);

217
srcs/ft_lstmap.c
View File

@@ -3,124 +3,129 @@
** if necessary the function del is used to delete an element ** if necessary the function del is used to delete an element
*/ */
/*
** #include <stdlib.h>
** #include <unistd.h>
** #include <stdio.h>
**
** typedef struct s_list
** {
** void *content;
** struct s_list *next;
** } t_list;
**
** t_list *ft_lstnew(void *content)
** {
** t_list *lst;
**
** if (!(lst = (t_list *)malloc(sizeof(*lst))))
** return (NULL);
** if (!content)
** lst->content = NULL;
** else
** lst->content = content;
** lst->next = NULL;
** return (lst);
** }
**
** void ft_lstadd_back(t_list **alst, t_list *new)
** {
** t_list *tmp;
**
** if (alst)
** {
** tmp = *alst;
** if (!tmp)
** *alst = new;
** else
** {
** while (tmp->next)
** tmp = tmp->next;
** tmp->next = new;
** }
** new->next = NULL;
** }
** }
**
** char *ft_strdup(const char *src)
** {
** int i;
** char *str;
**
** i = 0;
** while (src[i] != '\0')
** i++;
** if (!(str = (char*)malloc(sizeof(*str) * (i + 1))))
** return (NULL);
** while (i-- >= 0)
** str[i + 1] = src[i + 1];
** return (str);
** }
**
** void *to_uppercase(void *element)
** {
** char *i;
**
** if (!(i = ft_strdup((char*)element)))
** return (NULL);
** *i -= 32;
** return ((void *)i);
** }
**
** void ft_delete(void *element)
** {
** *(char*)element = '\0';
** }
**
** t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *));
**
** int main(void)
** {
** t_list *toto;
** void *(to_uppercase)(void *);
** void (ft_delete)(void*);
**
** toto = ft_lstnew("aa");
** toto->next = ft_lstnew("b");
** toto->next->next = ft_lstnew("c");
** printf("toto->data :%s\n",(char*)(toto->content));
** printf("toto->nxt->data :%s\n",(char*)(toto->next->content));
** printf("toto->nxt->nxt->data:%s\n",(char*)(toto->next->next->content));
** printf("toto->nxt->nxt->nxt :%s\n",(char*)(toto->next->next->next));
** toto = ft_lstmap(toto, to_uppercase, ft_delete);
** printf("----------------------\n");
** printf("toto->data :%s\n",(char*)(toto->content));
** printf("toto->nxt->data :%s\n",(char*)(toto->next->content));
** printf("toto->nxt->nxt->data:%s\n",(char*)(toto->next->next->content));
** printf("toto->nxt->nxt->nxt :%s\n",(char*)(toto->next->next->next));
** return (0);
** }
*/
#include <libc.h> #include "libft.h"
typedef struct s_list
{
void *content;
struct s_list *next;
} t_list;
t_list *ft_lstnew(void *content)
{
t_list *lst;
if (!(lst = (t_list *)malloc(sizeof(*lst))))
return (NULL);
if (!content)
lst->content = NULL;
else
lst->content = content;
lst->next = NULL;
return (lst);
}
void ft_lstadd_back(t_list **alst, t_list *new)
{
t_list *tmp;
if (alst)
{
tmp = *alst;
if (!tmp)
*alst = new;
else
{
while (tmp->next)
tmp = tmp->next;
tmp->next = new;
}
new->next = NULL;
}
}
void *to_uppercase(void *element)
{
char *i;
*i = *(char*)element;
*i -= 32;
return ((void *)i);
}
void ft_delete(void *element)
{
*(char*)element = '\0';
}
t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *));
int main(void)
{
t_list *toto;
void *(to_uppercase)(void *);
void (ft_delete)(void*);
toto = ft_lstnew("a");
toto->next = ft_lstnew("b");
toto->next->next = ft_lstnew("c");
printf("toto->data :%c\n",*(char*)(toto->content));
printf("toto->nxt->data :%c\n",*(char*)(toto->next->content));
printf("toto->nxt->nxt->data:%c\n",*(char*)(toto->next->next->content));
printf("toto->nxt->nxt->nxt :%s\n",(char*)(toto->next->next->next));
toto = ft_lstmap(toto, to_uppercase, ft_delete);
printf("toto->data :%c\n",*(char*)(toto->content));
printf("toto->nxt->data :%c\n",*(char*)(toto->next->content));
printf("toto->nxt->nxt->data:%c\n",*(char*)(toto->next->next->content));
printf("toto->nxt->nxt->nxt :%s\n",(char*)(toto->next->next->next));
return (0);
}
//#include "libft.h"
t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *)) t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *))
{ {
t_list *new; t_list *new;
t_list *tmp; t_list *tmp;
if (!lst) if(!(tmp = ft_lstnew(f(lst->content))))
return (NULL);
write(1, "o\n", 2);
new = ft_lstnew("");
tmp = new;
while (lst)
{ {
if (!(tmp = ft_lstnew(f(lst->content)))) del(tmp->content);
free(tmp);
return (NULL);
}
new = tmp;
while (lst->next)
{
lst = lst->next;
if(!(tmp->next = ft_lstnew(f(lst->content))))
{ {
del(tmp->content); del(tmp->next->content);
free(tmp); free(tmp->next);
return (NULL); return (NULL);
} }
lst = lst->next;
tmp = tmp->next; tmp = tmp->next;
} }
return (new); return (new);
// tmp = (t_list*)f(lst->content);
// new = tmp;
// while (lst->next)
// {
// lst = lst->next;
// if (!(tmp->next = (t_list*)f(lst->content)))
// {
// del(tmp->next->content);
// free(tmp->next);
// return (NULL);
// }
// tmp = tmp->next;
// }
// return (new);
} }