Merge pull request dropbox#259 from dropbox/AT/WIP/EnumFix

Fix enum compile issue in C++11

example/generated-src/objc/TXSSortItems+Private.mm

@@ -5,9 +5,9 @@
 #import "TXSSortItems.h"
 #import "DJICppWrapperCache+Private.h"
 #import "DJIError.h"
-#import "DJIMarshal+Private.h"
 #import "TXSItemList+Private.h"
 #import "TXSSortItems+Private.h"
+#import "TXSSortOrder+Private.h"
 #import "TXSTextboxListener+Private.h"
 #include <exception>
 #include <utility>

example/generated-src/objc/TXSSortOrder+Private.h

@@ -0,0 +1,6 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from example.djinni
+
+#include "sort_order.hpp"
+#import "DJIMarshal+Private.h"
+

src/source/ObjcppGenerator.scala

@@ -49,7 +49,11 @@ class ObjcppGenerator(spec: Spec) extends BaseObjcGenerator(spec) {
   private def arcAssert(w: IndentWriter) = w.wl("static_assert(__has_feature(objc_arc), " + q("Djinni requires ARC to be enabled for this file") + ");")
 
   override def generateEnum(origin: String, ident: Ident, doc: Doc, e: Enum) {
-    // No generation required
+    var imports = mutable.TreeSet[String]()
+    imports.add("#import " + q(spec.objcBaseLibIncludePrefix + "DJIMarshal+Private.h"))
+    imports.add("!#include " + q(spec.objcppIncludeCppPrefix + spec.cppFileIdentStyle(ident) + "." + spec.cppHeaderExt))
+
+    writeObjcFile(objcppMarshal.privateHeaderName(ident.name), origin, imports, w => {} )
   }
 
   def headerName(ident: String): String = idObjc.ty(ident) + "." + spec.objcHeaderExt

src/source/ObjcppMarshal.scala

@@ -34,9 +34,7 @@ class ObjcppMarshal(spec: Spec) extends Marshal(spec) {
     case o: MOpaque =>
       List(ImportRef(q(spec.objcBaseLibIncludePrefix + "DJIMarshal+Private.h")))
     case d: MDef => d.defType match {
-      case DEnum =>
-        List(ImportRef(q(spec.objcBaseLibIncludePrefix + "DJIMarshal+Private.h")))
-      case DInterface =>
+      case DEnum | DInterface =>
         List(ImportRef(include(m)))
       case DRecord =>
         val r = d.body.asInstanceOf[Record]
@@ -48,10 +46,7 @@ class ObjcppMarshal(spec: Spec) extends Marshal(spec) {
   }
 
   def include(m: Meta) = m match {
-    case d: MDef => d.defType match {
-      case DEnum => q(spec.objcBaseLibIncludePrefix + "DJIMarshal+Private.h")
-      case _ => q(spec.objcppIncludePrefix + privateHeaderName(d.name))
-    }
+    case d: MDef => q(spec.objcppIncludePrefix + privateHeaderName(d.name))
     case _ => throw new AssertionError("not applicable")
   }
 

test-suite/djinni/enum.djinni

@@ -11,6 +11,18 @@ color = enum {
 	violet;
 }
 
-opt_color_record = record {
-	my_color: optional<color>;
+enum_usage_record = record {
+    e: color;
+    o: optional<color>;
+    l: list<color>;
+    s: set<color>;
+    m: map<color, color>;
+}
+
+enum_usage_interface = interface +c +j +o {
+    e(e: color): color;
+    o(o: optional<color>): optional<color>;
+    l(l: list<color>): list<color>;
+    s(s: set<color>): set<color>;
+    m(m: map<color, color>): map<color, color>;
 }

test-suite/generated-src/cpp/assorted_primitives.hpp

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include "../../handwritten-src/cpp/optional.hpp"
 #include <cstdint>
-#include <experimental/optional>
 #include <utility>
 
 namespace testsuite {

test-suite/generated-src/cpp/client_interface.hpp

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include "../../handwritten-src/cpp/optional.hpp"
 #include <cstdint>
-#include <experimental/optional>
 #include <memory>
 #include <string>
 #include <vector>

test-suite/generated-src/cpp/client_returned_record.hpp

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include "../../handwritten-src/cpp/optional.hpp"
 #include <cstdint>
-#include <experimental/optional>
 #include <string>
 #include <utility>
 

test-suite/generated-src/cpp/constants.hpp

@@ -3,9 +3,9 @@
 
 #pragma once
 
+#include "../../handwritten-src/cpp/optional.hpp"
 #include "constant_record.hpp"
 #include <cstdint>
-#include <experimental/optional>
 #include <string>
 #include <utility>
 

test-suite/generated-src/cpp/constants_interface.hpp

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include "../../handwritten-src/cpp/optional.hpp"
 #include <cstdint>
-#include <experimental/optional>
 #include <string>
 
 namespace testsuite {

test-suite/generated-src/cpp/enum_usage_interface.hpp

@@ -0,0 +1,30 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#pragma once
+
+#include "../../handwritten-src/cpp/optional.hpp"
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
+namespace testsuite {
+
+enum class color;
+
+class EnumUsageInterface {
+public:
+    virtual ~EnumUsageInterface() {}
+
+    virtual color e(color e) = 0;
+
+    virtual std::experimental::optional<color> o(std::experimental::optional<color> o) = 0;
+
+    virtual std::vector<color> l(const std::vector<color> & l) = 0;
+
+    virtual std::unordered_set<color> s(const std::unordered_set<color> & s) = 0;
+
+    virtual std::unordered_map<color, color> m(const std::unordered_map<color, color> & m) = 0;
+};
+
+}  // namespace testsuite

test-suite/generated-src/cpp/enum_usage_record.hpp

@@ -0,0 +1,35 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#pragma once
+
+#include "../../handwritten-src/cpp/optional.hpp"
+#include "color.hpp"
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+#include <vector>
+
+namespace testsuite {
+
+struct EnumUsageRecord final {
+    color e;
+    std::experimental::optional<color> o;
+    std::vector<color> l;
+    std::unordered_set<color> s;
+    std::unordered_map<color, color> m;
+
+    EnumUsageRecord(color e_,
+                    std::experimental::optional<color> o_,
+                    std::vector<color> l_,
+                    std::unordered_set<color> s_,
+                    std::unordered_map<color, color> m_)
+    : e(std::move(e_))
+    , o(std::move(o_))
+    , l(std::move(l_))
+    , s(std::move(s_))
+    , m(std::move(m_))
+    {}
+};
+
+}  // namespace testsuite

test-suite/generated-src/cpp/reverse_client_interface.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <experimental/optional>
+#include "../../handwritten-src/cpp/optional.hpp"
 #include <memory>
 #include <string>
 

test-suite/generated-src/cpp/test_duration.hpp

@@ -3,9 +3,9 @@
 
 #pragma once
 
+#include "../../handwritten-src/cpp/optional.hpp"
 #include <chrono>
 #include <cstdint>
-#include <experimental/optional>
 #include <string>
 
 namespace testsuite {

test-suite/generated-src/cpp/test_helpers.hpp

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include "../../handwritten-src/cpp/optional.hpp"
 #include <cstdint>
-#include <experimental/optional>
 #include <memory>
 #include <string>
 #include <unordered_map>

test-suite/generated-src/java/com/dropbox/djinni/test/EnumUsageInterface.java

@@ -0,0 +1,92 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+package com.dropbox.djinni.test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+public abstract class EnumUsageInterface {
+    @Nonnull
+    public abstract Color e(@Nonnull Color e);
+
+    @CheckForNull
+    public abstract Color o(@CheckForNull Color o);
+
+    @Nonnull
+    public abstract ArrayList<Color> l(@Nonnull ArrayList<Color> l);
+
+    @Nonnull
+    public abstract HashSet<Color> s(@Nonnull HashSet<Color> s);
+
+    @Nonnull
+    public abstract HashMap<Color, Color> m(@Nonnull HashMap<Color, Color> m);
+
+    private static final class CppProxy extends EnumUsageInterface
+    {
+        private final long nativeRef;
+        private final AtomicBoolean destroyed = new AtomicBoolean(false);
+
+        private CppProxy(long nativeRef)
+        {
+            if (nativeRef == 0) throw new RuntimeException("nativeRef is zero");
+            this.nativeRef = nativeRef;
+        }
+
+        private native void nativeDestroy(long nativeRef);
+        public void destroy()
+        {
+            boolean destroyed = this.destroyed.getAndSet(true);
+            if (!destroyed) nativeDestroy(this.nativeRef);
+        }
+        protected void finalize() throws java.lang.Throwable
+        {
+            destroy();
+            super.finalize();
+        }
+
+        @Override
+        public Color e(Color e)
+        {
+            assert !this.destroyed.get() : "trying to use a destroyed object";
+            return native_e(this.nativeRef, e);
+        }
+        private native Color native_e(long _nativeRef, Color e);
+
+        @Override
+        public Color o(Color o)
+        {
+            assert !this.destroyed.get() : "trying to use a destroyed object";
+            return native_o(this.nativeRef, o);
+        }
+        private native Color native_o(long _nativeRef, Color o);
+
+        @Override
+        public ArrayList<Color> l(ArrayList<Color> l)
+        {
+            assert !this.destroyed.get() : "trying to use a destroyed object";
+            return native_l(this.nativeRef, l);
+        }
+        private native ArrayList<Color> native_l(long _nativeRef, ArrayList<Color> l);
+
+        @Override
+        public HashSet<Color> s(HashSet<Color> s)
+        {
+            assert !this.destroyed.get() : "trying to use a destroyed object";
+            return native_s(this.nativeRef, s);
+        }
+        private native HashSet<Color> native_s(long _nativeRef, HashSet<Color> s);
+
+        @Override
+        public HashMap<Color, Color> m(HashMap<Color, Color> m)
+        {
+            assert !this.destroyed.get() : "trying to use a destroyed object";
+            return native_m(this.nativeRef, m);
+        }
+        private native HashMap<Color, Color> native_m(long _nativeRef, HashMap<Color, Color> m);
+    }
+}