Change json structure and add comments for modules

src/builder/cpp_file_builder.rs

@@ -17,8 +17,12 @@ impl FileBuilder for CppFileBuilder {
         Ok(())
     }
 
-    fn write_namespace(&mut self, output: &mut dyn Write, name: &str) -> Result<()> {
-        write!(output, "namespace {} {{\n", name)?;
+    fn write_namespace(&mut self, output: &mut dyn Write, name: &str, comment: Option<&str>) -> Result<()> {
+        if let Some(comment) = comment {
+            write!(output, "namespace {} {{ // {}\n", name, comment)?;
+        } else {
+            write!(output, "namespace {} {{\n", name)?;
+        }
 
         Ok(())
     }

src/builder/csharp_file_builder.rs

@@ -14,8 +14,12 @@ impl FileBuilder for CSharpFileBuilder {
         Ok(())
     }
 
-    fn write_namespace(&mut self, output: &mut dyn Write, name: &str) -> Result<()> {
-        write!(output, "public static class {} {{\n", name)?;
+    fn write_namespace(&mut self, output: &mut dyn Write, name: &str, comment: Option<&str>) -> Result<()> {
+        if let Some(comment) = comment {
+            write!(output, "public static class {} {{ // {}\n", name, comment)?;
+        } else {
+            write!(output, "public static class {} {{\n", name)?;
+        }
 
         Ok(())
     }

src/builder/file_builder.rs

@@ -5,7 +5,7 @@ pub trait FileBuilder {
 
     fn write_top_level(&mut self, output: &mut dyn Write) -> Result<()>;
 
-    fn write_namespace(&mut self, output: &mut dyn Write, name: &str) -> Result<()>;
+    fn write_namespace(&mut self, output: &mut dyn Write, name: &str, comment: Option<&str>) -> Result<()>;
 
     fn write_variable(
         &mut self,

src/builder/json_file_builder.rs

@@ -1,22 +1,26 @@
-use std::io::{Result, Write};
+use std::{io::{Result, Write}, collections::BTreeMap};
 
-use serde_json::{json, Map, Value};
+use serde::Serialize;
 
 use super::FileBuilder;
 
-#[derive(Debug, PartialEq)]
-pub struct JsonFileBuilder {
-    json: Value,
-    current_namespace: String,
+
+#[derive(Debug, PartialEq, Default, Serialize)]
+struct JsonOffsetValue {
+    value: usize,
+    comment: Option<String>,
 }
 
-impl Default for JsonFileBuilder {
-    fn default() -> Self {
-        Self {
-            json: Value::Object(Map::new()),
-            current_namespace: String::new(),
-        }
-    }
+#[derive(Debug, PartialEq, Default, Serialize)]
+struct JsonMod {
+    data: BTreeMap<String, JsonOffsetValue>,
+    comment: Option<String>,
+}
+
+#[derive(Debug, PartialEq, Default)]
+pub struct JsonFileBuilder {
+    data: BTreeMap<String, JsonMod>,
+    current_namespace: String,
 }
 
 impl FileBuilder for JsonFileBuilder {
@@ -28,8 +32,9 @@ impl FileBuilder for JsonFileBuilder {
         Ok(())
     }
 
-    fn write_namespace(&mut self, _output: &mut dyn Write, name: &str) -> Result<()> {
+    fn write_namespace(&mut self, _output: &mut dyn Write, name: &str, comment: Option<&str>) -> Result<()> {
         self.current_namespace = name.to_string();
+        self.data.entry(name.to_string()).or_default().comment = comment.map(str::to_string);
 
         Ok(())
     }
@@ -39,26 +44,22 @@ impl FileBuilder for JsonFileBuilder {
         _output: &mut dyn Write,
         name: &str,
         value: usize,
-        _comment: Option<&str>,
+        comment: Option<&str>,
     ) -> Result<()> {
-        if let Some(map) = self.json.as_object_mut() {
-            let entry = map
-                .entry(&self.current_namespace)
-                .or_insert_with(|| json!({}));
-
-            if let Some(object) = entry.as_object_mut() {
-                object.insert(name.to_string(), json!(value));
-            }
-        }
+        self.data.entry(self.current_namespace.clone()).or_default().data
+            .insert(name.to_string(), JsonOffsetValue { 
+                value: value, 
+                comment: comment.map(str::to_string) 
+            });
 
         Ok(())
     }
 
     fn write_closure(&mut self, output: &mut dyn Write, eof: bool) -> Result<()> {
         if eof {
-            write!(output, "{}", serde_json::to_string_pretty(&self.json)?)?;
+            write!(output, "{}", serde_json::to_string_pretty(&self.data)?)?;
 
-            self.json = json!({});
+            self.data = BTreeMap::new();
         }
 
         Ok(())

src/builder/mod.rs

@@ -32,8 +32,8 @@ impl FileBuilder for FileBuilderEnum {
         self.as_mut().write_top_level(output)
     }
 
-    fn write_namespace(&mut self, output: &mut dyn Write, name: &str) -> Result<()> {
-        self.as_mut().write_namespace(output, name)
+    fn write_namespace(&mut self, output: &mut dyn Write, name: &str, comment: Option<&str>) -> Result<()> {
+        self.as_mut().write_namespace(output, name, comment)
     }
 
     fn write_variable(

src/builder/python_file_builder.rs

@@ -14,8 +14,12 @@ impl FileBuilder for PythonFileBuilder {
         Ok(())
     }
 
-    fn write_namespace(&mut self, output: &mut dyn Write, name: &str) -> Result<()> {
-        write!(output, "class {}:\n", name)?;
+    fn write_namespace(&mut self, output: &mut dyn Write, name: &str, comment: Option<&str>) -> Result<()> {
+        if let Some(comment) = comment {
+            write!(output, "class {}: # {}\n", name, comment)?;
+        } else {
+            write!(output, "class {}:\n", name)?;
+        }
 
         Ok(())
     }

src/builder/rust_file_builder.rs

@@ -19,8 +19,12 @@ impl FileBuilder for RustFileBuilder {
         Ok(())
     }
 
-    fn write_namespace(&mut self, output: &mut dyn Write, name: &str) -> Result<()> {
-        write!(output, "pub mod {} {{\n", name)?;
+    fn write_namespace(&mut self, output: &mut dyn Write, name: &str, comment: Option<&str>) -> Result<()> {
+        if let Some(comment) = comment {
+            write!(output, "pub mod {} {{ // {}\n", name, comment)?;
+        } else {
+            write!(output, "pub mod {} {{\n", name)?;
+        }
 
         Ok(())
     }