@@ -96,27 +96,27 @@ extension Array: JSValueConvertible where Element == JSValueConvertible {
96
96
extension RawJSValue : JSValueConvertible {
97
97
public func jsValue( ) -> JSValue {
98
98
switch kind {
99
- case JavaScriptValueKind_Invalid :
99
+ case . invalid :
100
100
fatalError ( )
101
- case JavaScriptValueKind_Boolean :
101
+ case . boolean :
102
102
return . boolean( payload1 != 0 )
103
- case JavaScriptValueKind_Number :
103
+ case . number :
104
104
return . number( payload3)
105
- case JavaScriptValueKind_String :
105
+ case . string :
106
106
// +1 for null terminator
107
107
let buffer = malloc ( Int ( payload2 + 1 ) ) !. assumingMemoryBound ( to: UInt8 . self)
108
108
defer { free ( buffer) }
109
109
_load_string ( JavaScriptObjectRef ( payload1) , buffer)
110
110
buffer [ Int ( payload2) ] = 0
111
111
let string = String ( decodingCString: UnsafePointer ( buffer) , as: UTF8 . self)
112
112
return . string( string)
113
- case JavaScriptValueKind_Object :
113
+ case . object :
114
114
return . object( JSObjectRef ( id: UInt32 ( payload1) ) )
115
- case JavaScriptValueKind_Null :
115
+ case . null :
116
116
return . null
117
- case JavaScriptValueKind_Undefined :
117
+ case . undefined :
118
118
return . undefined
119
- case JavaScriptValueKind_Function :
119
+ case . function :
120
120
return . function( JSFunctionRef ( id: UInt32 ( payload1) ) )
121
121
default :
122
122
fatalError ( " unreachable " )
@@ -132,35 +132,35 @@ extension JSValue {
132
132
var payload3 : JavaScriptPayload3 = 0
133
133
switch self {
134
134
case let . boolean( boolValue) :
135
- kind = JavaScriptValueKind_Boolean
135
+ kind = . boolean
136
136
payload1 = boolValue ? 1 : 0
137
137
payload2 = 0
138
138
case let . number( numberValue) :
139
- kind = JavaScriptValueKind_Number
139
+ kind = . number
140
140
payload1 = 0
141
141
payload2 = 0
142
142
payload3 = numberValue
143
143
case var . string( stringValue) :
144
- kind = JavaScriptValueKind_String
144
+ kind = . string
145
145
return stringValue. withUTF8 { bufferPtr in
146
146
let ptrValue = UInt32 ( UInt ( bitPattern: bufferPtr. baseAddress!) )
147
147
let rawValue = RawJSValue ( kind: kind, payload1: JavaScriptPayload1 ( ptrValue) , payload2: JavaScriptPayload2 ( bufferPtr. count) , payload3: 0 )
148
148
return body ( rawValue)
149
149
}
150
150
case let . object( ref) :
151
- kind = JavaScriptValueKind_Object
151
+ kind = . object
152
152
payload1 = JavaScriptPayload1 ( ref. id)
153
153
payload2 = 0
154
154
case . null:
155
- kind = JavaScriptValueKind_Null
155
+ kind = . null
156
156
payload1 = 0
157
157
payload2 = 0
158
158
case . undefined:
159
- kind = JavaScriptValueKind_Undefined
159
+ kind = . undefined
160
160
payload1 = 0
161
161
payload2 = 0
162
162
case let . function( functionRef) :
163
- kind = JavaScriptValueKind_Function
163
+ kind = . function
164
164
payload1 = JavaScriptPayload1 ( functionRef. id)
165
165
payload2 = 0
166
166
}
0 commit comments