Skip to content

Commit 2874fb9

Browse files
MaxGraeydcodeIO
authored andcommitted
Add trimStart/End aliases (AssemblyScript#287)
1 parent 301734b commit 2874fb9

File tree

7 files changed

+29
-15
lines changed

7 files changed

+29
-15
lines changed

std/assembly/index.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,8 @@ declare class String {
482482
trim(): string;
483483
trimLeft(): string;
484484
trimRight(): string;
485+
trimStart(): string;
486+
trimEnd(): string;
485487
padStart(targetLength: i32, padString?: string): string;
486488
padEnd(targetLength: i32, padString?: string): string;
487489
repeat(count?: i32): string;

std/assembly/string.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,17 @@ export class String {
303303
return out;
304304
}
305305

306+
@inline
306307
trimLeft(): String {
308+
return this.trimStart();
309+
}
310+
311+
@inline
312+
trimRight(): String {
313+
return this.trimEnd();
314+
}
315+
316+
trimStart(): String {
307317
assert(this !== null);
308318
var start: isize = 0;
309319
var len: isize = this.length;
@@ -323,7 +333,7 @@ export class String {
323333
return out;
324334
}
325335

326-
trimRight(): String {
336+
trimEnd(): String {
327337
assert(this !== null);
328338
var len: isize = this.length;
329339
while (

std/portable/index.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,8 @@ declare class String {
304304
trim(): string;
305305
trimLeft(): string;
306306
trimRight(): string;
307+
trimStart(): string;
308+
trimEnd(): string;
307309
padStart(targetLength: i32, padString?: string): string;
308310
padEnd(targetLength: i32, padString?: string): string;
309311
replace(search: string, replacement: string): string;

tests/compiler/std/string.optimized.wat

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2734,7 +2734,7 @@
27342734
(call $~lib/env/abort
27352735
(i32.const 0)
27362736
(i32.const 80)
2737-
(i32.const 345)
2737+
(i32.const 355)
27382738
(i32.const 4)
27392739
)
27402740
(unreachable)
@@ -2876,7 +2876,7 @@
28762876
(call $~lib/env/abort
28772877
(i32.const 0)
28782878
(i32.const 80)
2879-
(i32.const 365)
2879+
(i32.const 375)
28802880
(i32.const 4)
28812881
)
28822882
(unreachable)
@@ -3675,7 +3675,7 @@
36753675
(call $~lib/env/abort
36763676
(i32.const 0)
36773677
(i32.const 80)
3678-
(i32.const 513)
3678+
(i32.const 523)
36793679
(i32.const 10)
36803680
)
36813681
(unreachable)
@@ -4153,7 +4153,7 @@
41534153
(call $~lib/env/abort
41544154
(i32.const 0)
41554155
(i32.const 80)
4156-
(i32.const 385)
4156+
(i32.const 395)
41574157
(i32.const 4)
41584158
)
41594159
(unreachable)
@@ -4189,7 +4189,7 @@
41894189
(call $~lib/env/abort
41904190
(i32.const 0)
41914191
(i32.const 80)
4192-
(i32.const 390)
4192+
(i32.const 400)
41934193
(i32.const 6)
41944194
)
41954195
(unreachable)

tests/compiler/std/string.untouched.wat

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3451,7 +3451,7 @@
34513451
(call $~lib/env/abort
34523452
(i32.const 0)
34533453
(i32.const 80)
3454-
(i32.const 345)
3454+
(i32.const 355)
34553455
(i32.const 4)
34563456
)
34573457
(unreachable)
@@ -3601,7 +3601,7 @@
36013601
(call $~lib/env/abort
36023602
(i32.const 0)
36033603
(i32.const 80)
3604-
(i32.const 365)
3604+
(i32.const 375)
36053605
(i32.const 4)
36063606
)
36073607
(unreachable)
@@ -4465,7 +4465,7 @@
44654465
(call $~lib/env/abort
44664466
(i32.const 0)
44674467
(i32.const 80)
4468-
(i32.const 513)
4468+
(i32.const 523)
44694469
(i32.const 10)
44704470
)
44714471
(unreachable)
@@ -5012,7 +5012,7 @@
50125012
(call $~lib/env/abort
50135013
(i32.const 0)
50145014
(i32.const 80)
5015-
(i32.const 385)
5015+
(i32.const 395)
50165016
(i32.const 4)
50175017
)
50185018
(unreachable)
@@ -5047,7 +5047,7 @@
50475047
(call $~lib/env/abort
50485048
(i32.const 0)
50495049
(i32.const 80)
5050-
(i32.const 390)
5050+
(i32.const 400)
50515051
(i32.const 6)
50525052
)
50535053
(unreachable)

tests/parser/string-binding.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ export class ExternalString {
4040
trim(): String { return unreachable(); }
4141

4242
@binding(BindingCall.THIS, [], BindingType.OBJECT_HANDLE)
43-
trimLeft(): String { return unreachable(); }
43+
trimStart(): String { return unreachable(); }
4444

4545
@binding(BindingCall.THIS, [], BindingType.OBJECT_HANDLE)
46-
trimRight(): String { return unreachable(); }
46+
trimEnd(): String { return unreachable(); }
4747

4848
@binding(BindingCall.THIS, [ BindingType.OBJECT_HANDLE ], BindingType.PASS_THRU)
4949
@operator("==")

tests/parser/string-binding.ts.fixture.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ export class ExternalString {
5050
return unreachable();
5151
}
5252
@binding(BindingCall.THIS, [], BindingType.OBJECT_HANDLE)
53-
trimLeft(): String {
53+
trimStart(): String {
5454
return unreachable();
5555
}
5656
@binding(BindingCall.THIS, [], BindingType.OBJECT_HANDLE)
57-
trimRight(): String {
57+
trimEnd(): String {
5858
return unreachable();
5959
}
6060
@binding(BindingCall.THIS, [BindingType.OBJECT_HANDLE], BindingType.PASS_THRU)

0 commit comments

Comments
 (0)