42/42_EXT_05_computorv1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

using double everywhere

Browse Source
This commit is contained in:
hugogogo
2026-05-01 10:42:45 +02:00
parent 2eeed8580f
commit 7519b8e615
7 changed files with 78 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/lexer.c
View File

@@ -11,48 +11,8 @@ static bool token_is_variable(const char *input, int input_pos, int *token_size)
return false;
}
// number can be int "123"
static bool token_is_number_int(const char *input, int input_pos, int *token_size)
{
int number_size;
int max_number_size;
if (!ft_isdigit(input[input_pos]))
{
return false;
}
number_size = 1;
max_number_size = 16; // max size for int
while (number_size <= max_number_size)
{
if (ft_isdigit(input[input_pos + number_size]))
{
number_size++;
}
else if (input[input_pos + number_size] == '.')
{
if (ft_isdigit(input[input_pos + number_size + 1]))
{
// number is double
return false;
}
else
break;
}
else
break;
}
if (number_size > max_number_size)
{
stop_errors(ERROR_NUMBER_TOO_BIG);
}
*token_size = number_size;
return true;
}
// number can be double "123.456"
static bool token_is_number_double(const char *input, int input_pos, int *token_size)
// number can be int "123" or double "123.456"
static bool token_is_number(const char *input, int input_pos, int *token_size)
{
int number_size;
int max_number_size;
@@ -65,7 +25,7 @@ static bool token_is_number_double(const char *input, int input_pos, int *token_
has_dot = false;
number_size = 1;
max_number_size = 129; // max size for double double is 128 bits, + the coma
max_number_size = 24; // max char needed to represent double : 1 sign + 1 point + 17 fractinoal part + 5 exponent
while (number_size <= max_number_size)
{
if (ft_isdigit(input[input_pos + number_size]))
@@ -76,12 +36,12 @@ static bool token_is_number_double(const char *input, int input_pos, int *token_
{
if (has_dot)
{
// number is not a valid double, it has 2 dots
// number is not a valid token, it has 2 dots
return false;
}
if (!ft_isdigit(input[input_pos + number_size + 1]))
{
// number is not a double, it has no number after the dot
// number is not valid token, it has a dot with no number after the dot
return false;
}
has_dot = true;
@@ -92,7 +52,7 @@ static bool token_is_number_double(const char *input, int input_pos, int *token_
}
if (number_size > max_number_size)
{
stop_errors(ERROR_NUMBER_TOO_BIG);
stop_errors(ERROR_NUMBER_TOO_BIG, &input[input_pos]);
}
*token_size = number_size;
return true;
@@ -106,7 +66,7 @@ static bool token_is_power(const char *input, int input_pos, int *token_size)
*token_size = 1;
return true;
}
else if (ft_memcmp(&input[input_pos], "**", 2) == 0)
if (ft_memcmp(&input[input_pos], "**", 2) == 0)
{
*token_size = 2;
return true;
@@ -117,7 +77,12 @@ static bool token_is_power(const char *input, int input_pos, int *token_size)
// sign can be '+' or '-'
static bool token_is_sign(const char *input, int input_pos, int *token_size)
{
if (input[input_pos] == '+' || input[input_pos] == '-')
if (input[input_pos] == '+')
{
*token_size = 1;
return true;
}
if (input[input_pos] == '-')
{
*token_size = 1;
return true;
@@ -128,7 +93,17 @@ static bool token_is_sign(const char *input, int input_pos, int *token_size)
// factor can be '*' or '/' or ':'
static bool token_is_factor(const char *input, int input_pos, int *token_size)
{
if (input[input_pos] == '*' || input[input_pos] == '/' || input[input_pos] == ':')
if (input[input_pos] == '*')
{
*token_size = 1;
return true;
}
if (input[input_pos] == '/')
{
*token_size = 1;
return true;
}
if (input[input_pos] == ':')
{
*token_size = 1;
return true;
@@ -172,14 +147,9 @@ int lexerize(const char *input, token *tokens)
tokens[tokens_count].type = TOKEN_VARIABLE;
tokens[tokens_count].value_char = 'x';
}
else if (token_is_number_int(input, input_pos, &token_size))
else if (token_is_number(input, input_pos, &token_size))
{
tokens[tokens_count].type = TOKEN_NUMBER_INT;
tokens[tokens_count].value_int = ft_atoi(&input[input_pos]);
}
else if (token_is_number_double(input, input_pos, &token_size))
{
tokens[tokens_count].type = TOKEN_NUMBER_DOUBLE;
tokens[tokens_count].type = TOKEN_NUMBER;
tokens[tokens_count].value_double = ft_atof(&input[input_pos]);
}
else if (token_is_power(input, input_pos, &token_size))
@@ -204,15 +174,13 @@ int lexerize(const char *input, token *tokens)
}
else
{
// tmp
token_size = 1;
// stop_errors(ERROR_UNKNOWN_TOKEN);
stop_errors(ERROR_UNKNOWN_TOKEN, &input[input_pos]);
}
tokens_count++;
if (token_size == 0)
{
stop_errors(ERROR_UNKNOWN_TOKEN);
stop_errors(ERROR_UNKNOWN_TOKEN, &input[input_pos]);
}
input_pos += token_size;
}