Fix underlying type of enums

Author: kornilova203

ir/Enum.cpp

@@ -13,16 +13,16 @@ uint64_t Enumerator::getValue() {
     return value;
 }
 
-Enum::Enum(std::string name, std::vector<Enumerator> enumerators)
-        : name(std::move(name)), enumerators(std::move(enumerators)) {}
+Enum::Enum(std::string name, std::string type, std::vector<Enumerator> enumerators)
+        : name(std::move(name)), type(std::move(type)), enumerators(std::move(enumerators)) {}
 
 bool Enum::isAnonymous() const {
     return name.empty();
 }
 
 TypeDef Enum::generateTypeDef() const {
     assert (!isAnonymous());
-    return TypeDef("enum_" + name, "native.CInt");
+    return TypeDef("enum_" + name, type);
 }
 
 llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const Enum &e) {

ir/Enum.h

@@ -23,7 +23,7 @@ class Enumerator {
 
 class Enum {
 public:
-    Enum(std::string name, std::vector<Enumerator> enumerators);
+    Enum(std::string name, std::string type, std::vector<Enumerator> enumerators);
 
     bool isAnonymous() const;
 
@@ -33,6 +33,7 @@ class Enum {
 
 private:
     std::string name; // might be empty
+    std::string type;
     std::vector<Enumerator> enumerators;
 };
 

ir/IR.cpp

@@ -17,8 +17,8 @@ void IR::addTypeDef(std::string name, std::string type) {
     typeDefs.push_back(TypeDef(std::move(name), std::move(type)));
 }
 
-void IR::addEnum(std::string name, std::vector<Enumerator> enumerators) {
-    enums.push_back(Enum(std::move(name), std::move(enumerators)));
+void IR::addEnum(std::string name, std::string type, std::vector<Enumerator> enumerators) {
+    enums.push_back(Enum(std::move(name), std::move(type), std::move(enumerators)));
 }
 
 void IR::addStruct(std::string name, std::vector<Field> fields, uint64_t typeSize) {

ir/IR.h

@@ -19,7 +19,7 @@ class IR {
 
     void addTypeDef(std::string name, std::string type);
 
-    void addEnum(std::string name, std::vector<Enumerator> enumerators);
+    void addEnum(std::string name, std::string type, std::vector<Enumerator> enumerators);
 
     void addStruct(std::string name, std::vector<Field> fields, uint64_t typeSize);
 

tests/samples/Enum.h

@@ -7,3 +7,8 @@ enum days {
     SATURDAY = 3,
     SUNDAY // = 4
 };
+
+enum bigValues {
+    A = 10000000000, // does not fit into int
+    B // 10000000001
+};

tests/samples/Enum.scala

@@ -5,7 +5,8 @@ import scala.scalanative.native.Nat._
 @native.link("Enum")
 @native.extern
 object Enum {
-  type enum_days = native.CInt
+  type enum_days = native.CUnsignedInt
+  type enum_bigValues = native.CUnsignedLong
 }
 
 import Enum._
@@ -18,4 +19,7 @@ object EnumEnums {
   final val enum_days_FRIDAY = 5
   final val enum_days_SATURDAY = 3
   final val enum_days_SUNDAY = 4
+
+  final val enum_bigValues_A = 10000000000
+  final val enum_bigValues_B = 10000000001
 }

visitor/TreeVisitor.cpp

@@ -67,7 +67,7 @@ bool TreeVisitor::VisitEnumDecl(clang::EnumDecl *enumdecl) {
         enumerators.push_back(Enumerator(en->getNameAsString(), value));
     }
 
-    ir->addEnum(name, enumerators);
+    ir->addEnum(name, typeTranslator.Translate(enumdecl->getIntegerType()), enumerators);
 
     return true;
 }