Added support for string.indexOf and string indexing

Perryvw · Perryvw · commit 89f5a6f11713 · 2018-01-27T11:32:39.000+01:00
diff --git a/dist/TSHelper.js b/dist/TSHelper.js
@@ -28,6 +28,11 @@ var TSHelper = /** @class */ (function () {
         }
         return "unknown";
     };
+    TSHelper.isStringType = function (type) {
+        return (type.flags & ts.TypeFlags.String) != 0
+            || (type.flags & ts.TypeFlags.StringLike) != 0
+            || (type.flags & ts.TypeFlags.StringLiteral) != 0;
+    };
     TSHelper.isValueType = function (node) {
         return ts.isIdentifier(node) || ts.isLiteralExpression(node) || ts.isArrayLiteralExpression(node) || ts.isObjectLiteralExpression(node);
     };
diff --git a/dist/Transpiler.js b/dist/Transpiler.js
@@ -477,7 +477,14 @@ var LuaTranspiler = /** @class */ (function () {
         var caller = this.transpileExpression(expression.expression);
         switch (expression.name.escapedText) {
             case "replace":
-                return caller + ":sub(" + params + ")";
+                return "string.sub(" + caller + "," + params + ")";
+            case "indexOf":
+                if (node.arguments.length == 1) {
+                    return "(string.find(" + caller + "," + params + ",1,true) or 0)-1";
+                }
+                else {
+                    return "(string.find(" + caller + "," + params + "+1,true) or 0)-1";
+                }
             default:
                 throw new TranspileError("Unsupported string function: " + expression.name.escapedText, node);
         }
@@ -563,6 +570,9 @@ var LuaTranspiler = /** @class */ (function () {
         if (TSHelper_1.TSHelper.isArrayType(type) || TSHelper_1.TSHelper.isTupleType(type)) {
             return element + "[" + index + "+1]";
         }
+        else if (TSHelper_1.TSHelper.isStringType(type)) {
+            return "string.sub(" + element + "," + index + "+1," + index + "+1)";
+        }
         else {
             return element + "[" + index + "]";
         }
diff --git a/src/TSHelper.ts b/src/TSHelper.ts
@@ -29,6 +29,12 @@ export class TSHelper {
         return "unknown"
     }
 
+    static isStringType(type: ts.Type): boolean {
+        return (type.flags & ts.TypeFlags.String) != 0
+            || (type.flags & ts.TypeFlags.StringLike) != 0
+            || (type.flags & ts.TypeFlags.StringLiteral) != 0
+    }
+
     static isValueType(node: ts.Node): boolean {
         return ts.isIdentifier(node) || ts.isLiteralExpression(node) || ts.isArrayLiteralExpression(node) || ts.isObjectLiteralExpression(node);
     }
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -522,7 +522,13 @@ export class LuaTranspiler {
         const caller = this.transpileExpression(expression.expression);
         switch (expression.name.escapedText) {
             case "replace":
-                return `${caller}:sub(${params})`;
+                return `string.sub(${caller},${params})`;
+            case "indexOf":
+                if (node.arguments.length == 1) {
+                    return `(string.find(${caller},${params},1,true) or 0)-1`;
+                } else {
+                    return `(string.find(${caller},${params}+1,true) or 0)-1`;
+                }
             default:
                 throw new TranspileError("Unsupported string function: " + expression.name.escapedText, node);
         }
@@ -619,6 +625,8 @@ export class LuaTranspiler {
         const type = this.checker.getTypeAtLocation(node.expression);
         if (tsEx.isArrayType(type) || tsEx.isTupleType(type)) {
             return `${element}[${index}+1]`;
+        } else if (tsEx.isStringType(type)) {
+            return `string.sub(${element},${index}+1,${index}+1)`;
         } else {
             return `${element}[${index}]`;
         }
diff --git a/test/src/test/test3.lua b/test/src/test/test3.lua
@@ -7,4 +7,4 @@ local f = #c.d
 local g = #c.e
 local h = #"abc"
 table.insert(b, 3)
-a:sub("a","b")
+string.sub(a,"a","b")
diff --git a/test/src/test2.lua b/test/src/test2.lua
@@ -26,6 +26,11 @@ function TestClass.Test(self)
     print("sup")
     self.Test3(self,3,"")
     self.unit.GetParent(self.unit).GetParent(self.unit.GetParent(self.unit)).GetAbsOrigin(self.unit.GetParent(self.unit).GetParent(self.unit.GetParent(self.unit)))
+    local str = "abcbc"
+    print(string.sub(str,(string.find(str,"b",1,true) or 0)-1+1,(string.find(str,"b",1,true) or 0)-1+1))
+    print((string.find(str,"b",2+1,true) or 0)-1)
+    print((string.find("abc","c",1,true) or 0)-1)
+    print((string.find(str,"b",1,true) or 0)-1)
 end
 function TestClass.Test3(self,a,b)
     return ""
diff --git a/test/src/test2.ts b/test/src/test2.ts
@@ -43,6 +43,11 @@ export class TestClass {
         print("sup");
         this.Test3(3, "");
         this.unit.GetParent().GetParent().GetAbsOrigin();
+        let str="abcbc";
+        print(str[str.indexOf("b")]);
+        print(str.indexOf("b", 2));
+        print("abc".indexOf("c"));
+        print(str.indexOf("b"))
     }
 
     Test3(a: number, b: string): string {

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,12 @@ export class TSHelper {`
`29`	`29`	`return "unknown"`
`30`	`30`	`}`
`31`	`31`
	`32`	`+ static isStringType(type: ts.Type): boolean {`
	`33`	`+ return (type.flags & ts.TypeFlags.String) != 0`
	`34`	`+ \|\| (type.flags & ts.TypeFlags.StringLike) != 0`
	`35`	`+ \|\| (type.flags & ts.TypeFlags.StringLiteral) != 0`
	`36`	`+ }`
	`37`	`+`
`32`	`38`	`static isValueType(node: ts.Node): boolean {`
`33`	`39`	`return ts.isIdentifier(node) \|\| ts.isLiteralExpression(node) \|\| ts.isArrayLiteralExpression(node) \|\| ts.isObjectLiteralExpression(node);`
`34`	`40`	`}`