PEEK[start..end] #334

flying-sheep · 2018-11-06T23:03:00Z

fixes #329

flying-sheep · 2018-11-06T23:12:15Z

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.

pest/src/parser_state.rs

pest/src/stack.rs

dragostis

Very good progress! 👍

derive/src/lib.rs

meta/src/grammar.pest

dragostis · 2018-11-08T10:06:59Z

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 · 2018-11-09T09:57:07Z

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?

generator/src/generator.rs

flying-sheep · 2018-11-09T11:22:35Z

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

vm/tests/grammar.rs

dragostis

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 · 2018-11-17T10:10:58Z

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 · 2018-11-17T10:14:57Z

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 · 2018-11-17T10:38:38Z

Also, brackets should be added in pest_meta error renaming.

flying-sheep · 2018-11-17T16:22:49Z

i added the brackets, all done!

dragostis

LGTM apart from small fix!

vm/tests/grammar.rs

dragostis · 2018-11-19T10:24:49Z

bors r+

bors · 2018-11-19T10:24:52Z

👎 Rejected by code reviews

dragostis · 2018-11-19T10:25:54Z

bors r+

bors · 2018-11-19T10:26:08Z

Merge conflict

Co-Authored-By: flying-sheep <[email protected]>

dragostis · 2018-11-19T11:10:37Z

bors r+

334: PEEK[start..end] r=dragostis a=flying-sheep fixes #329 Co-authored-by: Philipp A <[email protected]> Co-authored-by: Dragoș Tiselice <[email protected]>

bors · 2018-11-19T11:21:41Z

Build succeeded

continuous-integration/travis-ci/push

flying-sheep · 2018-11-19T11:23:46Z

Yay 🥳

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

flying-sheep commented Nov 6, 2018

View reviewed changes

flying-sheep commented Nov 7, 2018

View reviewed changes

pest/src/parser_state.rs Outdated Show resolved Hide resolved

flying-sheep commented Nov 7, 2018

View reviewed changes

pest/src/parser_state.rs Outdated Show resolved Hide resolved

flying-sheep commented Nov 7, 2018

View reviewed changes

pest/src/stack.rs Show resolved Hide resolved

flying-sheep mentioned this pull request Nov 8, 2018

Unclear completeness of RST implementation flying-sheep/rust-rst#4

Closed

dragostis reviewed Nov 8, 2018

View reviewed changes

flying-sheep force-pushed the peek-slice branch from f123d3a to 2d5e03b Compare November 9, 2018 08:44

dragostis reviewed Nov 9, 2018

View reviewed changes

generator/src/generator.rs Outdated Show resolved Hide resolved

generator/src/generator.rs Outdated Show resolved Hide resolved

flying-sheep commented Nov 9, 2018

View reviewed changes

vm/tests/grammar.rs Outdated Show resolved Hide resolved

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

flying-sheep mentioned this pull request Nov 15, 2018

Bug: Non-matching rule changes parsing result #338

Closed

dragostis requested changes Nov 17, 2018

View reviewed changes

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

flying-sheep force-pushed the peek-slice branch from d28442b to 74be17d Compare November 17, 2018 16:30

dragostis requested changes Nov 18, 2018

View reviewed changes

vm/tests/grammar.rs Show resolved Hide resolved

dragostis approved these changes Nov 19, 2018

View reviewed changes

flying-sheep added 5 commits November 19, 2018 11:42

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 and others added 21 commits November 19, 2018 11:42

Added AST test for peek_slice

69c7286

rename stack_slice_peek → stack_match_peek_slice

f8e83b3

fix parse_all test

e3aaab9

Try testing PEEK[a..b]

080987e

fix OptimizedExpr generated code

2d05bf2

Co-Authored-By: flying-sheep <[email protected]>

fix OptimizedExpr generated code

7741191

Co-Authored-By: flying-sheep <[email protected]>

fixed test

ea29510

fixed code generation

400a5d8

Don’t break on TODO

64ee146

added doctest

7ca483c

Clarified stack docs

8f5d95b

Added MatchDir to stack_match_peek_slice

4ecd154

fixed docs

fcdcbb3

Clarified peek_slice doc

3101442

Co-Authored-By: flying-sheep <[email protected]>

Style

c028468

Co-Authored-By: flying-sheep <[email protected]>

removed unused iter function

5d36e2e

disallow -0

c8d0cdd

Style

ec6cbdf

added bracks to renaming

770f06d

fixed integer grammar

7e06dca

test peek_slice also in pest_derive

9a63e1b

flying-sheep force-pushed the peek-slice branch from a5c6f6e to 9a63e1b Compare November 19, 2018 10:43

fixed snapshot test

7bf4ed6

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

Merge #334

8e58e02

334: PEEK[start..end] r=dragostis a=flying-sheep fixes #329 Co-authored-by: Philipp A <[email protected]> Co-authored-by: Dragoș Tiselice <[email protected]>

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

flying-sheep deleted the peek-slice branch November 19, 2018 11:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PEEK[start..end] #334

PEEK[start..end] #334

flying-sheep commented Nov 6, 2018 •

edited

Loading

flying-sheep Nov 6, 2018

dragostis Nov 8, 2018

dragostis Nov 17, 2018

dragostis Nov 17, 2018

dragostis left a comment

dragostis Nov 8, 2018

flying-sheep commented Nov 9, 2018 •

edited

Loading

flying-sheep commented Nov 9, 2018 •

edited

Loading

dragostis left a comment

dragostis Nov 17, 2018

dragostis Nov 17, 2018

dragostis commented Nov 17, 2018

flying-sheep commented Nov 17, 2018

dragostis left a comment

dragostis commented Nov 19, 2018

bors bot commented Nov 19, 2018

dragostis commented Nov 19, 2018

bors bot commented Nov 19, 2018

dragostis commented Nov 19, 2018

bors bot commented Nov 19, 2018

flying-sheep commented Nov 19, 2018

PEEK[start..end] #334

PEEK[start..end] #334

Conversation

flying-sheep commented Nov 6, 2018 • edited Loading

flying-sheep Nov 6, 2018

Choose a reason for hiding this comment

dragostis Nov 8, 2018

Choose a reason for hiding this comment

dragostis Nov 17, 2018

Choose a reason for hiding this comment

dragostis Nov 17, 2018

Choose a reason for hiding this comment

dragostis left a comment

Choose a reason for hiding this comment

dragostis Nov 8, 2018

Choose a reason for hiding this comment

flying-sheep commented Nov 9, 2018 • edited Loading

flying-sheep commented Nov 9, 2018 • edited Loading

dragostis left a comment

Choose a reason for hiding this comment

dragostis Nov 17, 2018

Choose a reason for hiding this comment

dragostis Nov 17, 2018

Choose a reason for hiding this comment

dragostis commented Nov 17, 2018

flying-sheep commented Nov 17, 2018

dragostis left a comment

Choose a reason for hiding this comment

dragostis commented Nov 19, 2018

bors bot commented Nov 19, 2018

dragostis commented Nov 19, 2018

bors bot commented Nov 19, 2018

Merge conflict

dragostis commented Nov 19, 2018

bors bot commented Nov 19, 2018

Build succeeded

flying-sheep commented Nov 19, 2018

flying-sheep commented Nov 6, 2018 •

edited

Loading

flying-sheep commented Nov 9, 2018 •

edited

Loading

flying-sheep commented Nov 9, 2018 •

edited

Loading