summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/ast-tree.c46
-rw-r--r--src/compiler/ast-tree.h3
-rw-r--r--src/compiler/lexer.c23
-rw-r--r--src/compiler/lexer.h12
-rw-r--r--src/compiler/parser.c8
-rw-r--r--src/compiler/parser.h2
6 files changed, 30 insertions, 64 deletions
diff --git a/src/compiler/ast-tree.c b/src/compiler/ast-tree.c
index 965fca8..205a45f 100644
--- a/src/compiler/ast-tree.c
+++ b/src/compiler/ast-tree.c
@@ -8,11 +8,6 @@
#include "utils/string.h"
#include "utils/time.h"
#include "utils/type.h"
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
AstTree AST_TREE_TYPE_TYPE = {
.token = AST_TREE_TOKEN_TYPE_TYPE,
@@ -1319,7 +1314,7 @@ AstTreeRoot *getAstTreeRoot(char *filePath, AstTreeRoots *roots
#endif
) {
for (size_t i = 0; i < roots->size; ++i) {
- if (strcmp(roots->data[i]->filePath, filePath) == 0) {
+ if (strEquals(roots->data[i]->filePath, filePath)) {
free(filePath);
return roots->data[i];
}
@@ -1679,8 +1674,8 @@ bool pushVariable(AstTreeHelper *helper, AstTreeVariables *variables,
char *var_end = variables->data[j]->name_end;
if (variable->name_end - variable->name_begin == var_end - var_begin &&
- strncmp(var_begin, variable->name_begin,
- variable->name_end - variable->name_begin) == 0) {
+ strnEquals(var_begin, variable->name_begin,
+ variable->name_end - variable->name_begin)) {
printError(variable->name_begin, variable->name_end, "Variable exists");
return false;
}
@@ -2196,8 +2191,10 @@ AstTree *astTreeParseIdentifier(ParserNode *parserNode, AstTreeHelper *helper) {
AstTree *astTreeParseValue(ParserNode *parserNode, AstTreeToken token,
size_t metadata_size, AstTree *type) {
- void *metadata = a404m_malloc(metadata_size);
- memcpy(metadata, parserNode->metadata, metadata_size);
+ u8 *metadata = a404m_malloc(metadata_size);
+ for (size_t i = 0; i < metadata_size; ++i) {
+ metadata[i] = ((u8 *)parserNode->metadata)[i];
+ }
return newAstTree(token, metadata, type, parserNode->str_begin,
parserNode->str_end);
@@ -3146,7 +3143,7 @@ AstTree *makeTypeOf(AstTree *value) {
for (size_t i = 0; i < struc->variables.size; ++i) {
AstTreeVariable *member = struc->variables.data[i];
const size_t member_size = member->name_end - member->name_begin;
- if (member_size == size && strncmp(member->name_begin, str, size)) {
+ if (member_size == size && strnEquals(member->name_begin, str, size)) {
return copyAstTree(member->type);
}
}
@@ -4167,7 +4164,7 @@ bool setTypesFunctionCall(AstTree *tree, AstTreeSetTypesHelper _helper) {
for (size_t j = 0; j < function->arguments_size; ++j) {
AstTreeTypeFunctionArgument arg = function->arguments[j];
if ((size_t)(arg.name_end - arg.name_begin) == param_name_size &&
- strncmp(arg.name_begin, param.nameBegin, param_name_size) == 0) {
+ strnEquals(arg.name_begin, param.nameBegin, param_name_size)) {
initedArguments[j] = param;
goto END_OF_NAMED_FOR;
}
@@ -4226,7 +4223,7 @@ bool setTypesVariable(AstTree *tree, AstTreeSetTypesHelper helper,
const char *var_str = var->name_begin;
const size_t var_str_size = var->name_end - var->name_begin;
- if (var_str_size != str_size || strncmp(var_str, str, str_size) != 0) {
+ if (var_str_size != str_size || !strnEquals(var_str, str, str_size)) {
continue;
}
@@ -4244,7 +4241,7 @@ bool setTypesVariable(AstTree *tree, AstTreeSetTypesHelper helper,
const char *var_str = var->name_begin;
const size_t var_str_size = var->name_end - var->name_begin;
- if (var_str_size != str_size || strncmp(var_str, str, str_size) != 0) {
+ if (var_str_size != str_size || !strnEquals(var_str, str, str_size)) {
continue;
}
@@ -4272,8 +4269,7 @@ bool setTypesVariable(AstTree *tree, AstTreeSetTypesHelper helper,
for (size_t j = 0; j < function->arguments_size; ++j) {
AstTreeTypeFunctionArgument arg = function->arguments[j];
if ((size_t)(arg.name_end - arg.name_begin) == param_name_size &&
- strncmp(arg.name_begin, param.nameBegin, param_name_size) ==
- 0) {
+ strnEquals(arg.name_begin, param.nameBegin, param_name_size)) {
if (!typeIsEqual(arg.type, param.value->type)) {
goto CONTINUE_OUTER;
}
@@ -4701,8 +4697,8 @@ bool setTypesOperatorAccess(AstTree *tree, AstTreeSetTypesHelper helper) {
const char *str = metadata->member.name.begin;
const char LENGTH_STR[] = "length";
- const size_t LENGTH_STR_SIZE = strlen(LENGTH_STR);
- if (LENGTH_STR_SIZE == size && strncmp(LENGTH_STR, str, size) == 0) {
+ const size_t LENGTH_STR_SIZE = strLength(LENGTH_STR);
+ if (LENGTH_STR_SIZE == size && strnEquals(LENGTH_STR, str, size)) {
metadata->member.index = 0;
tree->type = copyAstTree(&AST_TREE_U64_TYPE);
return true;
@@ -4719,7 +4715,7 @@ bool setTypesOperatorAccess(AstTree *tree, AstTreeSetTypesHelper helper) {
for (size_t i = 0; i < struc->variables.size; ++i) {
AstTreeVariable *member = struc->variables.data[i];
const size_t member_size = member->name_end - member->name_begin;
- if (member_size == size && strncmp(member->name_begin, str, size) == 0) {
+ if (member_size == size && strnEquals(member->name_begin, str, size)) {
metadata->member.index = i;
tree->type = copyAstTree(member->type);
return true;
@@ -4769,11 +4765,11 @@ bool setTypesBuiltin(AstTree *tree, AstTreeSetTypesHelper helper,
return false;
}
} else if (param_name_size == FROM_STR_SIZE &&
- strncmp(param.nameBegin, FROM_STR, FROM_STR_SIZE) == 0 &&
+ strnEquals(param.nameBegin, FROM_STR, FROM_STR_SIZE) &&
from == NULL) {
from = param.value;
} else if (param_name_size == TO_STR_SIZE &&
- strncmp(param.nameBegin, TO_STR, TO_STR_SIZE) == 0 &&
+ strnEquals(param.nameBegin, TO_STR, TO_STR_SIZE) &&
to == NULL) {
to = param.value;
} else {
@@ -4841,8 +4837,8 @@ bool setTypesBuiltin(AstTree *tree, AstTreeSetTypesHelper helper,
return false;
}
} else if (param_name_size == VARIABLE_STR_SIZE &&
- strncmp(param.nameBegin, VARIABLE_STR, VARIABLE_STR_SIZE) ==
- 0 &&
+ strnEquals(param.nameBegin, VARIABLE_STR,
+ VARIABLE_STR_SIZE) &&
variable == NULL) {
variable = param.value;
} else {
@@ -4902,8 +4898,8 @@ bool setTypesBuiltin(AstTree *tree, AstTreeSetTypesHelper helper,
return false;
}
} else if (param_name_size == VARIABLE_STR_SIZE &&
- strncmp(param.nameBegin, VARIABLE_STR, VARIABLE_STR_SIZE) ==
- 0 &&
+ strnEquals(param.nameBegin, VARIABLE_STR,
+ VARIABLE_STR_SIZE) &&
file == NULL) {
file = param.value;
} else {
diff --git a/src/compiler/ast-tree.h b/src/compiler/ast-tree.h
index cb7c301..0e101a8 100644
--- a/src/compiler/ast-tree.h
+++ b/src/compiler/ast-tree.h
@@ -1,9 +1,6 @@
#pragma once
#include "compiler/parser.h"
-#include <stddef.h>
-#include <stdint.h>
-#include <sys/types.h>
#include <time.h>
typedef enum AstTreeToken {
diff --git a/src/compiler/lexer.c b/src/compiler/lexer.c
index b4e00b3..1c7e546 100644
--- a/src/compiler/lexer.c
+++ b/src/compiler/lexer.c
@@ -4,9 +4,6 @@
#include "utils/memory.h"
#include "utils/string.h"
-#include <stdint.h>
-#include <stdio.h>
-
const char *LEXER_TOKEN_STRINGS[] = {
"LEXER_TOKEN_SYMBOL_CLOSE_CURLY_BRACKET",
@@ -99,12 +96,12 @@ const char *LEXER_TOKEN_STRINGS[] = {
"LEXER_TOKEN_NONE",
};
-const char *LEXER_SYMBOL_STRINGS[] = {
+static const char *LEXER_SYMBOL_STRINGS[] = {
";", "(", ")", "{", "}", "->", ":", "=", "+=", "-=", "*=",
"/=", "%=", ",", "+", "-", "*", "/", "%", "==", "!=", ">",
">=", "<", "<=", "&", ".*", ".", "!", "&&", "||", "[", "]",
};
-const LexerToken LEXER_SYMBOL_TOKENS[] = {
+static const LexerToken LEXER_SYMBOL_TOKENS[] = {
LEXER_TOKEN_SYMBOL_EOL,
LEXER_TOKEN_SYMBOL_OPEN_PARENTHESIS,
LEXER_TOKEN_SYMBOL_CLOSE_PARENTHESIS,
@@ -139,10 +136,10 @@ const LexerToken LEXER_SYMBOL_TOKENS[] = {
LEXER_TOKEN_SYMBOL_OPEN_BRACKET,
LEXER_TOKEN_SYMBOL_CLOSE_BRACKET,
};
-const size_t LEXER_SYMBOL_SIZE =
+static const size_t LEXER_SYMBOL_SIZE =
sizeof(LEXER_SYMBOL_TOKENS) / sizeof(*LEXER_SYMBOL_TOKENS);
-const char *LEXER_KEYWORD_STRINGS[] = {
+static const char *LEXER_KEYWORD_STRINGS[] = {
"type", "void", "i8", "u8", "i16", "u16", "i32", "u32",
"i64", "u64",
#ifdef FLOAT_16_SUPPORT
@@ -151,7 +148,7 @@ const char *LEXER_KEYWORD_STRINGS[] = {
"f32", "f64", "f128", "bool", "putc", "return", "true", "false",
"if", "else", "while", "comptime", "null", "struct", "undefined", "code",
};
-const LexerToken LEXER_KEYWORD_TOKENS[] = {
+static const LexerToken LEXER_KEYWORD_TOKENS[] = {
LEXER_TOKEN_KEYWORD_TYPE, LEXER_TOKEN_KEYWORD_VOID,
LEXER_TOKEN_KEYWORD_I8, LEXER_TOKEN_KEYWORD_U8,
LEXER_TOKEN_KEYWORD_I16, LEXER_TOKEN_KEYWORD_U16,
@@ -169,7 +166,7 @@ const LexerToken LEXER_KEYWORD_TOKENS[] = {
LEXER_TOKEN_KEYWORD_NULL, LEXER_TOKEN_KEYWORD_STRUCT,
LEXER_TOKEN_KEYWORD_UNDEFINED, LEXER_TOKEN_KEYWORD_CODE,
};
-const size_t LEXER_KEYWORD_SIZE =
+static const size_t LEXER_KEYWORD_SIZE =
sizeof(LEXER_KEYWORD_TOKENS) / sizeof(*LEXER_KEYWORD_TOKENS);
const LexerNodeArray LEXER_NODE_ARRAY_ERROR = {
@@ -481,11 +478,5 @@ bool isSpace(char c) {
}
bool isString(char c) {
- switch (c) {
- case '\'':
- case '\"':
- return true;
- default:
- return false;
- }
+ return c == '\'' || c == '\"';
}
diff --git a/src/compiler/lexer.h b/src/compiler/lexer.h
index d1d746b..ca765d8 100644
--- a/src/compiler/lexer.h
+++ b/src/compiler/lexer.h
@@ -113,21 +113,11 @@ typedef enum LexerToken : u8 {
extern const char *LEXER_TOKEN_STRINGS[];
-extern const char *LEXER_SYMBOL_STRINGS[];
-extern const LexerToken LEXER_SYMBOL_TOKENS[];
-extern const size_t LEXER_SYMBOL_SIZE;
-
-extern const char *LEXER_KEYWORD_STRINGS[];
-extern const LexerToken LEXER_KEYWORD_TOKENS[];
-extern const size_t LEXER_KEYWORD_SIZE;
-
-struct ParserNode;
-
typedef struct LexerNode {
char *str_begin;
char *str_end;
- LexerToken token;
struct ParserNode *parserNode;
+ LexerToken token;
} LexerNode;
typedef struct LexerNodeArray {
diff --git a/src/compiler/parser.c b/src/compiler/parser.c
index 32c37c9..19e0009 100644
--- a/src/compiler/parser.c
+++ b/src/compiler/parser.c
@@ -6,11 +6,6 @@
#include "utils/memory.h"
#include "utils/string.h"
#include "utils/time.h"
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
const char *PARSER_TOKEN_STRINGS[] = {
"PARSER_TOKEN_ROOT",
@@ -763,8 +758,7 @@ bool parserNodeArray(LexerNode *begin, LexerNode *end, ParserNode *parent) {
parsedNodes_data = a404m_realloc(
parsedNodes_data, sizeof(*parsedNodes_data) * parsedNodes_capacity);
}
- parsedNodes_data[parsedNodes_size] = pNode;
- parsedNodes_size += 1;
+ parsedNodes_data[parsedNodes_size++] = pNode;
}
ParserNodeArray *parsedNodes = a404m_malloc(sizeof(*parsedNodes));
diff --git a/src/compiler/parser.h b/src/compiler/parser.h
index f37715d..f7d1954 100644
--- a/src/compiler/parser.h
+++ b/src/compiler/parser.h
@@ -2,8 +2,6 @@
#include "compiler/lexer.h"
#include "utils/type.h"
-#include <stddef.h>
-#include <stdint.h>
#include <time.h>
typedef enum ParserToken {
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-29 09:10:52 +0000