Skip to content

Commit fe6d2e5

Browse files
kateinoigakukunkateinoigakukun
authored
Merge pull request swiftwasm#313 from swiftwasm/maxd/jsstring-elementsequal
Use JS's `==` operator for `JSString` equality comparison
2 parents cdbac17 + 90d7238 commit fe6d2e5

8 files changed

Lines changed: 45 additions & 1 deletion

File tree

‎Runtime/src/index.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,13 @@ export class SwiftRuntime {
479479
return obj instanceof constructor;
480480
},
481481

482+
swjs_value_equals: (lhs_ref: ref, rhs_ref: ref) => {
483+
const memory = this.memory;
484+
const lhs = memory.getObject(lhs_ref);
485+
const rhs = memory.getObject(rhs_ref);
486+
return lhs == rhs;
487+
},
488+
482489
swjs_create_function: (
483490
host_func_id: number,
484491
line: number,

‎Runtime/src/types.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ export interface ImportedFunctions {
9696
exception_payload2_ptr: pointer
9797
): number;
9898
swjs_instanceof(obj_ref: ref, constructor_ref: ref): boolean;
99+
swjs_value_equals(lhs_ref: ref, rhs_ref: ref): boolean;
99100
swjs_create_function(host_func_id: number, line: number, file: ref): number;
100101
swjs_create_typed_array(
101102
constructor_ref: ref,

‎Sources/JavaScriptKit/FundamentalObjects/JSString.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public struct JSString: LosslessStringConvertible, Equatable {
7777
/// - lhs: A string to compare.
7878
/// - rhs: Another string to compare.
7979
public static func == (lhs: JSString, rhs: JSString) -> Bool {
80-
return lhs.guts.buffer == rhs.guts.buffer
80+
return swjs_value_equals(lhs.guts.jsRef, rhs.guts.jsRef)
8181
}
8282
}
8383

‎Sources/JavaScriptKit/Runtime/index.d.ts‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Sources/JavaScriptKit/Runtime/index.js‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Sources/JavaScriptKit/Runtime/index.mjs‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Sources/_CJavaScriptKit/include/_CJavaScriptKit.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,16 @@ IMPORT_JS_FUNCTION(swjs_call_throwing_new, JavaScriptObjectRef, (const JavaScrip
257257
IMPORT_JS_FUNCTION(swjs_instanceof, bool, (const JavaScriptObjectRef obj,
258258
const JavaScriptObjectRef constructor))
259259

260+
/// Acts like JavaScript `==` operator.
261+
/// Performs "==" comparison, a.k.a the "Abstract Equality Comparison"
262+
/// algorithm defined in the ECMAScript.
263+
/// https://262.ecma-international.org/11.0/#sec-abstract-equality-comparison
264+
///
265+
/// @param lhs The left-hand side value to compare.
266+
/// @param rhs The right-hand side value to compare.
267+
/// @result Return `true` if `lhs` is `==` to `rhs`. Return `false` if not.
268+
IMPORT_JS_FUNCTION(swjs_value_equals, bool, (const JavaScriptObjectRef lhs, const JavaScriptObjectRef rhs))
269+
260270
/// Creates a JavaScript thunk function that calls Swift side closure.
261271
/// See also comments on JSFunction.swift
262272
///

‎Tests/JavaScriptKitTests/JSStringTests.swift‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import JavaScriptKit
2+
import XCTest
3+
4+
final class JSStringTests: XCTestCase {
5+
func testEquatable() {
6+
let string1 = JSString("Hello, world!")
7+
let string2 = JSString("Hello, world!")
8+
let string3 = JSString("Hello, world")
9+
XCTAssertEqual(string1, string1)
10+
XCTAssertEqual(string1, string2)
11+
XCTAssertNotEqual(string1, string3)
12+
}
13+
}

0 commit comments

Comments
 (0)