Fixed some minor issues

lolleko · lolleko · commit a819459c80a6 · 2018-07-22T19:48:33.000+02:00
diff --git a/src/CommandLineParser.ts b/src/CommandLineParser.ts
@@ -21,7 +21,7 @@ const optionDeclarations: { [key: string]: yargs.Options } = {
     luaLibImport: {
         choices: ["inline", "require", "none"],
         default: "inline",
-        describe: "Specify Lua target version.",
+        describe: "Specifies how js standard features missing in lua are imported.",
         type: "string",
     },
     luaTarget: {
diff --git a/src/Compiler.ts b/src/Compiler.ts
@@ -51,8 +51,6 @@ export function compileFilesWithOptions(fileNames: string[], options: CompilerOp
             try {
                 const rootDir = options.rootDir;
 
-                // console.log(`Transpiling ${sourceFile.fileName}...`);
-
                 // Transpile AST
                 const lua = createTranspiler(checker, options, sourceFile).transpileSourceFile();
 
diff --git a/src/Index.ts b/src/Index.ts
@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 
-import {compile} from "./Compiler";
+import { compile } from "./Compiler";
 
 compile(process.argv.slice(2));
diff --git a/src/lualib/ArraySplice.ts b/src/lualib/ArraySplice.ts
@@ -1,22 +1,17 @@
-// https://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
 function __TS__ArraySplice<T>(list: T[], start: number, deleteCount: number, ...items: T[]): T[] {
-    // 1. 2.
+
     const len = list.length;
 
     let actualStart;
 
-    // 4.
     if (start <  0) {
         actualStart = Math.max(len + start, 0);
     } else {
         actualStart = Math.min(start, len);
     }
 
-    // 13.
-    // 14.
     const itemCount = items.length;
 
-    // 5. - 7.
     let actualDeleteCount: number;
 
     if (!start) {
@@ -27,13 +22,8 @@ function __TS__ArraySplice<T>(list: T[], start: number, deleteCount: number, ...
         actualDeleteCount = Math.min(Math.max(deleteCount, 0), len - actualStart);
     }
 
-    // 8. ignored
-
-    // 9.
     const out: T[] = [];
 
-    // 10.
-    // 11.
     for (let k = 0; k < actualDeleteCount; k++) {
         const from = actualStart + k;
 
@@ -42,9 +32,7 @@ function __TS__ArraySplice<T>(list: T[], start: number, deleteCount: number, ...
         }
     }
 
-    // 15.
     if (itemCount < actualDeleteCount) {
-        // a. b.
         for (let k = actualStart; k < len - actualDeleteCount; k++) {
             const from = k + actualDeleteCount;
             const to = k + itemCount;
@@ -55,11 +43,9 @@ function __TS__ArraySplice<T>(list: T[], start: number, deleteCount: number, ...
                 list[to] = undefined;
             }
         }
-        // c. d.
         for (let k = len; k > len - actualDeleteCount + itemCount; k--) {
             list[k - 1] = undefined;
         }
-    // 16.
     } else if (itemCount > actualDeleteCount) {
 
         for (let k = len - actualDeleteCount; k > actualStart; k--) {
@@ -71,23 +57,18 @@ function __TS__ArraySplice<T>(list: T[], start: number, deleteCount: number, ...
             } else {
                 list[to] = undefined;
             }
-
         }
     }
 
-    // 17.
-    // 18.
     let j = actualStart;
     for (const e of items) {
         list[j] = e;
         j++;
     }
 
-    // 19.
     for (let k = list.length - 1; k >= len - actualDeleteCount + itemCount; k--) {
         list[k] = undefined;
     }
 
-    // 20.
     return out;
 }
diff --git a/test/unit/lualib/lualib.spec.ts b/test/unit/lualib/lualib.spec.ts
@@ -1,5 +1,5 @@
 import { Expect, Test, TestCase } from "alsatian";
-import * as util from "../src/util";
+import * as util from "../../src/util";
 
 export class LuaLibArrayTests {
 

Original file line number	Diff line number	Diff line change
`@@ -1,22 +1,17 @@`
`1`		`-// https://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf`
`2`	`1`	`function __TS__ArraySplice<T>(list: T[], start: number, deleteCount: number, ...items: T[]): T[] {`
`3`		`- // 1. 2.`
	`2`	`+`
`4`	`3`	`const len = list.length;`
`5`	`4`
`6`	`5`	`let actualStart;`
`7`	`6`
`8`		`- // 4.`
`9`	`7`	`if (start < 0) {`
`10`	`8`	`actualStart = Math.max(len + start, 0);`
`11`	`9`	`} else {`
`12`	`10`	`actualStart = Math.min(start, len);`
`13`	`11`	`}`
`14`	`12`
`15`		`- // 13.`
`16`		`- // 14.`
`17`	`13`	`const itemCount = items.length;`
`18`	`14`
`19`		`- // 5. - 7.`
`20`	`15`	`let actualDeleteCount: number;`
`21`	`16`
`22`	`17`	`if (!start) {`
`@@ -27,13 +22,8 @@ function __TS__ArraySplice<T>(list: T[], start: number, deleteCount: number, ...`
`27`	`22`	`actualDeleteCount = Math.min(Math.max(deleteCount, 0), len - actualStart);`
`28`	`23`	`}`
`29`	`24`
`30`		`- // 8. ignored`
`31`		`-`
`32`		`- // 9.`
`33`	`25`	`const out: T[] = [];`
`34`	`26`
`35`		`- // 10.`
`36`		`- // 11.`
`37`	`27`	`for (let k = 0; k < actualDeleteCount; k++) {`
`38`	`28`	`const from = actualStart + k;`
`39`	`29`
`@@ -42,9 +32,7 @@ function __TS__ArraySplice<T>(list: T[], start: number, deleteCount: number, ...`
`42`	`32`	`}`
`43`	`33`	`}`
`44`	`34`
`45`		`- // 15.`
`46`	`35`	`if (itemCount < actualDeleteCount) {`
`47`		`- // a. b.`
`48`	`36`	`for (let k = actualStart; k < len - actualDeleteCount; k++) {`
`49`	`37`	`const from = k + actualDeleteCount;`
`50`	`38`	`const to = k + itemCount;`
`@@ -55,11 +43,9 @@ function __TS__ArraySplice<T>(list: T[], start: number, deleteCount: number, ...`
`55`	`43`	`list[to] = undefined;`
`56`	`44`	`}`
`57`	`45`	`}`
`58`		`- // c. d.`
`59`	`46`	`for (let k = len; k > len - actualDeleteCount + itemCount; k--) {`
`60`	`47`	`list[k - 1] = undefined;`
`61`	`48`	`}`
`62`		`- // 16.`
`63`	`49`	`} else if (itemCount > actualDeleteCount) {`
`64`	`50`
`65`	`51`	`for (let k = len - actualDeleteCount; k > actualStart; k--) {`
`@@ -71,23 +57,18 @@ function __TS__ArraySplice<T>(list: T[], start: number, deleteCount: number, ...`
`71`	`57`	`} else {`
`72`	`58`	`list[to] = undefined;`
`73`	`59`	`}`
`74`		`-`
`75`	`60`	`}`
`76`	`61`	`}`
`77`	`62`
`78`		`- // 17.`
`79`		`- // 18.`
`80`	`63`	`let j = actualStart;`
`81`	`64`	`for (const e of items) {`
`82`	`65`	`list[j] = e;`
`83`	`66`	`j++;`
`84`	`67`	`}`
`85`	`68`
`86`		`- // 19.`
`87`	`69`	`for (let k = list.length - 1; k >= len - actualDeleteCount + itemCount; k--) {`
`88`	`70`	`list[k] = undefined;`
`89`	`71`	`}`
`90`	`72`
`91`		`- // 20.`
`92`	`73`	`return out;`
`93`	`74`	`}`