Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the code generated by new command fails by Builder #24

Merged
merged 1 commit into from
Nov 18, 2022
+15 −3
Merged

Fix the code generated by new command fails by Builder #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/bin/parol/tools/new.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use clap::ArgGroup;
use derive_builder::Builder;
use miette::{bail, miette, Context, IntoDiagnostic, Result};
use miette::{miette, Context, IntoDiagnostic, Result};
use owo_colors::OwoColorize;
use parol::generators::NamingHelper as NmHlp;
use std::fs;
Expand Down
4 changes: 4 additions & 0 deletions src/bin/parol/tools/templates/lib.rs.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// auto generation needs derive_builder
mod derive_builder {
pub use parol_runtime::derive_builder::*;
}
{{#tree_gen?}}use parol_runtime::id_tree::Tree;
use parol_runtime::id_tree_layout::Layouter;
use parol_runtime::parser::ParseTreeType;{{/tree_gen}}
Expand Down
5 changes: 5 additions & 0 deletions src/bin/parol/tools/templates/main.rs.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
extern crate parol_runtime;

// auto generation needs derive_builder
mod derive_builder {
pub use parol_runtime::derive_builder::*;
}
Comment on lines +3 to +6
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To remove this, I've opened colin-kiegel/rust-derive-builder#274.


mod {{crate_name}}_grammar;
// The output is version controlled
mod {{crate_name}}_grammar_trait;
Expand Down
7 changes: 5 additions & 2 deletions templates/user_trait_template.rs.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@
// ---------------------------------------------------------

use parol_runtime::id_tree::Tree;
{{#auto_generate?}}use parol_runtime::parol_macros::{pop_item, pop_and_reverse_item};{{/auto_generate}}
{{#auto_generate?}}use parol_runtime::derive_builder::Builder;{{/auto_generate}}
{{#auto_generate?}}#[allow(unused_imports)]
use parol_runtime::parol_macros::{pop_item, pop_and_reverse_item};{{/auto_generate}}
{{#auto_generate?}}{{#ast_type_has_lifetime?}}use parol_runtime::lexer::Token;{{/ast_type_has_lifetime}}{{/auto_generate}}
use parol_runtime::parser::{ParseTreeStackEntry, ParseTreeType, UserActionsTrait};
{{#auto_generate?}}use parol_runtime::log::trace;
{{/auto_generate}}use parol_runtime::miette::{miette, {{#auto_generate?}}bail, IntoDiagnostic, {{/auto_generate}}Result};
{{/auto_generate}}#[allow(unused_imports)]
use parol_runtime::miette::{miette, {{#auto_generate?}}bail, IntoDiagnostic, {{/auto_generate}}Result};
{{^auto_generate?}}use crate::{{module_name}}::{{user_type_name}};{{/auto_generate}}{{^ast_type_has_lifetime?}}
use std::marker::PhantomData;{{/ast_type_has_lifetime}}

Expand Down