feat(parser): 启用parser和ast模块并重构解析器结构
- 在cbuild.toml中启用parser和ast依赖项 - 将AST内置类型枚举重命名为SCC_AST_BUILTIN_TYPE_*前缀格式 - 修复ast_def.h中的类型字段命名，将builtin改为type - 添加逗号操作符支持到表达式操作符枚举中 - 更新字面量表达式的lexeme字段为const char*指针和owned标志 - 重构解析器头文件结构，分离为parser.h、parser_utils.h、scc_sema.h等 - 实现新的解析器工具函数，包括预览、消费、回溯等功能 - 更新声明解析逻辑，使用新的解析器接口进行token处理 - 添加符号表语义分析功能框架 - 修复词法分析器中token移动时的空指针检查 - 统一使用scc_tree_dump_printf替代直接的scc_printf调用
This commit is contained in:
@@ -1,156 +1,159 @@
|
||||
#include <parser.h>
|
||||
|
||||
/*
|
||||
A.2.2 Declarations
|
||||
(6.7) declaration:
|
||||
declaration-specifiers init-declarator-list(opt) ;
|
||||
(6.7) declaration-specifiers:
|
||||
storage-class-specifier declaration-specifiers(opt)
|
||||
type-specifier declaration-specifiers(opt)
|
||||
type-qualifier declaration-specifiers(opt)
|
||||
function-specifier declaration-specifiers(opt)
|
||||
(6.7) init-declarator-list:
|
||||
init-declarator
|
||||
init-declarator-list , init-declarator
|
||||
(6.7) init-declarator:
|
||||
declarator
|
||||
declarator = initializer
|
||||
(6.7.1) storage-class-specifier:
|
||||
typedef
|
||||
extern
|
||||
static
|
||||
auto
|
||||
register
|
||||
(6.7.2) type-specifier:
|
||||
void
|
||||
char
|
||||
short
|
||||
int
|
||||
long
|
||||
float
|
||||
double
|
||||
signed
|
||||
unsigned
|
||||
_Bool
|
||||
_Complex
|
||||
struct-or-union-specifier
|
||||
enum-specifier
|
||||
typedef-name
|
||||
(6.7.2.1) struct-or-union-specifier:
|
||||
struct-or-union identifier(opt) { struct-declaration-list }
|
||||
struct-or-union identifier
|
||||
(6.7.2.1) struct-or-union:
|
||||
struct
|
||||
union
|
||||
(6.7.2.1) struct-declaration-list:
|
||||
struct-declaration
|
||||
struct-declaration-list struct-declaration
|
||||
(6.7.2.1) struct-declaration:
|
||||
specifier-qualifier-list struct-declarator-list ;
|
||||
(6.7.2.1) specifier-qualifier-list:
|
||||
type-specifier specifier-qualifier-list(opt)
|
||||
type-qualifier specifier-qualifier-list(opt)
|
||||
(6.7.2.1) struct-declarator-list:
|
||||
struct-declarator
|
||||
struct-declarator-list , struct-declarator
|
||||
(6.7.2.1) struct-declarator:
|
||||
declarator
|
||||
declarator(opt) : constant-expression
|
||||
(6.7.2.2) enum-specifier:
|
||||
enum identifier(opt) { enumerator-list }
|
||||
enum identifier(opt) { enumerator-list ,}
|
||||
enum identifier
|
||||
(6.7.2.2) enumerator-list:
|
||||
enumerator
|
||||
enumerator-list , enumerator
|
||||
(6.7.2.2) enumerator:
|
||||
enumeration-constant
|
||||
enumeration-constant = constant-expression
|
||||
(6.7.3) type-qualifier:
|
||||
const
|
||||
restrict
|
||||
volatile
|
||||
(6.7.4) function-specifier:
|
||||
inline
|
||||
(6.7.5) declarator:
|
||||
pointer(opt) direct-declarator
|
||||
(6.7.5) direct-declarator:
|
||||
identifier
|
||||
( declarator )
|
||||
direct-declarator [ type-qualifier-list(opt)
|
||||
assignment-expression(opt) ]
|
||||
direct-declarator [ static type-qualifier-list(opt)
|
||||
assignment-expression ]
|
||||
direct-declarator [ type-qualifier-list static
|
||||
assignment-expression ]
|
||||
direct-declarator [ type-qualifier-list(opt) *]
|
||||
direct-declarator ( parameter-type-list )
|
||||
direct-declarator ( identifier-list(opt) )
|
||||
(6.7.5) pointer:
|
||||
* type-qualifier-list(opt)
|
||||
* type-qualifier-list(opt) pointer
|
||||
(6.7.5) type-qualifier-list:
|
||||
type-qualifier
|
||||
type-qualifier-list type-qualifier
|
||||
(6.7.5) parameter-type-list:
|
||||
parameter-list
|
||||
parameter-list , ...
|
||||
(6.7.5) parameter-list:
|
||||
parameter-declaration
|
||||
parameter-list , parameter-declaration
|
||||
(6.7.5) parameter-declaration:
|
||||
declaration-specifiers declarator
|
||||
declaration-specifiers abstract-declarator(opt)
|
||||
(6.7.5) identifier-list:
|
||||
identifier
|
||||
identifier-list , identifier
|
||||
(6.7.6) type-name:
|
||||
specifier-qualifier-list abstract-declarator(opt)
|
||||
(6.7.6) abstract-declarator:
|
||||
pointer
|
||||
pointer(opt) direct-abstract-declarator
|
||||
(6.7.6) direct-abstract-declarator:
|
||||
( abstract-declarator )
|
||||
direct-abstract-declarator(opt) [ type-qualifier-list (opt)
|
||||
assignment-expression(opt) ]
|
||||
direct-abstract-declarator(opt) [static type-qualifier-list(opt)
|
||||
assignment-expression ]
|
||||
direct-abstract-declaratoropt [ type-qualifier-list static
|
||||
assignment-expression ]
|
||||
direct-abstract-declarator(opt) [ * ]
|
||||
direct-abstract-declarator(opt) ( parameter-type-list(opt) )
|
||||
(6.7.7) typedef-name:
|
||||
identifier
|
||||
(6.7.8) initializer:
|
||||
assignment-expression
|
||||
{ initializer-list }
|
||||
{ initializer-list , }
|
||||
(6.7.8) initializer-list:
|
||||
designation(opt) initializer
|
||||
initializer-list , designation(opt) initializer
|
||||
(6.7.8) designation:
|
||||
designator-list =
|
||||
(6.7.8) designator-list:
|
||||
designator
|
||||
designator-list designator
|
||||
(6.7.8) designator:
|
||||
[ constant-expression ]
|
||||
. identifier
|
||||
|
||||
(6.7) declaration:
|
||||
declaration-specifiers init-declarator-list(opt) ;
|
||||
(6.7) declaration-specifiers:
|
||||
storage-class-specifier declaration-specifiers(opt)
|
||||
type-specifier declaration-specifiers(opt)
|
||||
type-qualifier declaration-specifiers(opt)
|
||||
function-specifier declaration-specifiers(opt)
|
||||
(6.7) init-declarator-list:
|
||||
init-declarator
|
||||
init-declarator-list , init-declarator
|
||||
(6.7) init-declarator:
|
||||
declarator
|
||||
declarator = initializer
|
||||
(6.7.1) storage-class-specifier:
|
||||
typedef
|
||||
extern
|
||||
static
|
||||
auto
|
||||
register
|
||||
(6.7.2) type-specifier:
|
||||
void
|
||||
char
|
||||
short
|
||||
int
|
||||
long
|
||||
float
|
||||
double
|
||||
signed
|
||||
unsigned
|
||||
_Bool
|
||||
_Complex
|
||||
struct-or-union-specifier
|
||||
enum-specifier
|
||||
typedef-name
|
||||
(6.7.2.1) struct-or-union-specifier:
|
||||
struct-or-union identifier(opt) { struct-declaration-list }
|
||||
struct-or-union identifier
|
||||
(6.7.2.1) struct-or-union:
|
||||
struct
|
||||
union
|
||||
(6.7.2.1) struct-declaration-list:
|
||||
struct-declaration
|
||||
struct-declaration-list struct-declaration
|
||||
(6.7.2.1) struct-declaration:
|
||||
specifier-qualifier-list struct-declarator-list ;
|
||||
(6.7.2.1) specifier-qualifier-list:
|
||||
type-specifier specifier-qualifier-list(opt)
|
||||
type-qualifier specifier-qualifier-list(opt)
|
||||
(6.7.2.1) struct-declarator-list:
|
||||
struct-declarator
|
||||
struct-declarator-list , struct-declarator
|
||||
(6.7.2.1) struct-declarator:
|
||||
declarator
|
||||
declarator(opt) : constant-expression
|
||||
(6.7.2.2) enum-specifier:
|
||||
enum identifier(opt) { enumerator-list }
|
||||
enum identifier(opt) { enumerator-list ,}
|
||||
enum identifier
|
||||
(6.7.2.2) enumerator-list:
|
||||
enumerator
|
||||
enumerator-list , enumerator
|
||||
(6.7.2.2) enumerator:
|
||||
enumeration-constant
|
||||
enumeration-constant = constant-expression
|
||||
(6.7.3) type-qualifier:
|
||||
const
|
||||
restrict
|
||||
volatile
|
||||
(6.7.4) function-specifier:
|
||||
inline
|
||||
(6.7.5) declarator:
|
||||
pointer(opt) direct-declarator
|
||||
(6.7.5) direct-declarator:
|
||||
identifier
|
||||
( declarator )
|
||||
direct-declarator [ type-qualifier-list(opt)
|
||||
assignment-expression(opt) ]
|
||||
direct-declarator [ static type-qualifier-list(opt)
|
||||
assignment-expression ]
|
||||
direct-declarator [ type-qualifier-list static
|
||||
assignment-expression ]
|
||||
direct-declarator [ type-qualifier-list(opt) *]
|
||||
direct-declarator ( parameter-type-list )
|
||||
direct-declarator ( identifier-list(opt) )
|
||||
(6.7.5) pointer:
|
||||
* type-qualifier-list(opt)
|
||||
* type-qualifier-list(opt) pointer
|
||||
(6.7.5) type-qualifier-list:
|
||||
type-qualifier
|
||||
type-qualifier-list type-qualifier
|
||||
(6.7.5) parameter-type-list:
|
||||
parameter-list
|
||||
parameter-list , ...
|
||||
(6.7.5) parameter-list:
|
||||
parameter-declaration
|
||||
parameter-list , parameter-declaration
|
||||
(6.7.5) parameter-declaration:
|
||||
declaration-specifiers declarator
|
||||
declaration-specifiers abstract-declarator(opt)
|
||||
(6.7.5) identifier-list:
|
||||
identifier
|
||||
identifier-list , identifier
|
||||
(6.7.6) type-name:
|
||||
specifier-qualifier-list abstract-declarator(opt)
|
||||
(6.7.6) abstract-declarator:
|
||||
pointer
|
||||
pointer(opt) direct-abstract-declarator
|
||||
(6.7.6) direct-abstract-declarator:
|
||||
( abstract-declarator )
|
||||
direct-abstract-declarator(opt) [ type-qualifier-list (opt)
|
||||
assignment-expression(opt) ]
|
||||
direct-abstract-declarator(opt) [static type-qualifier-list(opt)
|
||||
assignment-expression ]
|
||||
direct-abstract-declaratoropt [ type-qualifier-list static
|
||||
assignment-expression ]
|
||||
direct-abstract-declarator(opt) [ * ]
|
||||
direct-abstract-declarator(opt) ( parameter-type-list(opt) )
|
||||
(6.7.7) typedef-name:
|
||||
identifier
|
||||
(6.7.8) initializer:
|
||||
assignment-expression
|
||||
{ initializer-list }
|
||||
{ initializer-list , }
|
||||
(6.7.8) initializer-list:
|
||||
designation(opt) initializer
|
||||
initializer-list , designation(opt) initializer
|
||||
(6.7.8) designation:
|
||||
designator-list =
|
||||
(6.7.8) designator-list:
|
||||
designator
|
||||
designator-list designator
|
||||
(6.7.8) designator:
|
||||
[ constant-expression ]
|
||||
. identifier
|
||||
|
||||
A.2.4 External definitions
|
||||
(6.9) translation-unit:
|
||||
external-declaration
|
||||
translation-unit external-declaration
|
||||
(6.9) external-declaration:
|
||||
function-definition
|
||||
declaration
|
||||
(6.9.1) function-definition:
|
||||
declaration-specifiers declarator declaration-list(opt)
|
||||
compound-statement
|
||||
(6.9.1) declaration-list:
|
||||
declaration
|
||||
declaration-list declaration
|
||||
|
||||
(6.9) translation-unit:
|
||||
external-declaration
|
||||
translation-unit external-declaration
|
||||
(6.9) external-declaration:
|
||||
function-definition
|
||||
declaration
|
||||
(6.9.1) function-definition:
|
||||
declaration-specifiers declarator declaration-listopt compound-statement
|
||||
(6.9.1) declaration-list:
|
||||
declaration
|
||||
declaration-list declaration
|
||||
*/
|
||||
|
||||
#include <parser_utils.h>
|
||||
#include <scc_parser.h>
|
||||
|
||||
scc_ast_decl_t *scc_parse_declaration(scc_parser_t *parser) {
|
||||
/**
|
||||
* ISO/IEC 9899:TC3
|
||||
@@ -171,22 +174,36 @@ scc_ast_decl_t *scc_parse_declaration(scc_parser_t *parser) {
|
||||
* declarator
|
||||
* declarator = initializer
|
||||
*/
|
||||
if (!scc_parse_is_declaration_start(parser, 0)) {
|
||||
cbool ok;
|
||||
const scc_lexer_tok_t *tok_ptr = scc_parser_next(parser);
|
||||
scc_lexer_tok_t tok;
|
||||
if (tok_ptr == null) {
|
||||
return null;
|
||||
}
|
||||
scc_ast_type_t *type = scc_parse_type(parser);
|
||||
|
||||
scc_ast_type_t *type = scc_malloc(sizeof(scc_ast_type_t));
|
||||
if (type == null) {
|
||||
LOG_ERROR("Failed to parse type");
|
||||
LOG_FATAL("out of memory");
|
||||
return null;
|
||||
}
|
||||
|
||||
const scc_lexer_tok_t *tok = scc_lexer_stream_current(parser->lex_stream);
|
||||
if (!scc_lexer_tok_match(tok, SCC_TOK_IDENT)) {
|
||||
LOG_ERROR("Expected identifier, got %s", scc_get_tok_name(tok->type));
|
||||
if (tok_ptr->type != SCC_TOK_INT) {
|
||||
// TODO back it
|
||||
scc_parser_reset(parser);
|
||||
return null;
|
||||
} else {
|
||||
type->base.type = SCC_AST_TYPE_BUILTIN;
|
||||
type->base.loc = tok_ptr->loc;
|
||||
type->builtin.type = SCC_AST_BUILTIN_TYPE_INT;
|
||||
type->builtin.quals = (scc_ast_decl_specifier_t){0};
|
||||
}
|
||||
|
||||
scc_parser_commit(parser);
|
||||
ok = scc_parser_next_consume(parser, &tok);
|
||||
if (ok == false) {
|
||||
return null;
|
||||
}
|
||||
|
||||
scc_lexer_stream_consume(parser->lex_stream);
|
||||
scc_ast_decl_t *decl = scc_malloc(sizeof(scc_ast_decl_t));
|
||||
|
||||
/*
|
||||
@@ -202,27 +219,28 @@ scc_ast_decl_t *scc_parse_declaration(scc_parser_t *parser) {
|
||||
direct-declarator ( parameter-type-list )
|
||||
direct-declarator ( identifier-listopt )
|
||||
*/
|
||||
if (!scc_parse_consume_if(parser->lex_stream, SCC_TOK_L_PAREN)) {
|
||||
if (!scc_parser_consume_if(parser, SCC_TOK_L_PAREN)) {
|
||||
// TODO
|
||||
if (scc_parse_consume_if(parser->lex_stream, SCC_TOK_SEMICOLON)) {
|
||||
if (scc_parser_consume_if(parser, SCC_TOK_SEMICOLON)) {
|
||||
decl->base.type = SCC_AST_DECL_VAR;
|
||||
decl->var.type = type;
|
||||
decl->var.name = tok->value.cstr.data;
|
||||
decl->var.name = scc_cstring_as_cstr(&tok.lexeme);
|
||||
decl->var.init = null;
|
||||
return decl;
|
||||
} else if (scc_parse_consume_if(parser->lex_stream, SCC_TOK_ASSIGN)) {
|
||||
goto RETURN;
|
||||
} else if (scc_parser_consume_if(parser, SCC_TOK_ASSIGN)) {
|
||||
decl->base.type = SCC_AST_DECL_VAR;
|
||||
decl->var.type = type;
|
||||
decl->var.name = tok->value.cstr.data;
|
||||
decl->var.init = scc_parse_expression(parser);
|
||||
return decl;
|
||||
decl->var.name = scc_cstring_as_cstr(&tok.lexeme);
|
||||
decl->var.init = null; // scc_parse_expression(parser);
|
||||
goto RETURN;
|
||||
}
|
||||
// TODO
|
||||
return null;
|
||||
}
|
||||
|
||||
// function decl
|
||||
decl->base.type = SCC_AST_DECL_FUNC;
|
||||
decl->func.name = tok->value.cstr.data;
|
||||
decl->func.name = scc_cstring_as_cstr(&tok.lexeme);
|
||||
decl->func.type = scc_malloc(sizeof(scc_ast_type_t));
|
||||
decl->func.type->base.type = SCC_AST_TYPE_FUNCTION;
|
||||
scc_vec_init(decl->func.type->function.param_types);
|
||||
@@ -231,20 +249,32 @@ scc_ast_decl_t *scc_parse_declaration(scc_parser_t *parser) {
|
||||
decl->func.type->function.is_variadic = false;
|
||||
|
||||
// TODO param type
|
||||
scc_parse_consume_if(parser->lex_stream, SCC_TOK_VOID);
|
||||
scc_parser_consume_if(parser, SCC_TOK_VOID);
|
||||
|
||||
if (!scc_parse_consume_if(parser->lex_stream, SCC_TOK_R_PAREN)) {
|
||||
if (!scc_parser_consume_if(parser, SCC_TOK_R_PAREN)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!scc_parse_is(parser->lex_stream, SCC_TOK_L_BRACE)) {
|
||||
tok_ptr = scc_parser_peek(parser);
|
||||
if (tok_ptr == null) {
|
||||
return null;
|
||||
}
|
||||
if (tok_ptr->type != SCC_TOK_L_BRACE) {
|
||||
if (tok_ptr->type == SCC_TOK_SEMICOLON) {
|
||||
decl->func.body = null;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
decl->func.body = scc_parse_statement(parser);
|
||||
Assert(decl->func.type != null);
|
||||
Assert(decl->func.type->base.type == SCC_AST_TYPE_FUNCTION);
|
||||
Assert(decl->func.body != null);
|
||||
Assert(decl->func.body->base.type == SCC_AST_STMT_COMPOUND);
|
||||
|
||||
RETURN:
|
||||
parser->sema_callbacks.on_decl(parser->sema_callbacks.context,
|
||||
decl->base.type, decl);
|
||||
return decl;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user