openharmony/third_party_rust_proc-macro2
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_proc-macro2 synced 2024-11-23 07:19:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #63 from alexcrichton/fix-eof

Browse Source 
Allow doc comments to be terminated with EOF
This commit is contained in:
David Tolnay 2018-01-25 13:32:43 -08:00 committed by GitHub
commit ce57c9d1a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/stable.rs
View File

@ -1179,7 +1179,7 @@ fn op_char(input: Cursor) -> PResult<char> {
named!(doc_comment -> (), alt!(
do_parse!(
punct!("//!") >>
take_until!("\n") >>
take_until_newline_or_eof!() >>
(())
)
|
@ -1193,7 +1193,7 @@ named!(doc_comment -> (), alt!(
do_parse!(
punct!("///") >>
not!(tag!("/")) >>
take_until!("\n") >>
take_until_newline_or_eof!() >>
(())
)
|

34
src/strnom.rs
View File

@ -263,34 +263,14 @@ macro_rules! option {
};
}
macro_rules! take_until {
($i:expr, $substr:expr) => {{
if $substr.len() > $i.len() {
Err(LexError)
macro_rules! take_until_newline_or_eof {
($i:expr,) => {{
if $i.len() == 0 {
Ok(($i, ""))
} else {
let substr_vec: Vec<char> = $substr.chars().collect();
let mut window: Vec<char> = vec![];
let mut offset = $i.len();
let mut parsed = false;
for (o, c) in $i.char_indices() {
window.push(c);
if window.len() > substr_vec.len() {
window.remove(0);
}
if window == substr_vec {
parsed = true;
window.pop();
let window_len: usize = window.iter()
.map(|x| x.len_utf8())
.fold(0, |x, y| x + y);
offset = o - window_len;
break;
}
}
if parsed {
Ok(($i.advance(offset), &$i.rest[..offset]))
} else {
Err(LexError)
match $i.find('\n') {
Some(i) => Ok(($i.advance(i), &$i.rest[..i])),
None => Ok(($i.advance($i.len()), ""))
}
}
}};

8
tests/test.rs
View File

@ -175,5 +175,13 @@ fn tricky_doc_commaent() {
let stream = "/**/".parse::<proc_macro2::TokenStream>().unwrap();
let tokens = stream.into_iter().collect::<Vec<_>>();
assert!(tokens.is_empty(), "not empty -- {:?}", tokens);
let stream = "/// doc".parse::<proc_macro2::TokenStream>().unwrap();
let tokens = stream.into_iter().collect::<Vec<_>>();
assert!(tokens.len() == 1, "not length 1 -- {:?}", tokens);
match tokens[0].kind {
proc_macro2::TokenNode::Literal(_) => {}
_ => panic!("wrong token {:?}", tokens[0]),
}
}