raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small Update to ast...

Browse source
This commit is contained in:
Maix0 2024-06-16 18:46:17 +02:00
parent 9f41a868a7
commit c9baa2b499
8 changed files with 393 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

133
ast/include/ast/ast.h
View file

@ -14,98 +14,63 @@
#define AST_H
#include "ast/ast_forward_def.h"
#include "me/types.h"
#include "me/vec/vec_ast.h"
/*
ast_statement:
case_statement
command
compound_statement
for_statement
function_definition
if_statement
list
negated_command
pipeline
redirected_statement
subshell
variable_assignment
variable_assignments
while_statement
ast_statement_not_pipeline == ast_statement - pipeline
ast_statement_not_subshell == ast_statement - subshell
*/
struct s_ast_empty
{
};
enum e_ast_list_kind
{
AST_LIST_AND,
AST_LIST_OR,
};
#include "ast/ast_raw_structs.h"
enum e_ast_node_kind
{
AST_ARITHMETIC_EXPANSION,
AST_CASE_ITEM,
AST_CASE,
AST_COMMAND_SUBSTITUTION,
AST_COMMAND,
AST_COMPOUND_STATEMENT,
AST_ELIF,
AST_ELSE,
AST_EMPTY,
};
AST_EXPANSION,
AST_FILE_REDIRECTION,
AST_FOR,
AST_FUNCTION_DEFINITION,
AST_HEREDOC_REDIRECTION,
AST_IF,
AST_LIST,
AST_PIPELINE,
AST_RAW_STRING,
AST_STRING,
AST_SUBSHELL,
AST_UNTIL,
AST_VARIABLE_ASSIGNMENT,
AST_WHILE,
AST_WORD,
enum e_ast_word_kind
{
AST_WORD_NO_QUOTE,
AST_WORD_SINGLE_STRING,
AST_WORD_DOUBLE_QUOTED,
AST_WORD_BACK_QUOTED,
};
struct s_ast_raw_string
{
t_str str;
t_usize len;
};
struct s_ast_list
{
t_ast_node *left;
t_ast_list_kind op;
t_ast_node *right;
};
/// @brief A string that is may be quoted or not
/// @param parts this can be multiple things:
/// - a "raw" string (no processing needed)
/// - a expension (variable, command substitution, artihmetic expansion, etc.)
/// @param parts_len the number of parts in the string
/// @note if the string isn't quoted, it needs to be split into parts using $IFS
struct s_ast_string
{
t_vec_ast parts;
};
struct s_ast_pipeline
{
t_vec_ast statements;
};
struct s_ast_word
{
t_ast_word_kind kind;
t_ast_node *inner;
};
struct s_ast_command
{
t_vec_ast prefixes;
t_vec_ast cmd_word;
t_vec_ast suffixes;
__AST_LAST_NODETYPE__,
};
union u_ast_node_data {
t_ast_empty empty;
t_ast_command command;
t_ast_arithmetic_expansion arithmetic_expansion;
t_ast_case_item case_item;
t_ast_case case_;
t_ast_command_substitution command_substitution;
t_ast_command command;
t_ast_compound_statement compound_statement;
t_ast_elif elif;
t_ast_else else_;
t_ast_empty empty;
t_ast_expansion expansion;
t_ast_file_redirection file_redirection;
t_ast_for for_;
t_ast_function_definition function_definition;
t_ast_heredoc_redirection heredoc_redirection;
t_ast_if if_;
t_ast_list list;
t_ast_pipeline pipeline;
t_ast_raw_string raw_string;
t_ast_string string;
t_ast_subshell subshell;
t_ast_until until;
t_ast_variable_assignment variable_assignment;
t_ast_while while_;
t_ast_word word;
};
struct s_ast_node

95
ast/include/ast/ast_forward_def.h
View file

@ -13,20 +13,93 @@
#ifndef AST_FORWARD_DEF_H
#define AST_FORWARD_DEF_H
typedef enum e_ast_node_kind t_ast_node_kind;
typedef enum e_ast_word_kind t_ast_word_kind;
typedef enum e_ast_list_kind t_ast_list_kind;
typedef enum e_ast_node_kind t_ast_node_kind;
typedef enum e_ast_word_kind t_ast_word_kind;
typedef enum e_ast_list_kind t_ast_list_kind;
typedef enum e_ast_expansion_operator t_ast_expansion_operator;
typedef union u_ast_node_data t_ast_node_data;
typedef struct s_ast_node t_ast_node;
typedef struct s_ast_node *t_ast_node;
typedef struct s_ast_empty t_ast_empty;
typedef struct s_ast_command t_ast_command;
typedef struct s_ast_word t_ast_word;
typedef struct s_ast_pipeline t_ast_pipeline;
typedef struct s_ast_raw_string t_ast_raw_string;
typedef struct s_ast_built_string t_ast_built_string;
typedef struct s_ast_list t_ast_list;
typedef struct s_ast_arithmetic_expansion t_ast_arithmetic_expansion;
typedef struct s_ast_case_item t_ast_case_item;
typedef struct s_ast_case t_ast_case;
typedef struct s_ast_command_substitution t_ast_command_substitution;
typedef struct s_ast_command t_ast_command;
typedef struct s_ast_compound_statement t_ast_compound_statement;
typedef struct s_ast_elif t_ast_elif;
typedef struct s_ast_else t_ast_else;
typedef struct s_ast_empty t_ast_empty;
typedef struct s_ast_expansion t_ast_expansion;
typedef struct s_ast_file_redirection t_ast_file_redirection;
typedef struct s_ast_for t_ast_for;
typedef struct s_ast_function_definition t_ast_function_definition;
typedef struct s_ast_heredoc_redirection t_ast_heredoc_redirection;
typedef struct s_ast_if t_ast_if;
typedef struct s_ast_list t_ast_list;
typedef struct s_ast_pipeline t_ast_pipeline;
typedef struct s_ast_raw_string t_ast_raw_string;
typedef struct s_ast_string t_ast_string;
typedef struct s_ast_subshell t_ast_subshell;
typedef struct s_ast_until t_ast_until;
typedef struct s_ast_variable_assignment t_ast_variable_assignment;
typedef struct s_ast_while t_ast_while;
typedef struct s_ast_word t_ast_word;
/*
t_ast_arithmetic_expansion arithmetic_expansion;
t_ast_case_item case_item;
t_ast_case case;
t_ast_command_substitution command_substitution;
t_ast_command command;
t_ast_compound_statement compound_statement;
t_ast_elif elif;
t_ast_else else;
t_ast_empty empty;
t_ast_expansion expansion;
t_ast_file_redirection file_redirection;
t_ast_for for;
t_ast_function_definition function_definition;
t_ast_heredoc_redirection heredoc_redirection;
t_ast_if if;
t_ast_list list;
t_ast_pipeline pipeline;
t_ast_raw_string raw_string;
t_ast_string string;
t_ast_subshell subshell;
t_ast_until until;
t_ast_variable_assignment variable_assignment;
t_ast_while while;
t_ast_word word;
*/
/*
AST_ARITHMETIC_EXPANSION,
AST_CASE_ITEM,
AST_CASE,
AST_COMMAND_SUBSTITUTION,
AST_COMMAND,
AST_COMPOUND_STATEMENT,
AST_ELIF,
AST_ELSE,
AST_EMPTY,
AST_EXPANSION,
AST_FILE_REDIRECTION,
AST_FOR,
AST_FUNCTION_DEFINITION,
AST_HEREDOC_REDIRECTION,
AST_IF,
AST_LIST,
AST_PIPELINE,
AST_RAW_STRING,
AST_STRING,
AST_SUBSHELL,
AST_UNTIL,
AST_VARIABLE_ASSIGNMENT,
AST_WHILE,
AST_WORD,
*/
#endif /* AST_FORWARD_DEF_H */

222
ast/include/ast/ast_raw_structs.h Normal file
View file

@ -0,0 +1,222 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ast_raw_structs.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/14 17:46:58 by maiboyer #+# #+# */
/* Updated: 2024/06/14 17:46:58 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef AST_RAW_STRUCTS_H
#define AST_RAW_STRUCTS_H
#include "ast/ast_forward_def.h"
#include "me/types.h"
#include "me/vec/vec_ast.h"
/*
ast_statement:
case_statement
command
compound_statement
for_statement
function_definition
if_statement
list
negated_command
pipeline
redirected_statement
subshell
variable_assignment
variable_assignments
while_statement
ast_statement_not_pipeline == ast_statement - pipeline
ast_statement_not_subshell == ast_statement - subshell
*/
struct s_ast_empty
{
};
enum e_ast_list_kind
{
AST_LIST_AND,
AST_LIST_OR,
};
enum e_ast_word_kind
{
AST_WORD_NO_QUOTE,
AST_WORD_SINGLE_STRING,
AST_WORD_DOUBLE_QUOTED,
AST_WORD_BACK_QUOTED,
};
struct s_ast_raw_string
{
t_str str;
t_usize len;
};
struct s_ast_list
{
t_ast_node left;
t_ast_list_kind op;
t_ast_node right;
};
/// @brief A string that is may be quoted or not
/// @param parts this can be multiple things:
/// - a "raw" string (no processing needed)
/// - a expension (variable, command substitution, artihmetic expansion, etc.)
/// @param parts_len the number of parts in the string
/// @note if the string isn't quoted, it needs to be split into parts using $IFS
struct s_ast_string
{
t_vec_ast parts;
};
struct s_ast_pipeline
{
bool bang;
t_vec_ast statements;
};
struct s_ast_word
{
t_ast_word_kind kind;
t_vec_ast inner;
};
struct s_ast_command
{
t_vec_ast prefixes;
t_vec_ast cmd_word;
t_vec_ast suffixes;
};
struct s_ast_if
{
t_vec_ast condition;
t_vec_ast then;
t_vec_ast elif_;
t_ast_node else_;
};
struct s_ast_elif
{
t_vec_ast condition;
t_vec_ast then;
};
struct s_ast_else
{
t_vec_ast then;
};
struct s_ast_while
{
t_vec_ast condition;
t_vec_ast do_;
};
struct s_ast_for
{
t_str var_name;
t_vec_ast words;
t_vec_ast do_;
};
struct s_ast_case
{
t_ast_node word;
t_vec_ast cases;
};
struct s_ast_case_item
{
t_vec_ast pattern;
t_vec_ast body;
};
struct s_ast_until
{
t_vec_ast condition;
t_vec_ast do_;
};
struct s_ast_function_definition
{
t_str name;
t_vec_ast body;
};
struct s_ast_subshell
{
t_vec_ast body;
};
struct s_ast_compound_statement
{
t_vec_ast body;
};
struct s_ast_variable_assignment
{
t_str name;
t_ast_node value;
};
struct s_ast_file_redirection
{
t_ast_node output;
t_ast_node input;
};
struct s_ast_heredoc_redirection
{
t_ast_node output;
t_ast_node delimiter;
};
enum e_ast_expansion_operator
{
E_OP_NONE = 0, // ${var}
E_OP_DEFAULT, // ${var-word}
E_OP_ASSIGN_DEFAULT, // ${var=word}
E_OP_ERROR, // ${var?word}
E_OP_ALTERNATE, // ${var+word}
E_OP_DEFAULT_COLON, // ${var:-word}
E_OP_ASSIGN_DEFAULT_COLON, // ${var:=word}
E_OP_ERROR_COLON, // ${var:?word}
E_OP_ALTERNATE_COLON, // ${var:+word}
E_OP_LENGTH, // ${#var}
E_OP_SMALLEST_PREFIX, // ${var#pattern}
E_OP_LARGEST_PREFIX, // ${var##pattern}
E_OP_SMALLEST_SUFFIX, // ${var%pattern}
E_OP_LARGEST_SUFFIX, // ${var%%pattern}
};
struct s_ast_expansion
{
t_str var_name;
t_ast_expansion_operator kind;
t_vec_ast args;
};
struct s_ast_arithmetic_expansion
{
t_ast_node expr;
};
struct s_ast_command_substitution
{
t_ast_node cmd;
};
#endif /* AST_RAW_STRUCTS_H */