Merge pull request #61 from ErwannLesech/add_ionumbers

feat<ionumbers>: add ionumbers in lexer

src/execute/redirections.c

@@ -0,0 +1,54 @@
+#include "../ast/ast.h"
+#include "ast_eval.h"
+
+#include <unistd.h>
+#include <fcntl.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/wait.h>
+
+int redir_output(struct ast_node *node, bool logger_enabled)
+{
+    if (logger_enabled)
+    {
+        printf("redir_output\n");
+    }
+    int stat = 0;
+    char *file_name = node->children[node->children_count - 1]->value;
+    int fd = open(file_name, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+    if (fd == -1)
+    {
+        return -1;
+    }
+
+    int stdout_fd = dup(STDOUT_FILENO);
+    if (stdout_fd == -1)
+    {
+        return -1;
+    }
+
+    // boucle pour dup les différents redirs
+
+    // mettre à null les nodes redirs et réaranger l'arbre
+
+    exec_cmd(node->children[0], false);
+
+    close(fd);
+    int status;
+    waitpid(pid, &status, 0);
+    stat = WEXITSTATUS(status);
+    return stat;
+}
+
+int redir_manager(struct ast_node *ast, bool logger_enabled)
+{
+    if (logger_enabled)
+    {
+        printf("redir_manager\n");
+    }
+    if (ast->children_count < 2)
+    {
+        return 0;
+    }
+    return 0;
+}

src/lexer/lexer.c

@@ -203,6 +203,12 @@ char *get_word(struct lexer *lexer, bool *is_diactivated)
     word = realloc(word, sizeof(char) * (word_index + 1));
     word[word_index] = '\0';
 
+    if (is_number(word) && (lexer->data[lexer->index] == '>'
+            || lexer->data[lexer->index] == '<' ))
+    {
+        lexer->curr_tok.type = TOKEN_IONUMBER;
+    }
+
     // Skip spaces and tabs
     while (lexer->data[lexer->index] == ' '
            || lexer->data[lexer->index] == '\t')
@@ -250,6 +256,14 @@ struct token parse_input_for_tok(struct lexer *lexer)
         return token;
     }
 
+    if (lexer->curr_tok.type == TOKEN_IONUMBER)
+    {
+        token.type = TOKEN_IONUMBER;
+        token.data = word;
+        lexer->curr_tok.type = TOKEN_EOL;
+        return token;
+    }
+
     // Check if the word is a variable name
     if (lexer->curr_tok.type == TOKEN_VARIABLE
         || lexer->curr_tok.type == TOKEN_VARIABLE_AND_DOUBLE_QUOTE)

src/lexer/lexer.h

@@ -13,6 +13,7 @@
 #include <stddef.h>
 
 #include "token.h"
+#include "../options/options.h"
 
 /**
  * \struct lexer

src/lexer/tests/lexer2_tests.c

@@ -217,7 +217,7 @@ Test(lexer2, token_redir_stick_left)
     token_free(tok);
 
     tok = lexer_pop(lexer);
-    cr_assert_eq(tok.type, TOKEN_WORD);
+    cr_assert_eq(tok.type, TOKEN_IONUMBER);
     cr_assert_str_eq(tok.data, "2");
     token_free(tok);
 
@@ -248,7 +248,7 @@ Test(lexer2, token_redir_stick_left2)
     token_free(tok);
 
     tok = lexer_pop(lexer);
-    cr_assert_eq(tok.type, TOKEN_WORD);
+    cr_assert_eq(tok.type, TOKEN_IONUMBER);
     cr_assert_str_eq(tok.data, "2");
     token_free(tok);
 
@@ -265,6 +265,58 @@ Test(lexer2, token_redir_stick_left2)
     lexer_free(lexer);
 }
 
+Test(lexer2, token_redir_stick_left_alpha)
+{
+    struct lexer *lexer = lexer_new("echo a>file");
+    struct token tok = lexer_pop(lexer);
+    cr_assert_eq(tok.type, TOKEN_WORD);
+    cr_assert_str_eq(tok.data, "echo");
+    token_free(tok);
+
+    tok = lexer_pop(lexer);
+    cr_assert_eq(tok.type, TOKEN_WORD);
+    cr_assert_str_eq(tok.data, "a");
+    token_free(tok);
+
+    tok = lexer_pop(lexer);
+    cr_assert_eq(tok.type, TOKEN_REDIR);
+    cr_assert_str_eq(tok.data, ">");
+    token_free(tok);
+
+    tok = lexer_pop(lexer);
+    cr_assert_eq(tok.type, TOKEN_WORD);
+    cr_assert_str_eq(tok.data, "file");
+    token_free(tok);
+
+    lexer_free(lexer);
+}
+
+Test(lexer2, token_redir_stick_left_alphanum)
+{
+    struct lexer *lexer = lexer_new("echo 13>file");
+    struct token tok = lexer_pop(lexer);
+    cr_assert_eq(tok.type, TOKEN_WORD);
+    cr_assert_str_eq(tok.data, "echo");
+    token_free(tok);
+
+    tok = lexer_pop(lexer);
+    cr_assert_eq(tok.type, TOKEN_IONUMBER);
+    cr_assert_str_eq(tok.data, "13");
+    token_free(tok);
+
+    tok = lexer_pop(lexer);
+    cr_assert_eq(tok.type, TOKEN_REDIR);
+    cr_assert_str_eq(tok.data, ">");
+    token_free(tok);
+
+    tok = lexer_pop(lexer);
+    cr_assert_eq(tok.type, TOKEN_WORD);
+    cr_assert_str_eq(tok.data, "file");
+    token_free(tok);
+
+    lexer_free(lexer);
+}
+
 Test(lexer2, token_redir_stick_left3)
 {
     struct lexer *lexer = lexer_new("ls -la >| file");
@@ -1052,4 +1104,5 @@ Test (lexer2, personalized_variable2)
     token_free(tok);
 
     lexer_free(lexer);
-}
+}
+

src/lexer/token.h

@@ -33,6 +33,7 @@ enum token_type
     TOKEN_OR, // ||
     TOKEN_PIPE, // |
     TOKEN_NEGATE, // \!
+    TOKEN_IONUMBER, // [0-9]+
     TOKEN_REDIR, // >, <, >>, >&, <&, >|, <>
     TOKEN_DOUBLE_QUOTE, // "
     TOKEN_WORD_ASSIGNMENT, // variable=

src/options/options.c

@@ -8,6 +8,7 @@
 
 #include "options.h"
 
+#include <ctype.h>
 #include <fcntl.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -16,6 +17,18 @@
 
 #include "../ast/ast.h"
 
+int is_number(char *str)
+{
+    int i = 0;
+    while (str[i])
+    {
+        if (!isdigit(str[i]))
+            return 0;
+        i++;
+    }
+    return 1;
+}
+
 bool check_logger(int *argc, char **argv)
 {
     bool logger_enabled = false;

src/options/options.h

@@ -53,4 +53,11 @@ void logger(char *str, enum logger_step step, bool logger_enabled);
  */
 void pretty_print(struct ast_node *ast, bool pretty_print_enabled, int *depths);
 
+/**
+ * \brief Check if the given string is a number.
+ * \param str The string to check.
+ * \return True if the string is a number, false otherwise.
+*/
+int is_number(char *str);
+
 #endif /* ! OPTIONS_H  */

src/parser/parser.h

@@ -14,6 +14,7 @@
 #include "../ast/ast.h"
 #include "../lexer/lexer.h"
 #include "../lexer/token.h"
+#include "../options/options.h"
 
 /**
  * \brief Parse loop the given lexer

src/parser/parser_functionnal.c

@@ -1,5 +1,3 @@
-#include <ctype.h>
-
 #include "parser.h"
 
 struct ast_node *prefix(struct lexer *lexer)
@@ -14,18 +12,6 @@ struct ast_node *prefix(struct lexer *lexer)
     return redirection(lexer);
 }
 
-int is_number(char *str)
-{
-    int i = 0;
-    while (str[i])
-    {
-        if (!isdigit(str[i]))
-            return 0;
-        i++;
-    }
-    return 1;
-}
-
 struct ast_node *redirection(struct lexer *lexer)
 {
     struct ast_node *current = ast_node_new(AST_REDIRECTION);