Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename back to extern, extend a stage1 parser hack 

Make it recognize extern/export symbols prefixed by @ as a builtin
rather than stand-alone keywords.
master
LemonBoy 2020-11-21 09:48:21 +01:00
parent 9b7d9c72b0
commit ccdaf946b9
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/stage1/codegen.cpp
View File

@ -8826,7 +8826,7 @@ static void define_builtin_fns(CodeGen *g) {
create_builtin_fn(g, BuiltinFnIdAlignCast, "alignCast", 2);
create_builtin_fn(g, BuiltinFnIdSetAlignStack, "setAlignStack", 1);
create_builtin_fn(g, BuiltinFnIdExport, "export", 2);
create_builtin_fn(g, BuiltinFnIdExtern, "extern1", 2);
create_builtin_fn(g, BuiltinFnIdExtern, "extern", 2);
create_builtin_fn(g, BuiltinFnIdErrorReturnTrace, "errorReturnTrace", 0);
create_builtin_fn(g, BuiltinFnIdAtomicRmw, "atomicRmw", 5);
create_builtin_fn(g, BuiltinFnIdAtomicLoad, "atomicLoad", 3);

13
src/stage1/parser.cpp
View File

@ -1652,18 +1652,21 @@ static AstNode *ast_parse_primary_type_expr(ParseContext *pc) {
// TODO: This is not in line with the grammar.
// Because the prev stage 1 tokenizer does not parse
// @[a-zA-Z_][a-zA-Z0-9_] as one token, it has to do a
// hack, where it accepts '@' (IDENTIFIER / KEYWORD_export).
// hack, where it accepts '@' (IDENTIFIER / KEYWORD_export /
// KEYWORD_extern).
// I'd say that it's better if '@' is part of the builtin
// identifier token.
Token *at_sign = eat_token_if(pc, TokenIdAtSign);
if (at_sign != nullptr) {
Buf *name;
Token *token = eat_token_if(pc, TokenIdKeywordExport);
if (token == nullptr) {
Token *token;
if ((token = eat_token_if(pc, TokenIdKeywordExport)) != nullptr) {
name = buf_create_from_str("export");
} else if ((token = eat_token_if(pc, TokenIdKeywordExtern)) != nullptr) {
name = buf_create_from_str("extern");
} else {
token = expect_token(pc, TokenIdSymbol);
name = token_buf(token);
} else {
name = buf_create_from_str("export");
}
AstNode *res = ast_expect(pc, ast_parse_fn_call_arguments);