summaryrefslogtreecommitdiff
path: root/src/expand/include.cpp
diff options
context:
space:
mode:
authorJohn Hodge <tpg@ucc.asn.au>2017-10-29 12:44:01 +0800
committerJohn Hodge <tpg@ucc.asn.au>2017-10-29 12:44:01 +0800
commit94ad750f1727a977b5e5e2b094527e6c449df41d (patch)
tree53dfa784a3beb7dc2d60b13aa6678dfe6b9c82e8 /src/expand/include.cpp
parent69311c5199292cd4b00b5c82fe8096d93b7e6465 (diff)
downloadmrust-94ad750f1727a977b5e5e2b094527e6c449df41d.tar.gz
Expand - Add parent spans to TTStream[O]
Diffstat (limited to 'src/expand/include.cpp')
-rw-r--r--src/expand/include.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/expand/include.cpp b/src/expand/include.cpp
index e66e07ce..59f33d47 100644
--- a/src/expand/include.cpp
+++ b/src/expand/include.cpp
@@ -69,7 +69,7 @@ class CIncludeExpander:
ERROR(sp, E0000, "include! doesn't take an ident");
Token tok;
- auto lex = TTStream(tt);
+ auto lex = TTStream(sp, tt);
auto path = get_string(sp, lex, crate, mod);
GET_CHECK_TOK(tok, lex, TOK_EOF);
@@ -95,7 +95,7 @@ class CIncludeBytesExpander:
ERROR(sp, E0000, "include_bytes! doesn't take an ident");
Token tok;
- auto lex = TTStream(tt);
+ auto lex = TTStream(sp, tt);
auto path = get_string(sp, lex, crate, mod);
GET_CHECK_TOK(tok, lex, TOK_EOF);
@@ -111,7 +111,7 @@ class CIncludeBytesExpander:
::std::vector<TokenTree> toks;
toks.push_back(Token(TOK_BYTESTRING, mv$(ss.str())));
- return box$( TTStreamO(TokenTree(Ident::Hygiene::new_scope(), mv$(toks))) );
+ return box$( TTStreamO(sp, TokenTree(Ident::Hygiene::new_scope(), mv$(toks))) );
}
};
@@ -124,7 +124,7 @@ class CIncludeStrExpander:
ERROR(sp, E0000, "include_str! doesn't take an ident");
Token tok;
- auto lex = TTStream(tt);
+ auto lex = TTStream(sp, tt);
auto path = get_string(sp, lex, crate, mod);
GET_CHECK_TOK(tok, lex, TOK_EOF);
@@ -140,7 +140,7 @@ class CIncludeStrExpander:
::std::vector<TokenTree> toks;
toks.push_back(Token(TOK_STRING, mv$(ss.str())));
- return box$( TTStreamO(TokenTree(Ident::Hygiene::new_scope(), mv$(toks))) );
+ return box$( TTStreamO(sp, TokenTree(Ident::Hygiene::new_scope(), mv$(toks))) );
}
};