diff options
author | ubsan <npmazzuca@gmail.com> | 2016-12-24 19:07:08 -0700 |
---|---|---|
committer | ubsan <npmazzuca@gmail.com> | 2016-12-24 19:07:08 -0700 |
commit | 0c14c734fa32014fd24297ccdbed927016185ffd (patch) | |
tree | ed4bbff4be39c44c57164641f4ed32b5ad4675f0 /src/expand/concat.cpp | |
parent | d12a8a886caf2e0edf33c1af831b1df990d2c892 (diff) | |
download | mrust-0c14c734fa32014fd24297ccdbed927016185ffd.tar.gz |
No more tears!
No more DOS line endings or trailing whitespace either
Diffstat (limited to 'src/expand/concat.cpp')
-rw-r--r-- | src/expand/concat.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/expand/concat.cpp b/src/expand/concat.cpp index 7475325a..a08e9168 100644 --- a/src/expand/concat.cpp +++ b/src/expand/concat.cpp @@ -19,18 +19,18 @@ class CConcatExpander: ::std::unique_ptr<TokenStream> expand(const Span& sp, const AST::Crate& crate, const ::std::string& ident, const TokenTree& tt, AST::Module& mod) override { Token tok; - + auto lex = TTStream(tt); if( ident != "" ) ERROR(sp, E0000, "format_args! doesn't take an ident"); - + ::std::string rv; do { if( LOOK_AHEAD(lex) == TOK_EOF ) { GET_TOK(tok, lex); break ; } - + auto v = Parse_Expr0(lex); DEBUG("concat - v=" << *v); Expand_BareExpr(crate, mod, v); @@ -63,7 +63,7 @@ class CConcatExpander: } while( GET_TOK(tok, lex) == TOK_COMMA ); if( tok.type() != TOK_EOF ) throw ParseError::Unexpected(lex, tok, {TOK_COMMA, TOK_EOF}); - + return box$( TTStreamO(TokenTree(Token(TOK_STRING, mv$(rv)))) ); } }; |