about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-07-17 03:05:08 -0700
committerGitHub <noreply@github.com>2016-07-17 03:05:08 -0700
commit6aba7be9a67467d31e6cbf75dc8b5f44d60cb5ca (patch)
tree27cf7fc6b3f0ad1bda7a790cc5fb3524c0929844 /src/libsyntax
parent7ed6068d3e528167e95b684d086a39e099fd26f1 (diff)
parentfecf3b6a2c192d52ae7f69551f76b1ac4b01a85c (diff)
downloadrust-6aba7be9a67467d31e6cbf75dc8b5f44d60cb5ca.tar.gz
rust-6aba7be9a67467d31e6cbf75dc8b5f44d60cb5ca.zip
Auto merge of #34829 - cgswords:tstream, r=nrc
Added tokenstream parser procedure

A tiny PR that simply adds a procedure for parsing `TokenStream`s to the parser in `src/libsyntax`. This is to ease using `TokenStream`s with the current (old) procedural macro system.
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/parse/mod.rs10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index 6af4d95e888..2147e8ec2eb 100644
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -228,10 +228,18 @@ pub fn filemap_to_parser<'a>(sess: &'a ParseSess,
 // compiler expands into it
 pub fn new_parser_from_tts<'a>(sess: &'a ParseSess,
                                cfg: ast::CrateConfig,
-                               tts: Vec<tokenstream::TokenTree>) -> Parser<'a> {
+                               tts: Vec<tokenstream::TokenTree>)
+                               -> Parser<'a> {
     tts_to_parser(sess, tts, cfg)
 }
 
+pub fn new_parser_from_ts<'a>(sess: &'a ParseSess,
+                              cfg: ast::CrateConfig,
+                              ts: tokenstream::TokenStream)
+                              -> Parser<'a> {
+    tts_to_parser(sess, ts.tts, cfg)
+}
+
 
 // base abstractions