Add some string functions (#377)

andreiradu · Perryvw · commit 9e0a0f09d675 · 2019-02-02T15:40:02.000+01:00
* -added string concat

* -added string.slice

* -added string.charCodeAt

* -added string concat test

* -removed copy-paste declares
diff --git a/src/LuaLib.ts b/src/LuaLib.ts
@@ -25,6 +25,7 @@ export enum LuaLibFeature {
     Set = "Set",
     StringReplace = "StringReplace",
     StringSplit = "StringSplit",
+    StringConcat = "StringConcat",
     Symbol = "Symbol",
 }
 
diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -2804,6 +2804,8 @@ export class LuaTransformer {
         switch (expressionName) {
             case "replace":
                 return this.transformLuaLibFunction(LuaLibFeature.StringReplace, caller, ...params);
+            case "concat":
+                return this.transformLuaLibFunction(LuaLibFeature.StringConcat, caller, ...params);
             case "indexOf":
                 const stringExpression =
                     node.arguments.length === 1
@@ -2843,6 +2845,18 @@ export class LuaTransformer {
                     const arg2 = params[1];
                     return this.createStringCall("sub", node, caller, arg1, arg2);
                 }
+            case "slice":
+                if (node.arguments.length === 0) {
+                    return caller;
+                }
+                else if (node.arguments.length === 1) {
+                    const arg1 = this.expressionPlusOne(params[0]);
+                    return this.createStringCall("sub", node, caller, arg1);
+                } else {
+                    const arg1 = this.expressionPlusOne(params[0]);
+                    const arg2 = params[1];
+                    return this.createStringCall("sub", node, caller, arg1, arg2);
+                }
             case "toLowerCase":
                 return this.createStringCall("lower", node, caller);
             case "toUpperCase":
@@ -2852,6 +2866,11 @@ export class LuaTransformer {
             case "charAt":
                 const firstParamPlusOne = this.expressionPlusOne(params[0]);
                 return this.createStringCall("sub", node, caller, firstParamPlusOne, firstParamPlusOne);
+            case "charCodeAt":
+            {
+                const firstParamPlusOne = this.expressionPlusOne(params[0]);
+                return this.createStringCall("byte", node, caller, firstParamPlusOne);
+            }
             default:
                 throw TSTLErrors.UnsupportedProperty("string", expressionName, node);
         }
diff --git a/src/lualib/StringConcat.ts b/src/lualib/StringConcat.ts
@@ -0,0 +1,7 @@
+function __TS__StringConcat(str1: string, ...args: string[]): string {
+  let out = str1;
+  for (const arg of args) {
+    out = out + arg;
+  }
+  return out;
+}
diff --git a/test/unit/string.spec.ts b/test/unit/string.spec.ts
@@ -81,7 +81,20 @@ export class StringTests
         // Assert
         Expect(result).toBe(expected);
     }
-
+    @TestCase("", ["", ""])
+    @TestCase("hello", ["test"])
+    @TestCase("hello", [])
+    @TestCase("hello", ["test", "bye"])
+    @Test("string.concatFct")
+    public concatFct(str: string, param: string[]): void {
+        const paramStr = param.map(elem => `"${elem}"`).join(", ");
+        console.log(`return "${str}".concat(${paramStr})`);
+         const result = util.transpileAndExecute(
+             `return "${str}".concat(${paramStr})`
+         );
+         // Assert
+         Expect(result).toBe(str.concat(...param));
+    }
     @TestCase("hello test", "")
     @TestCase("hello test", "t")
     @TestCase("hello test", "h")
@@ -122,7 +135,23 @@ export class StringTests
         // Assert
         Expect(result).toBe(inp.indexOf(searchValue, x));
     }
+    @TestCase("hello test")
+    @TestCase("hello test", 0)
+    @TestCase("hello test", 1)
+    @TestCase("hello test", 1, 2)
+    @TestCase("hello test", 1, 5)
+    @Test("string.slice")
+    public slice(inp: string, start?: number, end?: number): void
+    {
+        // Transpile/Execute
+        const paramStr = start? (end ? `${start}, ${end}` : `${start}`):'';
+        const result = util.transpileAndExecute(
+            `return "${inp}".slice(${paramStr})`
+        );
 
+        // Assert
+        Expect(result).toBe(inp.slice(start, end));
+    }
     @TestCase("hello test", 0)
     @TestCase("hello test", 1)
     @TestCase("hello test", 1, 2)
@@ -258,6 +287,20 @@ export class StringTests
         Expect(result).toBe(inp.charAt(index));
     }
 
+    @TestCase("hello test", 1)
+    @TestCase("hello test", 2)
+    @TestCase("hello test", 3)
+    @Test("string.charCodeAt")
+    public charCodeAt(inp: string, index: number): void
+    {
+        const result = util.transpileAndExecute(
+            `return "${inp}".charCodeAt(${index})`
+        );
+
+        // Assert
+        Expect(result).toBe(inp.charCodeAt(index));
+    }
+
     @TestCase("hello test", 1, 0)
     @TestCase("hello test", 1, 2)
     @TestCase("hello test", 3, 2)

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ export enum LuaLibFeature {`
`25`	`25`	`Set = "Set",`
`26`	`26`	`StringReplace = "StringReplace",`
`27`	`27`	`StringSplit = "StringSplit",`
	`28`	`+ StringConcat = "StringConcat",`
`28`	`29`	`Symbol = "Symbol",`
`29`	`30`	`}`
`30`	`31`