fluencelabs/lalrpop
1
0
Fork 0
mirror of https://github.com/fluencelabs/lalrpop synced 2025-04-25 03:02:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #512 from Marwes/version

Browse Source 
Version
This commit is contained in:
Markus Westerlind 2020-03-04 19:53:13 +01:00 committed by GitHub
commit bcdfaf6e87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 50 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Cargo.lock generated
View File

@ -128,10 +128,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "calculator" name = "calculator"
version = "0.18.0" version = "0.18.1"
dependencies = [ dependencies = [
"lalrpop 0.18.0", "lalrpop 0.18.1",
"lalrpop-util 0.18.0", "lalrpop-util 0.18.1",
"regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -275,7 +275,7 @@ dependencies = [
[[package]] [[package]]
name = "lalrpop" name = "lalrpop"
version = "0.18.0" version = "0.18.1"
dependencies = [ dependencies = [
"ascii-canvas 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "ascii-canvas 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
@ -284,7 +284,7 @@ dependencies = [
"docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ena 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "ena 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
"itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lalrpop-util 0.18.0", "lalrpop-util 0.18.1",
"petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -299,17 +299,17 @@ dependencies = [
[[package]] [[package]]
name = "lalrpop-test" name = "lalrpop-test"
version = "0.18.0" version = "0.18.1"
dependencies = [ dependencies = [
"diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"lalrpop 0.18.0", "lalrpop 0.18.1",
"lalrpop-util 0.18.0", "lalrpop-util 0.18.1",
"regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "lalrpop-util" name = "lalrpop-util"
version = "0.18.0" version = "0.18.1"
dependencies = [ dependencies = [
"regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -399,8 +399,8 @@ name = "pascal"
version = "0.11.0" version = "0.11.0"
dependencies = [ dependencies = [
"docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lalrpop 0.18.0", "lalrpop 0.18.1",
"lalrpop-util 0.18.0", "lalrpop-util 0.18.1",
"regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
@ -772,10 +772,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "whitespace" name = "whitespace"
version = "0.18.0" version = "0.18.1"
dependencies = [ dependencies = [
"lalrpop 0.18.0", "lalrpop 0.18.1",
"lalrpop-util 0.18.0", "lalrpop-util 0.18.1",
] ]
[[package]] [[package]]

20
RELEASES.md
View File

@ -1,3 +1,23 @@
<a name="0.18.1"></a>
## 0.18.1 (2020-03-04)
#### Bug Fixes
* Remove eprintln which I thought were removed ([a9a775eb](https://github.com/lalrpop/lalrpop/commit/a9a775ebb83e3367ed10edbd5a622302d7ae71b1))
<a name="0.18.0"></a>
## 0.18.0 (2020-03-04)
#### Bug Fixes
* Remove eprintln which I thought were removed ([a9a775eb](https://github.com/lalrpop/lalrpop/commit/a9a775ebb83e3367ed10edbd5a622302d7ae71b1))
<a name="0.18.0"></a> <a name="0.18.0"></a>
## 0.18.0 (2020-03-04) ## 0.18.0 (2020-03-04)

6
doc/calculator/Cargo.toml
View File

@ -1,17 +1,17 @@
[package] [package]
name = "calculator" name = "calculator"
version = "0.18.0" version = "0.18.1"
authors = ["Niko Matsakis <niko@alum.mit.edu>"] authors = ["Niko Matsakis <niko@alum.mit.edu>"]
build = "build.rs" # <-- We added this and everything after! build = "build.rs" # <-- We added this and everything after!
workspace = "../.." workspace = "../.."
[build-dependencies.lalrpop] [build-dependencies.lalrpop]
version = "0.18.0" version = "0.18.1"
path = "../../lalrpop" path = "../../lalrpop"
[dependencies] [dependencies]
regex = "1" regex = "1"
[dependencies.lalrpop-util] [dependencies.lalrpop-util]
version = "0.18.0" version = "0.18.1"
path = "../../lalrpop-util" path = "../../lalrpop-util"

2
doc/pascal/lalrpop/Cargo.toml
View File

@ -14,5 +14,5 @@ serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
[dependencies.lalrpop-util] [dependencies.lalrpop-util]
version = "0.18.0" version = "0.18.1"
path = "../../../lalrpop-util" path = "../../../lalrpop-util"

4
doc/src/quick_start_guide.md
View File

@ -18,12 +18,12 @@ build = "build.rs" # LALRPOP preprocessing
# (If you write your own tokenizer, or already have the regex # (If you write your own tokenizer, or already have the regex
# crate, you can skip this dependency.) # crate, you can skip this dependency.)
[dependencies] [dependencies]
lalrpop-util = "0.18.0" lalrpop-util = "0.18.1"
regex = "1" regex = "1"
# Add a build-time dependency on the lalrpop library: # Add a build-time dependency on the lalrpop library:
[build-dependencies] [build-dependencies]
lalrpop = "0.18.0" lalrpop = "0.18.1"
``` ```
Next create a `build.rs` file that looks like: Next create a `build.rs` file that looks like:

4
doc/src/tutorial/001_adding_lalrpop.md
View File

@ -30,10 +30,10 @@ version = "0.1.0"
authors = ["Niko Matsakis <niko@alum.mit.edu>"] authors = ["Niko Matsakis <niko@alum.mit.edu>"]
[build-dependencies] # <-- We added this and everything after! [build-dependencies] # <-- We added this and everything after!
lalrpop = "0.18.0" lalrpop = "0.18.1"
[dependencies] [dependencies]
lalrpop-util = "0.18.0" lalrpop-util = "0.18.1"
regex = "1" regex = "1"
``` ```

6
doc/whitespace/Cargo.toml
View File

@ -1,13 +1,13 @@
[package] [package]
name = "whitespace" name = "whitespace"
version = "0.18.0" version = "0.18.1"
authors = ["Mako <jlauve@rsmw.net>"] authors = ["Mako <jlauve@rsmw.net>"]
build = "build.rs" build = "build.rs"
[build-dependencies.lalrpop] [build-dependencies.lalrpop]
version = "0.18.0" version = "0.18.1"
path = "../../lalrpop" path = "../../lalrpop"
[dependencies.lalrpop-util] [dependencies.lalrpop-util]
version = "0.18.0" version = "0.18.1"
path = "../../lalrpop-util" path = "../../lalrpop-util"

2
lalrpop-test/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "lalrpop-test" name = "lalrpop-test"
version = "0.18.0" # LALRPOP version = "0.18.1" # LALRPOP
authors = ["Niko Matsakis <niko@alum.mit.edu>"] authors = ["Niko Matsakis <niko@alum.mit.edu>"]
license = "Apache-2.0/MIT" license = "Apache-2.0/MIT"
build = "build.rs" build = "build.rs"

2
lalrpop-util/Cargo.toml
View File

@ -3,7 +3,7 @@ name = "lalrpop-util"
description = "Runtime library for parsers generated by LALRPOP" description = "Runtime library for parsers generated by LALRPOP"
repository = "https://github.com/lalrpop/lalrpop" repository = "https://github.com/lalrpop/lalrpop"
license = "Apache-2.0/MIT" license = "Apache-2.0/MIT"
version = "0.18.0" # LALRPOP version = "0.18.1" # LALRPOP
authors = ["Niko Matsakis <niko@alum.mit.edu>"] authors = ["Niko Matsakis <niko@alum.mit.edu>"]
workspace = ".." workspace = ".."

1
lalrpop-util/src/lexer.rs
View File

@ -80,7 +80,6 @@ impl<'input, 'builder, E> Iterator for Matcher<'input, 'builder, E> {
loop { loop {
let text = self.text; let text = self.text;
let start_offset = self.consumed; let start_offset = self.consumed;
eprintln!("{:?}", text);
if text.is_empty() { if text.is_empty() {
self.consumed = start_offset; self.consumed = start_offset;
return None; return None;

4
lalrpop/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "lalrpop" name = "lalrpop"
version = "0.18.0" # LALRPOP version = "0.18.1" # LALRPOP
description = "convenient LR(1) parser generator" description = "convenient LR(1) parser generator"
repository = "https://github.com/lalrpop/lalrpop" repository = "https://github.com/lalrpop/lalrpop"
readme = "../README.md" readme = "../README.md"
@ -38,7 +38,7 @@ rand = "0.6"
[dependencies.lalrpop-util] [dependencies.lalrpop-util]
path = "../lalrpop-util" path = "../lalrpop-util"
version = "0.18.0" # LALRPOP version = "0.18.1" # LALRPOP
[features] [features]
# Feature used when developing LALRPOP. Tells the build script to use an existing lalrpop binary to # Feature used when developing LALRPOP. Tells the build script to use an existing lalrpop binary to

2
lalrpop/src/parser/lrgrammar.rs
View File

@ -1,4 +1,4 @@
// auto-generated: "lalrpop 0.18.0" // auto-generated: "lalrpop 0.18.1"
// sha256: 7429c0f7a93c938035ee9983794eb7106fc6980f07c91a8ea4971f93ee6af // sha256: 7429c0f7a93c938035ee9983794eb7106fc6980f07c91a8ea4971f93ee6af
use string_cache::DefaultAtom as Atom; use string_cache::DefaultAtom as Atom;
use grammar::parse_tree::*; use grammar::parse_tree::*;