Add separate parser git and version, bump to 0.6.0

Signed-off-by: James Goppert <james.goppert@gmail.com>

Author: jgoppert

Cargo.lock

@@ -2,7 +2,7 @@
 name = "rumoca_parser"
 authors = ["James Goppert", "Benjamin Perseghetti"]
 description = "A Modelica translator with focus on Casadi, Sympy, JAX, and Collimator generation"
-version = "0.5.0"
+version = "0.6.0"
 edition = "2021"
 license = "Apache-2.0"
 

Cargo.toml

@@ -8,19 +8,19 @@ fn main() {
 
     // Attempt to retrieve the current Git version
     let output = Command::new("git")
-        .args(["describe", "--dirty", "--tags"])
+        .args(["describe", "--dirty", "--tags", "--long"])
         .output()
         .expect("Failed to execute git command");
 
     if output.status.success() {
         // Convert the hash to a String and trim it
-        let git_hash = String::from_utf8_lossy(&output.stdout).trim().to_string();
+        let git_ver = String::from_utf8_lossy(&output.stdout).trim().to_string();
 
         // Pass the Git hash to your Rust code via an environment variable
-        println!("cargo:rustc-env=GIT_HASH={}", git_hash);
+        println!("cargo:rustc-env=GIT_VER={}", git_ver);
 
         // Optionally, display a warning during the build with the hash
-        println!("cargo:warning=Using Git version: {}", git_hash);
+        println!("cargo:warning=Using Git version: {}", git_ver);
     } else {
         eprintln!(
             "Failed to retrieve Git version: {}",

build.rs

@@ -16,7 +16,8 @@ pub struct StoredDefinition {
     pub classes: Vec<ClassDefinition>,
     pub within: Option<Name>,
     pub model_md5: String,
-    pub rumoca_git_hash: String,
+    pub rumoca_parser_version: String,
+    pub rumoca_parser_git: String,
 }
 
 #[derive(CommonTraits!, Default)]

src/s1_parser/ast.rs

@@ -151,7 +151,8 @@ pub StoredDefinition: ast::StoredDefinition = {
             span: ast::Span { left, right},
             classes,
             within,
-            rumoca_git_hash: "".to_string(),
+            rumoca_parser_version: "".to_string(),
+            rumoca_parser_git: "".to_string(),
             model_md5: "".to_string(),
         }
     }

src/s1_parser/modelica.lalrpop

@@ -68,6 +68,7 @@ pub fn parse_file(filename: &str) -> ast::StoredDefinition {
     let mut def = result.unwrap();
     let digest = md5::compute(file_txt);
     def.model_md5 = format!("{:x}", digest);
-    //def.rumoca_git_hash = env!("GIT_HASH").to_string();
+    def.rumoca_parser_version = env!("CARGO_PKG_VERSION").to_string();
+    def.rumoca_parser_git = option_env!("GIT_VER").unwrap_or("").to_string();
     def
 }

src/s1_parser/parser_helper.rs

@@ -112,11 +112,11 @@ impl Visitor for PrintVisitor {
     fn exit_component_reference(&mut self, comp: &ast::ComponentReference) {
         let mut s: String = "".to_string();
         for (index, part) in comp.parts.iter().enumerate() {
-             if index != 0 || comp.local {
-                 s += ".";
-             }
-             s += &part.name;
-         }
-         self.print(&s);
+            if index != 0 || comp.local {
+                s += ".";
+            }
+            s += &part.name;
+        }
+        self.print(&s);
     }
 }

src/s1_parser/print_visitor.rs

@@ -39,7 +39,7 @@ impl Walker {
                     }
                 }
             }
-            ast::ClassSpecifier::Extends { .. } => {},
+            ast::ClassSpecifier::Extends { .. } => {}
         }
         visitor.exit_class_definition(class);
         visitor.exit_any();