Fixed a couple map bugs

Perryvw · Perryvw · commit 543cd37e31f7 · 2018-07-20T10:38:29.000+02:00
diff --git a/src/lualib/Map.ts b/src/lualib/Map.ts
@@ -9,26 +9,31 @@ class Map<TKey, TValue> {
 
         if (other) {
             this.size = other.size;
-            other.forEach((value, key) => {this.items[key] = value; });
+            for (const [key, value] of other.entries()) {
+                this.items[key] = value;
+            }
         }
     }
 
     public clear(): void {
         this.items = {};
         this.size = 0;
+        return;
     }
 
     public delete(key: TKey): boolean {
         const contains = this.has(key);
+        if (contains) {
+            this.size = this.size - 1;
+        }
         this.items[key as any] = undefined;
-        this.size = this.size - 1;
         return contains;
     }
 
     public entries(): Array<[TKey, TValue]> {
         const out = [];
         for (const key in this.items) {
-            out[out.length + 1] = [key, this.items[key]];
+            out[out.length] = [key, this.items[key]];
         }
         return out;
     }
@@ -37,20 +42,21 @@ class Map<TKey, TValue> {
         for (const key in this.items) {
             callback(this.items[key], key as any, this);
         }
+        return;
     }
 
     public get(key: TKey): TValue {
         return this.items[key as any];
     }
 
     public has(key: TKey): boolean {
-        return this.items[key as any] != undefined;
+        return this.items[key as any] !== undefined;
     }
 
     public keys(): TKey[] {
         const out = [];
         for (const key in this.items) {
-            out[out.length + 1] = key;
+            out[out.length] = key;
         }
         return out;
     }
@@ -66,7 +72,7 @@ class Map<TKey, TValue> {
     public values(): TValue[] {
         const out = [];
         for (const key in this.items) {
-            out[out.length + 1] = this.items[key];
+            out[out.length] = this.items[key];
         }
         return out;
     }
diff --git a/tslint.json b/tslint.json
@@ -9,6 +9,7 @@
         "align": [true, "parameters", "statements", "arguments", "members", "elements"],
         "arrow-parens": [true, "ban-single-arg-parens"],
         "class-name": true,
+        "forin": false,
         "no-bitwise": false,
         "indent": [true, "spaces", 4],
         "max-classes-per-file": 1,

Original file line number	Diff line number	Diff line change
`@@ -9,26 +9,31 @@ class Map<TKey, TValue> {`
`9`	`9`
`10`	`10`	`if (other) {`
`11`	`11`	`this.size = other.size;`
`12`		`- other.forEach((value, key) => {this.items[key] = value; });`
	`12`	`+ for (const [key, value] of other.entries()) {`
	`13`	`+ this.items[key] = value;`
	`14`	`+ }`
`13`	`15`	`}`
`14`	`16`	`}`
`15`	`17`
`16`	`18`	`public clear(): void {`
`17`	`19`	`this.items = {};`
`18`	`20`	`this.size = 0;`
	`21`	`+ return;`
`19`	`22`	`}`
`20`	`23`
`21`	`24`	`public delete(key: TKey): boolean {`
`22`	`25`	`const contains = this.has(key);`
	`26`	`+ if (contains) {`
	`27`	`+ this.size = this.size - 1;`
	`28`	`+ }`
`23`	`29`	`this.items[key as any] = undefined;`
`24`		`- this.size = this.size - 1;`
`25`	`30`	`return contains;`
`26`	`31`	`}`
`27`	`32`
`28`	`33`	`public entries(): Array<[TKey, TValue]> {`
`29`	`34`	`const out = [];`
`30`	`35`	`for (const key in this.items) {`
`31`		`- out[out.length + 1] = [key, this.items[key]];`
	`36`	`+ out[out.length] = [key, this.items[key]];`
`32`	`37`	`}`
`33`	`38`	`return out;`
`34`	`39`	`}`
`@@ -37,20 +42,21 @@ class Map<TKey, TValue> {`
`37`	`42`	`for (const key in this.items) {`
`38`	`43`	`callback(this.items[key], key as any, this);`
`39`	`44`	`}`
	`45`	`+ return;`
`40`	`46`	`}`
`41`	`47`
`42`	`48`	`public get(key: TKey): TValue {`
`43`	`49`	`return this.items[key as any];`
`44`	`50`	`}`
`45`	`51`
`46`	`52`	`public has(key: TKey): boolean {`
`47`		`- return this.items[key as any] != undefined;`
	`53`	`+ return this.items[key as any] !== undefined;`
`48`	`54`	`}`
`49`	`55`
`50`	`56`	`public keys(): TKey[] {`
`51`	`57`	`const out = [];`
`52`	`58`	`for (const key in this.items) {`
`53`		`- out[out.length + 1] = key;`
	`59`	`+ out[out.length] = key;`
`54`	`60`	`}`
`55`	`61`	`return out;`
`56`	`62`	`}`
`@@ -66,7 +72,7 @@ class Map<TKey, TValue> {`
`66`	`72`	`public values(): TValue[] {`
`67`	`73`	`const out = [];`
`68`	`74`	`for (const key in this.items) {`
`69`		`- out[out.length + 1] = this.items[key];`
	`75`	`+ out[out.length] = this.items[key];`
`70`	`76`	`}`
`71`	`77`	`return out;`
`72`	`78`	`}`