WIP: Try to retain location #5
Conversation
| @@ -12,6 +12,93 @@ use hashlink::LinkedHashMap; | |||
|
|
|||
| use saphyr_parser::{Event, MarkedEventReceiver, Marker, Parser, ScanError, TScalarStyle, Tag}; | |||
|
|
|||
| #[derive(Clone, Debug, Eq, PartialEq)] | |||
| pub struct OtherMarker { | |||
There was a problem hiding this comment.
What does OtherMarker provide that Marker doesn't? Seems like all occurrences of it could be changed to just Marker.
| impl From<(usize, usize, usize)> for OtherMarker { | ||
| fn from((line, column, idx): (usize, usize, usize)) -> Self { | ||
| OtherMarker { line, column, idx } | ||
| } | ||
| } |
There was a problem hiding this comment.
I would very much have this conversion be explicit. (usize, usize, usize) is a very generic type that may be used for much more than a Marker.
| Start(OtherMarker), | ||
| Ended { | ||
| start: OtherMarker, | ||
| end: OtherMarker, | ||
| }, |
There was a problem hiding this comment.
| Start(OtherMarker), | |
| Ended { | |
| start: OtherMarker, | |
| end: OtherMarker, | |
| }, | |
| Index(OtherMarker), | |
| Span { | |
| start: OtherMarker, | |
| end: OtherMarker, | |
| }, |
| Location::Start(start) => { | ||
| let mut end = start.clone(); | ||
| end.idx = start.idx + arg; | ||
| end.column = start.column + arg; |
There was a problem hiding this comment.
This would need much more context than that. This doesn't support linebreaks.
| match Location::from(m) { | ||
| Location::Start(start) => Location::Ended { | ||
| start, | ||
| end: OtherMarker { | ||
| line: last_row, | ||
| column: last_column, | ||
| idx: last_idx, | ||
| }, | ||
| }, | ||
| Location::Ended { .. } => { | ||
| unreachable!("If we just convert this, it can't really have an end!") | ||
| } | ||
| } |
There was a problem hiding this comment.
Wouldn't it just be
Location::Ended { start: m.into(), end: OtherMarker { ... } }
I don't see why the conversion to a Location is necessary. The into could also be removed if we change OtherMarker to be a Marker.
| @@ -771,6 +974,7 @@ c: [1, 2] | |||
| "; | |||
| let out = YamlDecoder::read(s as &[u8]).decode().unwrap(); | |||
| let doc = &out[0]; | |||
| dbg!(&doc); | |||
There was a problem hiding this comment.
| dbg!(&doc); |
|
Closing this in favour of #6 |
Allows the event consumer to know whether the document explicitly starts with a `---`
No description provided.