authorgravatar for thejoshwolfe@gmail.comJosh Wolfe <thejoshwolfe@gmail.com> 2015-12-09 01:07:27-07:00
committergravatar for thejoshwolfe@gmail.comJosh Wolfe <thejoshwolfe@gmail.com> 2015-12-09 01:08:18-07:00
log6a48c007a62bca5ba712e92b1f1e32031e43717c
tree4774f54a2c41c285221bc2aac4a84264a1cf8adf
parentdfda85e870df1b0620c418940db3b946fdd3d620

fix typo


4 files changed, 6 insertions(+), 6 deletions(-)

README.md+1-1
......@@ -146,7 +146,7 @@ FnDef : FnProto Block
146146
147147ParamDeclList : token(LParen) list(ParamDecl, token(Comma)) token(RParen)
148148
149ParamDecl : token(Symbol) token(Colon) Type | token(Ellipse)
149ParamDecl : token(Symbol) token(Colon) Type | token(Ellipsis)
150150
151151Type : token(Symbol) | token(Unreachable) | token(Void) | PointerType | ArrayType
152152
src/parser.cpp+2-2
......@@ -517,7 +517,7 @@ static AstNode *ast_parse_type(ParseContext *pc, int token_index, int *new_token
517517}
518518
519519/*
520ParamDecl : token(Symbol) token(Colon) Type | token(Ellipse)
520ParamDecl : token(Symbol) token(Colon) Type | token(Ellipsis)
521521*/
522522static AstNode *ast_parse_param_decl(ParseContext *pc, int token_index, int *new_token_index) {
523523 Token *param_name = &pc->tokens->at(token_index);
......@@ -536,7 +536,7 @@ static AstNode *ast_parse_param_decl(ParseContext *pc, int token_index, int *new
536536
537537 *new_token_index = token_index;
538538 return node;
539 } else if (param_name->id == TokenIdEllipse) {
539 } else if (param_name->id == TokenIdEllipsis) {
540540 *new_token_index = token_index;
541541 return nullptr;
542542 } else {
src/tokenizer.cpp+2-2
......@@ -337,7 +337,7 @@ void tokenize(Buf *buf, Tokenization *out) {
337337 switch (c) {
338338 case '.':
339339 t.state = TokenizeStateDotDot;
340 t.cur_tok->id = TokenIdEllipse;
340 t.cur_tok->id = TokenIdEllipsis;
341341 break;
342342 default:
343343 t.pos -= 1;
......@@ -672,7 +672,7 @@ static const char * token_name(Token *token) {
672672 case TokenIdSlash: return "Slash";
673673 case TokenIdPercent: return "Percent";
674674 case TokenIdDot: return "Dot";
675 case TokenIdEllipse: return "Ellipse";
675 case TokenIdEllipsis: return "Ellipsis";
676676 }
677677 return "(invalid token)";
678678}
src/tokenizer.hpp+1-1
......@@ -65,7 +65,7 @@ enum TokenId {
6565 TokenIdSlash,
6666 TokenIdPercent,
6767 TokenIdDot,
68 TokenIdEllipse,
68 TokenIdEllipsis,
6969};
7070
7171struct Token {