PEEK[start..end] #334

flying-sheep · Nov 6, 2018

fixes #329

flying-sheep · Nov 6, 2018

flying-sheep reviewed Nov 6, 2018

View changes

flying-sheep · Nov 6, 2018

meta/src/parser.rs

-                Rule::quote,
-                Rule::single_quote
-            ],
+            positives: vec![Rule::term],


no idea why I had to change this. is this a bug on master or did my added rule really change something?

This may be a bug. I can take a closer look at it. It's weird that this particular example shouldn't be influenced by the changes you've made.

I'll take a jab at this right now to see exactly what's going on.

I've fixed it in #343.

flying-sheep · Nov 7, 2018

flying-sheep reviewed Nov 7, 2018

View changes

pest/src/parser_state.rs

flying-sheep · Nov 7, 2018

flying-sheep reviewed Nov 7, 2018

View changes

pest/src/parser_state.rs

flying-sheep · Nov 7, 2018

flying-sheep reviewed Nov 7, 2018

View changes

pest/src/stack.rs

dragostis · Nov 8, 2018

dragostis reviewed Nov 8, 2018

View changes

Very good progress! 👍

derive/src/lib.rs

meta/src/grammar.pest

dragostis · Nov 8, 2018

meta/src/parser.rs

-                Rule::quote,
-                Rule::single_quote
-            ],
+            positives: vec![Rule::term],


This may be a bug. I can take a closer look at it. It's weird that this particular example shouldn't be influenced by the changes you've made.

pest/src/stack.rs

meta/src/grammar.pest

meta/src/parser.rs

pest/src/parser_state.rs

pest/src/stack.rs

flying-sheep · Nov 9, 2018

OK, one problem:

   Compiling pest_grammars v2.0.0 (/home/phil/Dev/Rust/pest/grammars)
error[E0433]: failed to resolve. Use of undeclared type or module `state`
  --> derive/tests/grammar.rs:15:10
   |
15 | #[derive(Parser)]
   |          ^^^^^^ Use of undeclared type or module `state`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0433`.
error: Could not compile `pest_derive`.

I don’t know what I did differently than the other generator code. What did I miss?

dragostis · Nov 9, 2018

dragostis reviewed Nov 9, 2018

View changes

generator/src/generator.rs

flying-sheep · Nov 9, 2018

oh, whoops! thank you! I also fixed the next problem:

   Compiling pest_derive v2.0.1 (/home/phil/Dev/Rust/pest/derive)
error[E0308]: mismatched types
  --> derive/tests/grammar.rs:15:10
   |
15 | #[derive(Parser)]
   |          ^^^^^^
   |          |
   |          expected enum `std::option::Option`, found i32
   |          help: try using a variant of the expected type: `Some(-2i32)`
   |
   = note: expected type `std::option::Option<i32>`
              found type `i32`

the problem was that (Option as ToToken)::to_token only emits something if not empty!

I fixed it as described in dtolnay/quote#20

flying-sheep · Nov 9, 2018

flying-sheep reviewed Nov 9, 2018

View changes

vm/tests/grammar.rs

dragostis · Nov 17, 2018

dragostis requested changes Nov 17, 2018

View changes

This is pretty close. I'll take a look at the error reporting issue right now and let you know as soon as I figure it out.

derive/src/lib.rs

meta/src/ast.rs

meta/src/grammar.pest

dragostis · Nov 17, 2018

meta/src/parser.rs

-                Rule::quote,
-                Rule::single_quote
-            ],
+            positives: vec![Rule::term],


I'll take a jab at this right now to see exactly what's going on.

dragostis · Nov 17, 2018

pest/src/parser_state.rs

+    pub fn stack_match_peek_slice(mut self: Box<Self>, start: i32, end: Option<i32>, match_dir: MatchDir) -> ParseResult<Box<Self>> {
+        let range = match constrain_idxs(start, end, self.stack.len()) {
+            Some(r) => r,
+            None => return Err(self),


Should being out-of-range be considered a hard error or a match fail? Currently, POP-ing on an empty stack causes a panic, but I feel like this approach is probably more expressive, if more error-prone.

pest/src/parser_state.rs

pest/src/stack.rs

dragostis · Nov 17, 2018

Also, brackets should be added in pest_meta error renaming.

flying-sheep · Nov 17, 2018

i added the brackets, all done!

dragostis · Nov 18, 2018

dragostis requested changes Nov 18, 2018

View changes

LGTM apart from small fix!

vm/tests/grammar.rs

dragostis · Nov 19, 2018

bors r+

bors · Nov 19, 2018

👎 Rejected by code reviews

dragostis · Nov 19, 2018

dragostis approved these changes Nov 19, 2018

View changes

dragostis · Nov 19, 2018

bors r+

bors · Nov 19, 2018

Merge conflict

dragostis · Nov 19, 2018

bors r+

bors · Nov 19, 2018

Build succeeded

continuous-integration/travis-ci/push

flying-sheep · Nov 19, 2018

Yay 🥳

Too bad it wasn't a squash merge, that's some messy series of commits 😅

flying-sheep referenced this pull request Nov 8, 2018
Open
Unclear completeness of RST implementation #4

flying-sheep force-pushed the flying-sheep:peek-slice branch from f123d3a to 2d5e03b Nov 9, 2018

flying-sheep changed the title ~~PEEK[start..end] (work in progress)~~ PEEK[start..end] Nov 9, 2018

flying-sheep referenced this pull request Nov 15, 2018
Open
Bug: Non-matching rule changes parsing result #338

flying-sheep force-pushed the flying-sheep:peek-slice branch 2 times, most recently from 4307654 to ec331e9 Nov 17, 2018

flying-sheep force-pushed the flying-sheep:peek-slice branch from d28442b to 74be17d Nov 17, 2018

flying-sheep added some commits Nov 6, 2018

WIP PEEK[s..e]: parser & AST

789afb9

Added impl (does not work yet)

2b5d33c

Fixed warnings

e45f6e1

improved docs and accept leading 0

67d63b0

Added some index tests

f7e8eb0

flying-sheep force-pushed the flying-sheep:peek-slice branch from a5c6f6e to 9a63e1b Nov 19, 2018

fixed snapshot test

Loading status checks…

7bf4ed6

bors bot added a commit that referenced this pull request Nov 19, 2018

Merge #334
334: PEEK[start..end] r=dragostis a=flying-sheep fixes #329 Co-authored-by: Philipp A <flying-sheep@web.de> Co-authored-by: Dragoș Tiselice <dragostiselice@gmail.com>

Loading status checks…

8e58e02

bors bot merged commit 7bf4ed6 into pest-parser:master Nov 19, 2018
2 checks passed

2 checks passed

bors Build succeeded
Details

continuous-integration/travis-ci/pr The Travis CI build passed
Details

flying-sheep deleted the flying-sheep:peek-slice branch Nov 19, 2018

pest-parser/pest

Join GitHub today

PEEK[start..end] #334

Conversation

flying-sheep commented Nov 6, 2018 • edited

flying-sheep reviewed Nov 6, 2018 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

flying-sheep reviewed Nov 7, 2018 View changes

flying-sheep reviewed Nov 7, 2018 View changes

flying-sheep reviewed Nov 7, 2018 View changes

flying-sheep referenced this pull request Nov 8, 2018

dragostis reviewed Nov 8, 2018 View changes

This comment has been minimized.

flying-sheep force-pushed the flying-sheep:peek-slice branch from f123d3a to 2d5e03b Nov 9, 2018

This comment has been minimized.

flying-sheep commented Nov 9, 2018 • edited

dragostis reviewed Nov 9, 2018 View changes

This comment has been minimized.

flying-sheep commented Nov 9, 2018 • edited

flying-sheep reviewed Nov 9, 2018 View changes

flying-sheep changed the title PEEK[start..end] (work in progress) PEEK[start..end] Nov 9, 2018

flying-sheep referenced this pull request Nov 15, 2018

dragostis requested changes Nov 17, 2018 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

dragostis commented Nov 17, 2018

flying-sheep force-pushed the flying-sheep:peek-slice branch 2 times, most recently from 4307654 to ec331e9 Nov 17, 2018

This comment has been minimized.

flying-sheep commented Nov 17, 2018

flying-sheep force-pushed the flying-sheep:peek-slice branch from d28442b to 74be17d Nov 17, 2018

dragostis requested changes Nov 18, 2018 View changes

This comment has been minimized.

dragostis commented Nov 19, 2018

This comment has been minimized.

bors bot commented Nov 19, 2018

dragostis approved these changes Nov 19, 2018 View changes

This comment has been minimized.

dragostis commented Nov 19, 2018

This comment has been minimized.

bors bot commented Nov 19, 2018

Merge conflict

flying-sheep added some commits Nov 6, 2018

flying-sheep and others added some commits Nov 9, 2018

flying-sheep force-pushed the flying-sheep:peek-slice branch from a5c6f6e to 9a63e1b Nov 19, 2018

This comment has been minimized.

dragostis commented Nov 19, 2018

bors bot added a commit that referenced this pull request Nov 19, 2018

This comment has been minimized.

bors bot commented Nov 19, 2018

Build succeeded

Hide details View details bors bot merged commit 7bf4ed6 into pest-parser:master Nov 19, 2018 2 checks passed

2 checks passed

flying-sheep deleted the flying-sheep:peek-slice branch Nov 19, 2018

This comment has been minimized.

flying-sheep commented Nov 19, 2018

flying-sheep commented Nov 6, 2018 •

edited

flying-sheep reviewed Nov 6, 2018

View changes

flying-sheep reviewed Nov 7, 2018

View changes

flying-sheep reviewed Nov 7, 2018

View changes

flying-sheep reviewed Nov 7, 2018

View changes

dragostis reviewed Nov 8, 2018

View changes

flying-sheep force-pushed the flying-sheep:peek-slice branch from `f123d3a` to `2d5e03b` Nov 9, 2018

flying-sheep commented Nov 9, 2018 •

edited

dragostis reviewed Nov 9, 2018

View changes

flying-sheep commented Nov 9, 2018 •

edited

flying-sheep reviewed Nov 9, 2018

View changes

dragostis requested changes Nov 17, 2018

View changes

flying-sheep force-pushed the flying-sheep:peek-slice branch 2 times, most recently from `4307654` to `ec331e9` Nov 17, 2018

flying-sheep force-pushed the flying-sheep:peek-slice branch from `d28442b` to `74be17d` Nov 17, 2018

dragostis requested changes Nov 18, 2018

View changes

dragostis approved these changes Nov 19, 2018

View changes

flying-sheep force-pushed the flying-sheep:peek-slice branch from `a5c6f6e` to `9a63e1b` Nov 19, 2018

bors bot merged commit `7bf4ed6` into pest-parser:master Nov 19, 2018
2 checks passed