Allow doc comments to be terminated with EOF
Closes #61
diff --git a/src/stable.rs b/src/stable.rs
index ffa077a..41a7c4b 100644
--- a/src/stable.rs
+++ b/src/stable.rs
@@ -1179,7 +1179,7 @@
named!(doc_comment -> (), alt!(
do_parse!(
punct!("//!") >>
- take_until!("\n") >>
+ take_until_newline_or_eof!() >>
(())
)
|
@@ -1193,7 +1193,7 @@
do_parse!(
punct!("///") >>
not!(tag!("/")) >>
- take_until!("\n") >>
+ take_until_newline_or_eof!() >>
(())
)
|
diff --git a/src/strnom.rs b/src/strnom.rs
index 33964f4..dbac5c9 100644
--- a/src/strnom.rs
+++ b/src/strnom.rs
@@ -263,34 +263,14 @@
};
}
-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()), ""))
}
}
}};