Merge pull request #12 from v0-e/enh-snake-case

Snake case conversion enhancement
librasn · Apr 12, 2024 · cf4ee90 · cf4ee90
2 parents 44c92b1 + 344ec52
commit cf4ee90
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 18 deletions.
diff --git a/rasn-compiler-tests/tests/parameterization.rs b/rasn-compiler-tests/tests/parameterization.rs
@@ -109,17 +109,17 @@ e2e_pdu! {
     #[non_exhaustive]
     pub struct A2XPC5FlowBitRates {
         #[rasn(identifier = "a2X-GuaranteedFlowBitRate")]
-        pub a2X__guaranteed_flow_bit_rate: bool,
+        pub a2_x__guaranteed_flow_bit_rate: bool,
         #[rasn(size("1.."), identifier = "iE-Extensions")]
         pub i_e__extensions: Option<SequenceOf<A2XPC5FlowBitRatesIEExtensions>>,
     }
     impl A2XPC5FlowBitRates {
         pub fn new(
-            a2X__guaranteed_flow_bit_rate: bool,
+            a2_x__guaranteed_flow_bit_rate: bool,
             i_e__extensions: Option<SequenceOf<A2XPC5FlowBitRatesIEExtensions>>,
         ) -> Self {
             Self {
-                a2X__guaranteed_flow_bit_rate,
+                a2_x__guaranteed_flow_bit_rate,
                 i_e__extensions,
             }
         }

diff --git a/rasn-compiler/src/intermediate/utils.rs b/rasn-compiler/src/intermediate/utils.rs
@@ -30,23 +30,24 @@ const RUST_KEYWORDS: [&str; 38] = [
 ];
 
 pub fn to_rust_snake_case(input: &str) -> Ident {
-    let mut input = input.replace('-', "_");
-    let input = input.drain(..).fold(String::new(), |mut acc, c| {
-        if acc.is_empty() && c.is_uppercase() {
-            acc.push(c.to_ascii_lowercase());
-        } else if acc.ends_with(|last: char| last.is_lowercase() || last == '_') && c.is_uppercase()
-        {
-            acc.push('_');
-            acc.push(c.to_ascii_lowercase());
+    let input = input.replace('-', "_");
+    let mut lowercase = String::with_capacity(input.len());
+
+    let peekable = &mut input.chars().peekable();
+    while let Some(c) = peekable.next() {
+        if c.is_lowercase() || c == '_' || c.is_numeric() {
+            lowercase.push(c);
+            if peekable.peek().map_or(false, |next| next.is_uppercase()) {
+                lowercase.push('_');
+            }
         } else {
-            acc.push(c);
+            lowercase.push(c.to_ascii_lowercase());
         }
-        acc
-    });
-    let name = if RUST_KEYWORDS.contains(&input.as_str()) {
-        String::from("r_") + &input
+    }
+    let name = if RUST_KEYWORDS.contains(&lowercase.as_str()) {
+        String::from("r_") + &lowercase
     } else {
-        input
+        lowercase
     };
     Ident::new(&name, Span::call_site())
 }
@@ -112,7 +113,7 @@ use quote::format_ident;
 
 #[cfg(test)]
 mod tests {
-    use super::int_type_token;
+    use super::{int_type_token, to_rust_snake_case};
 
     #[test]
     fn determines_int_type() {
@@ -126,4 +127,16 @@ mod tests {
         assert_eq!(int_type_token(-67463, 23123, false), "i32");
         assert_eq!(int_type_token(255, 257, false), "u16");
     }
+
+    #[test]
+    fn converts_to_snake_case() {
+        assert_eq!(to_rust_snake_case("HelloWorld"), "hello_world");
+        assert_eq!(to_rust_snake_case("helloWorld"), "hello_world");
+        assert_eq!(to_rust_snake_case("hello-world"), "hello_world");
+        assert_eq!(to_rust_snake_case("HELLOWORLD"), "helloworld");
+        assert_eq!(to_rust_snake_case("HelloWORLD"), "hello_world");
+        assert_eq!(to_rust_snake_case("HELLO-WORLD"), "hello__world");
+        assert_eq!(to_rust_snake_case("struct"), "r_struct");
+        assert_eq!(to_rust_snake_case("STRUCT"), "r_struct");
+    }
 }