Fix enum names

Dominaezzz · Dominaezzz · commit f42f5a087c50 · 2020-06-08T17:30:39.000+01:00
diff --git a/codegen/src/main/kotlin/Main.kt b/codegen/src/main/kotlin/Main.kt
@@ -247,7 +247,7 @@ fun main(args: Array<String>) {
 		val lookUpTable = CodeBlock.builder()
 
 		for (enumValue in entries) {
-			val enumValueNameKt = enumValue.name.removePrefix(enumName)
+			val enumValueNameKt = enumValue.name.substringAfter('_')
 			check(enumValue.name != enumValueNameKt) { "Could not remove prefix $enumName from ${enumValue.name}" }
 
 			if (isBitmask) {
diff --git a/imgui/src/commonMain/generated/com/imgui/ImGuiAxis.kt b/imgui/src/commonMain/generated/com/imgui/ImGuiAxis.kt
@@ -1,11 +1,11 @@
 package com.imgui
 
 expect enum class ImGuiAxis {
-  _None,
+  None,
 
-  _X,
+  X,
 
-  _Y;
+  Y;
 
   companion object
 }
diff --git a/imgui/src/commonMain/generated/com/imgui/ImGuiInputReadMode.kt b/imgui/src/commonMain/generated/com/imgui/ImGuiInputReadMode.kt
@@ -1,17 +1,17 @@
 package com.imgui
 
 expect enum class ImGuiInputReadMode {
-  _Down,
+  Down,
 
-  _Pressed,
+  Pressed,
 
-  _Released,
+  Released,
 
-  _Repeat,
+  Repeat,
 
-  _RepeatSlow,
+  RepeatSlow,
 
-  _RepeatFast;
+  RepeatFast;
 
   companion object
 }
diff --git a/imgui/src/commonMain/generated/com/imgui/ImGuiInputSource.kt b/imgui/src/commonMain/generated/com/imgui/ImGuiInputSource.kt
@@ -1,17 +1,15 @@
 package com.imgui
 
 expect enum class ImGuiInputSource {
-  _None,
+  None,
 
-  _Mouse,
+  Mouse,
 
-  _Nav,
+  Nav,
 
-  _NavKeyboard,
+  NavKeyboard,
 
-  _NavGamepad,
-
-  _COUNT;
+  NavGamepad;
 
   companion object
 }
diff --git a/imgui/src/commonMain/generated/com/imgui/ImGuiLogType.kt b/imgui/src/commonMain/generated/com/imgui/ImGuiLogType.kt
@@ -1,15 +1,15 @@
 package com.imgui
 
 expect enum class ImGuiLogType {
-  _None,
+  None,
 
-  _TTY,
+  TTY,
 
-  _File,
+  File,
 
-  _Buffer,
+  Buffer,
 
-  _Clipboard;
+  Clipboard;
 
   companion object
 }
diff --git a/imgui/src/commonMain/generated/com/imgui/ImGuiNavForward.kt b/imgui/src/commonMain/generated/com/imgui/ImGuiNavForward.kt
@@ -1,11 +1,11 @@
 package com.imgui
 
 expect enum class ImGuiNavForward {
-  _None,
+  None,
 
-  _ForwardQueued,
+  ForwardQueued,
 
-  _ForwardActive;
+  ForwardActive;
 
   companion object
 }
diff --git a/imgui/src/commonMain/generated/com/imgui/ImGuiNavLayer.kt b/imgui/src/commonMain/generated/com/imgui/ImGuiNavLayer.kt
@@ -1,11 +1,9 @@
 package com.imgui
 
 expect enum class ImGuiNavLayer {
-  _Main,
+  Main,
 
-  _Menu,
-
-  _COUNT;
+  Menu;
 
   companion object
 }
diff --git a/imgui/src/commonMain/generated/com/imgui/ImGuiPlotType.kt b/imgui/src/commonMain/generated/com/imgui/ImGuiPlotType.kt
@@ -1,9 +1,9 @@
 package com.imgui
 
 expect enum class ImGuiPlotType {
-  _Lines,
+  Lines,
 
-  _Histogram;
+  Histogram;
 
   companion object
 }
diff --git a/imgui/src/commonMain/generated/com/imgui/ImGuiPopupPositionPolicy.kt b/imgui/src/commonMain/generated/com/imgui/ImGuiPopupPositionPolicy.kt
@@ -1,9 +1,9 @@
 package com.imgui
 
 expect enum class ImGuiPopupPositionPolicy {
-  _Default,
+  Default,
 
-  _ComboBox;
+  ComboBox;
 
   companion object
 }
diff --git a/imgui/src/jvmMain/generated/com/imgui/ImGuiAxis.kt b/imgui/src/jvmMain/generated/com/imgui/ImGuiAxis.kt
@@ -8,17 +8,17 @@ import kotlin.Int
 actual enum class ImGuiAxis(
   val value: Int
 ) {
-  _None(ImGuiAxis_None),
+  None(ImGuiAxis_None),
 
-  _X(ImGuiAxis_X),
+  X(ImGuiAxis_X),
 
-  _Y(ImGuiAxis_Y);
+  Y(ImGuiAxis_Y);
 
   actual companion object {
     fun from(value: Int): ImGuiAxis = when (value) {
-      ImGuiAxis_None -> _None
-      ImGuiAxis_X -> _X
-      ImGuiAxis_Y -> _Y
+      ImGuiAxis_None -> None
+      ImGuiAxis_X -> X
+      ImGuiAxis_Y -> Y
       else -> throw NoSuchElementException("""Unknown enum constant $value""")
     }
   }
diff --git a/imgui/src/jvmMain/generated/com/imgui/ImGuiInputReadMode.kt b/imgui/src/jvmMain/generated/com/imgui/ImGuiInputReadMode.kt
@@ -11,26 +11,26 @@ import kotlin.Int
 actual enum class ImGuiInputReadMode(
   val value: Int
 ) {
-  _Down(ImGuiInputReadMode_Down),
+  Down(ImGuiInputReadMode_Down),
 
-  _Pressed(ImGuiInputReadMode_Pressed),
+  Pressed(ImGuiInputReadMode_Pressed),
 
-  _Released(ImGuiInputReadMode_Released),
+  Released(ImGuiInputReadMode_Released),
 
-  _Repeat(ImGuiInputReadMode_Repeat),
+  Repeat(ImGuiInputReadMode_Repeat),
 
-  _RepeatSlow(ImGuiInputReadMode_RepeatSlow),
+  RepeatSlow(ImGuiInputReadMode_RepeatSlow),
 
-  _RepeatFast(ImGuiInputReadMode_RepeatFast);
+  RepeatFast(ImGuiInputReadMode_RepeatFast);
 
   actual companion object {
     fun from(value: Int): ImGuiInputReadMode = when (value) {
-      ImGuiInputReadMode_Down -> _Down
-      ImGuiInputReadMode_Pressed -> _Pressed
-      ImGuiInputReadMode_Released -> _Released
-      ImGuiInputReadMode_Repeat -> _Repeat
-      ImGuiInputReadMode_RepeatSlow -> _RepeatSlow
-      ImGuiInputReadMode_RepeatFast -> _RepeatFast
+      ImGuiInputReadMode_Down -> Down
+      ImGuiInputReadMode_Pressed -> Pressed
+      ImGuiInputReadMode_Released -> Released
+      ImGuiInputReadMode_Repeat -> Repeat
+      ImGuiInputReadMode_RepeatSlow -> RepeatSlow
+      ImGuiInputReadMode_RepeatFast -> RepeatFast
       else -> throw NoSuchElementException("""Unknown enum constant $value""")
     }
   }
diff --git a/imgui/src/jvmMain/generated/com/imgui/ImGuiInputSource.kt b/imgui/src/jvmMain/generated/com/imgui/ImGuiInputSource.kt
@@ -1,6 +1,5 @@
 package com.imgui
 
-import cimgui.internal.ImGuiInputSource.ImGuiInputSource_COUNT
 import cimgui.internal.ImGuiInputSource.ImGuiInputSource_Mouse
 import cimgui.internal.ImGuiInputSource.ImGuiInputSource_Nav
 import cimgui.internal.ImGuiInputSource.ImGuiInputSource_NavGamepad
@@ -11,26 +10,23 @@ import kotlin.Int
 actual enum class ImGuiInputSource(
   val value: Int
 ) {
-  _None(ImGuiInputSource_None),
+  None(ImGuiInputSource_None),
 
-  _Mouse(ImGuiInputSource_Mouse),
+  Mouse(ImGuiInputSource_Mouse),
 
-  _Nav(ImGuiInputSource_Nav),
+  Nav(ImGuiInputSource_Nav),
 
-  _NavKeyboard(ImGuiInputSource_NavKeyboard),
+  NavKeyboard(ImGuiInputSource_NavKeyboard),
 
-  _NavGamepad(ImGuiInputSource_NavGamepad),
-
-  _COUNT(ImGuiInputSource_COUNT);
+  NavGamepad(ImGuiInputSource_NavGamepad);
 
   actual companion object {
     fun from(value: Int): ImGuiInputSource = when (value) {
-      ImGuiInputSource_None -> _None
-      ImGuiInputSource_Mouse -> _Mouse
-      ImGuiInputSource_Nav -> _Nav
-      ImGuiInputSource_NavKeyboard -> _NavKeyboard
-      ImGuiInputSource_NavGamepad -> _NavGamepad
-      ImGuiInputSource_COUNT -> _COUNT
+      ImGuiInputSource_None -> None
+      ImGuiInputSource_Mouse -> Mouse
+      ImGuiInputSource_Nav -> Nav
+      ImGuiInputSource_NavKeyboard -> NavKeyboard
+      ImGuiInputSource_NavGamepad -> NavGamepad
       else -> throw NoSuchElementException("""Unknown enum constant $value""")
     }
   }
diff --git a/imgui/src/jvmMain/generated/com/imgui/ImGuiLogType.kt b/imgui/src/jvmMain/generated/com/imgui/ImGuiLogType.kt
@@ -10,23 +10,23 @@ import kotlin.Int
 actual enum class ImGuiLogType(
   val value: Int
 ) {
-  _None(ImGuiLogType_None),
+  None(ImGuiLogType_None),
 
-  _TTY(ImGuiLogType_TTY),
+  TTY(ImGuiLogType_TTY),
 
-  _File(ImGuiLogType_File),
+  File(ImGuiLogType_File),
 
-  _Buffer(ImGuiLogType_Buffer),
+  Buffer(ImGuiLogType_Buffer),
 
-  _Clipboard(ImGuiLogType_Clipboard);
+  Clipboard(ImGuiLogType_Clipboard);
 
   actual companion object {
     fun from(value: Int): ImGuiLogType = when (value) {
-      ImGuiLogType_None -> _None
-      ImGuiLogType_TTY -> _TTY
-      ImGuiLogType_File -> _File
-      ImGuiLogType_Buffer -> _Buffer
-      ImGuiLogType_Clipboard -> _Clipboard
+      ImGuiLogType_None -> None
+      ImGuiLogType_TTY -> TTY
+      ImGuiLogType_File -> File
+      ImGuiLogType_Buffer -> Buffer
+      ImGuiLogType_Clipboard -> Clipboard
       else -> throw NoSuchElementException("""Unknown enum constant $value""")
     }
   }
diff --git a/imgui/src/jvmMain/generated/com/imgui/ImGuiNavForward.kt b/imgui/src/jvmMain/generated/com/imgui/ImGuiNavForward.kt
@@ -8,17 +8,17 @@ import kotlin.Int
 actual enum class ImGuiNavForward(
   val value: Int
 ) {
-  _None(ImGuiNavForward_None),
+  None(ImGuiNavForward_None),
 
-  _ForwardQueued(ImGuiNavForward_ForwardQueued),
+  ForwardQueued(ImGuiNavForward_ForwardQueued),
 
-  _ForwardActive(ImGuiNavForward_ForwardActive);
+  ForwardActive(ImGuiNavForward_ForwardActive);
 
   actual companion object {
     fun from(value: Int): ImGuiNavForward = when (value) {
-      ImGuiNavForward_None -> _None
-      ImGuiNavForward_ForwardQueued -> _ForwardQueued
-      ImGuiNavForward_ForwardActive -> _ForwardActive
+      ImGuiNavForward_None -> None
+      ImGuiNavForward_ForwardQueued -> ForwardQueued
+      ImGuiNavForward_ForwardActive -> ForwardActive
       else -> throw NoSuchElementException("""Unknown enum constant $value""")
     }
   }
diff --git a/imgui/src/jvmMain/generated/com/imgui/ImGuiNavLayer.kt b/imgui/src/jvmMain/generated/com/imgui/ImGuiNavLayer.kt
@@ -1,24 +1,20 @@
 package com.imgui
 
-import cimgui.internal.ImGuiNavLayer.ImGuiNavLayer_COUNT
 import cimgui.internal.ImGuiNavLayer.ImGuiNavLayer_Main
 import cimgui.internal.ImGuiNavLayer.ImGuiNavLayer_Menu
 import kotlin.Int
 
 actual enum class ImGuiNavLayer(
   val value: Int
 ) {
-  _Main(ImGuiNavLayer_Main),
+  Main(ImGuiNavLayer_Main),
 
-  _Menu(ImGuiNavLayer_Menu),
-
-  _COUNT(ImGuiNavLayer_COUNT);
+  Menu(ImGuiNavLayer_Menu);
 
   actual companion object {
     fun from(value: Int): ImGuiNavLayer = when (value) {
-      ImGuiNavLayer_Main -> _Main
-      ImGuiNavLayer_Menu -> _Menu
-      ImGuiNavLayer_COUNT -> _COUNT
+      ImGuiNavLayer_Main -> Main
+      ImGuiNavLayer_Menu -> Menu
       else -> throw NoSuchElementException("""Unknown enum constant $value""")
     }
   }
diff --git a/imgui/src/jvmMain/generated/com/imgui/ImGuiPlotType.kt b/imgui/src/jvmMain/generated/com/imgui/ImGuiPlotType.kt
@@ -7,14 +7,14 @@ import kotlin.Int
 actual enum class ImGuiPlotType(
   val value: Int
 ) {
-  _Lines(ImGuiPlotType_Lines),
+  Lines(ImGuiPlotType_Lines),
 
-  _Histogram(ImGuiPlotType_Histogram);
+  Histogram(ImGuiPlotType_Histogram);
 
   actual companion object {
     fun from(value: Int): ImGuiPlotType = when (value) {
-      ImGuiPlotType_Lines -> _Lines
-      ImGuiPlotType_Histogram -> _Histogram
+      ImGuiPlotType_Lines -> Lines
+      ImGuiPlotType_Histogram -> Histogram
       else -> throw NoSuchElementException("""Unknown enum constant $value""")
     }
   }
diff --git a/imgui/src/jvmMain/generated/com/imgui/ImGuiPopupPositionPolicy.kt b/imgui/src/jvmMain/generated/com/imgui/ImGuiPopupPositionPolicy.kt
@@ -7,14 +7,14 @@ import kotlin.Int
 actual enum class ImGuiPopupPositionPolicy(
   val value: Int
 ) {
-  _Default(ImGuiPopupPositionPolicy_Default),
+  Default(ImGuiPopupPositionPolicy_Default),
 
-  _ComboBox(ImGuiPopupPositionPolicy_ComboBox);
+  ComboBox(ImGuiPopupPositionPolicy_ComboBox);
 
   actual companion object {
     fun from(value: Int): ImGuiPopupPositionPolicy = when (value) {
-      ImGuiPopupPositionPolicy_Default -> _Default
-      ImGuiPopupPositionPolicy_ComboBox -> _ComboBox
+      ImGuiPopupPositionPolicy_Default -> Default
+      ImGuiPopupPositionPolicy_ComboBox -> ComboBox
       else -> throw NoSuchElementException("""Unknown enum constant $value""")
     }
   }
diff --git a/imgui/src/nativeMain/generated/com/imgui/ImGuiAxis.kt b/imgui/src/nativeMain/generated/com/imgui/ImGuiAxis.kt
diff --git a/imgui/src/nativeMain/generated/com/imgui/ImGuiInputReadMode.kt b/imgui/src/nativeMain/generated/com/imgui/ImGuiInputReadMode.kt
diff --git a/imgui/src/nativeMain/generated/com/imgui/ImGuiInputSource.kt b/imgui/src/nativeMain/generated/com/imgui/ImGuiInputSource.kt
diff --git a/imgui/src/nativeMain/generated/com/imgui/ImGuiLogType.kt b/imgui/src/nativeMain/generated/com/imgui/ImGuiLogType.kt
diff --git a/imgui/src/nativeMain/generated/com/imgui/ImGuiNavForward.kt b/imgui/src/nativeMain/generated/com/imgui/ImGuiNavForward.kt
diff --git a/imgui/src/nativeMain/generated/com/imgui/ImGuiNavLayer.kt b/imgui/src/nativeMain/generated/com/imgui/ImGuiNavLayer.kt
diff --git a/imgui/src/nativeMain/generated/com/imgui/ImGuiPlotType.kt b/imgui/src/nativeMain/generated/com/imgui/ImGuiPlotType.kt
diff --git a/imgui/src/nativeMain/generated/com/imgui/ImGuiPopupPositionPolicy.kt b/imgui/src/nativeMain/generated/com/imgui/ImGuiPopupPositionPolicy.kt

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`package com.imgui`
`2`	`2`
`3`	`3`	`expect enum class ImGuiPlotType {`
`4`		`- _Lines,`
	`4`	`+ Lines,`
`5`	`5`
`6`		`- _Histogram;`
	`6`	`+ Histogram;`
`7`	`7`
`8`	`8`	`companion object`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`package com.imgui`
`2`	`2`
`3`	`3`	`expect enum class ImGuiPopupPositionPolicy {`
`4`		`- _Default,`
	`4`	`+ Default,`
`5`	`5`
`6`		`- _ComboBox;`
	`6`	`+ ComboBox;`
`7`	`7`
`8`	`8`	`companion object`
`9`	`9`	`}`