Add types to enumerators

Author: kornilova203

ir/Enum.cpp

@@ -1,6 +1,5 @@
 #include "Enum.h"
 #include <sstream>
-#include <cassert>
 
 Enumerator::Enumerator(std::string name, uint64_t value)
         : name(std::move(name)), value(value) {}
@@ -22,18 +21,40 @@ bool Enum::isAnonymous() const {
 
 TypeDef Enum::generateTypeDef() const {
     assert (!isAnonymous());
-    return TypeDef("enum_" + name, type);
+    return TypeDef(getTypeName(), type);
 }
 
 llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const Enum &e) {
     for (auto enumerator : e.enumerators) {
         std::string enumeratorName;
         if (!e.name.empty()) {
-            enumeratorName = "enum_" + e.name + "_" + enumerator.getName();
+            enumeratorName = e.getTypeName() + "_" + enumerator.getName();
         } else {
             enumeratorName = "enum_" + enumerator.getName();
         }
-        s << "  final val " << enumeratorName << " = " << std::to_string(enumerator.getValue()) << "\n";
+        s << "  final val " << enumeratorName;
+        std::string type;
+        if (e.isAnonymous()) {
+            type = e.type;
+        } else {
+            type = e.getTypeName();
+        }
+        s << ": " << type
+          << " = " << std::to_string(enumerator.getValue());
+
+        if (e.type == "native.CUnsignedInt") {
+            s << ".toUInt" << "\n";
+        } else if (e.type == "native.CUnsignedLong") {
+            s << "L.toULong" << "\n";
+        } else {
+            llvm::errs() << "Enum type is unsupported: " << e.type << "\n";
+            llvm::errs().flush();
+        }
     }
     return s;
 }
+
+std::string Enum::getTypeName() const {
+    assert(!isAnonymous());
+    return "enum_" + name;
+}

ir/Enum.h

@@ -29,6 +29,8 @@ class Enum {
 
     TypeDef generateTypeDef() const;
 
+    std::string getTypeName() const;
+
     friend llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const Enum &e);
 
 private:

tests/samples/Enum.h

@@ -10,5 +10,9 @@ enum days {
 
 enum bigValues {
     A = 10000000000, // does not fit into int
-    B // 10000000001
+    B = 1
+};
+
+enum { // anonymous enum
+    C, D
 };

tests/samples/Enum.scala

@@ -12,14 +12,17 @@ object Enum {
 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
+  final val enum_days_MONDAY: enum_days = 0.toUInt
+  final val enum_days_TUESDAY: enum_days = 200.toUInt
+  final val enum_days_WEDNESDAY: enum_days = 201.toUInt
+  final val enum_days_THURSDAY: enum_days = 4.toUInt
+  final val enum_days_FRIDAY: enum_days = 5.toUInt
+  final val enum_days_SATURDAY: enum_days = 3.toUInt
+  final val enum_days_SUNDAY: enum_days = 4.toUInt
 
-  final val enum_bigValues_A = 10000000000
-  final val enum_bigValues_B = 10000000001
+  final val enum_bigValues_A: enum_bigValues = 10000000000L.toULong
+  final val enum_bigValues_B: enum_bigValues = 1L.toULong
+
+  final val enum_C: native.CUnsignedInt = 0.toUInt
+  final val enum_D: native.CUnsignedInt = 1.toUInt
 }

tests/samples/Typedef.scala

@@ -9,21 +9,21 @@ object Typedef {
   type int2int = native.CFunctionPtr1[native.CInt, native.CInt]
   type day2string = native.CFunctionPtr1[enum_days, native.CString]
   type toggle = native.CFunctionPtr1[toggle_e, Unit]
-  type enum_days = native.CInt
-  type enum_toggle_e = native.CInt
+  type enum_days = native.CUnsignedInt
+  type enum_toggle_e = native.CUnsignedInt
 }
 
 import Typedef._
 
 object TypedefEnums {
-  final val enum_days_MONDAY = 0
-  final val enum_days_TUESDAY = 1
-  final val enum_days_WEDNESDAY = 2
-  final val enum_days_THURSDAY = 3
-  final val enum_days_FRIDAY = 4
-  final val enum_days_SATURDAY = 5
-  final val enum_days_SUNDAY = 6
+  final val enum_days_MONDAY: enum_days = 0.toUInt
+  final val enum_days_TUESDAY: enum_days = 1.toUInt
+  final val enum_days_WEDNESDAY: enum_days = 2.toUInt
+  final val enum_days_THURSDAY: enum_days = 3.toUInt
+  final val enum_days_FRIDAY: enum_days = 4.toUInt
+  final val enum_days_SATURDAY: enum_days = 5.toUInt
+  final val enum_days_SUNDAY: enum_days = 6.toUInt
 
-  final val enum_toggle_e_OFF = 0
-  final val enum_toggle_e_ON = 1
+  final val enum_toggle_e_OFF: enum_toggle_e = 0.toUInt
+  final val enum_toggle_e_ON: enum_toggle_e = 1.toUInt
 }