diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | include/lexer/token.h | 3 | ||||
| -rw-r--r-- | include/parser/types.h | 51 | ||||
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/parser/parser.c | 24 | ||||
| -rw-r--r-- | src/parser/types.c | 52 |
6 files changed, 124 insertions, 10 deletions
@@ -29,7 +29,7 @@ ENABLE_DEBUG = 1 CC = clang LD = ld.ldd -OFILES = $(addprefix src/,log.o hash.o hashmap.o lexer/char_info.o lexer/keywords.o lexer/lexer.o parser/parser.o main.o) +OFILES = $(addprefix src/,log.o hash.o hashmap.o lexer/char_info.o lexer/keywords.o lexer/lexer.o parser/types.o parser/parser.o main.o) CFLAGS = -Wall -Wextra -Werror -Iinclude -O3 LDFLAGS = diff --git a/include/lexer/token.h b/include/lexer/token.h index 134582a..ab8231d 100644 --- a/include/lexer/token.h +++ b/include/lexer/token.h @@ -39,6 +39,9 @@ enum token_kind { TOK_IDENTIFIER, + /* + * Do not modify this ordering without updating parser/types.c + */ TOK_VOID, TOK_INT }; diff --git a/include/parser/types.h b/include/parser/types.h new file mode 100644 index 0000000..aa4f976 --- /dev/null +++ b/include/parser/types.h @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2025 Quinn Stephens and the OSMORA team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holder nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _PARSER_TYPES_H +#define _PARSER_TYPES_H + +#include "lexer/token.h" + +enum type_kind { + TYK_UNKNOWN, + + TYK_BUILTIN +}; + +struct type { + enum type_kind kind; + + const char *name; + + size_t size; +}; + +struct type *types_find_builtin(enum token_kind tok_kind); + +#endif /* !_PARSER_TYPES_H */ @@ -32,7 +32,7 @@ #include "log.h" #include "parser.h" -static const char *src = "int test\nint main"; +static const char *src = "void test\nint main"; int main(int argc, char **argv) diff --git a/src/parser/parser.c b/src/parser/parser.c index 065bb32..041422e 100644 --- a/src/parser/parser.c +++ b/src/parser/parser.c @@ -32,6 +32,7 @@ #include "lexer.h" #include "log.h" #include "parser.h" +#include "parser/types.h" static void tok_error(struct token *tok, const char *fmt, ...) @@ -47,21 +48,28 @@ tok_error(struct token *tok, const char *fmt, ...) static bool parse_declaration(struct lexer *lexer, struct token *tok) { + struct type *typ; + /* - * TODO: Support more types. + * TODO: Support custom types. */ - if (tok->kind != TK_VOID && tok->kind != TK_INT) { - tok_error(tok, "expected \"void\" or \"int\"\n"); + if (!(tok->flags & TF_BUILTIN_TYPE)) { + tok_error(tok, "expected built-in type\n"); + return false; + } + + typ = types_find_builtin(tok->kind); + if (typ == NULL) { return false; } lexer_next(lexer, tok); - if (tok->kind != TK_IDENTIFIER) { + if (tok->kind != TOK_IDENTIFIER) { tok_error(tok, "expected identifier\n"); return false; } - log_debug("Parsed declaration of \"%.*s\"\n", tok->len, tok->pos); + log_debug("name: \"%.*s\", type: { name: \"%s\", size: %lu }\n", tok->len, tok->pos, typ->name, typ->size); lexer_next(lexer, tok); return true; @@ -80,13 +88,13 @@ parser_parse(struct lexer *lexer) return false; } - while (tok.kind != TK_EOF) { - if (tok.kind == TK_UNKNOWN) { + while (tok.kind != TOK_EOF) { + if (tok.kind == TOK_UNKNOWN) { tok_error(&tok, "unrecognized token\n"); return false; } - if ((tok.flags & TF_BUILTIN_TYPE) || tok.kind == TK_IDENTIFIER) { + if ((tok.flags & TF_BUILTIN_TYPE) || tok.kind == TOK_IDENTIFIER) { success = parse_declaration(lexer, &tok); } diff --git a/src/parser/types.c b/src/parser/types.c new file mode 100644 index 0000000..ba0c256 --- /dev/null +++ b/src/parser/types.c @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2025 Quinn Stephens and the OSMORA team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holder nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include "log.h" +#include "parser/types.h" + +#define BUILTIN_TYPE_COUNT 2 + +static struct type builtin_types[BUILTIN_TYPE_COUNT] = { + { .kind = TYK_BUILTIN, .name = "void", .size = 0 }, + { .kind = TYK_BUILTIN, .name = "int" , .size = 4 } +}; + +struct type * +types_find_builtin(enum token_kind tok_kind) +{ + int idx; + + idx = tok_kind - TOK_VOID; + if (idx < 0 || idx >= BUILTIN_TYPE_COUNT) { + log_error("token kind does not match any builtin type\n"); + return NULL; + } + + return &builtin_types[idx]; +} |