Skip to content

Commit

Permalink
Disabled the subcommand generate
Browse files Browse the repository at this point in the history
  • Loading branch information
jsinger67 committed Jul 9, 2023
1 parent 76f0416 commit f2f4900
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 29 deletions.
23 changes: 3 additions & 20 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions crates/parol/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ functionality of generated parsers nondeterministic output isn't desirable.

For more details about this special handling please see the
[book](https://jsinger67.github.io/ParGrammar.html#terminal-name-generation).
* Removed subcommand *generate* because of dependency conflicts

Maybe I find a substitute for the crate `rand_regex` which is sadly no more properly maintained.

## 0.22.0 - 2023-06-09

Expand Down
3 changes: 1 addition & 2 deletions crates/parol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ owo-colors = "3.5.0"
parol_runtime = { path = "../parol_runtime", version = "0.17.0", features = ["auto_generation"] }
parol-macros = { path = "../parol-macros", version = "0.2.0" }
rand = "0.8.5"
rand_regex = "0.15.1"
regex = { workspace = true }
regex-syntax = "0.6.29"
regex-syntax = "0.7.3"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
syn = { version = "2", default-features = false, features = ["full", "parsing"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/parol/src/bin/parol/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ fn extract_file_name(args: &CliArgs) -> Option<PathBuf> {
tools::ToolsSubcommands::first(args) => Some(args.grammar_file.clone()),
tools::ToolsSubcommands::follow(args) => Some(args.grammar_file.clone()),
tools::ToolsSubcommands::format(args) => Some(args.grammar_file.clone()),
tools::ToolsSubcommands::generate(args) => Some(args.grammar_file.clone()),
// tools::ToolsSubcommands::generate(args) => Some(args.grammar_file.clone()),
tools::ToolsSubcommands::left_factor(args) => Some(args.grammar_file.clone()),
tools::ToolsSubcommands::left_recursions(args) => Some(args.grammar_file.clone()),
tools::ToolsSubcommands::new(_) => None,
Expand Down
1 change: 0 additions & 1 deletion crates/parol/src/bin/parol/tools.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ declare_tools!(
first,
follow,
format,
generate,
left_factor,
left_recursions,
new,
Expand Down
5 changes: 3 additions & 2 deletions crates/parol/src/generators/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ pub mod grammar_type_generator;
pub use grammar_type_generator::GrammarTypeInfo;

/// Module with the language generator
pub mod language_generator;
pub use language_generator::LanguageGenerator;
/// DISABLED because of version conflicts. Crate `rand_regex` still depends on `[email protected]`
// pub mod language_generator;
// pub use language_generator::LanguageGenerator;

/// Module with the lexer generator
pub mod lexer_generator;
Expand Down
4 changes: 1 addition & 3 deletions crates/parol/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ extern crate function_name;
extern crate derive_builder;

extern crate rand;
extern crate rand_regex;

#[cfg(feature = "build")]
pub mod build;
Expand Down Expand Up @@ -62,8 +61,7 @@ pub use error_report::ParolErrorReporter;
pub mod generators;
pub use generators::{
check_and_transform_grammar, generate_lexer_source, generate_parser_source, try_format,
GrammarConfig, GrammarTypeInfo, LanguageGenerator, ScannerConfig, UserTraitGenerator,
UserTraitGeneratorBuilder,
GrammarConfig, GrammarTypeInfo, ScannerConfig, UserTraitGenerator, UserTraitGeneratorBuilder,
};

///
Expand Down

0 comments on commit f2f4900

Please sign in to comment.