Change directory structure

2019-07-25 21:06:00 +09:00 · 2019-07-25 21:06:00 +09:00 · 719c7eaa11
commit 719c7eaa11
parent 6e16fb5c2d
93 changed files with 36 additions and 30 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,3 @@
 /target
-/sv-parser-macro/target
 **/*.rs.bk
 Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,28 +1,6 @@
-[package]
-name = "sv-parser"
-version = "0.1.0"
-authors = ["dalance@gmail.com"]
-repository = "https://github.com/dalance/sv-parser"
-keywords = []
-categories = []
-license = "MIT"
-readme = "README.md"
-description = ""
-edition = "2018"
-build = "build.rs"
+[workspace]
+members = [
+    "sv-parser",
+    "sv-parser-macros",
+]

-[features]
-default = []
-trace = []
-
-[dependencies]
-nom = "5.0.0"
-#nom_locate = { git = "https://github.com/fflorent/nom_locate" }
-nom_locate = { path = "../nom_locate" }
-str-concat = "*"
-sv-parser-macro = { path = "./sv-parser-macro" }
-nom-packrat = "0.1.17"
-
-[build-dependencies]
-walkdir = "2"
-regex = "1"
--- a/sv-parser-macros/Cargo.toml
+++ b/sv-parser-macros/Cargo.toml
@ -1,5 +1,5 @@
 [package]
-name = "sv-parser-macro"
+name = "sv-parser-macros"
 version = "0.1.0"
 authors = ["dalance <dalance@gmail.com>"]
 edition = "2018"
--- a/sv-parser-macros/src/lib.rs
+++ b/sv-parser-macros/src/lib.rs
--- a/sv-parser/Cargo.toml
+++ b/sv-parser/Cargo.toml
@ -0,0 +1,28 @@
+[package]
+name = "sv-parser"
+version = "0.1.0"
+authors = ["dalance@gmail.com"]
+repository = "https://github.com/dalance/sv-parser"
+keywords = []
+categories = []
+license = "MIT"
+readme = "../README.md"
+description = ""
+edition = "2018"
+build = "build.rs"
+
+[features]
+default = []
+trace = []
+
+[dependencies]
+nom = "5.0.0"
+#nom_locate = { git = "https://github.com/fflorent/nom_locate" }
+nom_locate = { path = "../../nom_locate" }
+str-concat = "*"
+sv-parser-macros = { path = "../sv-parser-macros" }
+nom-packrat = "0.1.17"
+
+[build-dependencies]
+walkdir = "2"
+regex = "1"
--- a/sv-parser/build.rs
+++ b/sv-parser/build.rs
--- a/sv-parser/src/ast.rs
+++ b/sv-parser/src/ast.rs
@ -4,4 +4,3 @@ pub mod node;
 pub(crate) use any_node::*;
 pub(crate) use locate::*;
 pub(crate) use node::*;
-pub(crate) use sv_parser_macro::*;
--- a/sv-parser/src/ast/any_node.rs
+++ b/sv-parser/src/ast/any_node.rs
--- a/sv-parser/src/ast/locate.rs
+++ b/sv-parser/src/ast/locate.rs
--- a/sv-parser/src/ast/node.rs
+++ b/sv-parser/src/ast/node.rs
--- a/sv-parser/src/lib.rs
+++ b/sv-parser/src/lib.rs
--- a/sv-parser/src/parser.rs
+++ b/sv-parser/src/parser.rs
@ -21,6 +21,8 @@ pub use source_text::*;
 pub use specify_section::*;
 pub use udp_declaration_and_instantiation::*;

+pub(crate) use sv_parser_macros::*;
+
 // -----------------------------------------------------------------------------

 pub(crate) const RECURSIVE_FLAG_WORDS: usize = 1;
--- a/sv-parser/src/parser/behavioral_statements/assertion_statements.rs
+++ b/sv-parser/src/parser/behavioral_statements/assertion_statements.rs
--- a/sv-parser/src/parser/behavioral_statements/case_statements.rs
+++ b/sv-parser/src/parser/behavioral_statements/case_statements.rs
--- a/sv-parser/src/parser/behavioral_statements/clocking_block.rs
+++ b/sv-parser/src/parser/behavioral_statements/clocking_block.rs
--- a/sv-parser/src/parser/behavioral_statements/conditional_statements.rs
+++ b/sv-parser/src/parser/behavioral_statements/conditional_statements.rs
--- a/sv-parser/src/parser/behavioral_statements/continuous_assignment_and_net_alias_statements.rs
+++ b/sv-parser/src/parser/behavioral_statements/continuous_assignment_and_net_alias_statements.rs
--- a/sv-parser/src/parser/behavioral_statements/looping_statements.rs
+++ b/sv-parser/src/parser/behavioral_statements/looping_statements.rs
--- a/sv-parser/src/parser/behavioral_statements/mod.rs
+++ b/sv-parser/src/parser/behavioral_statements/mod.rs
--- a/sv-parser/src/parser/behavioral_statements/parallel_and_sequential_blocks.rs
+++ b/sv-parser/src/parser/behavioral_statements/parallel_and_sequential_blocks.rs
--- a/sv-parser/src/parser/behavioral_statements/patterns.rs
+++ b/sv-parser/src/parser/behavioral_statements/patterns.rs
--- a/sv-parser/src/parser/behavioral_statements/procedural_blocks_and_assignments.rs
+++ b/sv-parser/src/parser/behavioral_statements/procedural_blocks_and_assignments.rs
--- a/sv-parser/src/parser/behavioral_statements/randsequence.rs
+++ b/sv-parser/src/parser/behavioral_statements/randsequence.rs
--- a/sv-parser/src/parser/behavioral_statements/statements.rs
+++ b/sv-parser/src/parser/behavioral_statements/statements.rs
--- a/sv-parser/src/parser/behavioral_statements/subroutine_call_statements.rs
+++ b/sv-parser/src/parser/behavioral_statements/subroutine_call_statements.rs
--- a/sv-parser/src/parser/behavioral_statements/timing_control_statements.rs
+++ b/sv-parser/src/parser/behavioral_statements/timing_control_statements.rs
--- a/sv-parser/src/parser/declarations/assertion_declarations.rs
+++ b/sv-parser/src/parser/declarations/assertion_declarations.rs
--- a/sv-parser/src/parser/declarations/block_item_declarations.rs
+++ b/sv-parser/src/parser/declarations/block_item_declarations.rs
--- a/sv-parser/src/parser/declarations/covergroup_declarations.rs
+++ b/sv-parser/src/parser/declarations/covergroup_declarations.rs
--- a/sv-parser/src/parser/declarations/declaration_assignments.rs
+++ b/sv-parser/src/parser/declarations/declaration_assignments.rs
--- a/sv-parser/src/parser/declarations/declaration_lists.rs
+++ b/sv-parser/src/parser/declarations/declaration_lists.rs
--- a/sv-parser/src/parser/declarations/declaration_ranges.rs
+++ b/sv-parser/src/parser/declarations/declaration_ranges.rs
--- a/sv-parser/src/parser/declarations/delays.rs
+++ b/sv-parser/src/parser/declarations/delays.rs
--- a/sv-parser/src/parser/declarations/function_declarations.rs
+++ b/sv-parser/src/parser/declarations/function_declarations.rs
--- a/sv-parser/src/parser/declarations/interface_declarations.rs
+++ b/sv-parser/src/parser/declarations/interface_declarations.rs
--- a/sv-parser/src/parser/declarations/let_declarations.rs
+++ b/sv-parser/src/parser/declarations/let_declarations.rs
--- a/sv-parser/src/parser/declarations/mod.rs
+++ b/sv-parser/src/parser/declarations/mod.rs
--- a/sv-parser/src/parser/declarations/module_parameter_declarations.rs
+++ b/sv-parser/src/parser/declarations/module_parameter_declarations.rs
--- a/sv-parser/src/parser/declarations/net_and_variable_types.rs
+++ b/sv-parser/src/parser/declarations/net_and_variable_types.rs
--- a/sv-parser/src/parser/declarations/port_declarations.rs
+++ b/sv-parser/src/parser/declarations/port_declarations.rs
--- a/sv-parser/src/parser/declarations/strengths.rs
+++ b/sv-parser/src/parser/declarations/strengths.rs
--- a/sv-parser/src/parser/declarations/task_declarations.rs
+++ b/sv-parser/src/parser/declarations/task_declarations.rs
--- a/sv-parser/src/parser/declarations/type_declarations.rs
+++ b/sv-parser/src/parser/declarations/type_declarations.rs
--- a/sv-parser/src/parser/expressions/concatenations.rs
+++ b/sv-parser/src/parser/expressions/concatenations.rs
--- a/sv-parser/src/parser/expressions/expression_leftside_values.rs
+++ b/sv-parser/src/parser/expressions/expression_leftside_values.rs
--- a/sv-parser/src/parser/expressions/expressions.rs
+++ b/sv-parser/src/parser/expressions/expressions.rs
--- a/sv-parser/src/parser/expressions/mod.rs
+++ b/sv-parser/src/parser/expressions/mod.rs
--- a/sv-parser/src/parser/expressions/numbers.rs
+++ b/sv-parser/src/parser/expressions/numbers.rs
--- a/sv-parser/src/parser/expressions/operators.rs
+++ b/sv-parser/src/parser/expressions/operators.rs
--- a/sv-parser/src/parser/expressions/primaries.rs
+++ b/sv-parser/src/parser/expressions/primaries.rs
--- a/sv-parser/src/parser/expressions/strings.rs
+++ b/sv-parser/src/parser/expressions/strings.rs
--- a/sv-parser/src/parser/expressions/subroutine_calls.rs
+++ b/sv-parser/src/parser/expressions/subroutine_calls.rs
--- a/sv-parser/src/parser/general/attributes.rs
+++ b/sv-parser/src/parser/general/attributes.rs
--- a/sv-parser/src/parser/general/comments.rs
+++ b/sv-parser/src/parser/general/comments.rs
--- a/sv-parser/src/parser/general/identifiers.rs
+++ b/sv-parser/src/parser/general/identifiers.rs
--- a/sv-parser/src/parser/general/mod.rs
+++ b/sv-parser/src/parser/general/mod.rs
--- a/sv-parser/src/parser/instantiations/checker_instantiation.rs
+++ b/sv-parser/src/parser/instantiations/checker_instantiation.rs
--- a/sv-parser/src/parser/instantiations/generated_instantiation.rs
+++ b/sv-parser/src/parser/instantiations/generated_instantiation.rs
--- a/sv-parser/src/parser/instantiations/interface_instantiation.rs
+++ b/sv-parser/src/parser/instantiations/interface_instantiation.rs
--- a/sv-parser/src/parser/instantiations/mod.rs
+++ b/sv-parser/src/parser/instantiations/mod.rs
--- a/sv-parser/src/parser/instantiations/module_instantiation.rs
+++ b/sv-parser/src/parser/instantiations/module_instantiation.rs
--- a/sv-parser/src/parser/instantiations/program_instantiation.rs
+++ b/sv-parser/src/parser/instantiations/program_instantiation.rs
--- a/sv-parser/src/parser/primitive_instances/mod.rs
+++ b/sv-parser/src/parser/primitive_instances/mod.rs
--- a/sv-parser/src/parser/primitive_instances/primitive_gate_and_switch_types.rs
+++ b/sv-parser/src/parser/primitive_instances/primitive_gate_and_switch_types.rs
--- a/sv-parser/src/parser/primitive_instances/primitive_instantiation_and_instances.rs
+++ b/sv-parser/src/parser/primitive_instances/primitive_instantiation_and_instances.rs
--- a/sv-parser/src/parser/primitive_instances/primitive_strengths.rs
+++ b/sv-parser/src/parser/primitive_instances/primitive_strengths.rs
--- a/sv-parser/src/parser/primitive_instances/primitive_terminals.rs
+++ b/sv-parser/src/parser/primitive_instances/primitive_terminals.rs
--- a/sv-parser/src/parser/source_text/checker_items.rs
+++ b/sv-parser/src/parser/source_text/checker_items.rs
--- a/sv-parser/src/parser/source_text/class_items.rs
+++ b/sv-parser/src/parser/source_text/class_items.rs
--- a/sv-parser/src/parser/source_text/configuration_source_text.rs
+++ b/sv-parser/src/parser/source_text/configuration_source_text.rs
--- a/sv-parser/src/parser/source_text/constraints.rs
+++ b/sv-parser/src/parser/source_text/constraints.rs
--- a/sv-parser/src/parser/source_text/interface_items.rs
+++ b/sv-parser/src/parser/source_text/interface_items.rs
--- a/sv-parser/src/parser/source_text/library_source_text.rs
+++ b/sv-parser/src/parser/source_text/library_source_text.rs
--- a/sv-parser/src/parser/source_text/mod.rs
+++ b/sv-parser/src/parser/source_text/mod.rs
--- a/sv-parser/src/parser/source_text/module_items.rs
+++ b/sv-parser/src/parser/source_text/module_items.rs
--- a/sv-parser/src/parser/source_text/module_parameters_and_ports.rs
+++ b/sv-parser/src/parser/source_text/module_parameters_and_ports.rs
--- a/sv-parser/src/parser/source_text/package_items.rs
+++ b/sv-parser/src/parser/source_text/package_items.rs
--- a/sv-parser/src/parser/source_text/program_items.rs
+++ b/sv-parser/src/parser/source_text/program_items.rs
--- a/sv-parser/src/parser/source_text/system_verilog_source_text.rs
+++ b/sv-parser/src/parser/source_text/system_verilog_source_text.rs
--- a/sv-parser/src/parser/specify_section/mod.rs
+++ b/sv-parser/src/parser/specify_section/mod.rs
--- a/sv-parser/src/parser/specify_section/specify_block_declaration.rs
+++ b/sv-parser/src/parser/specify_section/specify_block_declaration.rs
--- a/sv-parser/src/parser/specify_section/specify_block_terminals.rs
+++ b/sv-parser/src/parser/specify_section/specify_block_terminals.rs
--- a/sv-parser/src/parser/specify_section/specify_path_declarations.rs
+++ b/sv-parser/src/parser/specify_section/specify_path_declarations.rs
--- a/sv-parser/src/parser/specify_section/specify_path_delays.rs
+++ b/sv-parser/src/parser/specify_section/specify_path_delays.rs
--- a/sv-parser/src/parser/specify_section/system_timing_check_command_arguments.rs
+++ b/sv-parser/src/parser/specify_section/system_timing_check_command_arguments.rs
--- a/sv-parser/src/parser/specify_section/system_timing_check_commands.rs
+++ b/sv-parser/src/parser/specify_section/system_timing_check_commands.rs
--- a/sv-parser/src/parser/specify_section/system_timing_check_event_definitions.rs
+++ b/sv-parser/src/parser/specify_section/system_timing_check_event_definitions.rs
--- a/sv-parser/src/parser/udp_declaration_and_instantiation/mod.rs
+++ b/sv-parser/src/parser/udp_declaration_and_instantiation/mod.rs
--- a/sv-parser/src/parser/udp_declaration_and_instantiation/udp_body.rs
+++ b/sv-parser/src/parser/udp_declaration_and_instantiation/udp_body.rs
--- a/sv-parser/src/parser/udp_declaration_and_instantiation/udp_declaration.rs
+++ b/sv-parser/src/parser/udp_declaration_and_instantiation/udp_declaration.rs
--- a/sv-parser/src/parser/udp_declaration_and_instantiation/udp_instantiation.rs
+++ b/sv-parser/src/parser/udp_declaration_and_instantiation/udp_instantiation.rs
--- a/sv-parser/src/parser/udp_declaration_and_instantiation/udp_ports.rs
+++ b/sv-parser/src/parser/udp_declaration_and_instantiation/udp_ports.rs
--- a/sv-parser/src/parser/utils.rs
+++ b/sv-parser/src/parser/utils.rs