Skip to content

Commit

Permalink
Merge pull request #67 from Sympatron/update-lalrpop
Browse files Browse the repository at this point in the history
Update lalrpop to 0.21
  • Loading branch information
jannic authored Sep 27, 2024
2 parents 60fd8a5 + f533596 commit 213a91f
Showing 3 changed files with 4 additions and 10 deletions.
7 changes: 2 additions & 5 deletions pio-parser/Cargo.toml
Original file line number Diff line number Diff line change
@@ -9,11 +9,8 @@ license = "MIT"
repository = "https://github.com/rp-rs/pio-rs"

[dependencies]
lalrpop-util = { version = "0.19.6", features = ["lexer"] }
lalrpop-util = { version = "0.21.0", features = ["lexer"] }
pio = { path = "..", version = "0.2.1" }

[build-dependencies]
lalrpop = "0.19.6"
# This is only here to work around https://github.com/lalrpop/lalrpop/issues/750
# It should be removed once that workaround is no longer needed.
regex-syntax = { version = "0.6", default-features = false, features = ["unicode"] }
lalrpop = "0.21.0"
5 changes: 1 addition & 4 deletions pio-proc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -19,7 +19,4 @@ quote = "1.0"
codespan-reporting = "0.11"
pio = { path = "..", version = "0.2.0" }
pio-parser = { path = "../pio-parser", version = "0.2.0" }
lalrpop-util = "0.19.6"
# This is only here to work around https://github.com/lalrpop/lalrpop/issues/750
# It should be removed once that workaround is no longer needed.
regex-syntax = { version = "0.6", default-features = false, features = ["unicode"] }
lalrpop-util = "0.21.0"
2 changes: 1 addition & 1 deletion pio-proc/src/lib.rs
Original file line number Diff line number Diff line change
@@ -402,7 +402,7 @@ fn parse_error(error: &pio_parser::ParseError, program_source: &str) -> proc_mac
ParseError::InvalidToken { location } => {
(*location..*location, vec!["invalid token".to_string()])
}
ParseError::UnrecognizedEOF { location, expected } => (
ParseError::UnrecognizedEof { location, expected } => (
*location..*location,
vec![
"unrecognized eof".to_string(),

0 comments on commit 213a91f

Please sign in to comment.