Replaced numeric loops woth for of and removed useless getRequireKeyword

lolleko · lolleko · commit 257df03c7f47 · 2018-09-04T16:18:02.000+02:00
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -174,10 +174,6 @@ export abstract class LuaTranspiler {
         return `"${this.pathToLuaRequirePath(relativePath)}"`;
     }
 
-    public getRequireKeyword(): string {
-        return "require";
-    }
-
     public pathToLuaRequirePath(filePath: string): string {
         return filePath.replace(new RegExp("\\\\|\/", "g"), ".");
     }
@@ -320,18 +316,18 @@ export abstract class LuaTranspiler {
 
         const imports = node.importClause.namedBindings;
 
-        const reqKeyword = this.getRequireKeyword();
+        const requireKeyword = "require";
 
         if (ts.isNamedImports(imports)) {
             const fileImportTable = path.basename(importPathWithoutQuotes) + this.importCount;
             const resolvedImportPath = this.getImportPath(importPathWithoutQuotes);
 
-            let result = `local ${fileImportTable} = ${reqKeyword}(${resolvedImportPath})\n`;
+            let result = `local ${fileImportTable} = ${requireKeyword}(${resolvedImportPath})\n`;
             this.importCount++;
 
             const filteredElements = imports.elements.filter(e => {
-                const decs = tsHelper.getCustomDecorators(this.checker.getTypeAtLocation(e), this.checker);
-                return !decs.has(DecoratorKind.Extension) && !decs.has(DecoratorKind.MetaExtension);
+                const decorators = tsHelper.getCustomDecorators(this.checker.getTypeAtLocation(e), this.checker);
+                return !decorators.has(DecoratorKind.Extension) && !decorators.has(DecoratorKind.MetaExtension);
             });
 
             if (filteredElements.length === 0) {
@@ -351,7 +347,7 @@ export abstract class LuaTranspiler {
             return result;
         } else if (ts.isNamespaceImport(imports)) {
             const resolvedImportPath = this.getImportPath(importPathWithoutQuotes);
-            return `local ${this.transpileIdentifier(imports.name)} = ${reqKeyword}(${resolvedImportPath})\n`;
+            return `local ${this.transpileIdentifier(imports.name)} = ${requireKeyword}(${resolvedImportPath})\n`;
         } else {
             throw TSTLErrors.UnsupportedImportType(imports);
         }
diff --git a/src/lualib/ArrayConcat.ts b/src/lualib/ArrayConcat.ts
@@ -1,19 +1,17 @@
-/* tslint:disable */
 declare function pcall(func: Function): any;
 declare function type(val: any): string;
 
 function __TS__ArrayConcat(arr1: any[], ...args: any[]): any[] {
   const out: any[] = [];
-  for (let i = 0; i < arr1.length; i++) {
-    out[out.length] = arr1[i];
+  for (const val of arr1) {
+    out[out.length] = val;
   }
-  for (let i = 0; i < args.length; i++) {
-    const arg = args[i];
+  for (const arg of args) {
     // Hack because we don't have an isArray function
     if (pcall(() => (arg as any[]).length) && type(arg) !== "string") {
         const argAsArray = (arg as any[]);
-        for (let j = 0; j < argAsArray.length; j++) {
-            out[out.length] = argAsArray[j];
+        for (const val of argAsArray) {
+            out[out.length] = val;
         }
     } else {
         out[out.length] = arg;
diff --git a/src/lualib/ArrayPush.ts b/src/lualib/ArrayPush.ts
@@ -1,8 +1,6 @@
 function __TS__ArrayPush<T>(arr: T[], ...items: T[]): number {
-    /* tslint:disable */
-    for (let i = 0; i < items.length; i++) {
-    /* tslint:enable */
-        arr[arr.length] = items[i];
+    for (const item of items) {
+        arr[arr.length] = item;
     }
     return arr.length;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`function __TS__ArrayPush<T>(arr: T[], ...items: T[]): number {`
`2`		`- /* tslint:disable */`
`3`		`- for (let i = 0; i < items.length; i++) {`
`4`		`- /* tslint:enable */`
`5`		`- arr[arr.length] = items[i];`
	`2`	`+ for (const item of items) {`
	`3`	`+ arr[arr.length] = item;`
`6`	`4`	`}`
`7`	`5`	`return arr.length;`
`8`	`6`	`}`