Auto merge of #85 - whitequark:uppercase, r=japaric

Normalize SVD names to upper case where they were to pascal case

Fixes #76.

Depends on calebmer/inflections#2.

Author: homunkulus

Cargo.lock

@@ -15,7 +15,7 @@ cast = "0.2.0"
 clap = "2.20.5"
 either = "1.0.3"
 error-chain = "0.10.0"
-inflections = "1.0.0"
+inflections = "1.1.0"
 quote = "0.3.15"
 svd-parser = "0.5.1"
 syn = "0.11.9"

Cargo.toml

@@ -9,7 +9,8 @@ use svd::{Access, BitRange, Defaults, Device, EnumeratedValues, Field,
 use syn::{Ident, Lit};
 
 use errors::*;
-use util::{self, ToSanitizedPascalCase, ToSanitizedSnakeCase, U32Ext};
+use util::{self, ToSanitizedPascalCase, ToSanitizedSnakeCase,
+           ToSanitizedUpperCase, U32Ext};
 
 /// Whole device generation
 pub fn device(d: &Device, items: &mut Vec<Tokens>) -> Result<()> {
@@ -26,6 +27,7 @@ pub fn device(d: &Device, items: &mut Vec<Tokens>) -> Result<()> {
             #![doc = #doc]
             #![deny(missing_docs)]
             #![deny(warnings)]
+            #![allow(non_camel_case_types)]
             #![feature(const_fn)]
             #![feature(optin_builtin_traits)]
             #![no_std]
@@ -130,7 +132,7 @@ pub fn interrupt(peripherals: &[Peripheral], items: &mut Vec<Tokens>) {
             );
         }
 
-        let name_pc = Ident::new(interrupt.name.to_sanitized_pascal_case());
+        let name_pc = Ident::new(interrupt.name.to_sanitized_upper_case());
         let description = format!(
             "{} - {}",
             interrupt.value,
@@ -242,7 +244,7 @@ pub fn peripheral(
     defaults: &Defaults,
 ) -> Result<()> {
     let name = Ident::new(&*p.name.to_uppercase());
-    let name_pc = Ident::new(&*p.name.to_sanitized_pascal_case());
+    let name_pc = Ident::new(&*p.name.to_sanitized_upper_case());
     let address = util::unsuffixed(u64(p.base_address));
     let description = util::respace(p.description.as_ref().unwrap_or(&p.name));
 
@@ -425,7 +427,7 @@ pub fn register(
 ) -> Result<()> {
     let access = util::access_of(register);
     let name = util::name_of(register);
-    let name_pc = Ident::new(&*name.to_sanitized_pascal_case());
+    let name_pc = Ident::new(&*name.to_sanitized_upper_case());
     let name_sc = Ident::new(&*name.to_sanitized_snake_case());
     let rsize = register.size
         .or(defs.size)
@@ -657,7 +659,7 @@ pub fn fields(
         fn from(f: &'a Field) -> Result<Self> {
             let BitRange { offset, width } = f.bit_range;
             let sc = f.name.to_sanitized_snake_case();
-            let pc = f.name.to_sanitized_pascal_case();
+            let pc = f.name.to_sanitized_upper_case();
             let pc_r = Ident::new(&*format!("{}R", pc));
             let pc_w = Ident::new(&*format!("{}W", pc));
             let _pc_w = Ident::new(&*format!("_{}W", pc));
@@ -761,15 +763,15 @@ pub fn fields(
                             description: description,
                             sc: sc,
                             pc: Ident::new(&*ev.name
-                                           .to_sanitized_pascal_case()),
+                                           .to_sanitized_upper_case()),
                             value: value,
                         })
                     })
                     .collect::<Result<Vec<_>>>()?;
 
                 let pc_r = &f.pc_r;
                 if let Some(ref base) = base {
-                    let pc = base.field.to_sanitized_pascal_case();
+                    let pc = base.field.to_sanitized_upper_case();
                     let base_pc_r = Ident::new(&*format!("{}R", pc));
                     let description =
                         format!("Possible values of the field `{}`", f.name);
@@ -1075,7 +1077,7 @@ pub fn fields(
                 let base_pc_w = base.as_ref()
                     .map(
                         |base| {
-                            let pc = base.field.to_sanitized_pascal_case();
+                            let pc = base.field.to_sanitized_upper_case();
                             let base_pc_w = Ident::new(&*format!("{}W", pc));
 
                             if let (Some(ref peripheral), Some(ref register)) = (base.peripheral, base.register) {
@@ -1142,7 +1144,7 @@ pub fn fields(
                                     format!("`{:b}`", value)
                                 }),
                             pc: Ident::new(&*ev.name
-                                           .to_sanitized_pascal_case()),
+                                           .to_sanitized_upper_case()),
                             sc: Ident::new(&*ev.name
                                            .to_sanitized_snake_case()),
                             value: value,

src/generate.rs

@@ -17,6 +17,10 @@ pub trait ToSanitizedPascalCase {
     fn to_sanitized_pascal_case(&self) -> Cow<str>;
 }
 
+pub trait ToSanitizedUpperCase {
+    fn to_sanitized_upper_case(&self) -> Cow<str>;
+}
+
 pub trait ToSanitizedSnakeCase {
     fn to_sanitized_snake_case(&self) -> Cow<str>;
 }
@@ -98,6 +102,19 @@ impl ToSanitizedSnakeCase for str {
     }
 }
 
+impl ToSanitizedUpperCase for str {
+    fn to_sanitized_upper_case(&self) -> Cow<str> {
+        let s = self.replace(BLACKLIST_CHARS, "");
+
+        match s.chars().next().unwrap_or('\0') {
+            '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' => {
+                Cow::from(format!("_{}", s.to_upper_case()))
+            }
+            _ => Cow::from(s.to_upper_case()),
+        }
+    }
+}
+
 impl ToSanitizedPascalCase for str {
     fn to_sanitized_pascal_case(&self) -> Cow<str> {
         let s = self.replace(BLACKLIST_CHARS, "");
@@ -138,7 +155,7 @@ pub fn expand(registers: &[Register]) -> Vec<ExpandedRegister> {
                         offset: info.address_offset,
                         ty: Either::Left(
                             info.name
-                                .to_sanitized_pascal_case()
+                                .to_sanitized_upper_case()
                                 .into_owned(),
                         ),
                     },
@@ -153,7 +170,7 @@ pub fn expand(registers: &[Register]) -> Vec<ExpandedRegister> {
                     info.name.replace("%s", "")
                 };
 
-                let ty = Rc::new(ty.to_sanitized_pascal_case().into_owned());
+                let ty = Rc::new(ty.to_sanitized_upper_case().into_owned());
 
                 let indices = array_info
                     .dim_index