Merge pull request #37 from kornilova-l/fix-enums-values

Fix enums values

Author: kornilova203

ir/Enum.cpp

@@ -9,6 +9,10 @@ std::string Enumerator::getName() {
     return name;
 }
 
+uint64_t Enumerator::getValue() {
+    return value;
+}
+
 Enum::Enum(std::string name, std::vector<Enumerator> enumerators)
         : name(std::move(name)), enumerators(std::move(enumerators)) {}
 
@@ -22,15 +26,14 @@ TypeDef Enum::generateTypeDef() const {
 }
 
 llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const Enum &e) {
-    int i = 0;
     for (auto enumerator : e.enumerators) {
         std::string enumeratorName;
         if (!e.name.empty()) {
             enumeratorName = "enum_" + e.name + "_" + enumerator.getName();
         } else {
             enumeratorName = "enum_" + enumerator.getName();
         }
-        s << "  final val " << enumeratorName << " = " << std::to_string(i++) << "\n";
+        s << "  final val " << enumeratorName << " = " << std::to_string(enumerator.getValue()) << "\n";
     }
     return s;
 }

ir/Enum.h

@@ -13,6 +13,8 @@ class Enumerator {
 
     std::string getName();
 
+    uint64_t getValue();
+
 private:
     std::string name;
     uint64_t value;

ir/IR.cpp

@@ -68,9 +68,13 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const IR &ir) {
     if (!ir.enums.empty()) {
         s << "object " << ir.libName << "Enums {\n";
 
-        for (const auto &e : ir.enums) {
-            s << e
-              << "\n"; // space between groups of enums
+        unsigned long enumeratorsCount = ir.enums.size();
+        for (unsigned long i = 0; i < enumeratorsCount; i++) {
+            auto &e = ir.enums[i];
+            s << e;
+            if (i < enumeratorsCount - 1) {
+                s << "\n"; // space between groups of enums
+            }
         }
 
         s << "}\n\n";

tests/samples/Enum.h

@@ -0,0 +1,9 @@
+enum days {
+    MONDAY, // = 0
+    TUESDAY = 200,
+    WEDNESDAY, // = 201
+    THURSDAY = 4,
+    FRIDAY = 5,
+    SATURDAY = 3,
+    SUNDAY // = 4
+};

tests/samples/Enum.scala

@@ -0,0 +1,21 @@
+import scala.scalanative._
+import scala.scalanative.native._
+import scala.scalanative.native.Nat._
+
+@native.link("Enum")
+@native.extern
+object Enum {
+  type enum_days = native.CInt
+}
+
+import Enum._
+
+object EnumEnums {
+  final val enum_days_MONDAY = 0
+  final val enum_days_TUESDAY = 200
+  final val enum_days_WEDNESDAY = 201
+  final val enum_days_THURSDAY = 4
+  final val enum_days_FRIDAY = 5
+  final val enum_days_SATURDAY = 3
+  final val enum_days_SUNDAY = 4
+}

tests/samples/Typedef.scala

@@ -26,5 +26,4 @@ object TypedefEnums {
 
   final val enum_toggle_e_OFF = 0
   final val enum_toggle_e_ON = 1
-
 }

visitor/TreeVisitor.cpp

@@ -62,9 +62,9 @@ bool TreeVisitor::VisitEnumDecl(clang::EnumDecl *enumdecl) {
 
     std::vector<Enumerator> enumerators;
 
-    int i = 0;
     for (const clang::EnumConstantDecl *en : enumdecl->enumerators()) {
-        enumerators.push_back(Enumerator(en->getNameAsString(), static_cast<uint64_t>(i++)));
+        uint64_t value = en->getInitVal().getLimitedValue();
+        enumerators.push_back(Enumerator(en->getNameAsString(), value));
     }
 
     ir->addEnum(name, enumerators);