Support negative enumerators

Author: kornilova203

ir/Enum.cpp

@@ -1,14 +1,14 @@
 #include "Enum.h"
 #include <sstream>
 
-Enumerator::Enumerator(std::string name, uint64_t value)
+Enumerator::Enumerator(std::string name, int64_t value)
         : name(std::move(name)), value(value) {}
 
 std::string Enumerator::getName() {
     return name;
 }
 
-uint64_t Enumerator::getValue() {
+int64_t Enumerator::getValue() {
     return value;
 }
 
@@ -42,14 +42,14 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const Enum &e) {
         s << ": " << type
           << " = " << std::to_string(enumerator.getValue());
 
-        if (e.type == "native.CUnsignedInt") {
-            s << ".toUInt" << "\n";
+        if (e.type == "native.CLong") {
+            s << "L";
+        } else if (e.type == "native.CUnsignedInt") {
+            s << ".toUInt";
         } else if (e.type == "native.CUnsignedLong") {
-            s << "L.toULong" << "\n";
-        } else {
-            llvm::errs() << "Enum type is unsupported: " << e.type << "\n";
-            llvm::errs().flush();
+            s << "L.toULong";
         }
+        s << "\n";
     }
     return s;
 }

ir/Enum.h

@@ -9,15 +9,15 @@
 
 class Enumerator {
 public:
-    Enumerator(std::string name, uint64_t value);
+    Enumerator(std::string name, int64_t value);
 
     std::string getName();
 
-    uint64_t getValue();
+    int64_t getValue();
 
 private:
     std::string name;
-    uint64_t value;
+    int64_t value;
 };
 
 

tests/samples/Enum.h

@@ -9,10 +9,20 @@ enum days {
 };
 
 enum bigValues {
-    A = 10000000000, // does not fit into int
-    B = 1
+    BIG_A = 10000000000, // does not fit into int
+    BIG_B = 1
 };
 
 enum { // anonymous enum
-    C, D
+    ANON_A, ANON_B
+};
+
+enum negativeValues {
+    NEG_A = -1,
+    NEG_B = -2
+};
+
+enum bigNegativeValues {
+    BIG_NEG_A = -10000000000,
+    BIG_NEG_B = -1
 };

tests/samples/Enum.scala

@@ -7,6 +7,8 @@ import scala.scalanative.native.Nat._
 object Enum {
   type enum_days = native.CUnsignedInt
   type enum_bigValues = native.CUnsignedLong
+  type enum_negativeValues = native.CInt
+  type enum_bigNegativeValues = native.CLong
 }
 
 import Enum._
@@ -20,9 +22,15 @@ object EnumEnums {
   final val enum_days_SATURDAY: enum_days = 3.toUInt
   final val enum_days_SUNDAY: enum_days = 4.toUInt
 
-  final val enum_bigValues_A: enum_bigValues = 10000000000L.toULong
-  final val enum_bigValues_B: enum_bigValues = 1L.toULong
+  final val enum_bigValues_BIG_A: enum_bigValues = 10000000000L.toULong
+  final val enum_bigValues_BIG_B: enum_bigValues = 1L.toULong
 
-  final val enum_C: native.CUnsignedInt = 0.toUInt
-  final val enum_D: native.CUnsignedInt = 1.toUInt
+  final val enum_ANON_A: native.CUnsignedInt = 0.toUInt
+  final val enum_ANON_B: native.CUnsignedInt = 1.toUInt
+
+  final val enum_negativeValues_NEG_A: enum_negativeValues = -1
+  final val enum_negativeValues_NEG_B: enum_negativeValues = -2
+
+  final val enum_bigNegativeValues_BIG_NEG_A: enum_bigNegativeValues = -10000000000L
+  final val enum_bigNegativeValues_BIG_NEG_B: enum_bigNegativeValues = -1L
 }

visitor/TreeVisitor.cpp

@@ -63,8 +63,8 @@ bool TreeVisitor::VisitEnumDecl(clang::EnumDecl *enumdecl) {
     std::vector<Enumerator> enumerators;
 
     for (const clang::EnumConstantDecl *en : enumdecl->enumerators()) {
-        uint64_t value = en->getInitVal().getLimitedValue();
-        enumerators.push_back(Enumerator(en->getNameAsString(), value));
+        int64_t value = en->getInitVal().getSExtValue();
+        enumerators.emplace_back(en->getNameAsString(), value);
     }
 
     ir->addEnum(name, typeTranslator.Translate(enumdecl->getIntegerType()), enumerators);