diff --git a/src/comp/syntax/ast.rs b/src/comp/syntax/ast.rs index 71fc2b6cf96c..fb0f474c0840 100644 --- a/src/comp/syntax/ast.rs +++ b/src/comp/syntax/ast.rs @@ -333,7 +333,7 @@ tag mac_ { mac_invoc(path, (@expr)[], option::t[str]); mac_embed_type(@ty); mac_embed_block(block); - mac_elipsis; + mac_ellipsis; } type lit = spanned[lit_]; diff --git a/src/comp/syntax/fold.rs b/src/comp/syntax/fold.rs index b41e8bbc09a4..a7692490bccf 100644 --- a/src/comp/syntax/fold.rs +++ b/src/comp/syntax/fold.rs @@ -140,7 +140,7 @@ fn fold_mac_(&mac m, ast_fold fld) -> mac { case (mac_embed_block(?block)) { mac_embed_block(fld.fold_block(block)) } - case (mac_elipsis) { mac_elipsis } + case (mac_ellipsis) { mac_ellipsis } }, span=m.span); } diff --git a/src/comp/syntax/parse/lexer.rs b/src/comp/syntax/parse/lexer.rs index d5c0b2c09bb0..733faaf4f09c 100644 --- a/src/comp/syntax/parse/lexer.rs +++ b/src/comp/syntax/parse/lexer.rs @@ -370,7 +370,7 @@ fn next_token(&reader rdr) -> token::token { if (rdr.curr() == '.' && rdr.next() == '.') { rdr.bump(); rdr.bump(); - ret token::ELIPSIS; + ret token::ELLIPSIS; } ret token::DOT; } diff --git a/src/comp/syntax/parse/token.rs b/src/comp/syntax/parse/token.rs index 2582c22892b9..bb594d9e1b96 100644 --- a/src/comp/syntax/parse/token.rs +++ b/src/comp/syntax/parse/token.rs @@ -43,7 +43,7 @@ tag token { /* Structural symbols */ AT; DOT; - ELIPSIS; + ELLIPSIS; COMMA; SEMI; COLON; @@ -116,7 +116,7 @@ fn to_str(lexer::reader r, token t) -> str { /* Structural symbols */ case (AT) { ret "@"; } case (DOT) { ret "."; } - case (ELIPSIS) { ret "..."; } + case (ELLIPSIS) { ret "..."; } case (COMMA) { ret ","; } case (SEMI) { ret ";"; } case (COLON) { ret ":"; } diff --git a/src/comp/syntax/print/pprust.rs b/src/comp/syntax/print/pprust.rs index 2fcef0d76136..7a4007e1a603 100644 --- a/src/comp/syntax/print/pprust.rs +++ b/src/comp/syntax/print/pprust.rs @@ -691,7 +691,7 @@ fn print_mac(&ps s, &ast::mac m) { case (ast::mac_embed_block(?blk)) { print_possibly_embedded_block(s, blk, true); } - case (ast::mac_elipsis) { + case (ast::mac_ellipsis) { word(s.s, "..."); } } diff --git a/src/comp/syntax/visit.rs b/src/comp/syntax/visit.rs index f3511e60be58..5198130c2fbc 100644 --- a/src/comp/syntax/visit.rs +++ b/src/comp/syntax/visit.rs @@ -261,7 +261,7 @@ fn visit_mac[E](mac m, &E e, &vt[E] v) { case (ast::mac_invoc(?pth, ?args, ?body)) { visit_exprs(args, e, v); } case (ast::mac_embed_type(?ty)) { v.visit_ty(ty, e, v); } case (ast::mac_embed_block(?blk)) { v.visit_block(blk, e, v); } - case (ast::mac_elipsis) { } + case (ast::mac_ellipsis) { } } } diff --git a/src/comp/syntax/walk.rs b/src/comp/syntax/walk.rs index 0e2e13f6dc5a..540905893a74 100644 --- a/src/comp/syntax/walk.rs +++ b/src/comp/syntax/walk.rs @@ -274,7 +274,7 @@ fn walk_mac(&ast_visitor v, ast::mac mac) { case (ast::mac_invoc(?pth, ?args, ?body)) { walk_exprs(v, args); } case (ast::mac_embed_type(?ty)) { walk_ty(v, ty); } case (ast::mac_embed_block(?blk)) { walk_block(v, blk); } - case (ast::mac_elipsis) { } + case (ast::mac_ellipsis) { } } }