Use enum_extensibility(closed)

Author: kateinoigakukun

Sources/JavaScriptKit/JSValueConvertible.swift

@@ -96,27 +96,27 @@ extension Array: JSValueConvertible where Element == JSValueConvertible {
 extension RawJSValue: JSValueConvertible {
     public func jsValue() -> JSValue {
         switch kind {
-        case JavaScriptValueKind_Invalid:
+        case .invalid:
             fatalError()
-        case JavaScriptValueKind_Boolean:
+        case .boolean:
             return .boolean(payload1 != 0)
-        case JavaScriptValueKind_Number:
+        case .number:
             return .number(payload3)
-        case JavaScriptValueKind_String:
+        case .string:
             // +1 for null terminator
             let buffer = malloc(Int(payload2 + 1))!.assumingMemoryBound(to: UInt8.self)
             defer { free(buffer) }
             _load_string(JavaScriptObjectRef(payload1), buffer)
             buffer[Int(payload2)] = 0
             let string = String(decodingCString: UnsafePointer(buffer), as: UTF8.self)
             return .string(string)
-        case JavaScriptValueKind_Object:
+        case .object:
             return .object(JSObjectRef(id: UInt32(payload1)))
-        case JavaScriptValueKind_Null:
+        case .null:
             return .null
-        case JavaScriptValueKind_Undefined:
+        case .undefined:
             return .undefined
-        case JavaScriptValueKind_Function:
+        case .function:
             return .function(JSFunctionRef(id: UInt32(payload1)))
         default:
             fatalError("unreachable")
@@ -132,35 +132,35 @@ extension JSValue {
         var payload3: JavaScriptPayload3 = 0
         switch self {
         case let .boolean(boolValue):
-            kind = JavaScriptValueKind_Boolean
+            kind = .boolean
             payload1 = boolValue ? 1 : 0
             payload2 = 0
         case let .number(numberValue):
-            kind = JavaScriptValueKind_Number
+            kind = .number
             payload1 = 0
             payload2 = 0
             payload3 = numberValue
         case var .string(stringValue):
-            kind = JavaScriptValueKind_String
+            kind = .string
             return stringValue.withUTF8 { bufferPtr in
                 let ptrValue = UInt32(UInt(bitPattern: bufferPtr.baseAddress!))
                 let rawValue = RawJSValue(kind: kind, payload1: JavaScriptPayload1(ptrValue), payload2: JavaScriptPayload2(bufferPtr.count), payload3: 0)
                 return body(rawValue)
             }
         case let .object(ref):
-            kind = JavaScriptValueKind_Object
+            kind = .object
             payload1 = JavaScriptPayload1(ref.id)
             payload2 = 0
         case .null:
-            kind = JavaScriptValueKind_Null
+            kind = .null
             payload1 = 0
             payload2 = 0
         case .undefined:
-            kind = JavaScriptValueKind_Undefined
+            kind = .undefined
             payload1 = 0
             payload2 = 0
         case let .function(functionRef):
-            kind = JavaScriptValueKind_Function
+            kind = .function
             payload1 = JavaScriptPayload1(functionRef.id)
             payload2 = 0
         }

Sources/_CJavaScriptKit/include/_CJavaScriptKit.h

@@ -6,15 +6,15 @@
 typedef unsigned int JavaScriptObjectRef;
 typedef unsigned int JavaScriptHostFuncRef;
 
-typedef enum {
-  JavaScriptValueKind_Invalid = -1,
-  JavaScriptValueKind_Boolean = 0,
-  JavaScriptValueKind_String = 1,
-  JavaScriptValueKind_Number = 2,
-  JavaScriptValueKind_Object = 3,
-  JavaScriptValueKind_Null = 4,
-  JavaScriptValueKind_Undefined = 5,
-  JavaScriptValueKind_Function = 6,
+typedef enum __attribute__((enum_extensibility(closed))) {
+  JavaScriptValueKindInvalid = -1,
+  JavaScriptValueKindBoolean = 0,
+  JavaScriptValueKindString = 1,
+  JavaScriptValueKindNumber = 2,
+  JavaScriptValueKindObject = 3,
+  JavaScriptValueKindNull = 4,
+  JavaScriptValueKindUndefined = 5,
+  JavaScriptValueKindFunction = 6,
 } JavaScriptValueKind;
 
 typedef unsigned JavaScriptPayload1;