Make ast hashable, bump to v0.6.1

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.6.0"
+version = "0.6.1"
 edition = "2021"
 license = "Apache-2.0"
 

Cargo.toml

@@ -180,11 +180,11 @@ pub enum Token {
     #[regex("\"[\\- _0-9a-zA-Z]*\"", quoted_string_callback)]
     String(String),
 
-    #[regex("[1-9][0-9]*", |lex| lex.slice().parse::<i64>().unwrap(), priority=3)]
-    UnsignedInteger(i64),
+    #[regex("[1-9][0-9]*", |lex| lex.slice().to_string(), priority=3)]
+    UnsignedInteger(String),
 
-    #[regex(r"(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?", |lex| lex.slice().parse::<f64>().unwrap())]
-    UnsignedReal(f64),
+    #[regex(r"(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?", |lex| lex.slice().to_string())]
+    UnsignedReal(String),
 
     #[token(r"(true|false)?", |lex| lex.slice().parse::<bool>().unwrap())]
     Boolean(bool),

src/s0_lexer/tokens.rs

@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 derive_alias! {
-    #[derive(CommonTraits!)] = #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)];
+    #[derive(CommonTraits!)] = #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Hash)];
 }
 
 #[derive(CommonTraits!, Default)]
@@ -279,8 +279,8 @@ pub enum BinaryOp {
 
 #[derive(CommonTraits!)]
 pub enum Expression {
-    UnsignedInteger(i64),
-    UnsignedReal(f64),
+    UnsignedInteger(String),
+    UnsignedReal(String),
     Boolean(bool),
     //String(String),
     Ref {

src/s1_parser/ast.rs

@@ -99,8 +99,8 @@ extern {
         // other lexical tokens
         "IDENT" => Token::Identifier(<String>),
         "STRING" => Token::String(<String>),
-        "UNSIGNED-INTEGER" => Token::UnsignedInteger(<i64>),
-        "UNSIGNED-REAL" => Token::UnsignedReal(<f64>),
+        "UNSIGNED-INTEGER" => Token::UnsignedInteger(<String>),
+        "UNSIGNED-REAL" => Token::UnsignedReal(<String>),
         "boolean" => Token::Boolean(<bool>),
         "(" => Token::LParen,
         ")" => Token::RParen,