Commit 18adf42

authored

Add support for instanceof (#25)

* Add instanceof support * Make instanceof safe * Directly return the result of instanceof * Remove instanceof(JSValue)

1 parent b5382e6 commit 18adf42Copy full SHA for 18adf42

File tree

+25

-1

lines changed

+25

-1

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -228,6 +228,8 @@ New_Object_Construction: do {`
`228`	`228`	`let cat1 = objectConstructor.new("Tama", 3, true)`
`229`	`229`	`try expectEqual(getJSValue(this: cat1, name: "name"), .string("Tama"))`
`230`	`230`	`try expectEqual(getJSValue(this: cat1, name: "age"), .number(3))`
	`231`	`+ try expectEqual(cat1.instanceof(objectConstructor), true)`
	`232`	`+ try expectEqual(cat1.instanceof(try expectFunction(getJSValue(this: .global, name: "Array"))), false)`
`231`	`233`	`let cat1Bark = try expectFunction(getJSValue(this: cat1, name: "bark"))`
`232`	`234`	`try expectEqual(cat1Bark(), .string("nyan"))`
`233`	`235`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class SwiftRuntimeHeap {`
`59`	`59`
`60`	`60`	`allocHeap(value: any) {`
`61`	`61`	`const isObject = typeof value == "object";`
`62`		`- const entry = this._heapEntryByValue.get(value);`
	`62`	`+ const entry = this._heapEntryByValue.get(value);`
`63`	`63`	`if (isObject && entry) {`
`64`	`64`	`entry.rc++`
`65`	`65`	`return entry.id`
`@@ -362,6 +362,14 @@ export class SwiftRuntime {`
`362`	`362`	throw Error(`Invalid result type of object constructor of "${obj}": "${result}"`)
`363`	`363`	`writeUint32(result_obj, this.heap.allocHeap(result));`
`364`	`364`	`},`
	`365`	`+ swjs_instanceof: (`
	`366`	`+ obj_ref: ref, constructor_ref: ref,`
	`367`	`+ result_ptr: pointer`
	`368`	`+ ) => {`
	`369`	`+ const obj = this.heap.referenceHeap(obj_ref)`
	`370`	`+ const constructor = this.heap.referenceHeap(constructor_ref)`
	`371`	`+ return obj instanceof constructor`
	`372`	`+ },`
`365`	`373`	`swjs_destroy_ref: (ref: ref) => {`
`366`	`374`	`this.heap.freeHeap(ref)`
`367`	`375`	`}`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,10 @@ public class JSObjectRef: Equatable {`
`32`	`32`	`getJSValue(this: self, index: Int32(index))`
`33`	`33`	`}`
`34`	`34`
	`35`	`+ public func instanceof(_ constructor: JSFunctionRef) -> Bool {`
	`36`	`+ _instanceof(self.id, constructor.id)`
	`37`	`+ }`
	`38`	`+`
`35`	`39`	`public subscript(_ index: Int) -> JSValue {`
`36`	`40`	`get { get(index) }`
`37`	`41`	`set { set(index, newValue) }`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,10 @@ import _CJavaScriptKit`
`64`	`64`	`_: UnsafePointer<RawJSValue>!, _: Int32,`
`65`	`65`	`_: UnsafeMutablePointer<JavaScriptObjectRef>!`
`66`	`66`	`) { fatalError() }`
	`67`	`+ func _instanceof(`
	`68`	`+ _: JavaScriptObjectRef,`
	`69`	`+ _: JavaScriptObjectRef`
	`70`	`+ ) -> Bool { fatalError() }`
`67`	`71`	`func _create_function(`
`68`	`72`	`_: JavaScriptHostFuncRef,`
`69`	`73`	`_: UnsafePointer<JavaScriptObjectRef>!`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`#define _CJavaScriptKit_h`
`3`	`3`
`4`	`4`	`#include <stdlib.h>`
	`5`	`+#include <stdbool.h>`
`5`	`6`
`6`	`7`	`typedef unsigned int JavaScriptObjectRef;`
`7`	`8`	`typedef unsigned int JavaScriptHostFuncRef;`
`@@ -82,6 +83,11 @@ __attribute__((__import_module__("javascript_kit"),`
`82`	`83`	`_call_new(const JavaScriptObjectRef ref, const RawJSValue *argv, const int argc,`
`83`	`84`	`JavaScriptObjectRef *result_obj);`
`84`	`85`
	`86`	`+__attribute__((__import_module__("javascript_kit"),`
	`87`	`+ __import_name__("swjs_instanceof"))) extern bool`
	`88`	`+_instanceof(const JavaScriptObjectRef obj,`
	`89`	`+ const JavaScriptObjectRef constructor);`
	`90`	`+`
`85`	`91`	`__attribute__((__import_module__("javascript_kit"),`
`86`	`92`	`__import_name__("swjs_create_function"))) extern void`
`87`	`93`	`_create_function(const JavaScriptHostFuncRef host_func_id,`

Comments

(0)