Add trimStart/End aliases (AssemblyScript#287)

MaxGraey · dcodeIO · commit 2874fb9d8ae9 · 2018-09-30T22:21:34.000+02:00
diff --git a/std/assembly/index.d.ts b/std/assembly/index.d.ts
@@ -482,6 +482,8 @@ declare class String {
   trim(): string;
   trimLeft(): string;
   trimRight(): string;
+  trimStart(): string;
+  trimEnd(): string;
   padStart(targetLength: i32, padString?: string): string;
   padEnd(targetLength: i32, padString?: string): string;
   repeat(count?: i32): string;
diff --git a/std/assembly/string.ts b/std/assembly/string.ts
@@ -303,7 +303,17 @@ export class String {
     return out;
   }
 
+  @inline
   trimLeft(): String {
+    return this.trimStart();
+  }
+
+  @inline
+  trimRight(): String {
+    return this.trimEnd();
+  }
+
+  trimStart(): String {
     assert(this !== null);
     var start: isize = 0;
     var len: isize = this.length;
@@ -323,7 +333,7 @@ export class String {
     return out;
   }
 
-  trimRight(): String {
+  trimEnd(): String {
     assert(this !== null);
     var len: isize = this.length;
     while (
diff --git a/std/portable/index.d.ts b/std/portable/index.d.ts
@@ -304,6 +304,8 @@ declare class String {
   trim(): string;
   trimLeft(): string;
   trimRight(): string;
+  trimStart(): string;
+  trimEnd(): string;
   padStart(targetLength: i32, padString?: string): string;
   padEnd(targetLength: i32, padString?: string): string;
   replace(search: string, replacement: string): string;
diff --git a/tests/compiler/std/string.optimized.wat b/tests/compiler/std/string.optimized.wat
@@ -2734,7 +2734,7 @@
     (call $~lib/env/abort
      (i32.const 0)
      (i32.const 80)
-     (i32.const 345)
+     (i32.const 355)
      (i32.const 4)
     )
     (unreachable)
@@ -2876,7 +2876,7 @@
     (call $~lib/env/abort
      (i32.const 0)
      (i32.const 80)
-     (i32.const 365)
+     (i32.const 375)
      (i32.const 4)
     )
     (unreachable)
@@ -3675,7 +3675,7 @@
               (call $~lib/env/abort
                (i32.const 0)
                (i32.const 80)
-               (i32.const 513)
+               (i32.const 523)
                (i32.const 10)
               )
               (unreachable)
@@ -4153,7 +4153,7 @@
     (call $~lib/env/abort
      (i32.const 0)
      (i32.const 80)
-     (i32.const 385)
+     (i32.const 395)
      (i32.const 4)
     )
     (unreachable)
@@ -4189,7 +4189,7 @@
     (call $~lib/env/abort
      (i32.const 0)
      (i32.const 80)
-     (i32.const 390)
+     (i32.const 400)
      (i32.const 6)
     )
     (unreachable)
diff --git a/tests/compiler/std/string.untouched.wat b/tests/compiler/std/string.untouched.wat
@@ -3451,7 +3451,7 @@
     (call $~lib/env/abort
      (i32.const 0)
      (i32.const 80)
-     (i32.const 345)
+     (i32.const 355)
      (i32.const 4)
     )
     (unreachable)
@@ -3601,7 +3601,7 @@
     (call $~lib/env/abort
      (i32.const 0)
      (i32.const 80)
-     (i32.const 365)
+     (i32.const 375)
      (i32.const 4)
     )
     (unreachable)
@@ -4465,7 +4465,7 @@
                  (call $~lib/env/abort
                   (i32.const 0)
                   (i32.const 80)
-                  (i32.const 513)
+                  (i32.const 523)
                   (i32.const 10)
                  )
                  (unreachable)
@@ -5012,7 +5012,7 @@
     (call $~lib/env/abort
      (i32.const 0)
      (i32.const 80)
-     (i32.const 385)
+     (i32.const 395)
      (i32.const 4)
     )
     (unreachable)
@@ -5047,7 +5047,7 @@
     (call $~lib/env/abort
      (i32.const 0)
      (i32.const 80)
-     (i32.const 390)
+     (i32.const 400)
      (i32.const 6)
     )
     (unreachable)
diff --git a/tests/parser/string-binding.ts b/tests/parser/string-binding.ts
@@ -40,10 +40,10 @@ export class ExternalString {
   trim(): String { return unreachable(); }
 
   @binding(BindingCall.THIS, [], BindingType.OBJECT_HANDLE)
-  trimLeft(): String { return unreachable(); }
+  trimStart(): String { return unreachable(); }
 
   @binding(BindingCall.THIS, [], BindingType.OBJECT_HANDLE)
-  trimRight(): String { return unreachable(); }
+  trimEnd(): String { return unreachable(); }
 
   @binding(BindingCall.THIS, [ BindingType.OBJECT_HANDLE ], BindingType.PASS_THRU)
   @operator("==")
diff --git a/tests/parser/string-binding.ts.fixture.ts b/tests/parser/string-binding.ts.fixture.ts
@@ -50,11 +50,11 @@ export class ExternalString {
     return unreachable();
   }
   @binding(BindingCall.THIS, [], BindingType.OBJECT_HANDLE)
-  trimLeft(): String {
+  trimStart(): String {
     return unreachable();
   }
   @binding(BindingCall.THIS, [], BindingType.OBJECT_HANDLE)
-  trimRight(): String {
+  trimEnd(): String {
     return unreachable();
   }
   @binding(BindingCall.THIS, [BindingType.OBJECT_HANDLE], BindingType.PASS_THRU)

Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,11 @@ export class ExternalString {`
`50`	`50`	`return unreachable();`
`51`	`51`	`}`
`52`	`52`	`@binding(BindingCall.THIS, [], BindingType.OBJECT_HANDLE)`
`53`		`- trimLeft(): String {`
	`53`	`+ trimStart(): String {`
`54`	`54`	`return unreachable();`
`55`	`55`	`}`
`56`	`56`	`@binding(BindingCall.THIS, [], BindingType.OBJECT_HANDLE)`
`57`		`- trimRight(): String {`
	`57`	`+ trimEnd(): String {`
`58`	`58`	`return unreachable();`
`59`	`59`	`}`
`60`	`60`	`@binding(BindingCall.THIS, [BindingType.OBJECT_HANDLE], BindingType.PASS_THRU)`