From 72247bee1830e3f16cdf37e5a8bd151e2a70f20d Mon Sep 17 00:00:00 2001 From: Luni-4 Date: Wed, 22 Apr 2020 14:58:55 +0200 Subject: [PATCH] Move languages into their own module --- src/lib.rs | 45 ++----------------- src/preproc.rs | 2 +- src/{ => rca_languages}/language_ccomment.rs | 0 src/{ => rca_languages}/language_cpp.rs | 0 src/{ => rca_languages}/language_csharp.rs | 0 src/{ => rca_languages}/language_css.rs | 0 src/{ => rca_languages}/language_go.rs | 0 src/{ => rca_languages}/language_html.rs | 0 src/{ => rca_languages}/language_java.rs | 0 .../language_javascript.rs | 0 src/{ => rca_languages}/language_mozjs.rs | 0 src/{ => rca_languages}/language_preproc.rs | 0 src/{ => rca_languages}/language_python.rs | 0 src/{ => rca_languages}/language_rust.rs | 0 src/{ => rca_languages}/language_tsx.rs | 0 .../language_typescript.rs | 0 src/rca_languages/mod.rs | 41 +++++++++++++++++ 17 files changed, 45 insertions(+), 43 deletions(-) rename src/{ => rca_languages}/language_ccomment.rs (100%) rename src/{ => rca_languages}/language_cpp.rs (100%) rename src/{ => rca_languages}/language_csharp.rs (100%) rename src/{ => rca_languages}/language_css.rs (100%) rename src/{ => rca_languages}/language_go.rs (100%) rename src/{ => rca_languages}/language_html.rs (100%) rename src/{ => rca_languages}/language_java.rs (100%) rename src/{ => rca_languages}/language_javascript.rs (100%) rename src/{ => rca_languages}/language_mozjs.rs (100%) rename src/{ => rca_languages}/language_preproc.rs (100%) rename src/{ => rca_languages}/language_python.rs (100%) rename src/{ => rca_languages}/language_rust.rs (100%) rename src/{ => rca_languages}/language_tsx.rs (100%) rename src/{ => rca_languages}/language_typescript.rs (100%) create mode 100644 src/rca_languages/mod.rs diff --git a/src/lib.rs b/src/lib.rs index 85875f6c4..e68b748b7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -22,6 +22,9 @@ pub use crate::node::*; mod rca_metrics; pub(crate) use rca_metrics::*; +mod rca_languages; +pub(crate) use rca_languages::*; + pub mod web; #[macro_use] @@ -68,45 +71,3 @@ pub use crate::comment_rm::*; mod dump; pub use crate::dump::*; - -mod language_ccomment; -pub use crate::language_ccomment::*; - -mod language_cpp; -pub use crate::language_cpp::*; - -mod language_csharp; -pub use crate::language_csharp::*; - -mod language_css; -pub use crate::language_css::*; - -mod language_go; -pub use crate::language_go::*; - -mod language_html; -pub use crate::language_html::*; - -mod language_java; -pub use crate::language_java::*; - -mod language_mozjs; -pub use crate::language_mozjs::*; - -mod language_javascript; -pub use crate::language_javascript::*; - -mod language_python; -pub use crate::language_python::*; - -mod language_rust; -pub use crate::language_rust::*; - -mod language_tsx; -pub use crate::language_tsx::*; - -mod language_typescript; -pub use crate::language_typescript::*; - -mod language_preproc; -pub use crate::language_preproc::*; diff --git a/src/preproc.rs b/src/preproc.rs index c9112b96b..cd6f5e188 100644 --- a/src/preproc.rs +++ b/src/preproc.rs @@ -5,8 +5,8 @@ use std::collections::{hash_map, HashMap, HashSet}; use std::path::PathBuf; use std::sync::{Arc, Mutex}; -use crate::language_preproc::*; use crate::languages::*; +use crate::rca_languages::language_preproc::*; use crate::tools::*; use crate::traits::*; diff --git a/src/language_ccomment.rs b/src/rca_languages/language_ccomment.rs similarity index 100% rename from src/language_ccomment.rs rename to src/rca_languages/language_ccomment.rs diff --git a/src/language_cpp.rs b/src/rca_languages/language_cpp.rs similarity index 100% rename from src/language_cpp.rs rename to src/rca_languages/language_cpp.rs diff --git a/src/language_csharp.rs b/src/rca_languages/language_csharp.rs similarity index 100% rename from src/language_csharp.rs rename to src/rca_languages/language_csharp.rs diff --git a/src/language_css.rs b/src/rca_languages/language_css.rs similarity index 100% rename from src/language_css.rs rename to src/rca_languages/language_css.rs diff --git a/src/language_go.rs b/src/rca_languages/language_go.rs similarity index 100% rename from src/language_go.rs rename to src/rca_languages/language_go.rs diff --git a/src/language_html.rs b/src/rca_languages/language_html.rs similarity index 100% rename from src/language_html.rs rename to src/rca_languages/language_html.rs diff --git a/src/language_java.rs b/src/rca_languages/language_java.rs similarity index 100% rename from src/language_java.rs rename to src/rca_languages/language_java.rs diff --git a/src/language_javascript.rs b/src/rca_languages/language_javascript.rs similarity index 100% rename from src/language_javascript.rs rename to src/rca_languages/language_javascript.rs diff --git a/src/language_mozjs.rs b/src/rca_languages/language_mozjs.rs similarity index 100% rename from src/language_mozjs.rs rename to src/rca_languages/language_mozjs.rs diff --git a/src/language_preproc.rs b/src/rca_languages/language_preproc.rs similarity index 100% rename from src/language_preproc.rs rename to src/rca_languages/language_preproc.rs diff --git a/src/language_python.rs b/src/rca_languages/language_python.rs similarity index 100% rename from src/language_python.rs rename to src/rca_languages/language_python.rs diff --git a/src/language_rust.rs b/src/rca_languages/language_rust.rs similarity index 100% rename from src/language_rust.rs rename to src/rca_languages/language_rust.rs diff --git a/src/language_tsx.rs b/src/rca_languages/language_tsx.rs similarity index 100% rename from src/language_tsx.rs rename to src/rca_languages/language_tsx.rs diff --git a/src/language_typescript.rs b/src/rca_languages/language_typescript.rs similarity index 100% rename from src/language_typescript.rs rename to src/rca_languages/language_typescript.rs diff --git a/src/rca_languages/mod.rs b/src/rca_languages/mod.rs new file mode 100644 index 000000000..6b74160a4 --- /dev/null +++ b/src/rca_languages/mod.rs @@ -0,0 +1,41 @@ +pub mod language_ccomment; +pub use language_ccomment::*; + +pub mod language_cpp; +pub use language_cpp::*; + +pub mod language_csharp; +pub use language_csharp::*; + +pub mod language_css; +pub use language_css::*; + +pub mod language_go; +pub use language_go::*; + +pub mod language_html; +pub use language_html::*; + +pub mod language_java; +pub use language_java::*; + +pub mod language_mozjs; +pub use language_mozjs::*; + +pub mod language_javascript; +pub use language_javascript::*; + +pub mod language_python; +pub use language_python::*; + +pub mod language_rust; +pub use language_rust::*; + +pub mod language_tsx; +pub use language_tsx::*; + +pub mod language_typescript; +pub use language_typescript::*; + +pub mod language_preproc; +pub use language_preproc::*;