From: Lukas Jiriste <ljiriste@student.42prague.com>
Date: Sat, 31 Aug 2024 16:58:10 +0000 (+0200)
Subject: Fix comments and noninitialized res in categorize
X-Git-Url: https://git.ljiriste.work/?a=commitdiff_plain;h=53c4d0d0a2453372396e203a72bee2ed868aa1d6;p=42%2Fminishell.git

Fix comments and noninitialized res in categorize
---

diff --git a/src/token_categorize.c b/src/token_categorize.c
index 6579637..39c68b7 100644
--- a/src/token_categorize.c
+++ b/src/token_categorize.c
@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   categorization_step.c                              :+:      :+:    :+:   */
+/*   token_categorize.c                                 :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: lnikolov <lnikolov@student.42prague.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/21 16:34:43 by ljiriste          #+#    #+#             */
-/*   Updated: 2024/08/31 15:53:33 by lnikolov         ###   ########.fr       */
+/*   Updated: 2024/08/31 18:56:37 by ljiriste         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -63,6 +63,7 @@ int	categorization_step(char *line, size_t *i,
 {
 	int	res;
 
+	res = 0;
 	if (is_operator_start(current_token->vec, current_token->size)
 		&& can_expand_operator(current_token, line[*i]))
 		res = (ft_vec_append(current_token, line + (*i)++) != success);
@@ -81,8 +82,6 @@ int	categorization_step(char *line, size_t *i,
 				!= success;
 		++*i;
 	}
-	else if (current_token->size > 0)
-		res = ft_vec_append(current_token, line + (*i)++) != success;
 	else
 		res = ft_vec_append(current_token, line + (*i)++) != success;
 	return (res);
diff --git a/src/tokenization.c b/src/tokenization.c
index d0ffe6e..a4e945a 100644
--- a/src/tokenization.c
+++ b/src/tokenization.c
@@ -6,7 +6,7 @@
 /*   By: lnikolov <lnikolov@student.42prague.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/31 15:08:00 by lnikolov          #+#    #+#             */
-/*   Updated: 2024/08/31 15:42:59 by lnikolov         ###   ########.fr       */
+/*   Updated: 2024/08/31 18:56:53 by ljiriste         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -68,7 +68,7 @@ int	tokenize(char *line, t_vec *tokens)
 	i = 0;
 	while (line[i] && res == 0)
 	{
-		if (line[i] == '#')
+		if (line[i] == '#' && (i == 0 || ft_isspace(line[i - 1])))
 			break ;
 		res = categorization_step(line, &i, &current_token, tokens);
 	}