| ... | ... | @@ -116,20 +116,18 @@ pub const Parser = struct { |
| 116 | 116 | return amt; |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | | pub fn eatUntil(p: *Parser, test_c: u8) !?struct { usize, usize } { |
| 119 | pub fn eatUntil(p: *Parser, test_c: u8) !?[2]usize { |
| 120 | 120 | const start = p.idx; |
| 121 | | var len: usize = 0; |
| 122 | 121 | while (true) { |
| 123 | 122 | try p.peekAmt(1) orelse return null; |
| 124 | 123 | const amt = std.mem.indexOfScalar(u8, p.slice(), test_c) orelse { |
| 125 | 124 | const left = p.avail(); |
| 126 | | len += left; |
| 127 | 125 | p.idx += left; |
| 128 | 126 | continue; |
| 129 | 127 | }; |
| 130 | | len += amt; |
| 131 | 128 | p.idx += amt; |
| 132 | | return .{ start, len }; |
| 129 | const end = p.idx; |
| 130 | return .{ start, end }; |
| 133 | 131 | } |
| 134 | 132 | } |
| 135 | 133 | |
| ... | ... | @@ -211,7 +209,7 @@ pub fn Mixin(comptime T: type) type { |
| 211 | 209 | return pp.parser.trimByte(test_c); |
| 212 | 210 | } |
| 213 | 211 | |
| 214 | | pub fn eatUntil(pp: *T, test_c: u8) !usize { |
| 212 | pub fn eatUntil(pp: *T, test_c: u8) !?[2]usize { |
| 215 | 213 | return pp.parser.eatUntil(test_c); |
| 216 | 214 | } |
| 217 | 215 | }; |