[Draft, for discussion only] IDL gen improvements 3 - Fold all proc-macro code back into rs-matter-macros

Cargo.toml

@@ -2,9 +2,7 @@
 resolver = "2"
 members = [
         "rs-matter",
-        "rs-matter-data-model",
         "rs-matter-macros",
-        "rs-matter-macros-impl",
         "examples",
 ]
 

rs-matter-macros/Cargo.toml

@@ -23,6 +23,19 @@ syn = { version = "2", features = ["extra-traits", "parsing"] }
 quote = "1"
 proc-macro2 = "1"
 proc-macro-crate = "3"
+miette = { version = "5", features = ["fancy"] }
+nom = "7"
+nom-greedyerror = "0.5"
+nom-supreme = "0.8"
+nom_locate = "4.2"
+convert_case = "0.6"
+thiserror = "1"
+tracing = "0.1"
+tracing-subscriber = { version = "0.3", features = ["regex", "json"] }
 
-rs-matter-data-model = { path = "../rs-matter-data-model" }
-rs-matter-macros-impl = { path = "../rs-matter-macros-impl" }
+[dev-dependencies]
+assert-tokenstreams-eq = "0.1.0"
+criterion = { version = "0.5.1", features = ["html_reports"] }
+divan = "0.1.4"
+rstest = "0.18.2"
+clap = { version = "4", features = ["derive"] }

rs-matter-macros/README.md

@@ -1,5 +1,6 @@
-# rs-matter-macros: The Rust Implementation of Matter Library - Proc-macros
+# rs-matter-macros: The Rust Implementation of Matter Library - Procedural Macros
 
-Proc-macros for implementing the `ToTLV` and `FromTLV` traits.
+* Proc-macros for deriving the `FromTLV` and `ToTLV` traits
+* An `import!` proc-macro for generating Matter clusters' meta-data and handler traits
 
 NOTE: The macros are re-exported by the `rs-matter` crate which should be used instead of adding a direct dependency on the `rs-matter-macros` crate.

rs-matter-data-model/benches/client-clusters-criterion.rs → rs-matter-macros/benches/client-clusters-criterion.rs

@@ -1,6 +1,6 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use miette::GraphicalReportHandler;
-use rs_matter_data_model::{idl::Idl, CSA_STANDARD_CLUSTERS_IDL};
+use rs_matter_macros::{idl::Idl, CSA_STANDARD_CLUSTERS_IDL};
 
 pub fn criterion_benchmark(c: &mut Criterion) {
     c.bench_function("load example client clusters", |b| {

rs-matter-data-model/benches/client-clusters.rs → rs-matter-macros/benches/client-clusters.rs

@@ -1,6 +1,6 @@
 use divan::black_box;
 use miette::GraphicalReportHandler;
-use rs_matter_data_model::{idl::Idl, CSA_STANDARD_CLUSTERS_IDL};
+use rs_matter_macros::{idl::Idl, CSA_STANDARD_CLUSTERS_IDL};
 
 fn main() {
     // Run registered benchmarks.

rs-matter-macros-impl/src/idl.rs → rs-matter-macros/src/idl.rs

@@ -14,20 +14,24 @@
  * limitations under the License.
  */
 
+use parser::Cluster;
 use proc_macro2::{Ident, Literal, Span, TokenStream};
 use quote::quote;
 
-use rs_matter_data_model::Cluster;
-
 mod bitmap;
 mod cluster;
 mod enumeration;
 mod field;
 mod handler;
 mod id;
+mod parser;
 mod struct_in;
 mod struct_out;
 
+pub use parser::Idl;
+
+pub const CSA_STANDARD_CLUSTERS_IDL: &str = include_str!("idl/parser/controller-clusters.matter");
+
 /// Some context data for IDL generation
 ///
 /// Data that is necessary to be able to code generate various bits.
@@ -142,8 +146,8 @@ fn cluster_internal(
 mod tests {
     use assert_tokenstreams_eq::assert_tokenstreams_eq;
 
-    use rs_matter_data_model::idl::Idl;
-    use rs_matter_data_model::{Cluster, CSA_STANDARD_CLUSTERS_IDL};
+    use super::Idl;
+    use super::{Cluster, CSA_STANDARD_CLUSTERS_IDL};
 
     use crate::idl::IdlGenerateContext;
 

rs-matter-macros-impl/src/idl/bitmap.rs → rs-matter-macros/src/idl/bitmap.rs

@@ -20,9 +20,8 @@ use proc_macro2::{Literal, TokenStream};
 
 use quote::quote;
 
-use rs_matter_data_model::{Bitmap, Cluster};
-
 use super::id::{ident, idl_id_to_constant_name};
+use super::parser::{Bitmap, Cluster};
 use super::IdlGenerateContext;
 
 /// Create the token stream corresponding to all bitmap definitions in the provided IDL cluster.

rs-matter-macros-impl/src/idl/cluster.rs → rs-matter-macros/src/idl/cluster.rs

@@ -22,9 +22,8 @@
 use proc_macro2::{Literal, TokenStream};
 use quote::quote;
 
-use rs_matter_data_model::{AccessPrivilege, Cluster, StructType};
-
 use super::id::{ident, idl_attribute_name_to_enum_variant_name};
+use super::parser::{AccessPrivilege, Cluster, StructType};
 use super::IdlGenerateContext;
 
 pub(crate) const NO_RESPONSE: &str = "DefaultSuccess";

rs-matter-macros-impl/src/idl/enumeration.rs → rs-matter-macros/src/idl/enumeration.rs

@@ -19,9 +19,8 @@
 use proc_macro2::{Literal, TokenStream};
 use quote::quote;
 
-use rs_matter_data_model::{Cluster, Enum};
-
 use super::id::{ident, idl_id_to_enum_variant_name};
+use super::parser::{Cluster, Enum};
 use super::IdlGenerateContext;
 
 /// Create the token stream corresponding to all enum definitions in the provided IDL cluster.

rs-matter-macros-impl/src/idl/field.rs → rs-matter-macros/src/idl/field.rs

@@ -19,9 +19,8 @@
 use proc_macro2::{Ident, TokenStream};
 use quote::quote;
 
-use rs_matter_data_model::{Cluster, DataType};
-
 use super::id::ident;
+use super::parser::{Cluster, DataType};
 
 /// Return a stream representing the Rust type that corresponds to the given
 /// IDL type.

rs-matter-macros-impl/src/idl/handler.rs → rs-matter-macros/src/idl/handler.rs

@@ -20,11 +20,10 @@
 use proc_macro2::{Ident, Literal, TokenStream};
 use quote::quote;
 
-use rs_matter_data_model::{Attribute, Cluster, Command, DataType, StructType};
-
 use super::cluster::{GLOBAL_ATTR, NO_RESPONSE};
 use super::field::{field_type, field_type_builder, BuilderPolicy};
 use super::id::{ident, idl_attribute_name_to_enum_variant_name, idl_field_name_to_rs_name};
+use super::parser::{Attribute, Cluster, Command, DataType, StructType};
 use super::IdlGenerateContext;
 
 /// Return a token stream defining the handler trait for the provided IDL cluster.