aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorc2024-01-27 10:32:18 -0500
committerc2024-01-27 10:32:18 -0500
commitf48c3a6cb320c897ca7477af17f8e5eb7447fd72 (patch)
tree053890a8497f0459cb08ddb0c5caad6daa617e3a /src
parent0ff1d40842390da36908c7ffce62f2cf33b173b9 (diff)
Simple parser tests passing :).
Diffstat (limited to 'src')
-rw-r--r--src/include/tree.h4
-rw-r--r--src/parser.c57
-rw-r--r--src/tree.c2
3 files changed, 22 insertions, 41 deletions
diff --git a/src/include/tree.h b/src/include/tree.h
index 8b8e14a..31b8f3f 100644
--- a/src/include/tree.h
+++ b/src/include/tree.h
@@ -82,8 +82,8 @@ typedef struct TREE {
} tree_t;
/* Create a new AST. */
-tree_t* tree_init(int type);
-/* Destroy the AST. */
+tree_t* tree_init(tree_type_t type);
+/* Destroy the AST (if it exists). */
void tree_destroy(tree_t* tree);
/*
diff --git a/src/parser.c b/src/parser.c
index bb945db..344ca89 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -1,4 +1,5 @@
#include "include/parser.h"
+#include "include/token.h"
parser_t* parser_init(token_t* token) {
parser_t* parser;
@@ -11,18 +12,16 @@ parser_t* parser_init(token_t* token) {
}
void parser_destroy(parser_t* parser) {
- free(parser);
+ if (parser) { free(parser); }
}
int parser_nxt_token(parser_t* parser) {
- if (parser->token->nxt) {
- token_t* nxt = parser->token->nxt;
- free(parser->token);
- parser->token = nxt;
- return 1;
- } else {
- return 0;
+ /* Preserve original token list, to be cleaned up by lexer. */
+ parser->token = parser->token->nxt;
+ if (parser->token && parser->token->type == TOKEN_TYPE_EXPR_END) {
+ return parser_nxt_token(parser);
}
+ return parser->token ? 1 : 0;
}
int parser_match(parser_t* parser, token_type_t type) {
@@ -39,6 +38,7 @@ tree_t* parser_parse_lint(parser_t* parser) {
lint = tree_init(TREE_TYPE_LINT);
lint->data.lint.val = atoi(parser->token->val);
+ parser_nxt_token(parser);
return lint;
}
@@ -57,52 +57,33 @@ tree_t* parser_parse_lstr(parser_t* parser) {
}
tree_t* parser_parse_expr(parser_t* parser) {
- tree_t* expr;
-
- expr = tree_init(TREE_TYPE_EXPR);
+ tree_t* expr = NULL;
switch (parser->token->type) {
case TOKEN_TYPE_INT:
- expr->data.expr.val = parser_parse_lint(parser);
- break;
- case TOKEN_TYPE_STR:
- expr->data.expr.val = parser_parse_lstr(parser);
+ expr = parser_parse_lint(parser);
break;
- case TOKEN_TYPE_KWD:
- expr->data.expr.val = parser_parse_call(parser);
- break;
- case TOKEN_TYPE_TAG:
- expr->data.expr.val = parser_parse_def(parser);
- break;
- case TOKEN_TYPE_LBLOCK:
+ case TOKEN_TYPE_EXPR_END:
parser_nxt_token(parser);
- expr->data.expr.val = parser_parse_block(parser);
break;
default:
- expr->data.lstr.val = "???"; /* TODO: Add an "unknown" token type. */
- return expr;
+ log_war("%s: Unknown token type: %d", __func__, parser->token->type);
+ parser_nxt_token(parser);
}
return expr;
}
tree_t* parser_parse_block(parser_t* parser) {
+ /* There is nothing to do. */
+ if (!parser->token || parser->token->type == TOKEN_TYPE_RBLOCK) {
+ return NULL;
+ }
tree_t* block;
-
block = tree_init(TREE_TYPE_BLOCK);
- if (!parser->token) {
- block->data.block.val = NULL;
- block->data.block.nxt = NULL;
- } else {
- switch (parser->token->type) {
- case TOKEN_TYPE_INT:
- block->data.block.val = parser_parse_lint(parser);
- break;
- }
- }
-
- block->data.block.nxt = NULL;
+ block->data.block.val = parser_parse_expr(parser);
+ block->data.block.nxt = parser_parse_block(parser);
return block;
}
diff --git a/src/tree.c b/src/tree.c
index a024371..62c8218 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -1,6 +1,6 @@
#include "include/tree.h"
-tree_t* tree_init(int type) {
+tree_t* tree_init(tree_type_t type) {
tree_t* tree;
tree = emalloc(sizeof(tree_t));