Skip to content

Resolve small issues #44

New issue

Have a question about this project? No Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

No Sign up for GitHub

By clicking “No Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? No Sign in to your account

Merged
merged 3 commits into from
Sep 11, 2020
Merged

Resolve small issues #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54c146e
Resolve rename warnings
kateinoigakukun Sep 10, 2020
92dd0be
Remove unused code
kateinoigakukun Sep 10, 2020
af97471
Add explicitly modulemap file
kateinoigakukun Sep 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions Runtime/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,7 @@ export class SwiftRuntime {
writeUint32(result_obj, this.heap.retain(result));
},
swjs_instanceof: (
obj_ref: ref, constructor_ref: ref,
result_ptr: pointer
obj_ref: ref, constructor_ref: ref
) => {
const obj = this.heap.referenceHeap(obj_ref)
const constructor = this.heap.referenceHeap(constructor_ref)
Expand All @@ -415,9 +414,6 @@ export class SwiftRuntime {
// Call `.slice()` to copy the memory
writeUint32(result_obj, this.heap.retain(array.slice()));
},
swjs_retain: (ref: ref) => {
this.heap.retain(this.heap.referenceHeap(ref))
},
swjs_release: (ref: ref) => {
this.heap.release(ref)
}
Expand Down
28 changes: 14 additions & 14 deletions Sources/JavaScriptKit/BasicObjects/JSTypedArray.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import _CJavaScriptKit

public protocol TypedArrayElement: JSValueConvertible, JSValueConstructible {
static var typedArrayKind: JavaScriptTypedArrayKind { get }
static var typedArrayClass: JSFunctionRef { get }
static var typedArrayClass: JSFunction { get }
}

public class JSTypedArray<Element>: JSValueConvertible, ExpressibleByArrayLiteral where Element: TypedArrayElement {
Expand All @@ -23,7 +23,7 @@ public class JSTypedArray<Element>: JSValueConvertible, ExpressibleByArrayLitera
setJSValue(this: ref, index: Int32(index), value: newValue.jsValue())
}
}

// This private initializer assumes that the passed object is TypedArray
private init(unsafe object: JSObject) {
self.ref = object
Expand Down Expand Up @@ -70,16 +70,16 @@ func valueForBitWidth<T>(typeName: String, bitWidth: Int, when32: T) -> T {
}

extension Int: TypedArrayElement {
public static var typedArrayClass: JSFunctionRef {
valueForBitWidth(typeName: "Int", bitWidth: Int.bitWidth, when32: JSObjectRef.global.Int32Array).function!
public static var typedArrayClass: JSFunction {
valueForBitWidth(typeName: "Int", bitWidth: Int.bitWidth, when32: JSObject.global.Int32Array).function!
}
public static var typedArrayKind: JavaScriptTypedArrayKind {
valueForBitWidth(typeName: "Int", bitWidth: Int.bitWidth, when32: .int32)
}
}
extension UInt: TypedArrayElement {
public static var typedArrayClass: JSFunctionRef {
valueForBitWidth(typeName: "UInt", bitWidth: Int.bitWidth, when32: JSObjectRef.global.Uint32Array).function!
public static var typedArrayClass: JSFunction {
valueForBitWidth(typeName: "UInt", bitWidth: Int.bitWidth, when32: JSObject.global.Uint32Array).function!
}
public static var typedArrayKind: JavaScriptTypedArrayKind {
valueForBitWidth(typeName: "UInt", bitWidth: UInt.bitWidth, when32: .uint32)
Expand All @@ -89,30 +89,30 @@ extension UInt: TypedArrayElement {
// MARK: - Concrete TypedArray classes

extension Int8: TypedArrayElement {
public static var typedArrayClass: JSFunctionRef { JSObjectRef.global.Int8Array.function! }
public static var typedArrayClass: JSFunction { JSObject.global.Int8Array.function! }
public static var typedArrayKind: JavaScriptTypedArrayKind { .int8 }
}
extension UInt8: TypedArrayElement {
public static var typedArrayClass: JSFunctionRef { JSObjectRef.global.Uint8Array.function! }
public static var typedArrayClass: JSFunction { JSObject.global.Uint8Array.function! }
public static var typedArrayKind: JavaScriptTypedArrayKind { .uint8 }
}
// TODO: Support Uint8ClampedArray?

extension Int16: TypedArrayElement {
public static var typedArrayClass: JSFunctionRef { JSObjectRef.global.Int16Array.function! }
public static var typedArrayClass: JSFunction { JSObject.global.Int16Array.function! }
public static var typedArrayKind: JavaScriptTypedArrayKind { .int16 }
}
extension UInt16: TypedArrayElement {
public static var typedArrayClass: JSFunctionRef { JSObjectRef.global.Uint16Array.function! }
public static var typedArrayClass: JSFunction { JSObject.global.Uint16Array.function! }
public static var typedArrayKind: JavaScriptTypedArrayKind { .uint16 }
}

extension Int32: TypedArrayElement {
public static var typedArrayClass: JSFunctionRef { JSObjectRef.global.Int32Array.function! }
public static var typedArrayClass: JSFunction { JSObject.global.Int32Array.function! }
public static var typedArrayKind: JavaScriptTypedArrayKind { .int32 }
}
extension UInt32: TypedArrayElement {
public static var typedArrayClass: JSFunctionRef { JSObjectRef.global.Uint32Array.function! }
public static var typedArrayClass: JSFunction { JSObject.global.Uint32Array.function! }
public static var typedArrayKind: JavaScriptTypedArrayKind { .uint32 }
}

Expand All @@ -127,10 +127,10 @@ extension UInt32: TypedArrayElement {
//}

extension Float32: TypedArrayElement {
public static var typedArrayClass: JSFunctionRef { JSObjectRef.global.Float32Array.function! }
public static var typedArrayClass: JSFunction { JSObject.global.Float32Array.function! }
public static var typedArrayKind: JavaScriptTypedArrayKind { .float32 }
}
extension Float64: TypedArrayElement {
public static var typedArrayClass: JSFunctionRef { JSObjectRef.global.Float64Array.function! }
public static var typedArrayClass: JSFunction { JSObject.global.Float64Array.function! }
public static var typedArrayKind: JavaScriptTypedArrayKind { .float64 }
}
4 changes: 4 additions & 0 deletions Sources/_CJavaScriptKit/include/module.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module _CJavaScriptKit {
header "_CJavaScriptKit.h"
export *
}