Merge pull request #298 from LeDron12/master

enum typedef + enum constants printf
polystat · Aug 7, 2022 · 491d81a · 491d81a · 0pdd · Aug 7, 2022
2 parents 5d3951d + be6f4b6
commit 491d81a
Show file tree

Hide file tree

Showing 7 changed files with 118 additions and 66 deletions.
diff --git a/project/src/transpiler/CMakeLists.txt b/project/src/transpiler/CMakeLists.txt
@@ -17,55 +17,55 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 
 # Source files list
 set(SOURCE_FILES
-    # Headers
-    vardecl.h
-    analyzers.h
-    matchers.h
-    util.h
-    memory_manager.h
-    unit_transpiler.h
-    eo_object.h
-    function_manager.h
-    transpile_helper.h
-    recorddecl.h
-    record_manager.h
-    aliases.h
-    tracer.h
-    process_variables.h
-    enumdecl.h
-    enum_manager.h
+        # Headers
+        vardecl.h
+        analyzers.h
+        matchers.h
+        util.h
+        memory_manager.h
+        unit_transpiler.h
+        eo_object.h
+        function_manager.h
+        transpile_helper.h
+        recorddecl.h
+        record_manager.h
+        aliases.h
+        tracer.h
+        process_variables.h
+        enumdecl.h
+        enum_manager.h
 
-    # Sources
-    main.cpp
-    vardecl.cpp
-    analyzers.cpp
-    matchers.cpp
-    util.cpp
-    memory_manager.cpp
-    unit_transpiler.cpp
-    eo_object.cpp
-    function_manager.cpp
-    transpile_helper.cpp
-    recorddecl.cpp
-    record_manager.cpp
-    tracer.cpp
-    process_variables.cpp
-    enumdecl.cpp
-    enum_manager.cpp)
+        # Sources
+        main.cpp
+        vardecl.cpp
+        analyzers.cpp
+        matchers.cpp
+        util.cpp
+        memory_manager.cpp
+        unit_transpiler.cpp
+        eo_object.cpp
+        function_manager.cpp
+        transpile_helper.cpp
+        recorddecl.cpp
+        record_manager.cpp
+        tracer.cpp
+        process_variables.cpp
+        enumdecl.cpp
+        enum_manager.cpp)
 
 # add_executable(recvisitor main.cpp)
 add_executable(c2eo ${SOURCE_FILES})
 
 # llvm libraries
 target_link_libraries(c2eo
-                      clangAST
-                      clangASTMatchers
-                      clangBasic
-                      clangFrontend
-                      clangSerialization
-                      clangTooling
-                      LLVMSupport
-                      LLVMFrontendOpenMP)
+        clangAST
+        clangASTMatchers
+        clangBasic
+        clangFrontend
+        clangSerialization
+        clangTooling
+        LLVMSupport
+        LLVMFrontendOpenMP)
 
 set(LLVM_LINK_COMPONENTS
         Support)
diff --git a/project/src/transpiler/enum_manager.cpp b/project/src/transpiler/enum_manager.cpp
@@ -27,6 +27,11 @@
 EnumType EnumManager::Add(const clang::EnumDecl *id, std::string name,
                           size_t size,
                           const std::vector<EnumConstantType> &values) {
+  //    llvm::outs() << "enum " << name << "\n";
+  //    for (auto val : values) {
+  //        llvm::outs() << "enum const " << val.name << " " << val.value <<
+  //        "\n";
+  //    }
   EnumType enumType = {id, std::move(name), size, values};
   enum_types.push_back(enumType);
   return enumType;
@@ -44,3 +49,12 @@ EnumConstantType *EnumManager::GetConstantById(
   }
   return nullptr;
 }
+
+EnumType *EnumManager::GetById(const clang::EnumDecl *id) {
+  for (auto type = enum_types.begin(); type != enum_types.end(); type++) {
+    if (type->id == id) {
+      return type.base();
+    }
+  }
+  return nullptr;
+}
diff --git a/project/src/transpiler/enum_manager.h b/project/src/transpiler/enum_manager.h
@@ -56,6 +56,8 @@ class EnumManager {
 
   EnumConstantType *GetConstantById(const clang::EnumConstantDecl *id);
 
+  EnumType *GetById(const clang::EnumDecl *id);
+
   std::vector<EnumType> enum_types;
 };
 

diff --git a/project/src/transpiler/enumdecl.cpp b/project/src/transpiler/enumdecl.cpp
@@ -38,12 +38,18 @@ EnumType ProcessEnumDecl(const clang::EnumDecl *ED) {
   }
 
   extern UnitTranspiler transpiler;
-  //    if (transpiler.enum_manager_.GetById(ED)) {
-  //        return {};
-  //    }
+  if (transpiler.enum_manager_.GetById(ED) != nullptr) {
+    return {};
+  }
 
   std::vector<EnumConstantType> constants;
-  std::string enum_name = "en-" + ED->getNameAsString();
+  std::string enum_name = "en-";
+  try {
+    enum_name += ED->getNameAsString();
+  } catch (std::exception &) {
+    enum_name += "noname";
+  }
+
   uint64_t size = 0;
 
   for (auto decl = ED->decls_begin(); decl != ED->decls_end(); decl++) {

diff --git a/project/src/transpiler/transpile_helper.cpp b/project/src/transpiler/transpile_helper.cpp
@@ -31,6 +31,7 @@
 #include <utility>
 #include <vector>
 
+#include "src/transpiler/enumdecl.h"
 #include "src/transpiler/memory_manager.h"
 #include "src/transpiler/process_variables.h"
 #include "src/transpiler/recorddecl.h"
@@ -139,6 +140,8 @@ EOObject GetSwitchEOObject(const SwitchStmt *p_stmt);
 EOObject GetCaseCondEOObject(const vector<const Expr *> &all_cases,
                              const EOObject &switch_exp, size_t i);
 
+void AppendDeclStmt(const DeclStmt *stmt);
+
 extern UnitTranspiler transpiler;
 extern ASTContext *context;
 
@@ -366,6 +369,8 @@ EOObject GetStmtEOObject(const Stmt *stmt) {
     return GetFloatingLiteralEOObject(op);
   }
   if (stmt_class == Stmt::DeclStmtClass) {
+    const auto *op = dyn_cast<DeclStmt>(stmt);
+    AppendDeclStmt(op);
     return EOObject(EOObjectType::EO_EMPTY);
   }
   if (stmt_class == Stmt::CallExprClass) {
@@ -602,6 +607,15 @@ EOObject GetSwitchEOObject(const SwitchStmt *p_stmt) {
   return goto_object;
 }
 
+void AppendDeclStmt(const DeclStmt *stmt) {
+  for (auto *decl : stmt->decls()) {
+    if (decl->getKind() == Decl::Kind::Enum) {
+      auto *enum_decl = dyn_cast<clang::EnumDecl>(decl);
+      ProcessEnumDecl(enum_decl);
+    }
+  }
+}
+
 EOObject GetCaseCondEOObject(const vector<const Expr *> &all_cases,
                              const EOObject &switch_exp, size_t i) {
   EOObject eq_object{"eq"};

diff --git a/project/tests/main/enum/enum.c → project/tests/main/enum/enum01.c b/project/tests/main/enum/enum.c → project/tests/main/enum/enum01.c
@@ -1,28 +1,20 @@
 #include "stdio.h"
 
-enum numbers_1 {
-    ZERO,
-    ONE,
-    TWO
-};
+enum numbers_1 { ZERO, ONE, TWO };
 
-enum numbers_2 {
-    FIVE = 5,
-    TEN = 10,
-    FIFTEEN = 15
-};
+enum numbers_2 { FIVE = 5, TEN = 10, FIFTEEN = 15 };
 
 enum numbers_3 {
-    TWENTY_FIVE = 25,
-    TWENTY_SIX,
-    TWENTY_SEVEN,
-    TWENTY_FIVE_2 = TWENTY_FIVE,
-    TWENTY_SIX_2,
-    TWENTY_SEVEN_2,
-    TWENTY_FOUR = 24,
-    MINUS_FOUR = -4,
-    MINUS_THREE,
-    MINUS_TWO
+  TWENTY_FIVE = 25,
+  TWENTY_SIX,
+  TWENTY_SEVEN,
+  TWENTY_FIVE_2 = TWENTY_FIVE,
+  TWENTY_SIX_2,
+  TWENTY_SEVEN_2,
+  TWENTY_FOUR = 24,
+  MINUS_FOUR = -4,
+  MINUS_THREE,
+  MINUS_TWO
 };
 
 int main() {

diff --git a/project/tests/main/enum/enum02.c b/project/tests/main/enum/enum02.c
@@ -0,0 +1,24 @@
+#include <stdio.h>
+
+enum fred { a, b, c };
+
+int main() {
+  printf("%d\n", a);
+  printf("%d\n", b);
+  printf("%d\n", c);
+
+  enum fred d;
+
+  typedef enum { e, f, g } h;
+  printf("%d\n", e);
+  printf("%d\n", f);
+  printf("%d\n", g);
+
+  typedef enum { i, j, k } m;
+
+  printf("%d\n", i);
+  printf("%d\n", j);
+  printf("%d\n", k);
+
+  return 0;
+}