From 76ef1b292a4d86a0aa7cf248313b742895929e69 Mon Sep 17 00:00:00 2001
From: Alexis Glass <alexis@mutagene.net>
Date: Sun, 19 Nov 2023 13:21:06 +0100
Subject: [PATCH] Revert more enum changes which were not required

---
 .../expected/all_datatypes/cpp-headers/enum_data.hpp        | 4 ++--
 src/it/resources/expected/all_datatypes/cppcli/EnumData.hpp | 4 ++--
 .../expected/all_datatypes/objc-headers/ITEnumData.h        | 4 ++--
 .../expected/all_datatypes_json/cpp-headers/enum_data.hpp   | 4 ++--
 .../resources/expected/deprecation/cpp-headers/my_enum.hpp  | 4 ++--
 .../resources/expected/deprecation/objc-headers/ITMyEnum.h  | 4 ++--
 src/it/resources/expected/deprecation/ts/module.ts          | 4 ++--
 src/it/resources/expected/my_enum/cpp-headers/my_enum.hpp   | 6 +++---
 src/it/resources/expected/my_enum/cppcli/MyEnum.hpp         | 6 +++---
 src/it/resources/expected/my_enum/objc-headers/ITMyEnum.h   | 6 +++---
 src/main/scala/djinni/generator.scala                       | 4 +++-
 11 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/it/resources/expected/all_datatypes/cpp-headers/enum_data.hpp b/src/it/resources/expected/all_datatypes/cpp-headers/enum_data.hpp
index c923eeda..0e3f8b72 100644
--- a/src/it/resources/expected/all_datatypes/cpp-headers/enum_data.hpp
+++ b/src/it/resources/expected/all_datatypes/cpp-headers/enum_data.hpp
@@ -6,8 +6,8 @@
 #include <functional>
 
 enum class EnumData : int {
-    A = 0,
-    B = 1,
+    A,
+    B,
 };
 
 namespace std {
diff --git a/src/it/resources/expected/all_datatypes/cppcli/EnumData.hpp b/src/it/resources/expected/all_datatypes/cppcli/EnumData.hpp
index 8f1758cd..46f80147 100644
--- a/src/it/resources/expected/all_datatypes/cppcli/EnumData.hpp
+++ b/src/it/resources/expected/all_datatypes/cppcli/EnumData.hpp
@@ -6,6 +6,6 @@
 #include "../cpp-headers/enum_data.hpp"
 
 public enum class EnumData {
-    A = 0,
-    B = 1,
+    A,
+    B,
 };
diff --git a/src/it/resources/expected/all_datatypes/objc-headers/ITEnumData.h b/src/it/resources/expected/all_datatypes/objc-headers/ITEnumData.h
index 4f8625b9..b90b0b83 100644
--- a/src/it/resources/expected/all_datatypes/objc-headers/ITEnumData.h
+++ b/src/it/resources/expected/all_datatypes/objc-headers/ITEnumData.h
@@ -5,6 +5,6 @@
 
 typedef NS_ENUM(NSInteger, ITEnumData)
 {
-    ITEnumDataA = 0,
-    ITEnumDataB = 1,
+    ITEnumDataA,
+    ITEnumDataB,
 };
diff --git a/src/it/resources/expected/all_datatypes_json/cpp-headers/enum_data.hpp b/src/it/resources/expected/all_datatypes_json/cpp-headers/enum_data.hpp
index 2d35337b..caaf7d49 100644
--- a/src/it/resources/expected/all_datatypes_json/cpp-headers/enum_data.hpp
+++ b/src/it/resources/expected/all_datatypes_json/cpp-headers/enum_data.hpp
@@ -6,8 +6,8 @@
 #include <functional>
 
 enum class EnumData : int {
-    FIRSTENUMVALUE = 0,
-    SECONDENUMVALUE = 1,
+    FIRSTENUMVALUE,
+    SECONDENUMVALUE,
 };
 
 namespace std {
diff --git a/src/it/resources/expected/deprecation/cpp-headers/my_enum.hpp b/src/it/resources/expected/deprecation/cpp-headers/my_enum.hpp
index a4610be5..3215ddce 100644
--- a/src/it/resources/expected/deprecation/cpp-headers/my_enum.hpp
+++ b/src/it/resources/expected/deprecation/cpp-headers/my_enum.hpp
@@ -12,9 +12,9 @@
  */
 enum class [[deprecated("Use something else")]] MyEnum : int {
     /** @deprecated Use something else */
-    OPTION1 = 0,
+    OPTION1,
     /** not deprecated */
-    OPTION2 = 1,
+    OPTION2,
 };
 
 namespace std {
diff --git a/src/it/resources/expected/deprecation/objc-headers/ITMyEnum.h b/src/it/resources/expected/deprecation/objc-headers/ITMyEnum.h
index 18affa09..a251be4d 100644
--- a/src/it/resources/expected/deprecation/objc-headers/ITMyEnum.h
+++ b/src/it/resources/expected/deprecation/objc-headers/ITMyEnum.h
@@ -12,7 +12,7 @@
 typedef NS_ENUM(NSInteger, ITMyEnum)
 {
     /** @deprecated Use something else */
-    ITMyEnumOption1 = 0,
+    ITMyEnumOption1,
     /** not deprecated */
-    ITMyEnumOption2 = 1,
+    ITMyEnumOption2,
 };
diff --git a/src/it/resources/expected/deprecation/ts/module.ts b/src/it/resources/expected/deprecation/ts/module.ts
index 024240e9..c8e4a7b6 100644
--- a/src/it/resources/expected/deprecation/ts/module.ts
+++ b/src/it/resources/expected/deprecation/ts/module.ts
@@ -9,9 +9,9 @@
  */
 export enum MyEnum {
     /** @deprecated Use something else */
-    OPTION1 = 0,
+    OPTION1,
     /** not deprecated */
-    OPTION2 = 1,
+    OPTION2,
 }
 
 /**
diff --git a/src/it/resources/expected/my_enum/cpp-headers/my_enum.hpp b/src/it/resources/expected/my_enum/cpp-headers/my_enum.hpp
index 582373b8..c1a4a8d1 100644
--- a/src/it/resources/expected/my_enum/cpp-headers/my_enum.hpp
+++ b/src/it/resources/expected/my_enum/cpp-headers/my_enum.hpp
@@ -8,9 +8,9 @@
 /** enum comment */
 enum class MyEnum : int {
     /** enum option comment */
-    OPTION1 = 0,
-    OPTION2 = 1,
-    OPTION3 = 2,
+    OPTION1,
+    OPTION2,
+    OPTION3,
 };
 
 namespace std {
diff --git a/src/it/resources/expected/my_enum/cppcli/MyEnum.hpp b/src/it/resources/expected/my_enum/cppcli/MyEnum.hpp
index e2bb4043..9c333bc7 100644
--- a/src/it/resources/expected/my_enum/cppcli/MyEnum.hpp
+++ b/src/it/resources/expected/my_enum/cppcli/MyEnum.hpp
@@ -8,7 +8,7 @@
 /** enum comment */
 public enum class MyEnum {
     /** enum option comment */
-    Option1 = 0,
-    Option2 = 1,
-    Option3 = 2,
+    Option1,
+    Option2,
+    Option3,
 };
diff --git a/src/it/resources/expected/my_enum/objc-headers/ITMyEnum.h b/src/it/resources/expected/my_enum/objc-headers/ITMyEnum.h
index b06f44d6..0d34da00 100644
--- a/src/it/resources/expected/my_enum/objc-headers/ITMyEnum.h
+++ b/src/it/resources/expected/my_enum/objc-headers/ITMyEnum.h
@@ -7,7 +7,7 @@
 typedef NS_ENUM(NSInteger, ITMyEnum)
 {
     /** enum option comment */
-    ITMyEnumOption1 = 0,
-    ITMyEnumOption2 = 1,
-    ITMyEnumOption3 = 2,
+    ITMyEnumOption1,
+    ITMyEnumOption2,
+    ITMyEnumOption3,
 };
diff --git a/src/main/scala/djinni/generator.scala b/src/main/scala/djinni/generator.scala
index 78ee4fb0..08d15663 100644
--- a/src/main/scala/djinni/generator.scala
+++ b/src/main/scala/djinni/generator.scala
@@ -780,7 +780,9 @@ abstract class Generator(spec: Spec) {
       writeDoc(w, o.doc)
       w.wl(
         ident(o.ident.name) + (if (e.flags) s" $delim 1$optionSuffix << $shift"
-                               else s" $delim $shift") + ","
+                               else if (delim != "=") s" $delim $shift"
+                               else "")
+          + ","
       )
       shift += 1
     }