Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 1 | use std::iter::FromIterator; |
| 2 | use std::slice; |
| 3 | use std::vec; |
Nika Layzell | d73a365 | 2017-10-24 08:57:05 -0400 | [diff] [blame] | 4 | #[cfg(feature = "extra-traits")] |
| 5 | use std::fmt::{self, Debug}; |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 6 | |
Nika Layzell | d73a365 | 2017-10-24 08:57:05 -0400 | [diff] [blame] | 7 | #[cfg_attr(feature = "extra-traits", derive(Eq, PartialEq, Hash))] |
Alex Crichton | 7b9e02f | 2017-05-30 15:54:33 -0700 | [diff] [blame] | 8 | #[cfg_attr(feature = "clone-impls", derive(Clone))] |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 9 | pub struct Punctuated<T, P> { |
| 10 | inner: Vec<(T, Option<P>)>, |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 11 | } |
| 12 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 13 | impl<T, P> Punctuated<T, P> { |
| 14 | pub fn new() -> Punctuated<T, P> { |
| 15 | Punctuated { inner: Vec::new() } |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 16 | } |
| 17 | |
| 18 | pub fn is_empty(&self) -> bool { |
| 19 | self.inner.len() == 0 |
| 20 | } |
| 21 | |
| 22 | pub fn len(&self) -> usize { |
| 23 | self.inner.len() |
| 24 | } |
| 25 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 26 | pub fn first(&self) -> Option<Element<&T, &P>> { |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 27 | self.inner.first().map(|&(ref t, ref d)| match *d { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 28 | Some(ref d) => Element::Punctuated(t, d), |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 29 | None => Element::End(t), |
Alex Crichton | 0aa50e0 | 2017-07-07 20:59:03 -0700 | [diff] [blame] | 30 | }) |
| 31 | } |
| 32 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 33 | pub fn last(&self) -> Option<Element<&T, &P>> { |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 34 | self.inner.last().map(|&(ref t, ref d)| match *d { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 35 | Some(ref d) => Element::Punctuated(t, d), |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 36 | None => Element::End(t), |
Alex Crichton | 0aa50e0 | 2017-07-07 20:59:03 -0700 | [diff] [blame] | 37 | }) |
| 38 | } |
| 39 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 40 | pub fn last_mut(&mut self) -> Option<Element<&mut T, &mut P>> { |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 41 | self.inner |
| 42 | .last_mut() |
| 43 | .map(|&mut (ref mut t, ref mut d)| match *d { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 44 | Some(ref mut d) => Element::Punctuated(t, d), |
Alex Crichton | 0aa50e0 | 2017-07-07 20:59:03 -0700 | [diff] [blame] | 45 | None => Element::End(t), |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 46 | }) |
Alex Crichton | 0aa50e0 | 2017-07-07 20:59:03 -0700 | [diff] [blame] | 47 | } |
| 48 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 49 | pub fn iter(&self) -> Iter<T, P> { |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 50 | Iter { |
| 51 | inner: self.inner.iter(), |
| 52 | } |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 53 | } |
| 54 | |
David Tolnay | 6eff4da | 2018-01-01 20:27:45 -0800 | [diff] [blame^] | 55 | pub fn elements(&self) -> Elements<T, P> { |
| 56 | Elements { |
| 57 | inner: self.inner.iter(), |
| 58 | } |
| 59 | } |
| 60 | |
| 61 | pub fn elements_mut(&mut self) -> ElementsMut<T, P> { |
| 62 | ElementsMut { |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 63 | inner: self.inner.iter_mut(), |
| 64 | } |
Alex Crichton | 164c533 | 2017-07-06 13:18:34 -0700 | [diff] [blame] | 65 | } |
| 66 | |
David Tolnay | 6eff4da | 2018-01-01 20:27:45 -0800 | [diff] [blame^] | 67 | pub fn into_elements(self) -> IntoElements<T, P> { |
| 68 | IntoElements { |
| 69 | inner: self.inner.into_iter(), |
| 70 | } |
| 71 | } |
| 72 | |
David Tolnay | 660fd1f | 2017-12-31 01:52:57 -0500 | [diff] [blame] | 73 | pub fn push(&mut self, token: T) { |
David Tolnay | dc03aec | 2017-12-30 01:54:18 -0500 | [diff] [blame] | 74 | assert!(self.empty_or_trailing()); |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 75 | self.inner.push((token, None)); |
| 76 | } |
| 77 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 78 | pub fn push_trailing(&mut self, punctuation: P) { |
David Tolnay | 660fd1f | 2017-12-31 01:52:57 -0500 | [diff] [blame] | 79 | assert!(!self.is_empty()); |
| 80 | let last = self.inner.last_mut().unwrap(); |
| 81 | assert!(last.1.is_none()); |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 82 | last.1 = Some(punctuation); |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 83 | } |
| 84 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 85 | pub fn pop(&mut self) -> Option<Element<T, P>> { |
David Tolnay | 660fd1f | 2017-12-31 01:52:57 -0500 | [diff] [blame] | 86 | self.inner.pop().map(|(t, d)| Element::new(t, d)) |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 87 | } |
| 88 | |
| 89 | pub fn trailing_delim(&self) -> bool { |
David Tolnay | 660fd1f | 2017-12-31 01:52:57 -0500 | [diff] [blame] | 90 | self.inner.last().map(|last| last.1.is_some()).unwrap_or(false) |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 91 | } |
Michael Layzell | 3936ceb | 2017-07-08 00:28:36 -0400 | [diff] [blame] | 92 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 93 | /// Returns true if either this `Punctuated` is empty, or it has a trailing |
| 94 | /// punctuation. |
David Tolnay | dc03aec | 2017-12-30 01:54:18 -0500 | [diff] [blame] | 95 | /// |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 96 | /// Equivalent to `punctuated.is_empty() || punctuated.trailing_delim()`. |
Michael Layzell | 3936ceb | 2017-07-08 00:28:36 -0400 | [diff] [blame] | 97 | pub fn empty_or_trailing(&self) -> bool { |
David Tolnay | 660fd1f | 2017-12-31 01:52:57 -0500 | [diff] [blame] | 98 | self.inner.last().map(|last| last.1.is_some()).unwrap_or(true) |
Michael Layzell | 3936ceb | 2017-07-08 00:28:36 -0400 | [diff] [blame] | 99 | } |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 100 | } |
| 101 | |
Nika Layzell | d73a365 | 2017-10-24 08:57:05 -0400 | [diff] [blame] | 102 | #[cfg(feature = "extra-traits")] |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 103 | impl<T: Debug, P: Debug> Debug for Punctuated<T, P> { |
Nika Layzell | d73a365 | 2017-10-24 08:57:05 -0400 | [diff] [blame] | 104 | fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { |
| 105 | self.inner.fmt(f) |
| 106 | } |
| 107 | } |
| 108 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 109 | impl<T, P> FromIterator<Element<T, P>> for Punctuated<T, P> { |
| 110 | fn from_iter<I: IntoIterator<Item = Element<T, P>>>(i: I) -> Self { |
| 111 | let mut ret = Punctuated::new(); |
Alex Crichton | 24f1282 | 2017-07-14 07:15:32 -0700 | [diff] [blame] | 112 | ret.extend(i); |
Alex Crichton | 954046c | 2017-05-30 21:49:42 -0700 | [diff] [blame] | 113 | ret |
| 114 | } |
| 115 | } |
| 116 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 117 | impl<T, P> Extend<Element<T, P>> for Punctuated<T, P> { |
| 118 | fn extend<I: IntoIterator<Item = Element<T, P>>>(&mut self, i: I) { |
David Tolnay | 660fd1f | 2017-12-31 01:52:57 -0500 | [diff] [blame] | 119 | for elem in i { |
| 120 | match elem { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 121 | Element::Punctuated(a, b) => self.inner.push((a, Some(b))), |
Alex Crichton | 24f1282 | 2017-07-14 07:15:32 -0700 | [diff] [blame] | 122 | Element::End(a) => self.inner.push((a, None)), |
| 123 | } |
| 124 | } |
| 125 | } |
| 126 | } |
| 127 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 128 | impl<T, P> IntoIterator for Punctuated<T, P> { |
David Tolnay | 6eff4da | 2018-01-01 20:27:45 -0800 | [diff] [blame^] | 129 | type Item = T; |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 130 | type IntoIter = IntoIter<T, P>; |
Alex Crichton | 954046c | 2017-05-30 21:49:42 -0700 | [diff] [blame] | 131 | |
David Tolnay | bb4ca9f | 2017-12-26 12:28:58 -0500 | [diff] [blame] | 132 | fn into_iter(self) -> Self::IntoIter { |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 133 | IntoIter { |
| 134 | inner: self.inner.into_iter(), |
| 135 | } |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 136 | } |
| 137 | } |
| 138 | |
David Tolnay | 6eff4da | 2018-01-01 20:27:45 -0800 | [diff] [blame^] | 139 | impl<'a, T, P> IntoIterator for &'a Punctuated<T, P> { |
| 140 | type Item = &'a T; |
| 141 | type IntoIter = Iter<'a, T, P>; |
| 142 | |
| 143 | fn into_iter(self) -> Self::IntoIter { |
| 144 | Punctuated::iter(self) |
| 145 | } |
| 146 | } |
| 147 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 148 | impl<T, P> Default for Punctuated<T, P> { |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 149 | fn default() -> Self { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 150 | Punctuated::new() |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 151 | } |
| 152 | } |
| 153 | |
David Tolnay | 6eff4da | 2018-01-01 20:27:45 -0800 | [diff] [blame^] | 154 | pub struct Elements<'a, T: 'a, P: 'a> { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 155 | inner: slice::Iter<'a, (T, Option<P>)>, |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 156 | } |
| 157 | |
David Tolnay | 6eff4da | 2018-01-01 20:27:45 -0800 | [diff] [blame^] | 158 | impl<'a, T, P> Iterator for Elements<'a, T, P> { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 159 | type Item = Element<&'a T, &'a P>; |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 160 | |
David Tolnay | 6eff4da | 2018-01-01 20:27:45 -0800 | [diff] [blame^] | 161 | fn next(&mut self) -> Option<Self::Item> { |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 162 | self.inner.next().map(|pair| match pair.1 { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 163 | Some(ref p) => Element::Punctuated(&pair.0, p), |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 164 | None => Element::End(&pair.0), |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 165 | }) |
| 166 | } |
| 167 | } |
| 168 | |
David Tolnay | 6eff4da | 2018-01-01 20:27:45 -0800 | [diff] [blame^] | 169 | pub struct ElementsMut<'a, T: 'a, P: 'a> { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 170 | inner: slice::IterMut<'a, (T, Option<P>)>, |
Alex Crichton | 164c533 | 2017-07-06 13:18:34 -0700 | [diff] [blame] | 171 | } |
| 172 | |
David Tolnay | 6eff4da | 2018-01-01 20:27:45 -0800 | [diff] [blame^] | 173 | impl<'a, T, P> Iterator for ElementsMut<'a, T, P> { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 174 | type Item = Element<&'a mut T, &'a mut P>; |
Alex Crichton | 164c533 | 2017-07-06 13:18:34 -0700 | [diff] [blame] | 175 | |
David Tolnay | 6eff4da | 2018-01-01 20:27:45 -0800 | [diff] [blame^] | 176 | fn next(&mut self) -> Option<Self::Item> { |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 177 | self.inner.next().map(|pair| match pair.1 { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 178 | Some(ref mut p) => Element::Punctuated(&mut pair.0, p), |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 179 | None => Element::End(&mut pair.0), |
Alex Crichton | 164c533 | 2017-07-06 13:18:34 -0700 | [diff] [blame] | 180 | }) |
| 181 | } |
| 182 | } |
| 183 | |
David Tolnay | 6eff4da | 2018-01-01 20:27:45 -0800 | [diff] [blame^] | 184 | pub struct IntoElements<T, P> { |
| 185 | inner: vec::IntoIter<(T, Option<P>)>, |
| 186 | } |
| 187 | |
| 188 | impl<T, P> Iterator for IntoElements<T, P> { |
| 189 | type Item = Element<T, P>; |
| 190 | |
| 191 | fn next(&mut self) -> Option<Self::Item> { |
| 192 | self.inner.next().map(|pair| match pair.1 { |
| 193 | Some(p) => Element::Punctuated(pair.0, p), |
| 194 | None => Element::End(pair.0), |
| 195 | }) |
| 196 | } |
| 197 | } |
| 198 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 199 | pub struct IntoIter<T, P> { |
| 200 | inner: vec::IntoIter<(T, Option<P>)>, |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 201 | } |
| 202 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 203 | impl<T, P> Iterator for IntoIter<T, P> { |
David Tolnay | 6eff4da | 2018-01-01 20:27:45 -0800 | [diff] [blame^] | 204 | type Item = T; |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 205 | |
David Tolnay | 6eff4da | 2018-01-01 20:27:45 -0800 | [diff] [blame^] | 206 | fn next(&mut self) -> Option<Self::Item> { |
| 207 | self.inner.next().map(|pair| pair.0) |
| 208 | } |
| 209 | } |
| 210 | |
| 211 | pub struct Iter<'a, T: 'a, P: 'a> { |
| 212 | inner: slice::Iter<'a, (T, Option<P>)>, |
| 213 | } |
| 214 | |
| 215 | impl<'a, T, P> Iterator for Iter<'a, T, P> { |
| 216 | type Item = &'a T; |
| 217 | |
| 218 | fn next(&mut self) -> Option<Self::Item> { |
| 219 | self.inner.next().map(|pair| &pair.0) |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 220 | } |
| 221 | } |
| 222 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 223 | pub enum Element<T, P> { |
| 224 | Punctuated(T, P), |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 225 | End(T), |
| 226 | } |
| 227 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 228 | impl<T, P> Element<T, P> { |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 229 | pub fn into_item(self) -> T { |
| 230 | match self { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 231 | Element::Punctuated(t, _) | Element::End(t) => t, |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 232 | } |
| 233 | } |
| 234 | |
| 235 | pub fn item(&self) -> &T { |
| 236 | match *self { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 237 | Element::Punctuated(ref t, _) | Element::End(ref t) => t, |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 238 | } |
| 239 | } |
| 240 | |
| 241 | pub fn item_mut(&mut self) -> &mut T { |
| 242 | match *self { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 243 | Element::Punctuated(ref mut t, _) | Element::End(ref mut t) => t, |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 244 | } |
| 245 | } |
| 246 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 247 | pub fn punct(&self) -> Option<&P> { |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 248 | match *self { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 249 | Element::Punctuated(_, ref d) => Some(d), |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 250 | Element::End(_) => None, |
| 251 | } |
| 252 | } |
Nika Layzell | cda7ebd | 2017-10-24 23:10:44 -0400 | [diff] [blame] | 253 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 254 | pub fn new(t: T, d: Option<P>) -> Self { |
David Tolnay | 660fd1f | 2017-12-31 01:52:57 -0500 | [diff] [blame] | 255 | match d { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 256 | Some(d) => Element::Punctuated(t, d), |
David Tolnay | 660fd1f | 2017-12-31 01:52:57 -0500 | [diff] [blame] | 257 | None => Element::End(t), |
| 258 | } |
| 259 | } |
| 260 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 261 | pub fn into_tuple(self) -> (T, Option<P>) { |
Nika Layzell | cda7ebd | 2017-10-24 23:10:44 -0400 | [diff] [blame] | 262 | match self { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 263 | Element::Punctuated(t, d) => (t, Some(d)), |
Nika Layzell | cda7ebd | 2017-10-24 23:10:44 -0400 | [diff] [blame] | 264 | Element::End(t) => (t, None), |
| 265 | } |
| 266 | } |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 267 | } |
| 268 | |
Alex Crichton | 7b9e02f | 2017-05-30 15:54:33 -0700 | [diff] [blame] | 269 | #[cfg(feature = "parsing")] |
| 270 | mod parsing { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 271 | use super::Punctuated; |
David Tolnay | c5ab8c6 | 2017-12-26 16:43:39 -0500 | [diff] [blame] | 272 | use synom::Synom; |
| 273 | use cursor::Cursor; |
David Tolnay | 203557a | 2017-12-27 23:59:33 -0500 | [diff] [blame] | 274 | use parse_error; |
| 275 | use synom::PResult; |
Alex Crichton | 7b9e02f | 2017-05-30 15:54:33 -0700 | [diff] [blame] | 276 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 277 | impl<T, P> Punctuated<T, P> |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 278 | where |
| 279 | T: Synom, |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 280 | P: Synom, |
Alex Crichton | 7b9e02f | 2017-05-30 15:54:33 -0700 | [diff] [blame] | 281 | { |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 282 | pub fn parse_separated(input: Cursor) -> PResult<Self> { |
Alex Crichton | 954046c | 2017-05-30 21:49:42 -0700 | [diff] [blame] | 283 | Self::parse(input, T::parse, false) |
| 284 | } |
| 285 | |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 286 | pub fn parse_separated_nonempty(input: Cursor) -> PResult<Self> { |
Alex Crichton | 954046c | 2017-05-30 21:49:42 -0700 | [diff] [blame] | 287 | Self::parse_separated_nonempty_with(input, T::parse) |
Alex Crichton | 7b9e02f | 2017-05-30 15:54:33 -0700 | [diff] [blame] | 288 | } |
| 289 | |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 290 | pub fn parse_terminated(input: Cursor) -> PResult<Self> { |
Alex Crichton | 954046c | 2017-05-30 21:49:42 -0700 | [diff] [blame] | 291 | Self::parse_terminated_with(input, T::parse) |
| 292 | } |
Nika Layzell | b49a9e5 | 2017-12-05 13:31:52 -0500 | [diff] [blame] | 293 | |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 294 | pub fn parse_terminated_nonempty(input: Cursor) -> PResult<Self> { |
Nika Layzell | b49a9e5 | 2017-12-05 13:31:52 -0500 | [diff] [blame] | 295 | Self::parse_terminated_nonempty_with(input, T::parse) |
| 296 | } |
Alex Crichton | 954046c | 2017-05-30 21:49:42 -0700 | [diff] [blame] | 297 | } |
| 298 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 299 | impl<T, P> Punctuated<T, P> |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 300 | where |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 301 | P: Synom, |
Alex Crichton | 954046c | 2017-05-30 21:49:42 -0700 | [diff] [blame] | 302 | { |
David Tolnay | dc03aec | 2017-12-30 01:54:18 -0500 | [diff] [blame] | 303 | pub fn parse_separated_with( |
| 304 | input: Cursor, |
| 305 | parse: fn(Cursor) -> PResult<T>, |
| 306 | ) -> PResult<Self> { |
| 307 | Self::parse(input, parse, false) |
| 308 | } |
| 309 | |
Alex Crichton | 954046c | 2017-05-30 21:49:42 -0700 | [diff] [blame] | 310 | pub fn parse_separated_nonempty_with( |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 311 | input: Cursor, |
| 312 | parse: fn(Cursor) -> PResult<T>, |
| 313 | ) -> PResult<Self> { |
Alex Crichton | 954046c | 2017-05-30 21:49:42 -0700 | [diff] [blame] | 314 | match Self::parse(input, parse, false) { |
David Tolnay | f4aa6b4 | 2017-12-31 16:40:33 -0500 | [diff] [blame] | 315 | Ok((ref b, _)) if b.is_empty() => parse_error(), |
Alex Crichton | 954046c | 2017-05-30 21:49:42 -0700 | [diff] [blame] | 316 | other => other, |
| 317 | } |
Alex Crichton | 7b9e02f | 2017-05-30 15:54:33 -0700 | [diff] [blame] | 318 | } |
| 319 | |
Alex Crichton | 954046c | 2017-05-30 21:49:42 -0700 | [diff] [blame] | 320 | pub fn parse_terminated_with( |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 321 | input: Cursor, |
| 322 | parse: fn(Cursor) -> PResult<T>, |
| 323 | ) -> PResult<Self> { |
Alex Crichton | 954046c | 2017-05-30 21:49:42 -0700 | [diff] [blame] | 324 | Self::parse(input, parse, true) |
| 325 | } |
| 326 | |
Nika Layzell | b49a9e5 | 2017-12-05 13:31:52 -0500 | [diff] [blame] | 327 | pub fn parse_terminated_nonempty_with( |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 328 | input: Cursor, |
| 329 | parse: fn(Cursor) -> PResult<T>, |
| 330 | ) -> PResult<Self> { |
Nika Layzell | b49a9e5 | 2017-12-05 13:31:52 -0500 | [diff] [blame] | 331 | match Self::parse(input, parse, true) { |
David Tolnay | f4aa6b4 | 2017-12-31 16:40:33 -0500 | [diff] [blame] | 332 | Ok((ref b, _)) if b.is_empty() => parse_error(), |
Nika Layzell | b49a9e5 | 2017-12-05 13:31:52 -0500 | [diff] [blame] | 333 | other => other, |
| 334 | } |
| 335 | } |
| 336 | |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 337 | fn parse( |
| 338 | mut input: Cursor, |
| 339 | parse: fn(Cursor) -> PResult<T>, |
| 340 | terminated: bool, |
| 341 | ) -> PResult<Self> { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 342 | let mut res = Punctuated::new(); |
Alex Crichton | 7b9e02f | 2017-05-30 15:54:33 -0700 | [diff] [blame] | 343 | |
| 344 | // get the first element |
Alex Crichton | 954046c | 2017-05-30 21:49:42 -0700 | [diff] [blame] | 345 | match parse(input) { |
David Tolnay | f4aa6b4 | 2017-12-31 16:40:33 -0500 | [diff] [blame] | 346 | Err(_) => Ok((res, input)), |
| 347 | Ok((o, i)) => { |
Michael Layzell | 0a1a663 | 2017-06-02 18:07:43 -0400 | [diff] [blame] | 348 | if i == input { |
Michael Layzell | 760fd66 | 2017-05-31 22:46:05 -0400 | [diff] [blame] | 349 | return parse_error(); |
Alex Crichton | 7b9e02f | 2017-05-30 15:54:33 -0700 | [diff] [blame] | 350 | } |
| 351 | input = i; |
David Tolnay | 660fd1f | 2017-12-31 01:52:57 -0500 | [diff] [blame] | 352 | res.push(o); |
Alex Crichton | 7b9e02f | 2017-05-30 15:54:33 -0700 | [diff] [blame] | 353 | |
| 354 | // get the separator first |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 355 | while let Ok((s, i2)) = P::parse(input) { |
Michael Layzell | 0a1a663 | 2017-06-02 18:07:43 -0400 | [diff] [blame] | 356 | if i2 == input { |
Alex Crichton | 7b9e02f | 2017-05-30 15:54:33 -0700 | [diff] [blame] | 357 | break; |
| 358 | } |
| 359 | |
| 360 | // get the element next |
David Tolnay | f4aa6b4 | 2017-12-31 16:40:33 -0500 | [diff] [blame] | 361 | if let Ok((o3, i3)) = parse(i2) { |
Michael Layzell | 0a1a663 | 2017-06-02 18:07:43 -0400 | [diff] [blame] | 362 | if i3 == i2 { |
Alex Crichton | 7b9e02f | 2017-05-30 15:54:33 -0700 | [diff] [blame] | 363 | break; |
| 364 | } |
David Tolnay | 660fd1f | 2017-12-31 01:52:57 -0500 | [diff] [blame] | 365 | res.push_trailing(s); |
| 366 | res.push(o3); |
Alex Crichton | 7b9e02f | 2017-05-30 15:54:33 -0700 | [diff] [blame] | 367 | input = i3; |
| 368 | } else { |
| 369 | break; |
| 370 | } |
| 371 | } |
| 372 | if terminated { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 373 | if let Ok((sep, after)) = P::parse(input) { |
Alex Crichton | 7b9e02f | 2017-05-30 15:54:33 -0700 | [diff] [blame] | 374 | res.push_trailing(sep); |
| 375 | input = after; |
| 376 | } |
| 377 | } |
David Tolnay | f4aa6b4 | 2017-12-31 16:40:33 -0500 | [diff] [blame] | 378 | Ok((res, input)) |
Alex Crichton | 7b9e02f | 2017-05-30 15:54:33 -0700 | [diff] [blame] | 379 | } |
| 380 | } |
| 381 | } |
| 382 | } |
| 383 | } |
| 384 | |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 385 | #[cfg(feature = "printing")] |
| 386 | mod printing { |
| 387 | use super::*; |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 388 | use quote::{ToTokens, Tokens}; |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 389 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 390 | impl<T, P> ToTokens for Punctuated<T, P> |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 391 | where |
| 392 | T: ToTokens, |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 393 | P: ToTokens, |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 394 | { |
| 395 | fn to_tokens(&self, tokens: &mut Tokens) { |
| 396 | tokens.append_all(self.iter()) |
| 397 | } |
| 398 | } |
| 399 | |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 400 | impl<T, P> ToTokens for Element<T, P> |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 401 | where |
| 402 | T: ToTokens, |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 403 | P: ToTokens, |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 404 | { |
| 405 | fn to_tokens(&self, tokens: &mut Tokens) { |
| 406 | match *self { |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 407 | Element::Punctuated(ref a, ref b) => { |
Alex Crichton | ccbb45d | 2017-05-23 10:58:24 -0700 | [diff] [blame] | 408 | a.to_tokens(tokens); |
| 409 | b.to_tokens(tokens); |
| 410 | } |
| 411 | Element::End(ref a) => a.to_tokens(tokens), |
| 412 | } |
| 413 | } |
| 414 | } |
| 415 | } |