Change name from Sc2CsVisitor to ModelBuilder and module from cs_buil…

…der to builder

Signed-off-by: Enrico Ghiorzi <[email protected]>

scan_fmt_xml/src/cs_builder.rs → scan_fmt_xml/src/builder.rs

@@ -32,7 +32,7 @@ struct EventBuilder {
 }
 
 #[derive(Debug)]
-pub struct Sc2CsVisitor {
+pub struct ModelBuilder {
     cs: ChannelSystemBuilder,
     // Represent OMG types
     scan_types: HashMap<String, Type>,
@@ -55,7 +55,7 @@ pub struct Sc2CsVisitor {
     parameters: HashMap<(PgId, PgId, usize, String), Channel>,
 }
 
-impl Sc2CsVisitor {
+impl ModelBuilder {
     pub fn visit(parser: Parser) -> anyhow::Result<CsModel> {
         // Add base types
         // FIXME: Is there a better way? Const object?
@@ -65,7 +65,7 @@ impl Sc2CsVisitor {
             (String::from("URI"), Type::Integer),
         ];
 
-        let mut model = Sc2CsVisitor {
+        let mut model = ModelBuilder {
             cs: ChannelSystemBuilder::new(),
             scan_types: HashMap::from_iter(base_types),
             enums: HashMap::new(),

scan_fmt_xml/src/lib.rs

@@ -1,7 +1,7 @@
 //! Parser and model builder for SCAN's XML specification format.
 
-mod cs_builder;
+mod builder;
 mod parser;
 
-pub use cs_builder::Sc2CsVisitor;
+pub use builder::ModelBuilder;
 pub use parser::Parser;

scan_fmt_xml/tests/basic.rs

@@ -56,7 +56,7 @@ fn param_triangle() -> anyhow::Result<()> {
 
 fn test(file: PathBuf) -> anyhow::Result<()> {
     let parser = Parser::parse(file)?;
-    let mut model = Sc2CsVisitor::visit(parser)?;
+    let mut model = ModelBuilder::visit(parser)?;
     let mut steps = 0;
     assert!(model.cs.possible_transitions().count() > 0);
     while let Some((pg_id, act, loc)) = model