diff --git a/src/asttools.rs b/src/asttools.rs index 69b6a8a3e..8f740702d 100644 --- a/src/asttools.rs +++ b/src/asttools.rs @@ -15,6 +15,7 @@ pub fn get_parent<'a>(node: &'a Node<'a>, level: usize) -> Option> { Some(node) } +#[macro_export] macro_rules! has_ancestors { ($node:expr, $( $typs:pat )|*, $( $typ:pat ),+) => {{ let mut res = false; diff --git a/src/lib.rs b/src/lib.rs index 9c2fdcf4f..85875f6c4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -19,33 +19,15 @@ pub use crate::enums::*; pub mod node; pub use crate::node::*; +mod rca_metrics; +pub(crate) use rca_metrics::*; + pub mod web; #[macro_use] pub mod asttools; pub use crate::asttools::*; -pub mod cyclomatic; -pub use crate::cyclomatic::*; - -pub mod exit; -pub use crate::exit::*; - -pub mod loc; -pub use crate::loc::*; - -pub mod mi; -pub use crate::mi::*; - -pub mod halstead; -pub use crate::halstead::*; - -pub mod nom; -pub use crate::nom::*; - -pub mod fn_args; -pub use crate::fn_args::*; - pub mod metrics; pub use crate::metrics::*; diff --git a/src/cyclomatic.rs b/src/rca_metrics/cyclomatic.rs similarity index 100% rename from src/cyclomatic.rs rename to src/rca_metrics/cyclomatic.rs diff --git a/src/exit.rs b/src/rca_metrics/exit.rs similarity index 100% rename from src/exit.rs rename to src/rca_metrics/exit.rs diff --git a/src/fn_args.rs b/src/rca_metrics/fn_args.rs similarity index 100% rename from src/fn_args.rs rename to src/rca_metrics/fn_args.rs diff --git a/src/halstead.rs b/src/rca_metrics/halstead.rs similarity index 100% rename from src/halstead.rs rename to src/rca_metrics/halstead.rs diff --git a/src/loc.rs b/src/rca_metrics/loc.rs similarity index 100% rename from src/loc.rs rename to src/rca_metrics/loc.rs diff --git a/src/mi.rs b/src/rca_metrics/mi.rs similarity index 98% rename from src/mi.rs rename to src/rca_metrics/mi.rs index d76884384..f16e89b87 100644 --- a/src/mi.rs +++ b/src/rca_metrics/mi.rs @@ -3,9 +3,9 @@ use serde::Serialize; use std::fmt; use tree_sitter::Node; -use crate::cyclomatic; -use crate::halstead; -use crate::loc; +use super::cyclomatic; +use super::halstead; +use super::loc; use crate::checker::Checker; diff --git a/src/rca_metrics/mod.rs b/src/rca_metrics/mod.rs new file mode 100644 index 000000000..275f6557b --- /dev/null +++ b/src/rca_metrics/mod.rs @@ -0,0 +1,7 @@ +pub mod cyclomatic; +pub mod exit; +pub mod fn_args; +pub mod halstead; +pub mod loc; +pub mod mi; +pub mod nom; diff --git a/src/nom.rs b/src/rca_metrics/nom.rs similarity index 100% rename from src/nom.rs rename to src/rca_metrics/nom.rs