Skip to content
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

Sort numeric symbols #690

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Sort numeric symbols #690

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0a8b21
Sort numeric symbols
Andarist Mar 16, 2025
3d8a6b7
Merge remote-tracking branch 'origin/main' into sort-numeric-symbols
Andarist Mar 22, 2025
5969539
remove debug code
Andarist Mar 22, 2025
76ad0f4
simplify
Andarist Mar 22, 2025
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
1 change: 1 addition & 0 deletions internal/checker/checker.go
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ import (
"iter"
"maps"
"math"

"slices"
"strconv"
"strings"
12 changes: 12 additions & 0 deletions internal/checker/utilities.go
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ package checker
import (
"cmp"
"slices"
"strconv"
"strings"
"sync"

@@ -628,6 +629,17 @@ func (c *Checker) compareSymbolsWorker(s1, s2 *ast.Symbol) int {
if s2 == nil {
return -1
}
int1, err1 := strconv.Atoi(s1.Name)
int2, err2 := strconv.Atoi(s2.Name)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm afraid it's not that simple. Consider symbols named "0", "00", and "000" and so on! We'd want a check that the symbol round-trips as a number. Which unfortunately is a more expensive check.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, I can implement that - as long as it's even something you'd like to see getting in. At the moment, the main user-oriented improvement in this is a better error message here: testdata/baselines/reference/submodule/conformance/arityAndOrderCompatibility01.errors.txt. But at the same time, this test case isn't exercising a particularly popular pattern.

if err1 == nil && err2 == nil {
return cmp.Compare(int1, int2)
}
if err1 == nil {
return -1
}
if err2 == nil {
return 1
}
if len(s1.Declarations) != 0 && len(s2.Declarations) != 0 {
if r := c.compareNodes(s1.Declarations[0], s2.Declarations[0]); r != 0 {
return r
20 changes: 10 additions & 10 deletions testdata/baselines/reference/submodule/compiler/declarationEmitLateBoundAssignments.types
View file
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

=== declarationEmitLateBoundAssignments.ts ===
export function foo() {}
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }

foo.bar = 12;
>foo.bar = 12 : 12
>foo.bar : number
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>bar : number
>12 : 12

@@ -19,7 +19,7 @@ const _private = Symbol();
foo[_private] = "ok";
>foo[_private] = "ok" : "ok"
>foo[_private] : string
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>_private : unique symbol
>"ok" : "ok"

@@ -30,7 +30,7 @@ const strMem = "strMemName";
foo[strMem] = "ok";
>foo[strMem] = "ok" : "ok"
>foo[strMem] : string
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>strMem : "strMemName"
>"ok" : "ok"

@@ -41,7 +41,7 @@ const dashStrMem = "dashed-str-mem";
foo[dashStrMem] = "ok";
>foo[dashStrMem] = "ok" : "ok"
>foo[dashStrMem] : string
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>dashStrMem : "dashed-str-mem"
>"ok" : "ok"

@@ -52,31 +52,31 @@ const numMem = 42;
foo[numMem] = "ok";
>foo[numMem] = "ok" : "ok"
>foo[numMem] : string
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>numMem : 42
>"ok" : "ok"

const x: string = foo[_private];
>x : string
>foo[_private] : string
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>_private : unique symbol

const y: string = foo[strMem];
>y : string
>foo[strMem] : string
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>strMem : "strMemName"

const z: string = foo[numMem];
>z : string
>foo[numMem] : string
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>numMem : 42

const a: string = foo[dashStrMem];
>a : string
>foo[dashStrMem] : string
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>dashStrMem : "dashed-str-mem"

20 changes: 10 additions & 10 deletions ...ata/baselines/reference/submodule/compiler/declarationEmitLateBoundAssignments.types.diff
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@
=== declarationEmitLateBoundAssignments.ts ===
export function foo() {}
->foo : typeof foo
+>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
+>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }

foo.bar = 12;
>foo.bar = 12 : 12
>foo.bar : number
->foo : typeof foo
+>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
+>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>bar : number
>12 : 12

@@ -20,7 +20,7 @@
>foo[_private] = "ok" : "ok"
>foo[_private] : string
->foo : typeof foo
+>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
+>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>_private : unique symbol
>"ok" : "ok"

@@ -29,7 +29,7 @@
>foo[strMem] = "ok" : "ok"
>foo[strMem] : string
->foo : typeof foo
+>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
+>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>strMem : "strMemName"
>"ok" : "ok"

@@ -38,7 +38,7 @@
>foo[dashStrMem] = "ok" : "ok"
>foo[dashStrMem] : string
->foo : typeof foo
+>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
+>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>dashStrMem : "dashed-str-mem"
>"ok" : "ok"

@@ -47,35 +47,35 @@
>foo[numMem] = "ok" : "ok"
>foo[numMem] : string
->foo : typeof foo
+>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
+>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>numMem : 42
>"ok" : "ok"

const x: string = foo[_private];
>x : string
>foo[_private] : string
->foo : typeof foo
+>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
+>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>_private : unique symbol

const y: string = foo[strMem];
>y : string
>foo[strMem] : string
->foo : typeof foo
+>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
+>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>strMem : "strMemName"

const z: string = foo[numMem];
>z : string
>foo[numMem] : string
->foo : typeof foo
+>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
+>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>numMem : 42

const a: string = foo[dashStrMem];
>a : string
>foo[dashStrMem] : string
->foo : typeof foo
+>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
+>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>dashStrMem : "dashed-str-mem"

20 changes: 10 additions & 10 deletions testdata/baselines/reference/submodule/compiler/declarationEmitLateBoundJSAssignments.types
View file
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

=== file.js ===
export function foo() {}
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }

foo.bar = 12;
>foo.bar = 12 : 12
>foo.bar : number
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>bar : number
>12 : 12

@@ -19,7 +19,7 @@ const _private = Symbol();
foo[_private] = "ok";
>foo[_private] = "ok" : "ok"
>foo[_private] : string
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>_private : unique symbol
>"ok" : "ok"

@@ -30,7 +30,7 @@ const strMem = "strMemName";
foo[strMem] = "ok";
>foo[strMem] = "ok" : "ok"
>foo[strMem] : string
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>strMem : "strMemName"
>"ok" : "ok"

@@ -41,7 +41,7 @@ const dashStrMem = "dashed-str-mem";
foo[dashStrMem] = "ok";
>foo[dashStrMem] = "ok" : "ok"
>foo[dashStrMem] : string
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>dashStrMem : "dashed-str-mem"
>"ok" : "ok"

@@ -52,35 +52,35 @@ const numMem = 42;
foo[numMem] = "ok";
>foo[numMem] = "ok" : "ok"
>foo[numMem] : string
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>numMem : 42
>"ok" : "ok"

/** @type {string} */
const x = foo[_private];
>x : string
>foo[_private] : string
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>_private : unique symbol

/** @type {string} */
const y = foo[strMem];
>y : string
>foo[strMem] : string
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>strMem : "strMemName"

/** @type {string} */
const z = foo[numMem];
>z : string
>foo[numMem] : string
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>numMem : 42

/** @type {string} */
const a = foo[dashStrMem];
>a : string
>foo[dashStrMem] : string
>foo : { (): void; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; foo[numMem]: string; }
>foo : { (): void; foo[numMem]: string; bar: number; foo[_private]: string; strMemName: string; foo[dashStrMem]: string; }
>dashStrMem : "dashed-str-mem"

12 changes: 6 additions & 6 deletions .../baselines/reference/submodule/compiler/declarationEmitPartialReuseComputedProperty.types
View file
Original file line number Diff line number Diff line change
@@ -15,9 +15,9 @@ export const neg = -1;
>1 : 1

export const o = () => null! as { [n]: string, foo: string, [poz]: number, [neg]: number }
>o : () => { A: string; foo: string; [poz]: number; [neg]: number; }
>() => null! as { [n]: string, foo: string, [poz]: number, [neg]: number } : () => { A: string; foo: string; [poz]: number; [neg]: number; }
>null! as { [n]: string, foo: string, [poz]: number, [neg]: number } : { A: string; foo: string; [poz]: number; [neg]: number; }
>o : () => { [neg]: number; [poz]: number; A: string; foo: string; }
>() => null! as { [n]: string, foo: string, [poz]: number, [neg]: number } : () => { [neg]: number; [poz]: number; A: string; foo: string; }
>null! as { [n]: string, foo: string, [poz]: number, [neg]: number } : { [neg]: number; [poz]: number; A: string; foo: string; }
>null! : never
>[n] : string
>n : "A"
@@ -29,9 +29,9 @@ export const o = () => null! as { [n]: string, foo: string, [poz]: number, [neg]

=== b.ts ===
import { o } from "./a";
>o : () => { A: string; foo: string; [poz]: number; [neg]: number; }
>o : () => { [neg]: number; [poz]: number; A: string; foo: string; }

export const g = o
>g : () => { A: string; foo: string; [poz]: number; [neg]: number; }
>o : () => { A: string; foo: string; [poz]: number; [neg]: number; }
>g : () => { [neg]: number; [poz]: number; A: string; foo: string; }
>o : () => { [neg]: number; [poz]: number; A: string; foo: string; }

12 changes: 6 additions & 6 deletions ...lines/reference/submodule/compiler/declarationEmitPartialReuseComputedProperty.types.diff
View file
Original file line number Diff line number Diff line change
@@ -7,9 +7,9 @@
->o : () => { [n]: string; foo: string; [poz]: number; [neg]: number; }
->() => null! as { [n]: string, foo: string, [poz]: number, [neg]: number } : () => { [n]: string; foo: string; [poz]: number; [neg]: number; }
->null! as { [n]: string, foo: string, [poz]: number, [neg]: number } : { foo: string; A: string; 1: number; [-1]: number; }
+>o : () => { A: string; foo: string; [poz]: number; [neg]: number; }
+>() => null! as { [n]: string, foo: string, [poz]: number, [neg]: number } : () => { A: string; foo: string; [poz]: number; [neg]: number; }
+>null! as { [n]: string, foo: string, [poz]: number, [neg]: number } : { A: string; foo: string; [poz]: number; [neg]: number; }
+>o : () => { [neg]: number; [poz]: number; A: string; foo: string; }
+>() => null! as { [n]: string, foo: string, [poz]: number, [neg]: number } : () => { [neg]: number; [poz]: number; A: string; foo: string; }
+>null! as { [n]: string, foo: string, [poz]: number, [neg]: number } : { [neg]: number; [poz]: number; A: string; foo: string; }
>null! : never
>[n] : string
>n : "A"
@@ -18,11 +18,11 @@
=== b.ts ===
import { o } from "./a";
->o : () => { A: string; foo: string; 1: number; [-1]: number; }
+>o : () => { A: string; foo: string; [poz]: number; [neg]: number; }
+>o : () => { [neg]: number; [poz]: number; A: string; foo: string; }

export const g = o
->g : () => { A: string; foo: string; 1: number; [-1]: number; }
->o : () => { A: string; foo: string; 1: number; [-1]: number; }
+>g : () => { A: string; foo: string; [poz]: number; [neg]: number; }
+>o : () => { A: string; foo: string; [poz]: number; [neg]: number; }
+>g : () => { [neg]: number; [poz]: number; A: string; foo: string; }
+>o : () => { [neg]: number; [poz]: number; A: string; foo: string; }

12 changes: 6 additions & 6 deletions testdata/baselines/reference/submodule/compiler/dynamicNames.types
View file
Original file line number Diff line number Diff line change
@@ -486,8 +486,8 @@ t0 = C; // static side

// object literals
export const o1 = {
>o1 : { a: number; [c5]: string; [s2]: boolean; }
>{ [c4]: 1, [c5]: "a", [s2]: true} : { a: number; [c5]: string; [s2]: boolean; }
>o1 : { [c5]: string; a: number; [s2]: boolean; }
>{ [c4]: 1, [c5]: "a", [s2]: true} : { [c5]: string; a: number; [s2]: boolean; }

[c4]: 1,
>[c4] : number
@@ -510,24 +510,24 @@ export const o1 = {
export const o1_c4 = o1[c4];
>o1_c4 : number
>o1[c4] : number
>o1 : { a: number; [c5]: string; [s2]: boolean; }
>o1 : { [c5]: string; a: number; [s2]: boolean; }
>c4 : "a"

export const o1_c5 = o1[c5];
>o1_c5 : string
>o1[c5] : string
>o1 : { a: number; [c5]: string; [s2]: boolean; }
>o1 : { [c5]: string; a: number; [s2]: boolean; }
>c5 : 1

export const o1_s2 = o1[s2];
>o1_s2 : boolean
>o1[s2] : boolean
>o1 : { a: number; [c5]: string; [s2]: boolean; }
>o1 : { [c5]: string; a: number; [s2]: boolean; }
>s2 : unique symbol

export const o2: T0 = o1;
>o2 : T0
>o1 : { a: number; [c5]: string; [s2]: boolean; }
>o1 : { [c5]: string; a: number; [s2]: boolean; }

// recursive declarations
// (type parameter indirection courtesy of #20400)
Loading
Oops, something went wrong.
Loading
Oops, something went wrong.