Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 17 additions & 2 deletions tslang/lib/TypeScript/MLIRGenAccessCall.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1344,13 +1344,28 @@ namespace mlirgen
return false;
}

// Whether the class, or a base class, declares `[key: string]: T`.
// Whether the class, or a base class, declares an indexer a string key goes to: `[key: string]: T`,
// or `[key: number | string]: T`.
static bool classHasStringIndexer(ClassInfo::TypePtr classInfo)
{
auto takesString = [](mlir::Type keyType) {
if (isa<mlir_ts::StringType>(keyType))
{
return true;
}

if (auto unionType = dyn_cast<mlir_ts::UnionType>(keyType))
{
return llvm::any_of(unionType.getTypes(), [](mlir::Type type) { return isa<mlir_ts::StringType>(type); });
}

return false;
};

for (auto &indexInfo : classInfo->indexes)
{
if (indexInfo.indexSignature && indexInfo.indexSignature.getNumInputs() > 0
&& isa<mlir_ts::StringType>(indexInfo.indexSignature.getInput(0)))
&& takesString(indexInfo.indexSignature.getInput(0)))
{
return true;
}
Expand Down
4 changes: 4 additions & 0 deletions tslang/test/tester/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,7 @@ tslang_add_test(NAME test-compile-00-class-symbol-iterator COMMAND test-runner "
tslang_add_test(NAME test-compile-00-class-indexer COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_indexer.ts")
tslang_add_test(NAME test-compile-00-class-indexer-super COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_indexer_super.ts")
tslang_add_test(NAME test-compile-00-class-indexer-string-key COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_indexer_string_key.ts")
tslang_add_test(NAME test-compile-00-class-indexer-union-key COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_indexer_union_key.ts")
tslang_add_test(NAME test-compile-00-class-from-tuple COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_from_tuple.ts")
tslang_add_test(NAME test-compile-00-class-access-control COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_access_control.ts")
tslang_add_test(NAME test-compile-00-class-protected-constructor COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_protected_constr.ts")
Expand Down Expand Up @@ -1339,6 +1340,7 @@ tslang_add_test(NAME test-jit-00-class-symbol-iterator COMMAND test-runner -jit
tslang_add_test(NAME test-jit-00-class-indexer COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_indexer.ts")
tslang_add_test(NAME test-jit-00-class-indexer-super COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_indexer_super.ts")
tslang_add_test(NAME test-jit-00-class-indexer-string-key COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_indexer_string_key.ts")
tslang_add_test(NAME test-jit-00-class-indexer-union-key COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_indexer_union_key.ts")
tslang_add_test(NAME test-jit-00-class-from-tuple COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_from_tuple.ts")
tslang_add_test(NAME test-jit-00-class-access-control COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_access_control.ts")
tslang_add_test(NAME test-jit-00-class-protected-constructor COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_protected_constr.ts")
Expand Down Expand Up @@ -1783,6 +1785,7 @@ endforeach()
# in one file under own (gc, rc and none run it above and in the corpus), and across a shared
# library's boundary under gc, rc and own
tslang_add_test(NAME test-jit-00-class-indexer-string-key-own COMMAND test-runner -jit -mm=own "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_indexer_string_key.ts")
tslang_add_test(NAME test-jit-00-class-indexer-union-key-own COMMAND test-runner -jit -mm=own "${PROJECT_SOURCE_DIR}/test/tester/tests/00class_indexer_union_key.ts")
foreach(string_indexer_mm gc rc own)
tslang_add_test(NAME test-compile-shared-export-import-class-string-indexer-${string_indexer_mm} COMMAND test-runner -shared -mm=${string_indexer_mm} "${PROJECT_SOURCE_DIR}/test/tester/tests/import_class_string_indexer.ts" "${PROJECT_SOURCE_DIR}/test/tester/tests/export_class_string_indexer.ts")
tslang_add_test(NAME test-jit-shared-export-import-class-string-indexer-${string_indexer_mm} COMMAND test-runner -jit -shared -mm=${string_indexer_mm} "${PROJECT_SOURCE_DIR}/test/tester/tests/import_class_string_indexer.ts" "${PROJECT_SOURCE_DIR}/test/tester/tests/export_class_string_indexer.ts")
Expand Down Expand Up @@ -2487,6 +2490,7 @@ set(TSLANG_CORPUS
00class_iface.ts
00class_indexer_super.ts
00class_indexer_string_key.ts
00class_indexer_union_key.ts
00class_indexer.ts
00class_iterator_super.ts
00class_iterator.ts
Expand Down
76 changes: 76 additions & 0 deletions tslang/test/tester/tests/00class_indexer_union_key.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
// A class indexer whose key is `number | string`: number keys and string keys, constant or not,
// go to the one get/set; a constant string that names a member is still that member.

class Table {
private names: string[] = [];
private items: string[] = [];

[key: number | string]: string;

get(key: number | string): string {
let position = -1;
if (typeof key == "number") {
position = key;
} else {
for (let i = 0; i < this.names.length; i++) {
if (this.names[i] == key) {
position = i;
}
}
}

if (position < 0 || position >= this.items.length) {
return "";
}

return this.items[position];
}

set(key: number | string, value: string) {
let position = -1;
if (typeof key == "number") {
position = key;
} else {
position = this.names.length;
this.names.push(key + "");
this.items.length = position + 1;
}

// in one place: under -mm=own a parameter is taken on every path or none
this.items[position] = value;
}

get size() {
return this.items.length;
}
}

function main() {
const table = new Table();

// string keys
table["a"] = "x";
table["b"] = "z";
assert(table["a"] == "x");
assert(table["missing"] == "");

// number keys reach the same items
assert(table[0] == "x");
assert(table[1] == "z");
table[0] = "y";
assert(table["a"] == "y");

// variable keys of either kind
const name = "b";
let index = 1;
let other = "a";
assert(table[name] == "z");
assert(table[index] == "z");
assert(table[other] == "y");

// a key that names a member is the member
assert(table["size"] == 2);

print(table["a"], table[1], table["size"]);
print("done.");
}
Loading