amelioration tests et explication dans main, et amelioration ecriture printf en pseudo code
This commit is contained in:
283
ft_printf.c
283
ft_printf.c
@@ -1,13 +1,13 @@
|
||||
|
||||
#include "ft_printf.h"
|
||||
#include <libc.h>
|
||||
|
||||
int ft_error(int i)
|
||||
{
|
||||
if (i == 0)
|
||||
return (1);
|
||||
return (0);
|
||||
}
|
||||
|
||||
//int ft_error(int i)
|
||||
//{
|
||||
// if (i == 0)
|
||||
// return (1);
|
||||
// return (0);
|
||||
//}
|
||||
|
||||
/*
|
||||
%[arg_nbr$][flags 0,-,#,', ,+][width *][.precision *][length hh,h,ll,l,L,j,t,z][specifier d,i,u,x,X,c,s,p,%,e,f,g,n,E,F,G,a,A,C,S,o]
|
||||
@@ -43,43 +43,98 @@ while ((s = next_word(str)) != NULL)
|
||||
|
||||
|
||||
*/
|
||||
char *ft_nextword(char *str)
|
||||
{
|
||||
char *word;
|
||||
|
||||
word = strdup(str);
|
||||
return (word);
|
||||
}
|
||||
//char *ft_nextword(char *str)
|
||||
//{
|
||||
// char *word;
|
||||
//
|
||||
// word = strdup(str);
|
||||
// return (word);
|
||||
//}
|
||||
|
||||
t_prist *ft_store(char *str)
|
||||
{
|
||||
t_prist *lst;
|
||||
t_prist *lstmp;
|
||||
char *tmp;
|
||||
//t_prist *ft_store(char *str)
|
||||
//{
|
||||
// t_prist *lst;
|
||||
// t_prist *lstmp;
|
||||
// char *tmp;
|
||||
//
|
||||
// lst = NULL;
|
||||
// while (*str != '\0')
|
||||
// {
|
||||
// lstmp = lst;
|
||||
// (*lst) = (t_prist *)malloc(sizeof(*lst));
|
||||
// tmp = ft_nextword(str);
|
||||
// (*arglst)->str = ft_strdup(tmp);
|
||||
// ...fill_flag...;
|
||||
// if (tmp != NULL)
|
||||
// tmp[0] = '%';
|
||||
// str = tmp;
|
||||
// lst->next = lstmp;
|
||||
// }
|
||||
// return (lst);
|
||||
//}
|
||||
|
||||
lst = NULL;
|
||||
while (*str != '\0')
|
||||
{
|
||||
lstmp = lst;
|
||||
(*lst) = (t_prist *)malloc(sizeof(*lst));
|
||||
tmp = ft_nextword(str);
|
||||
(*arglst)->str = ft_strdup(tmp);
|
||||
...fill_flag...;
|
||||
if (tmp != NULL)
|
||||
tmp[0] = '%';
|
||||
str = tmp;
|
||||
lst->next = lstmp;
|
||||
}
|
||||
return (lst);
|
||||
}
|
||||
/*
|
||||
** char *print; | -contain the arg converted into a string
|
||||
** char *type; | -contain the specifier type to use
|
||||
** | by va_arg
|
||||
** while s = next_word() | -return the next sequence to be print
|
||||
** | (either a string, or a conversion)
|
||||
** type = ft_specifier(&s) | -return the type if it's a conversion,
|
||||
** | or NULL if it's a string.
|
||||
** | if convers0, rmvs length & specifier from s
|
||||
** if !type: ft_put_word() | -print the string if it wasn't a conversion
|
||||
** while flag_*(s) | -for each * present, expand it into s
|
||||
** ft_expand_star() | in order it appears
|
||||
** print = ft_convert() | -convert the arg with its type,
|
||||
** | then trsfm it into a str and rtrn the str
|
||||
** ft_flag_transform() | -proceed all modification according to flags
|
||||
** ft_put_word(print) | -print the string fully converted
|
||||
** return (length) | -return the length of what was printed
|
||||
*/
|
||||
|
||||
int ft_printf(char *string, ...)
|
||||
{
|
||||
char *print;
|
||||
char *type;
|
||||
int length;
|
||||
|
||||
length = 0;
|
||||
while ((s = next_word(str)) != NULL)
|
||||
{
|
||||
if (!(type = ft_specifier(&s)))
|
||||
lentgh += ft_put_word(s);
|
||||
while (flag_*(s))
|
||||
ft_expand_star(va_arg(ap, int), &s);
|
||||
print = ft_convert(va_arg(ap, type), type);
|
||||
print = ft_flag_transform(s, print);
|
||||
length += ft_put_word(print);
|
||||
}
|
||||
return (length)
|
||||
}
|
||||
|
||||
// ft_flag_transform()
|
||||
// {
|
||||
// if ((i = flag_p(&s))) // precision is calculated before width, if its on string it cuts it if smaller than it,
|
||||
// print = ft_precision(i, print); // and on numbers it add '0' before it if bigger, then add minus sign if negatif (if precision is given with flags - or 0 they're ignored and cuted from s)
|
||||
// if ((i = flag_w(s))) //
|
||||
// {
|
||||
// if (flag_-(s))
|
||||
// print = ft_right_padded(i, print);
|
||||
// else if (flag_0(s))
|
||||
// print = ft_left_padded(i, print);
|
||||
// }
|
||||
// // if (flag_+(s))
|
||||
// // else if (flag_space(s))
|
||||
// // if (flag_'(s))
|
||||
// // if (flag_#(s))
|
||||
// // print = ft_alternate_form(print)
|
||||
// }
|
||||
|
||||
t_prist *lst;
|
||||
va_list ap;
|
||||
|
||||
va_start(ap, string);
|
||||
lst = ft_store(string);
|
||||
while (*string != '\0')
|
||||
{
|
||||
if (*string == 's')
|
||||
@@ -107,11 +162,28 @@ int main(void)
|
||||
i = 6;
|
||||
printf("%s-%s-%c-%i\n\n", s, str, c, i);
|
||||
ft_printf(s, c, str, i);
|
||||
printf("char %lu\n", sizeof(char));
|
||||
printf("short %lu\n", sizeof(short));
|
||||
printf("int %lu\n", sizeof(int));
|
||||
printf("long %lu\n", sizeof(long));
|
||||
printf("long long %lu\n", sizeof(long long));
|
||||
printf("unsigned char %lu\n", sizeof(unsigned char));
|
||||
printf("unsigned short %lu\n", sizeof(unsigned short));
|
||||
printf("unsigned int %lu\n", sizeof(unsigned int));
|
||||
printf("unsigned long %lu\n", sizeof(unsigned long));
|
||||
printf("unsigned long long %lu\n", sizeof(unsigned long long));
|
||||
printf("char * %lu\n", sizeof(char *));
|
||||
printf("short * %lu\n", sizeof(short *));
|
||||
printf("int * %lu\n", sizeof(int *));
|
||||
printf("long * %lu\n", sizeof(long *));
|
||||
printf("long long * %lu\n", sizeof(long long *));
|
||||
printf("double %lu\n", sizeof(double));
|
||||
// printf("wint_t %lu\n", sizeof(wint_t));
|
||||
// printf("wchar_T %lu\n", sizeof(wchar_t));
|
||||
return (0);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
conversions : cspdiuxX%
|
||||
flags : - 0 . *
|
||||
conversions : nfge
|
||||
@@ -121,80 +193,79 @@ conversions : nfge
|
||||
% [flags 0,- ][width *][.precision *] [specifier d,i,u,x,X,c,s,p,% ]
|
||||
% [flags #,', ,+] [length hh,h,ll,l ][specifier e,f,g,n ]
|
||||
|
||||
int flag: pw+ '#-0
|
||||
00000000 00000000 00000000 00000001 == 1 '0'
|
||||
00000000 00000000 00000000 00000010 == 2 '-'
|
||||
00000000 00000000 00000000 00000100 == 4 '#'
|
||||
00000000 00000000 00000000 00001000 == 8 '''
|
||||
00000000 00000000 00000000 00010000 == 16 ' '
|
||||
00000000 00000000 00000000 00100000 == 32 '+'
|
||||
00000000 00000000 00000000 01000000 == 64 '*' width
|
||||
00000000 00000000 00000000 10000000 == 128 '*' precision
|
||||
p == long unsigned int
|
||||
|
||||
typedef struct s_prist
|
||||
{
|
||||
char *str;
|
||||
int flag; // default 0 ; [0-#' +**] binary
|
||||
int width; // default 0 ;
|
||||
int prec; // default 0 ; precision
|
||||
char *length; // default "\0" ;
|
||||
char spec; // default 0 ; specifier
|
||||
char *arg; // default "\0" ;
|
||||
int p_nb; // default 0 ; print_nb : order in which to print (order it was found in string)
|
||||
int a_nb; // default 0 ; arg_nb : number of the corresponding argument (for flag $)
|
||||
struct s_prist *next;
|
||||
} t_prist;
|
||||
char 1bytes 8bits
|
||||
short 2bytes 16bits
|
||||
int 4bytes 32bits
|
||||
long 8bytes 64bits
|
||||
long long 8bytes 64bits
|
||||
|
||||
("2 1 3 4 3", 1, 2, 3, 4)
|
||||
255 -127 - +127 00 [char] [hhd, hhi, c] [int] [d( , h, hh), i( , h, hh), c]
|
||||
65535 -32768 - +32767 01 [short] [hd, hi] [int]
|
||||
4294967295 -2147483648 - +2147483647 02 [int] [d, i] [int]
|
||||
18446744073709551615 -9223372036854775808 - +9223372036854775807 04 [long] [ld, li] [long] [d(l ,ll), i(l, ll)]
|
||||
18446744073709551615 -9223372036854775808 - +9223372036854775807 04 [long long] [lld, lli] [long]
|
||||
256 0 - +255 05 [unsigned char] [hhu, hhx, hhX] [unsigned long] [u( , h, hh, l, ll), x( , h, hh, l, ll), X( , h, hh, l, ll), p]
|
||||
65536 0 - +65536 06 [unsigned short] [hu, hx, hX] [unsigned long]
|
||||
4294967296 0 - +4294967296 07 [unsigned int] [u, x, X, p] [unsigned long]
|
||||
18446744073709551616 0 - +18446744073709551616 09 [unsigned long] [lu, lx, lX] [unsigned long]
|
||||
18446744073709551616 0 - +18446744073709551616 09 [unsigned long long] [llu, llx, llX] [unsigned long]
|
||||
18446744073709551616 0 - +18446744073709551616 10 [char *] [s, hhn] [char *] [s]
|
||||
|
||||
ft_error(int err)
|
||||
ft_store("%i truc %-10d machin\n")
|
||||
ft_split_print(str)
|
||||
prist->str = "%i";
|
||||
ft_fill_lst(prist)
|
||||
prist->flag; // default = 0
|
||||
prist->width; // default = 0
|
||||
prist->prec; // default = 0
|
||||
prist->length;
|
||||
prist->spec;
|
||||
prist->p_nb;
|
||||
prist->a_nb; // if not $ == p_nb
|
||||
prist->str = " truc ";
|
||||
ft_fill_lst(prist)
|
||||
... // if str start without % it means it can be printed as a string directly
|
||||
prist->str = "%-10d";
|
||||
ft_fill_lst...
|
||||
prist->str = " machin\n";
|
||||
ft_fill_lst...
|
||||
return
|
||||
{{str; flag; width; precision; length; specifier; p_nb 1; a_nb 2},
|
||||
{str; flag; width; precision; length; specifier; p_nb 2; a_nb 1},
|
||||
{str; flag; width; precision; length; specifier; p_nb 3; a_nb 3},
|
||||
{str; flag; width; precision; length; specifier; p_nb 4; a_nb 4},
|
||||
{str; flag; width; precision; length; specifier; p_nb 5; a_nb 3}}
|
||||
18446744073709551616 0 - +18446744073709551616 16 [double] [e, le, f, lf, g, lg] []
|
||||
18446744073709551616 0 - +18446744073709551616 17 [wint_t] [lc] []
|
||||
18446744073709551616 0 - +18446744073709551616 18 [wchar_t] [ls] []
|
||||
18446744073709551616 0 - +18446744073709551616 11 [short *] [hn] []
|
||||
18446744073709551616 0 - +18446744073709551616 12 [int *] [n] []
|
||||
18446744073709551616 0 - +18446744073709551616 13 [long *] [ln] []
|
||||
18446744073709551616 0 - +18446744073709551616 14 [long long *] [lln] []
|
||||
|
||||
ft_sort_by_arg
|
||||
{{str; flag; width; precision; length; specifier; p_nb 2; a_nb 1},
|
||||
{str; flag; width; precision; length; specifier; p_nb 1; a_nb 2},
|
||||
{str; flag; width; precision; length; specifier; p_nb 3; a_nb 3},
|
||||
{str; flag; width; precision; length; specifier; p_nb 5; a_nb 3},
|
||||
{str; flag; width; precision; length; specifier; p_nb 4; a_nb 4}}
|
||||
d int 0 int
|
||||
dhh char 1 char
|
||||
dh short 2 short
|
||||
dl long 3 long
|
||||
dll long long 4 long long
|
||||
|
||||
ft_add_arg
|
||||
if lst->str[o] != '\%' rerun without looking for argument
|
||||
if lst->flag == * rerun for next argument but same list element
|
||||
[fl][w][p] or or
|
||||
%i ,1 -> '1' [] [0][0] [ ][0][0] [] [0][0]
|
||||
%*i ,3,1 -> ' 1' [*] [0][0] [* ][0][0] [w] [0][0]
|
||||
%.*i ,2,1 -> '01' [*] [0][0] [ *][0][0] [p] [0][0]
|
||||
%*.*i ,3,2,1 -> ' 01' [**][0][0] [**][0][0] [wp][0][0]
|
||||
%3.*i ,2,1 -> ' 01' [*] [3][0] [ *][3][0] [p] [3][0]
|
||||
%*.2i ,3,1 -> ' 01' [*] [0][2] [* ][0][2] [w] [0][2]
|
||||
%3.2i ,1 -> ' 01' [] [3][2] [ ][3][2] [] [3][2]
|
||||
if lst->next->a_nb == lst->a_nb rerun for next list element but same argument
|
||||
{{str; flag; width; precision; length; specifier; arg; p_nb 2; a_nb 1},
|
||||
{str; flag; width; precision; length; specifier; arg; p_nb 1; a_nb 2},
|
||||
{str; flag; width; precision; length; specifier; arg; p_nb 3; a_nb 3},
|
||||
{str; flag; width; precision; length; specifier; arg; p_nb 5; a_nb 3},
|
||||
{str; flag; width; precision; length; specifier; arg; p_nb 4; a_nb 4}}
|
||||
i int
|
||||
ihh char
|
||||
ih short
|
||||
il long
|
||||
ill long long
|
||||
|
||||
u unsigned int 5 unsigned int
|
||||
uhh unsigned char 6 unsigned char
|
||||
uh unsigned short 7 unsigned short
|
||||
ul unsigned long 8 unsigned long
|
||||
ull unsigned long long 9 unsigned long long
|
||||
|
||||
x unsigned int
|
||||
xhh unsigned char
|
||||
xh unsigned short
|
||||
xl unsigned long
|
||||
xll unsigned long long
|
||||
|
||||
X unsigned int
|
||||
Xhh unsigned char
|
||||
Xh unsigned short
|
||||
Xl unsigned long
|
||||
Xll unsigned long long
|
||||
|
||||
c char -> int
|
||||
cl wint_t 10 wint_t
|
||||
s char * 11 char *
|
||||
sl wchar_t * 12 wchar_t *
|
||||
p unsigned int
|
||||
e double 13 double
|
||||
el
|
||||
f double
|
||||
fl
|
||||
g double
|
||||
gl
|
||||
|
||||
n int * 14 int *
|
||||
nhh char *
|
||||
nh short * 15 short *
|
||||
nl long * 16 long *
|
||||
nll long long * 17 long long *
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user