Skip to content

Use fully qualified names in generic types #544

New issue

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

Sign up for GitHub

By clicking “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? Sign in to your account

Merged
merged 4 commits into from
Mar 25, 2019
Merged

Use fully qualified names in generic types #544

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5aba289
Use fully qualified names in generic types
dcodeIO Mar 16, 2019
5a4ab58
fix infinite parser loops, fix test suite parse error reporting
dcodeIO Mar 20, 2019
f114830
implement option forwarding to node.js, e.g. '-- --inspect'
dcodeIO Mar 20, 2019
272d367
assert that thisType isn't a (recursive) signature
dcodeIO Mar 20, 2019
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
24 changes: 11 additions & 13 deletions src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,20 +266,20 @@ export class Type {
return null;
}

/** Converts this type to its TypeScript representation. */
toString(kindOnly: bool = false): string {
if (!kindOnly && this.is(TypeFlags.REFERENCE)) {
/** Converts this type to a string. */
toString(): string {
if (this.is(TypeFlags.REFERENCE)) {
let classReference = this.classReference;
if (classReference) {
return this.is(TypeFlags.NULLABLE)
? classReference.name + " | null"
: classReference.name;
? classReference.internalName + " | null"
: classReference.internalName;
}
let signatureReference = this.signatureReference;
if (signatureReference) {
return this.is(TypeFlags.NULLABLE)
? "(" + signatureReference.toString(true) + ") | null"
: signatureReference.toString(true);
? "(" + signatureReference.toString() + ") | null"
: signatureReference.toString();
}
assert(false);
}
Expand Down Expand Up @@ -637,17 +637,15 @@ export class Signature {
}

/** Converts this signature to a string. */
toString(includeThis: bool = false): string {
toString(): string {
var sb = new Array<string>();
sb.push("(");
var index = 0;
var thisType = this.thisType;
if (thisType) {
if (includeThis) {
sb.push("this: ");
sb.push(thisType.toString());
index = 1;
}
sb.push("this: ");
sb.push(thisType.toString());
index = 1;
}
var parameters = this.parameterTypes;
var numParameters = parameters.length;
Expand Down
12 changes: 6 additions & 6 deletions tests/compiler/nonNullAssertion.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
local.get $0
i32.load
)
(func $~lib/array/Array<Foo>#__get (; 5 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/array/Array<nonNullAssertion/Foo>#__get (; 5 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(local $4 i32)
Expand Down Expand Up @@ -87,9 +87,9 @@
(func $nonNullAssertion/testArr (; 6 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
local.get $0
i32.const 0
call $~lib/array/Array<Foo>#__get
call $~lib/array/Array<nonNullAssertion/Foo>#__get
)
(func $~lib/array/Array<Foo | null>#__get (; 7 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/array/Array<nonNullAssertion/Foo | null>#__get (; 7 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(local $4 i32)
Expand Down Expand Up @@ -125,18 +125,18 @@
(func $nonNullAssertion/testElem (; 8 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
local.get $0
i32.const 0
call $~lib/array/Array<Foo | null>#__get
call $~lib/array/Array<nonNullAssertion/Foo | null>#__get
)
(func $nonNullAssertion/testAll (; 9 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
local.get $0
i32.const 0
call $~lib/array/Array<Foo | null>#__get
call $~lib/array/Array<nonNullAssertion/Foo | null>#__get
i32.load
)
(func $nonNullAssertion/testAll2 (; 10 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
local.get $0
i32.const 0
call $~lib/array/Array<Foo | null>#__get
call $~lib/array/Array<nonNullAssertion/Foo | null>#__get
i32.load
)
(func $nonNullAssertion/testFn (; 11 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
Expand Down
20 changes: 10 additions & 10 deletions tests/compiler/std/array-access.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
(export "stringArrayMethodCall" (func $std/array-access/stringArrayMethodCall))
(export "stringArrayArrayPropertyAccess" (func $std/array-access/stringArrayArrayPropertyAccess))
(export "stringArrayArrayMethodCall" (func $std/array-access/stringArrayArrayMethodCall))
(func $~lib/array/Array<Array<i32>>#__get (; 1 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/array/Array<~lib/array/Array<i32>>#__get (; 1 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(local $4 i32)
Expand Down Expand Up @@ -89,11 +89,11 @@
(func $std/array-access/i32ArrayArrayElementAccess (; 3 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
local.get $0
i32.const 0
call $~lib/array/Array<Array<i32>>#__get
call $~lib/array/Array<~lib/array/Array<i32>>#__get
i32.const 1
call $~lib/array/Array<i32>#__get
)
(func $~lib/array/Array<String>#__get (; 4 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/array/Array<~lib/string/String>#__get (; 4 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(local $4 i32)
Expand Down Expand Up @@ -129,7 +129,7 @@
(func $std/array-access/stringArrayPropertyAccess (; 5 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
local.get $0
i32.const 0
call $~lib/array/Array<String>#__get
call $~lib/array/Array<~lib/string/String>#__get
i32.load
)
(func $~lib/internal/string/compareUnsafe (; 6 ;) (type $FUNCSIG$iiiiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (result i32)
Expand Down Expand Up @@ -255,12 +255,12 @@
(func $std/array-access/stringArrayMethodCall (; 8 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
local.get $0
i32.const 0
call $~lib/array/Array<String>#__get
call $~lib/array/Array<~lib/string/String>#__get
i32.const 8
i32.const 0
call $~lib/string/String#startsWith
)
(func $~lib/array/Array<Array<String>>#__get (; 9 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/array/Array<~lib/array/Array<~lib/string/String>>#__get (; 9 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(local $4 i32)
Expand Down Expand Up @@ -296,17 +296,17 @@
(func $std/array-access/stringArrayArrayPropertyAccess (; 10 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
local.get $0
i32.const 0
call $~lib/array/Array<Array<String>>#__get
call $~lib/array/Array<~lib/array/Array<~lib/string/String>>#__get
i32.const 1
call $~lib/array/Array<String>#__get
call $~lib/array/Array<~lib/string/String>#__get
i32.load
)
(func $std/array-access/stringArrayArrayMethodCall (; 11 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
local.get $0
i32.const 0
call $~lib/array/Array<Array<String>>#__get
call $~lib/array/Array<~lib/array/Array<~lib/string/String>>#__get
i32.const 1
call $~lib/array/Array<String>#__get
call $~lib/array/Array<~lib/string/String>#__get
i32.const 8
i32.const 0
call $~lib/string/String#startsWith
Expand Down
28 changes: 14 additions & 14 deletions tests/compiler/std/array-literal.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@
end
local.get $0
)
(func $~lib/array/Array<Ref>#constructor (; 14 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/array/Array<std/array-literal/Ref>#constructor (; 14 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(local $4 i32)
Expand Down Expand Up @@ -729,7 +729,7 @@
end
local.get $0
)
(func $~lib/array/Array<Ref>#__unchecked_set (; 15 ;) (type $FUNCSIG$viii) (param $0 i32) (param $1 i32) (param $2 i32)
(func $~lib/array/Array<std/array-literal/Ref>#__unchecked_set (; 15 ;) (type $FUNCSIG$viii) (param $0 i32) (param $1 i32) (param $2 i32)
(local $3 i32)
(local $4 i32)
(local $5 i32)
Expand Down Expand Up @@ -763,7 +763,7 @@
end
local.get $0
)
(func $~lib/array/Array<RefWithCtor>#constructor (; 17 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/array/Array<std/array-literal/RefWithCtor>#constructor (; 17 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(local $4 i32)
Expand Down Expand Up @@ -824,7 +824,7 @@
end
local.get $0
)
(func $~lib/array/Array<RefWithCtor>#__unchecked_set (; 18 ;) (type $FUNCSIG$viii) (param $0 i32) (param $1 i32) (param $2 i32)
(func $~lib/array/Array<std/array-literal/RefWithCtor>#__unchecked_set (; 18 ;) (type $FUNCSIG$viii) (param $0 i32) (param $1 i32) (param $2 i32)
(local $3 i32)
(local $4 i32)
(local $5 i32)
Expand Down Expand Up @@ -1201,27 +1201,27 @@
block (result i32)
i32.const 0
i32.const 3
call $~lib/array/Array<Ref>#constructor
call $~lib/array/Array<std/array-literal/Ref>#constructor
local.set $3
local.get $3
i32.const 0
i32.const 0
call $std/array-literal/Ref#constructor
call $~lib/array/Array<Ref>#__unchecked_set
call $~lib/array/Array<std/array-literal/Ref>#__unchecked_set
local.get $3
i32.const 1
i32.const 0
call $std/array-literal/Ref#constructor
call $~lib/array/Array<Ref>#__unchecked_set
call $~lib/array/Array<std/array-literal/Ref>#__unchecked_set
local.get $3
i32.const 2
i32.const 0
call $std/array-literal/Ref#constructor
call $~lib/array/Array<Ref>#__unchecked_set
call $~lib/array/Array<std/array-literal/Ref>#__unchecked_set
local.get $3
end
global.set $std/array-literal/dynamicArrayRef
block $~lib/array/Array<Ref>#get:length|inlined.0 (result i32)
block $~lib/array/Array<std/array-literal/Ref>#get:length|inlined.0 (result i32)
global.get $std/array-literal/dynamicArrayRef
local.set $3
local.get $3
Expand All @@ -1241,27 +1241,27 @@
block (result i32)
i32.const 0
i32.const 3
call $~lib/array/Array<RefWithCtor>#constructor
call $~lib/array/Array<std/array-literal/RefWithCtor>#constructor
local.set $4
local.get $4
i32.const 0
i32.const 0
call $std/array-literal/RefWithCtor#constructor
call $~lib/array/Array<RefWithCtor>#__unchecked_set
call $~lib/array/Array<std/array-literal/RefWithCtor>#__unchecked_set
local.get $4
i32.const 1
i32.const 0
call $std/array-literal/RefWithCtor#constructor
call $~lib/array/Array<RefWithCtor>#__unchecked_set
call $~lib/array/Array<std/array-literal/RefWithCtor>#__unchecked_set
local.get $4
i32.const 2
i32.const 0
call $std/array-literal/RefWithCtor#constructor
call $~lib/array/Array<RefWithCtor>#__unchecked_set
call $~lib/array/Array<std/array-literal/RefWithCtor>#__unchecked_set
local.get $4
end
global.set $std/array-literal/dynamicArrayRefWithCtor
block $~lib/array/Array<RefWithCtor>#get:length|inlined.0 (result i32)
block $~lib/array/Array<std/array-literal/RefWithCtor>#get:length|inlined.0 (result i32)
global.get $std/array-literal/dynamicArrayRefWithCtor
local.set $4
local.get $4
Expand Down
Loading