mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-21 23:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

update enum parsing to new plan

Browse Source
This commit is contained in:
Andrew Kelley 2016-01-10 16:58:21 -07:00
parent 3ef2f7058b
commit fc748e2ccd
3 changed files with 35 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
doc/langref.md
View File

@ -32,23 +32,15 @@ zig | C equivalent | Description
```
Root : many(TopLevelDecl) token(EOF)
TopLevelDecl : FnDef | ExternBlock | RootExportDecl | Use | StructDecl | VariableDeclaration | EnumDecl
TopLevelDecl : FnDef | ExternBlock | RootExportDecl | Use | ContainerDecl | VariableDeclaration
VariableDeclaration : option(FnVisibleMod) (token(Var) | token(Const)) token(Symbol) (token(Eq) Expression | token(Colon) Type option(token(Eq) Expression))
StructDecl : many(Directive) option(FnVisibleMod) token(Struct) StructPayload
StructPayload: token(Symbol) token(LBrace) many(StructMember) token(RBrace)
EnumDecl : many(Directive) option(FnVisibleMod) token(Enum) token(Symbol) token(LBrace) many(EnumField) token(RBrace)
ContainerDecl : many(Directive) option(FnVisibleMod) (token(Struct) | token(Enum)) token(Symbol) token(LBrace) many(StructMember) token(RBrace)
StructMember: StructField | FnDecl
StructField : token(Symbol) token(Colon) Type token(Comma)
EnumField : (EnumDiscriminant | StructPayload) token(Comma)
EnumDiscriminant : token(Symbol) option(token(Eq) Expression)
StructField : token(Symbol) option(token(Colon) Type token(Comma))
Use : many(Directive) token(Use) token(String) token(Semicolon)
@ -168,9 +160,7 @@ SliceExpression : token(LBracket) Expression token(Ellipsis) option(Expression)
PrefixOp : token(Not) | token(Dash) | token(Tilde) | token(Star) | (token(Ampersand) option(token(Const)))
PrimaryExpression : token(Number) | token(String) | token(CharLiteral) | KeywordLiteral | GroupedExpression | Goto | token(Break) | token(Continue) | BlockExpression | token(Symbol) | StructValueExpression | CompilerFnType | (token(AtSign) token(Symbol) FnCallExpression) | NamespaceSymbol
NamespaceSymbol : token(Symbol) token(ColonColon) token(Symbol)
PrimaryExpression : token(Number) | token(String) | token(CharLiteral) | KeywordLiteral | GroupedExpression | Goto | token(Break) | token(Continue) | BlockExpression | token(Symbol) | StructValueExpression | CompilerFnType | (token(AtSign) token(Symbol) FnCallExpression)
StructValueExpression : token(Type) token(LBrace) list(StructValueExpressionField, token(Comma)) token(RBrace)

6
src/all_types.hpp
View File

@ -451,8 +451,14 @@ struct AstNodeAsmExpr {
Expr resolved_expr;
};
enum ContainerKind {
ContainerKindStruct,
ContainerKindEnum,
};
struct AstNodeStructDecl {
Buf name;
ContainerKind kind;
ZigList<AstNode *> fields;
ZigList<AstNode *> fns;
ZigList<AstNode *> *directives;

138
src/parser.cpp
View File

@ -431,7 +431,9 @@ void ast_print(AstNode *node, int indent) {
break;
case NodeTypeStructField:
fprintf(stderr, "%s '%s'\n", node_type_str(node->type), buf_ptr(&node->data.struct_field.name));
ast_print(node->data.struct_field.type, indent + 2);
if (node->data.struct_field.type) {
ast_print(node->data.struct_field.type, indent + 2);
}
break;
case NodeTypeEnumDecl:
fprintf(stderr, "%s '%s'\n",
@ -2727,106 +2729,7 @@ static AstNode *ast_parse_use(ParseContext *pc, int *token_index) {
}
/*
EnumDecl : many(Directive) option(FnVisibleMod) token(Enum) token(Symbol) token(LBrace) many(EnumField) token(RBrace)
EnumField : (EnumDiscriminant | StructPayload) token(Comma)
EnumDiscriminant : token(Symbol) option(token(Eq) Expression)
*/
static AstNode *ast_parse_enum_decl(ParseContext *pc, int *token_index) {
Token *first_token = &pc->tokens->at(*token_index);
VisibMod visib_mod;
if (first_token->id == TokenIdKeywordPub) {
Token *next_token = &pc->tokens->at(*token_index + 1);
if (next_token->id == TokenIdKeywordEnum) {
visib_mod = VisibModPub;
*token_index += 2;
} else {
return nullptr;
}
} else if (first_token->id == TokenIdKeywordExport) {
Token *next_token = &pc->tokens->at(*token_index + 1);
if (next_token->id == TokenIdKeywordEnum) {
visib_mod = VisibModExport;
*token_index += 2;
} else {
return nullptr;
}
} else if (first_token->id == TokenIdKeywordEnum) {
visib_mod = VisibModPrivate;
*token_index += 1;
} else {
return nullptr;
}
Token *enum_name = ast_eat_token(pc, token_index, TokenIdSymbol);
AstNode *node = ast_create_node(pc, NodeTypeEnumDecl, first_token);
ast_buf_from_token(pc, enum_name, &node->data.enum_decl.name);
node->data.enum_decl.visib_mod = visib_mod;
node->data.enum_decl.directives = pc->directive_list;
pc->directive_list = nullptr;
ast_eat_token(pc, token_index, TokenIdLBrace);
for (;;) {
Token *token = &pc->tokens->at(*token_index);
if (token->id == TokenIdRBrace) {
*token_index += 1;
break;
} else if (token->id == TokenIdSymbol) {
AstNode *field_node = ast_create_node(pc, NodeTypeEnumField, token);
*token_index += 1;
ast_buf_from_token(pc, token, &field_node->data.enum_field.name);
Token *eq_tok = &pc->tokens->at(*token_index);
if (eq_tok->id == TokenIdEq) {
*token_index += 1;
field_node->data.enum_field.val_expr = ast_parse_expression(pc, token_index, true);
} else if (eq_tok->id == TokenIdLBrace) {
*token_index += 1;
for (;;) {
Token *token = &pc->tokens->at(*token_index);
if (token->id == TokenIdRBrace) {
*token_index += 1;
break;
} else if (token->id == TokenIdSymbol) {
AstNode *sub_field_node = ast_create_node(pc, NodeTypeStructField, token);
*token_index += 1;
ast_buf_from_token(pc, token, &sub_field_node->data.struct_field.name);
ast_eat_token(pc, token_index, TokenIdColon);
sub_field_node->data.struct_field.type = ast_parse_type(pc, token_index);
ast_eat_token(pc, token_index, TokenIdComma);
field_node->data.enum_decl.fields.append(sub_field_node);
} else {
ast_invalid_token_error(pc, token);
}
}
}
ast_eat_token(pc, token_index, TokenIdComma);
node->data.enum_decl.fields.append(field_node);
} else {
ast_invalid_token_error(pc, token);
}
}
return node;
}
/*
StructDecl : many(Directive) option(FnVisibleMod) token(Struct) StructPayload
StructPayload: token(Symbol) token(LBrace) many(StructMember) token(RBrace)
ContainerDecl : many(Directive) option(FnVisibleMod) (token(Struct) | token(Enum)) token(Symbol) token(LBrace) many(StructMember) token(RBrace)
StructMember: StructField | FnDecl
StructField : token(Symbol) token(Colon) Type token(Comma)
*/
@ -2834,25 +2737,35 @@ static AstNode *ast_parse_struct_decl(ParseContext *pc, int *token_index) {
Token *first_token = &pc->tokens->at(*token_index);
VisibMod visib_mod;
ContainerKind kind;
if (first_token->id == TokenIdKeywordPub) {
Token *next_token = &pc->tokens->at(*token_index + 1);
if (next_token->id == TokenIdKeywordStruct) {
if (next_token->id == TokenIdKeywordStruct ||
next_token->id == TokenIdKeywordEnum)
{
visib_mod = VisibModPub;
kind = (next_token->id == TokenIdKeywordStruct) ? ContainerKindStruct : ContainerKindEnum;
*token_index += 2;
} else {
return nullptr;
}
} else if (first_token->id == TokenIdKeywordExport) {
Token *next_token = &pc->tokens->at(*token_index + 1);
if (next_token->id == TokenIdKeywordStruct) {
if (next_token->id == TokenIdKeywordStruct ||
next_token->id == TokenIdKeywordEnum)
{
visib_mod = VisibModExport;
kind = (next_token->id == TokenIdKeywordStruct) ? ContainerKindStruct : ContainerKindEnum;
*token_index += 2;
} else {
return nullptr;
}
} else if (first_token->id == TokenIdKeywordStruct) {
} else if (first_token->id == TokenIdKeywordStruct ||
first_token->id == TokenIdKeywordEnum)
{
visib_mod = VisibModPrivate;
kind = (first_token->id == TokenIdKeywordStruct) ? ContainerKindStruct : ContainerKindEnum;
*token_index += 1;
} else {
return nullptr;
@ -2861,6 +2774,7 @@ static AstNode *ast_parse_struct_decl(ParseContext *pc, int *token_index) {
Token *struct_name = ast_eat_token(pc, token_index, TokenIdSymbol);
AstNode *node = ast_create_node(pc, NodeTypeStructDecl, first_token);
node->data.struct_decl.kind = kind;
ast_buf_from_token(pc, struct_name, &node->data.struct_decl.name);
node->data.struct_decl.visib_mod = visib_mod;
@ -2900,9 +2814,13 @@ static AstNode *ast_parse_struct_decl(ParseContext *pc, int *token_index) {
ast_buf_from_token(pc, token, &field_node->data.struct_field.name);
ast_eat_token(pc, token_index, TokenIdColon);
field_node->data.struct_field.type = ast_parse_type(pc, token_index);
Token *colon_tok = &pc->tokens->at(*token_index);
if (colon_tok->id == TokenIdColon) {
*token_index += 1;
field_node->data.struct_field.type = ast_parse_type(pc, token_index);
} else {
field_node->data.struct_field.type = ast_create_void_type_node(pc, colon_tok);
}
ast_eat_token(pc, token_index, TokenIdComma);
@ -2956,12 +2874,6 @@ static void ast_parse_top_level_decls(ParseContext *pc, int *token_index, ZigLis
continue;
}
AstNode *enum_node = ast_parse_enum_decl(pc, token_index);
if (enum_node) {
top_level_decls->append(enum_node);
continue;
}
if (pc->directive_list->length > 0) {
ast_error(pc, directive_token, "invalid directive");
}