From 405d0c32ba8a6a065c2a8767295490e4add20498 Mon Sep 17 00:00:00 2001 From: Quinn Stephens Date: Sat, 7 Jun 2025 23:03:12 -0400 Subject: Refactor and begin parser * Added token flags * Added `int` keyword * Moved code from main.c to parser/parser.c * Began work on parsing declarations Signed-off-by: Quinn Stephens --- include/lexer/keywords.h | 4 +++- include/lexer/token.h | 7 ++++++- include/parser.h | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 include/parser.h (limited to 'include') diff --git a/include/lexer/keywords.h b/include/lexer/keywords.h index 4919f73..23c5630 100644 --- a/include/lexer/keywords.h +++ b/include/lexer/keywords.h @@ -36,7 +36,9 @@ struct keyword { struct hashmap_entry hashmap_entry; size_t len; - enum token_kind value; + + enum token_kind tok_kind; + uint8_t tok_flags; }; struct keyword *keywords_find(struct token *tok); diff --git a/include/lexer/token.h b/include/lexer/token.h index e89da51..9400c01 100644 --- a/include/lexer/token.h +++ b/include/lexer/token.h @@ -38,11 +38,16 @@ enum token_kind { TK_EOF, TK_IDENTIFIER, - TK_VOID + TK_VOID, + TK_INT }; +#define TF_NONE 0 +#define TF_BUILTIN_TYPE (1 << 0) + struct token { enum token_kind kind; + uint8_t flags; const char *pos; int line; diff --git a/include/parser.h b/include/parser.h new file mode 100644 index 0000000..369115b --- /dev/null +++ b/include/parser.h @@ -0,0 +1,37 @@ +/* + * 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_H +#define _PARSER_H 1 + +#include "lexer.h" + +bool parser_parse(struct lexer *lexer); + +#endif /* !_PARSER_H */ -- cgit v1.2.3