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

tjr pas grand chose

Browse Source
This commit is contained in:
hugodu69
2020-02-21 13:32:24 +01:00
parent 2f8e5b0320
commit cd6f817972
3 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ft_printf
View File

Binary file not shown.

110
ft_printf.c
View File

@@ -1,6 +1,59 @@
#include "ft_printf.h" #include "ft_printf.h"
/*
** FT_FLAG_TRANSFORM :
** if i = flag_p(&s) | -precision is calculated before width,
** | on str, if < length(str), cuts it,
** print = ft_precision() | on nbr, if > length(nbr), add '0' before,
** | then add '-' if negatif
** | (if precision given with flags '-' or '0'
** | they're ignored and cuted from s)
** if i = flag_w(s) | -width is caculated
** if flag_-(&s) | -if flag '-', rm '-' and width from s
** print = ft_rpadd() | -put extra width as ' ' to right,
** else if flag_0(&s) | -if flag '0', rm '0' and width from s
** print = ft_lpadd() | -put extra width as '0' to left
** else | -if just width
** print = ft_lpadd() | put extra width as ' ' to left
** // if flag_+(s) |
** // else if flag_space(s) |
** // if flag_'(s) |
** // if flag_#(s) |
** // print = ft_altfrm() |
**
** int flag_p(char **s);
** char *ft_precision(int i, char *print);
** int flag_w(char *s);
** void flag_-(char **s);
** char *ft_rpadd(int i, char *print);
** char *ft_lpadd(int i, char *print, char c);
*/
char *ft_flag_transform(char *s, char *print)
{
(void)s;
// int i;
//
// if ((i = flag_p(&s)))
// print = ft_precision(i, print);
// if ((i = flag_w(s)))
// {
// if (flag_-(&s))
// print = ft_rpadd(i, print);
// else if (flag_0(&s))
// print = ft_lpadd(i, print, '0');
// else
// print = ft_lpadd(i, print, ' ');
// }
// if (flag_+(s)) //
// else if (flag_space(s)) //
// if (flag_'(s)) //
// if (flag_#(s)) //
// print = ft_alternate_form(print) //
return (print);
}
/* /*
** FT_PRINTF : ** FT_PRINTF :
** va_list ap; ** va_list ap;
@@ -44,61 +97,12 @@ int ft_printf(char *string, ...)
while (ft_strchr(s, '*')) while (ft_strchr(s, '*'))
if (!(ft_expand_star(va_arg(ap, int), &s))) if (!(ft_expand_star(va_arg(ap, int), &s)))
return (-1); return (-1);
print = ft_convert(ap, type); if (!(print = ft_convert(ap, type)))
print = ft_flag_transform(s, print); return (-1);
if (!(print = ft_flag_transform(s, print)))
return (-1);
length += ft_put_word(print); length += ft_put_word(print);
} }
} }
return (length); return (length);
} }
/*
** FT_FLAG_TRANSFORM :
** if i = flag_p(&s) | -precision is calculated before width,
** | on str, if < length(str), cuts it,
** print = ft_precision() | on nbr, if > length(nbr), add '0' before,
** | then add '-' if negatif
** | (if precision given with flags '-' or '0'
** | they're ignored and cuted from s)
** if i = flag_w(s) | -width is caculated
** if flag_-(&s) | -if flag '-', rm '-' and width from s
** print = ft_rpadd() | -put extra width as ' ' to right,
** else if flag_0(&s) | -if flag '0', rm '0' and width from s
** print = ft_lpadd() | -put extra width as '0' to left
** else | -if just width
** print = ft_lpadd() | put extra width as ' ' to left
** // if flag_+(s) |
** // else if flag_space(s) |
** // if flag_'(s) |
** // if flag_#(s) |
** // print = ft_altfrm() |
**
** int flag_p(char **s);
** char *ft_precision(int i, char *print);
** int flag_w(char *s);
** void flag_-(char **s);
** char *ft_rpadd(int i, char *print);
** char *ft_lpadd(int i, char *print, char c);
*/
char *ft_flag_transform(char *s, char *print)
{
return (NULL);
// if ((i = flag_p(&s)))
// print = ft_precision(i, print);
// if ((i = flag_w(s)))
// {
// if (flag_-(&s))
// print = ft_rpadd(i, print);
// else if (flag_0(&s))
// print = ft_lpadd(i, print, '0');
// else
// print = ft_lpadd(i, print, ' ');
// }
// if (flag_+(s)) //
// else if (flag_space(s)) //
// if (flag_'(s)) //
// if (flag_#(s)) //
// print = ft_alternate_form(print) //
}

2
main.c
View File

@@ -1,5 +1,5 @@
#include "ft_printf.h" #include "ft_printf.h"
#include <libc.h> #include <stdio.h> // for printf
#include <locale.h> #include <locale.h>
int ft_printf_test(char *string, ...) int ft_printf_test(char *string, ...)