change to dynamic array for lexer and parser to speed up lexical analysis
This commit is contained in:
@@ -1,44 +1,45 @@
|
||||
#include "parser.h"
|
||||
#include "../dynamic_array/darray.h"
|
||||
#include "../lexer/token.h"
|
||||
#include "string/string.h"
|
||||
#include <stdbool.h>
|
||||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include "../lexer/token.h"
|
||||
#include "../list/list.h"
|
||||
#include "string/string.h"
|
||||
|
||||
TaggedValue * parse_token(LinkedList * tokens, size_t *index) {
|
||||
Token * token = get_element_at(tokens, *index);
|
||||
ParsedValue *parse_token(DArray *tokens, size_t *index) {
|
||||
Token *token = darray_get(tokens, *index);
|
||||
switch (token->type) {
|
||||
case TOKEN_STRING:
|
||||
(*index)++;
|
||||
return parse_string(*token);
|
||||
case TOKEN_NEW_LINE:
|
||||
(*index)++;
|
||||
return NULL;
|
||||
default:
|
||||
fprintf(stderr, "Panic: %s\n", "unreachable"); \
|
||||
exit(EXIT_FAILURE); \
|
||||
case TOKEN_STRING:
|
||||
(*index)++;
|
||||
return parse_string(*token);
|
||||
case TOKEN_NEW_LINE:
|
||||
(*index)++;
|
||||
return NULL;
|
||||
default:
|
||||
fprintf(stderr, "Panic: %s\n", "unreachable");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
void parser(LinkedList * parsed, LinkedList * tokens, bool inline_flag) {
|
||||
void parser(DArray *parsed, DArray *tokens, bool inline_flag) {
|
||||
size_t index = 0;
|
||||
size_t length = list_length(tokens);
|
||||
size_t length = tokens->size;
|
||||
while (index < length) {
|
||||
TaggedValue * parsed_code = parse_token(tokens, &index);
|
||||
if (parsed_code)
|
||||
append(parsed,parsed_code);
|
||||
ParsedValue *parsed_code = parse_token(tokens, &index);
|
||||
if (parsed_code) {
|
||||
darray_push(parsed, parsed_code);
|
||||
free(parsed_code);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void free_tagged_value(void *ptr) {
|
||||
TaggedValue *tagged = ptr;
|
||||
switch (tagged->type) {
|
||||
case AST_STRING:
|
||||
free(tagged->data);
|
||||
break;
|
||||
// Add cases if needed
|
||||
}
|
||||
free(tagged); // Always free the TaggedValue itself
|
||||
void free_parsed_value(void *ptr) {
|
||||
ParsedValue *tagged = ptr;
|
||||
switch (tagged->type) {
|
||||
case AST_STRING:
|
||||
free(tagged->data);
|
||||
break;
|
||||
// Add cases if needed
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include <stdbool.h>
|
||||
#include <stddef.h>
|
||||
#include "../dynamic_array/darray.h"
|
||||
|
||||
|
||||
typedef struct LinkedList LinkedList;
|
||||
@@ -15,13 +16,13 @@ typedef struct {
|
||||
ValueType type;
|
||||
void *data;
|
||||
|
||||
} TaggedValue;
|
||||
} ParsedValue;
|
||||
|
||||
void parser(LinkedList *parsed, LinkedList *tokens, bool inline_flag);
|
||||
void parser(DArray * parsed, DArray * tokens, bool inline_flag);
|
||||
|
||||
TaggedValue *parse_token(LinkedList *tokens, size_t *index);
|
||||
ParsedValue * parse_token(DArray * tokens, size_t *index);
|
||||
|
||||
void free_tagged_value(void *ptr);
|
||||
void free_parsed_value(void *ptr);
|
||||
|
||||
|
||||
#endif // PARSER_H
|
||||
@@ -71,10 +71,10 @@ char *unquote(char *str) {
|
||||
return unescaped;
|
||||
}
|
||||
|
||||
TaggedValue * parse_string(Token token) {
|
||||
TaggedValue * taggedValue = malloc(sizeof(TaggedValue));
|
||||
ParsedValue * parse_string(Token token) {
|
||||
ParsedValue * parsedValue = malloc(sizeof(ParsedValue));
|
||||
|
||||
taggedValue->type = AST_STRING;
|
||||
taggedValue->data = unquote(token.value);
|
||||
return taggedValue;
|
||||
parsedValue->type = AST_STRING;
|
||||
parsedValue->data = unquote(token.value);
|
||||
return parsedValue;
|
||||
}
|
||||
@@ -10,6 +10,6 @@ char *swap_quotes(char *input, char quote);
|
||||
|
||||
char *unquote(char *str);
|
||||
|
||||
TaggedValue *parse_string(Token token);
|
||||
ParsedValue *parse_string(Token token);
|
||||
|
||||
#endif // STRING_UTILS_H
|
||||
Reference in New Issue
Block a user