Fixup handling of macro names

src/CStarToC11.ml

@@ -59,10 +59,9 @@ module S = Set.Make(String)
 let rec vars_of m = function
   | CStar.Var v ->
       S.singleton v
-  | Qualified v ->
-      S.singleton (to_c_name m v)
+  | Qualified v
   | Macro v ->
-      S.singleton (String.uppercase_ascii (to_c_name m v))
+      S.singleton (to_c_name m v)
   | Constant _
   | Bool _
   | StringLiteral _
@@ -909,11 +908,9 @@ and mk_expr m (e: expr): C.expr =
   | Var ident ->
       Name ident
 
-  | Qualified ident ->
-      Name (to_c_name m ident)
-
+  | Qualified ident
   | Macro ident ->
-      Name (String.uppercase_ascii (to_c_name m ident))
+      Name (to_c_name m ident)
 
   | Constant (w, c) ->
       Cast (([], Int w, Ident ""), Constant (w, c))

src/GlobalNames.ml

@@ -221,12 +221,12 @@ let pascal_case name =
     done;
     Buffer.contents b
   else
-    String.uppercase_ascii (String.sub name 0 1) ^ 
+    String.uppercase_ascii (String.sub name 0 1) ^
     String.sub name 1 (String.length name - 1)
 
 let camel_case name =
   let name = pascal_case name in
-  String.lowercase_ascii (String.sub name 0 1) ^ 
+  String.lowercase_ascii (String.sub name 0 1) ^
   String.sub name 1 (String.length name - 1)
 
 let strip_leading_underscores name =
@@ -272,6 +272,7 @@ let target_c_name ~attempt_shortening ?(kind=Other) lid =
     else
       pre_name
   in
+  let formatted_name = if kind = Macro then String.uppercase_ascii formatted_name else formatted_name in
   formatted_name, non_modular_renaming
 
 let to_c_name ?kind m lid =