From a63defb0b90f8d12655128ef16797e5d0ab209c6 Mon Sep 17 00:00:00 2001
From: Hugo LAMY <hugogogo@protonmail.com>
Date: Mon, 10 Feb 2020 13:59:22 +0100
Subject: [PATCH] nex_word ok

---
 .ft_printf.c.swn | Bin 32768 -> 28672 bytes
 ft_printf.c      |  68 +-----------------------------
 ft_printf.h      |  18 +++-----
 next_word.c      | 107 +++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 113 insertions(+), 80 deletions(-)
 create mode 100644 next_word.c

diff --git a/.ft_printf.c.swn b/.ft_printf.c.swn
index c0a6dca4fcbf6dfe689aa33f862f3e55a7601996..e71ca7f60b4c0b107bb910a79f7b2972f8392edc 100644
GIT binary patch
delta 4775
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
UqW@i)>or+<s?}+cFIR~F0#w%~l>h($

delta 3789
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
KvA5H}sDA=*CZ}8g

diff --git a/ft_printf.c b/ft_printf.c
index 9399900..02112ed 100644
--- a/ft_printf.c
+++ b/ft_printf.c
@@ -1,8 +1,8 @@
 
 #include "ft_printf.h"
-#include <libc.h>
 
 /*
+** FT_PRINTF :
 **	va_list	ap;
 **	int		length;
 **	char	*print;				| -contain the arg converted into a string
@@ -31,71 +31,6 @@
 ** char *ft_flag_transform(char *s, char *print);
 */
 
-int		word_length(char *s)
-{
-	int		i;
-
-	i = 1;
-	if (s[0] == '\0')
-		return (0);
-	if (s[0] != '%')
-	{
-		while (s[i] != '%' && s[i] != '\0')
-			i++;
-		printf("%02i.:",i);
-		return (i);
-	}
-	while (strchr("#0- +'", s[i]) != NULL)
-		i++;
-	if (strchr("*", s[i]) != NULL)
-		i++;
-	else if (strchr("123456789", s[i]) != NULL)
-	{
-		i++;
-		while (strchr("0123456789", s[i]) != NULL)
-			i++;
-	}
-	if (strchr(".", s[i]) != NULL)
-	{
-		i++;
-		if (strchr("*", s[i]) != NULL)
-			i++;
-		else if (strchr("123456789", s[i]) != NULL)
-		{
-			i++;
-			while (strchr("0123456789", s[i]) != NULL)
-				i++;
-		}
-	}
-	if (strchr("hl", s[i]) != NULL)
-		i++;
-	if (strchr("diuxXcspefgn%", s[i]) != NULL)
-		i++;
-	printf("%02i::",i);
-	return (i);
-}
-
-char	*next_word(char **string)
-{
-	char	*s;
-	char	*word;
-	int		i;
-
-	s = *string;
-	if (*s == '\0')
-		return (NULL);
-	if ((i = word_length(s)) < 0)
-	{
-		printf("error\n");
-		return (NULL);
-	}
-	word = (char *)malloc(sizeof(char) * (i + 1));
-	word[i] = '\0';
-	memmove(word, s, i);
-	*string += i;
-	return (word);
-}
-
 int		ft_printf(char *string, ...)
 {
 	char	*s;
@@ -176,7 +111,6 @@ int		ft_printf(char *string, ...)
 
 int		ft_printf_test(char *string, ...)
 {
-	t_prist	*lst;
 	va_list	ap;
 
 	va_start(ap, string);
diff --git a/ft_printf.h b/ft_printf.h
index 96aa670..d9651b3 100644
--- a/ft_printf.h
+++ b/ft_printf.h
@@ -4,20 +4,12 @@
 # include <stdio.h>
 # include <stdarg.h>
 
+# include <libc.h>
+
 int		ft_printf(char *string, ...);
 
-typedef struct		s_prist
-{
-	char			*str;
-	int				flag;
-	int				width;
-	int				prec;
-	char			*length;
-	char 			spec;
-	char			*arg;
-	int				p_nb;
-	int				a_nb;
-	struct s_prist	*next;
-}					t_prist;
+int		width_precision(char *s);
+int		word_length(char *s);
+char	*next_word(char **s);
 
 #endif
diff --git a/next_word.c b/next_word.c
new file mode 100644
index 0000000..216f64f
--- /dev/null
+++ b/next_word.c
@@ -0,0 +1,107 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   next_word.c                                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: hulamy <marvin@42.fr>                      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/02/10 13:58:30 by hulamy            #+#    #+#             */
+/*   Updated: 2020/02/10 13:58:34 by hulamy           ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "ft_printf.h"
+
+/*
+** -placed outside of "word_length" for lake of space
+** -check if there is a '*' or a number
+** -usefull as such for the 'width', and after a check
+**  for a '.' for the 'precision' flag
+*/
+
+int		width_precision(char *s)
+{
+	int		i;
+
+	i = 0;
+	if (strchr("*", s[i]) != NULL)
+		i++;
+	else if (strchr("123456789", s[i]) != NULL)
+	{
+		i++;
+		while (strchr("0123456789", s[i]) != NULL)
+			i++;
+	}
+	return (i);
+}
+
+/*
+** -return the length of the next word to print
+** -for that it got through the characters expecting
+**  in the following order :
+**  [%][flags][width][.precision][length][specifier]
+**  knowing that 'flags' can repeat themselves
+** -a single '%' is treated as a word of length 1
+**  (unlike the real printf)
+** -it's written :
+**   i += width_precision(s + i + 1) + 1;
+**  instead of :
+**   i++;
+**   i += width_precision(s + i);
+**  to save a line (3 with the brackets)
+*/
+
+int		word_length(char *s)
+{
+	int		i;
+
+	i = 1;
+	if (s[0] == '\0')
+		return (0);
+	if (s[0] != '%')
+	{
+		while (s[i] != '%' && s[i] != '\0')
+			i++;
+		printf("%02i.:",i);
+		return (i);
+	}
+	while (strchr("#0- +'", s[i]) != NULL)
+		i++;
+	i += width_precision(s + i);
+	if (strchr(".", s[i]) != NULL)
+		i += width_precision(s + i + 1) + 1;
+	if (strchr("hl", s[i]) != NULL)
+		i++;
+	if (strchr("diuxXcspefgn%", s[i]) != NULL)
+		i++;
+	printf("%02i::",i);
+	return (i);
+}
+
+/*
+** -return the next sequence to be print
+**  (either a string, or a conversion)
+** -a single '%' is an error in real printf
+**  but is treated as a '%' here
+*/
+
+char	*next_word(char **string)
+{
+	char	*s;
+	char	*word;
+	int		i;
+
+	s = *string;
+	if (*s == '\0')
+		return (NULL);
+	if ((i = word_length(s)) < 0)
+	{
+		printf("error\n");
+		return (NULL);
+	}
+	word = (char *)malloc(sizeof(char) * (i + 1));
+	word[i] = '\0';
+	memmove(word, s, i);
+	*string += i;
+	return (word);
+}