Translate anonymous enums

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -2606,7 +2606,7 @@ bool Converter::VisitEnumDecl(clang::EnumDecl *decl) {
   }
   Mapper::AddRuleForUserDefinedType(decl);
   StrCat("#[derive(Clone, Copy, PartialEq, Debug, Default)]");
-  StrCat(std::format("enum {}", Mapper::Map(ctx_.getCanonicalTagType(decl))));
+  StrCat(std::format("enum {}", GetRecordName(decl)));
   StrCat("{");
   bool first_enumerator = true;
   for (auto e : decl->enumerators()) {

cpp2rust/converter/mapper.cpp

@@ -736,6 +736,12 @@ std::string ToString(const clang::NamedDecl *decl) {
     return synthesizeAnonRecordName(record);
   }
 
+  if (auto *enum_decl = clang::dyn_cast<clang::EnumDecl>(decl);
+      enum_decl && !enum_decl->getIdentifier() &&
+      enum_decl->getTypedefNameForAnonDecl() == nullptr) {
+    return std::format("anon_enum_{}", GetLineNumber(enum_decl));
+  }
+
   std::string out;
   llvm::raw_string_ostream os(out);
 

tests/unit/anonymous-enum.cpp

@@ -0,0 +1,21 @@
+enum {
+  FIRST_A,
+  FIRST_B,
+};
+
+struct S {
+  int a;
+
+  enum {
+    SECOND_A,
+    SECOND_B,
+  };
+};
+
+int main() {
+  enum {
+    THIRD_A,
+    THIRD_B,
+  };
+  return 0;
+};

tests/unit/out/refcount/anonymous-enum.rs

@@ -0,0 +1,45 @@
+extern crate libcc2rs;
+use libcc2rs::*;
+use std::cell::RefCell;
+use std::collections::BTreeMap;
+use std::io::prelude::*;
+use std::io::{Read, Seek, Write};
+use std::os::fd::AsFd;
+use std::rc::{Rc, Weak};
+#[derive(Clone, Copy, PartialEq, Debug, Default)]
+enum anon_enum_1 {
+    #[default]
+    FIRST_A = 0,
+    FIRST_B = 1,
+}
+#[derive(Clone, Copy, PartialEq, Debug, Default)]
+enum anon_enum_9 {
+    #[default]
+    SECOND_A = 0,
+    SECOND_B = 1,
+}
+#[derive(Default)]
+pub struct S {
+    pub a: Value<i32>,
+}
+impl Clone for S {
+    fn clone(&self) -> Self {
+        let mut this = Self {
+            a: Rc::new(RefCell::new((*self.a.borrow()))),
+        };
+        this
+    }
+}
+impl ByteRepr for S {}
+pub fn main() {
+    std::process::exit(main_0());
+}
+fn main_0() -> i32 {
+    #[derive(Clone, Copy, PartialEq, Debug, Default)]
+    enum anon_enum_16 {
+        #[default]
+        THIRD_A = 0,
+        THIRD_B = 1,
+    };
+    return 0;
+}

tests/unit/out/unsafe/anonymous-enum.rs

@@ -0,0 +1,39 @@
+extern crate libc;
+use libc::*;
+extern crate libcc2rs;
+use libcc2rs::*;
+use std::collections::BTreeMap;
+use std::io::{Read, Seek, Write};
+use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
+use std::rc::Rc;
+#[derive(Clone, Copy, PartialEq, Debug, Default)]
+enum anon_enum_1 {
+    #[default]
+    FIRST_A = 0,
+    FIRST_B = 1,
+}
+#[derive(Clone, Copy, PartialEq, Debug, Default)]
+enum anon_enum_9 {
+    #[default]
+    SECOND_A = 0,
+    SECOND_B = 1,
+}
+#[repr(C)]
+#[derive(Copy, Clone, Default)]
+pub struct S {
+    pub a: i32,
+}
+pub fn main() {
+    unsafe {
+        std::process::exit(main_0() as i32);
+    }
+}
+unsafe fn main_0() -> i32 {
+    #[derive(Clone, Copy, PartialEq, Debug, Default)]
+    enum anon_enum_16 {
+        #[default]
+        THIRD_A = 0,
+        THIRD_B = 1,
+    };
+    return 0;
+}