precision ok, width en cours
This commit is contained in:
Hugo LAMY
BIN
.ft_printf.c.swm
Normal file
BIN
.ft_printf.c.swm
Normal file
Binary file not shown.
183
ft_printf.c
183
ft_printf.c
@@ -1,6 +1,105 @@
|
||||
|
||||
#include "ft_printf.h"
|
||||
|
||||
/*
|
||||
** -function that modify the string 'print' according to the precision flag :
|
||||
** if length(s) < precision, add x '0' bfr nbr, but after '-' if negative
|
||||
*/
|
||||
|
||||
char *precision_int(char *print, int precision)
|
||||
{
|
||||
int i;
|
||||
char *tmp;
|
||||
|
||||
i = ft_strlen(print);
|
||||
if (print[0] == '-')
|
||||
precision++;
|
||||
if (precision > i)
|
||||
{
|
||||
if (!(tmp = (char *)malloc(sizeof(char) * (precision + 1))))
|
||||
return (NULL);
|
||||
tmp[precision] = '\0';
|
||||
if (print[0] == '-')
|
||||
tmp[0] = '-';
|
||||
while (i)
|
||||
tmp[--precision] = print[--i];
|
||||
if (print[0] == '-')
|
||||
precision++;
|
||||
while (precision)
|
||||
tmp[--precision] = '0';
|
||||
if (print[0] == '-')
|
||||
tmp[0] = '-';
|
||||
free(print);
|
||||
print = tmp;
|
||||
}
|
||||
return (print);
|
||||
}
|
||||
|
||||
/*
|
||||
** -it first verify if there is a precision point, and if so, it execute a
|
||||
** serie of action listed below, otherwise return print as it is
|
||||
** ACTIONS :
|
||||
** -look for a '.'
|
||||
** -if followed by numbers, extract an int version of those numbers
|
||||
** -if the '.' is alone, gives value '0' to the int
|
||||
** -then removes the '.' and the numbers from the %string
|
||||
** -if flag '0' is present in %string, removes it (actually turn each occurence
|
||||
** in a '.')
|
||||
** -and transform 'print' according to the precision :
|
||||
** -1 if type is s: if length(s) > precision, removes end of 'print' to print
|
||||
** only x chars, with x = precision
|
||||
** -2 if type is "diouxX": call fonction 'precision_int' that return :
|
||||
** if length(s) < precision, add x '0' bfr nbr, but after '-' if negative
|
||||
** -3 if type is "aAeEfF": not covered
|
||||
** -4 si type is "gG": not covered
|
||||
** -5 else: error
|
||||
*/
|
||||
|
||||
char *ft_precision(char *s, char *print, char *type)
|
||||
{
|
||||
char *tmp;
|
||||
int precision;
|
||||
int i;
|
||||
|
||||
if ((tmp = ft_strchr(s, '.')))
|
||||
{
|
||||
precision = ft_atoi(tmp + 1);
|
||||
*tmp = '\0';
|
||||
while (ft_strchr("#- +'0", *(++s)))
|
||||
if (*s == '0')
|
||||
*s = '.';
|
||||
i = 0;
|
||||
if (ft_strchr(type, 's'))
|
||||
{
|
||||
while (i < precision && print[i])
|
||||
i++;
|
||||
if (print[i])
|
||||
print[i] = '\0';
|
||||
}
|
||||
if (ft_strchrset(type, "diouxX"))
|
||||
print = precision_int(print, precision);
|
||||
}
|
||||
return (print);
|
||||
}
|
||||
|
||||
/*
|
||||
**
|
||||
*/
|
||||
|
||||
char *ft_width(char *s, char *print, char *type)
|
||||
{
|
||||
int i;
|
||||
|
||||
ft_putstr("[");ft_putstr(s);ft_putstr("|");
|
||||
while (ft_strchr("%#- +'0.", *s))
|
||||
s++;
|
||||
ft_putstr(s);ft_putstr("|");
|
||||
i = ft_atoi(s);
|
||||
(void)type;
|
||||
ft_putnbr(i);ft_putstr("]");
|
||||
return (print);
|
||||
}
|
||||
|
||||
/*
|
||||
** FT_FLAG_TRANSFORM :
|
||||
** if i = flag_p(&s) | -precision is calculated before width,
|
||||
@@ -30,84 +129,12 @@
|
||||
** char *ft_lpadd(int i, char *print, char c);
|
||||
*/
|
||||
|
||||
char *ft_precision(char *s, char *print)
|
||||
{ char *test;
|
||||
char *tmp;
|
||||
int i; test = s;
|
||||
|
||||
if ((tmp = ft_strchr(s, '.')))
|
||||
{ ft_putstr("(");ft_putstr(s);ft_putstr(")");
|
||||
i = ft_atoi(tmp + 1);
|
||||
while (*tmp)
|
||||
*(tmp++) = '\0';
|
||||
while (ft_strchr("#- +'0", *(++s)))
|
||||
if (*s == '0')
|
||||
*s = '.';
|
||||
// tmp = s;
|
||||
// while (ft_strchr("%#- +'0", *s))
|
||||
// {
|
||||
// if (*s == '0')
|
||||
// s++;
|
||||
// *tmp = *s;
|
||||
// tmp++;
|
||||
// s++;
|
||||
// }
|
||||
// while (*s)
|
||||
// {
|
||||
// *tmp = *s;
|
||||
// s++;
|
||||
// tmp++;
|
||||
// }
|
||||
/* *tmp = '\0';*/ s = test;ft_putstr("[");ft_putnbr(i);ft_putstr("]");ft_putstr("(");ft_putstr(s);ft_putstr(")");
|
||||
// return (precision_trsf);
|
||||
}
|
||||
return (print);
|
||||
}
|
||||
|
||||
char *ft_flag_transform(char *s, char *print)
|
||||
char *ft_flag_transform(char *s, char *print, char *type)
|
||||
{
|
||||
// printf("|%i| - |%.0i| - |%.0i| - |%.i|\n",0,0,1,0);
|
||||
// printf("|%i| - |%i| - |%.4i| - |%.4i|\n",10,-10,10,-10);
|
||||
// printf("|%i| - |%05i| - |%05.4i| - |%.4i|\n",10,10,10,10);
|
||||
// printf("|%i| - |%-5i| - |%-5.4i| - |%-.4i|\n",10,10,10,10);
|
||||
// char * t = "trois";
|
||||
// printf("|%s| - |%.0s| - |%.2s| - |%.10s|\n",t,t,t,t);
|
||||
// char y = 'y';
|
||||
// printf("|%c| - |%.0c| - |%.2c| - |%.10c|\n",y,y,y,y);
|
||||
|
||||
print = ft_precision(s, print);
|
||||
// (print, s, type); // -regarde s'il y a un '.' suivit de
|
||||
// chiffres, donc une precision
|
||||
// -si oui transforme les chiffres en
|
||||
// un int 'precision'
|
||||
// -s'il y a un '.' sans chiffres,
|
||||
// donner la valeur 0 a 'precision'
|
||||
// -virer ces chiffres et le '.' de s
|
||||
// -si flag '0', l'enlever de s aussi
|
||||
// -transformer print en fonction de
|
||||
// cette precision :
|
||||
// -1 si type vaut s:
|
||||
// -si length(s) > a precision
|
||||
// raboter la fin de s pour afficher
|
||||
// uniquement au max la longueur de
|
||||
// precision
|
||||
// -sinon laisser print tel quel
|
||||
// -2 si type de s est "diouxX":
|
||||
// -si length(s) < a precision
|
||||
// ajouter des '0' avant le nombre
|
||||
// mais apres le signe '-' si c'est
|
||||
// un nombre negatif
|
||||
// -3 si type de s est "aAeEfF":
|
||||
// -non traite
|
||||
// -4 si type de s est "gG":
|
||||
// -non traite
|
||||
// -5 sinon:
|
||||
// -erreur
|
||||
|
||||
// int i;
|
||||
//
|
||||
// if ((i = flag_p(&s)))
|
||||
// print = ft_precision(i, print);
|
||||
ft_putstr(s);ft_putstr("|");
|
||||
print = ft_precision(s, print, type);
|
||||
ft_putstr(s);ft_putstr("|");
|
||||
print = ft_width(s, print, type);
|
||||
// if ((i = flag_w(s)))
|
||||
// {
|
||||
// if (flag_-(&s))
|
||||
@@ -171,7 +198,7 @@ int ft_printf(char *string, ...)
|
||||
return (-1);
|
||||
if (!(print = ft_convert(ap, type)))
|
||||
return (-1);
|
||||
if (!(print = ft_flag_transform(s, print)))
|
||||
if (!(print = ft_flag_transform(s, print, type)))
|
||||
return (-1);
|
||||
length += ft_put_word(print);
|
||||
}
|
||||
|
||||
72
main.c
72
main.c
@@ -88,33 +88,53 @@ int main(int ac, char **av)
|
||||
{
|
||||
printf("sdf\n");
|
||||
ft_printf("sdf\n\n");
|
||||
printf("%i\n", 23);
|
||||
ft_printf("%i\n\n", 23);
|
||||
printf("'%i'\n", 23);
|
||||
ft_printf("'%i'\n\n", 23);
|
||||
long int k = -23;
|
||||
printf("%li\n", k);
|
||||
ft_printf("%li\n\n", k);
|
||||
printf("%i\n", -32);
|
||||
ft_printf("%i\n\n", -32);
|
||||
printf("%li\n", 9223372036854775807);
|
||||
ft_printf("%li\n\n", 9223372036854775807);
|
||||
printf("%c\n", 'f');
|
||||
ft_printf("%c\n\n", 'f');
|
||||
printf("%s\n", "sdffhk");
|
||||
ft_printf("%s\n\n", "sdffhk");
|
||||
printf("%u\n", 1221879);
|
||||
ft_printf("%u\n\n", 1221879);
|
||||
printf("%x\n", 3287);
|
||||
ft_printf("%x\n\n", 3287);
|
||||
printf("%lX\n", 9223372036854775807);
|
||||
ft_printf("%lX\n\n", 9223372036854775807);
|
||||
printf("%p\n", "dfgdf");
|
||||
ft_printf("%p\n\n", "dfgdf");
|
||||
ft_printf("%.i\n", 123);
|
||||
ft_printf("%.2i\n", 123);
|
||||
ft_printf("%.252653i\n", 123);
|
||||
ft_printf("%0.6i\n", 123);
|
||||
ft_printf("%- 032.6i\n", 123);
|
||||
ft_printf("%0-0 32.6i\n", 123);
|
||||
printf("'%li'\n", k);
|
||||
ft_printf("'%li'\n\n", k);
|
||||
printf("'%i'\n", -32);
|
||||
ft_printf("'%i'\n\n", -32);
|
||||
printf("'%li'\n", 9223372036854775807);
|
||||
ft_printf("'%li'\n\n", 9223372036854775807);
|
||||
printf("'%c'\n", 'f');
|
||||
ft_printf("'%c'\n\n", 'f');
|
||||
printf("'%s'\n", "sdffhk");
|
||||
ft_printf("'%s'\n\n", "sdffhk");
|
||||
printf("'%u'\n", 1221879);
|
||||
ft_printf("'%u'\n\n", 1221879);
|
||||
printf("'%x'\n", 3287);
|
||||
ft_printf("'%x'\n\n", 3287);
|
||||
printf("'%lX'\n", 9223372036854775807);
|
||||
ft_printf("'%lX'\n\n", 9223372036854775807);
|
||||
printf("'%p'\n", "dfgdf");
|
||||
ft_printf("'%p'\n\n", "dfgdf");
|
||||
printf("'%.i'\n", 123);
|
||||
ft_printf("'%.i'\n\n", 123);
|
||||
printf("'%.2i'\n", 123);
|
||||
ft_printf("'%.2i'\n\n", 123);
|
||||
printf("'%.25i'\n", 123);
|
||||
ft_printf("'%.25i'\n\n", 123);
|
||||
printf("'%0.6i'\n", 123);
|
||||
ft_printf("'%0.6i'\n\n", 123);
|
||||
printf("'%- 032.6i'\n", 123);
|
||||
ft_printf("'%- 032.6i'\n\n", 123);
|
||||
printf("'%0-0 32.6i'\n", 123);
|
||||
ft_printf("'%0-0 32.6i'\n\n", 123);
|
||||
printf("'%0-0.6i'\n", 123);
|
||||
ft_printf("'%0-0.6i'\n\n", 123);
|
||||
printf("'%s'\n", "string");
|
||||
ft_printf("'%s'\n\n", "string");
|
||||
printf("'%.7s'\n", "string");
|
||||
ft_printf("'%.7s'\n\n", "string");
|
||||
printf("'%.2s'\n", "string");
|
||||
ft_printf("'%.2s'\n\n", "string");
|
||||
printf("'%.0s'\n", "string");
|
||||
ft_printf("'%.0s'\n\n", "string");
|
||||
printf("'%.s'\n", "string");
|
||||
ft_printf("'%.s'\n\n", "string");
|
||||
printf("'%.7i'\n", -123456);
|
||||
ft_printf("'%.7i'\n\n", -123456);
|
||||
}
|
||||
|
||||
/* ////////////////////////////////////////////////////////////////// */
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2020/02/19 16:23:01 by hulamy #+# #+# */
|
||||
/* Updated: 2020/02/20 13:03:34 by hulamy ### ########.fr */
|
||||
/* Updated: 2020/02/24 14:34:16 by hulamy ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2020/02/10 13:58:30 by hulamy #+# #+# */
|
||||
/* Updated: 2020/02/10 16:36:35 by hulamy ### ########.fr */
|
||||
/* Updated: 2020/02/24 14:33:47 by hulamy ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@@ -26,12 +26,8 @@ int width_precision(char *s)
|
||||
i = 0;
|
||||
if (ft_strchr("*", s[i]) != NULL)
|
||||
i++;
|
||||
else if (ft_strchr("123456789", s[i]) != NULL)
|
||||
{
|
||||
while (ft_strchr("0123456789", s[i]) != NULL)
|
||||
i++;
|
||||
while (ft_strchr("0123456789", s[i]) != NULL)
|
||||
i++;
|
||||
}
|
||||
return (i);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user