Make the sample generic.

Paul van Brenk · Paul van Brenk · commit 1b6fab6a0161 · 2015-06-22T16:23:22.000-07:00
diff --git a/mankala/Base.ts b/mankala/Base.ts
@@ -1,21 +1,22 @@
 ///<reference path="Driver.ts"/>
 
 namespace Base {
-    export interface IList {
+    export interface IList<T> {
         isHead: boolean;
-        next: IList;
-        prev: IList;
-        insertAfter(entry: IList): IList;
-        insertBefore(entry: IList): IList;
+        next: IList<T>;
+        prev: IList<T>;
+        data: T;
+        insertAfter(entry: IList<T>): IList<T>;
+        insertBefore(entry: IList<T>): IList<T>;
         item();
         empty(): boolean;
     }
 
-    export class List implements IList {
-        next: IList;
-        prev: IList;
-        
-        constructor (public isHead: boolean, public data) { }
+    export class List<T> implements IList<T> {
+        next: IList<T>;
+        prev: IList<T>;
+
+        constructor(public isHead: boolean, public data: T) { }
 
         item() {
             return this.data;
@@ -25,15 +26,15 @@ namespace Base {
             return this.next == this;
         }
 
-        insertAfter(entry: IList): IList {
+        insertAfter(entry: IList<T>): IList<T> {
             entry.next = this.next;
             entry.prev = this;
             this.next = entry;
             entry.next.prev = entry;
             return (entry);
         }
 
-        insertBefore(entry: IList): IList {
+        insertBefore(entry: IList<T>): IList<T> {
             this.prev.next = entry;
             entry.next = this;
             entry.prev = this.prev;
@@ -42,21 +43,21 @@ namespace Base {
         }
     }
 
-    export function listMakeEntry(data): IList {
-        var entry: List = new List(false, data);
+    export function listMakeEntry<T>(data: T): IList<T> {
+        var entry: List<T> = new List<T>(false, data);
         entry.prev = entry;
         entry.next = entry;
         return entry;
     }
 
-    export function listMakeHead(): IList {
-        var entry: List = new List(true, null);
+    export function listMakeHead<T>(): IList<T> {
+        var entry: List<T> = new List(true, null);
         entry.prev = entry;
         entry.next = entry;
         return entry;
     }
 
-    export function listRemove(entry: IList): IList {
+    export function listRemove<T>(entry: IList<T>): IList<T> {
         if (entry == null) {
             return null;
         }
diff --git a/mankala/Game.ts b/mankala/Game.ts
@@ -14,7 +14,7 @@ namespace Mankala {
     const humanScoreId = "humanScore";
     const computerScoreId = "computerScore"
 
-    export interface IPositionList extends Base.IList {
+    export interface IPositionList extends Base.IList<Position> {
         data: Position;
         push(pos: Position);
         pop(): Position;
@@ -25,7 +25,7 @@ namespace Mankala {
     }
 
     function popPosition(l: IPositionList) {
-        var entry: IPositionList = <IPositionList>Base.listRemove(l.next);
+        var entry = Base.listRemove(l.next);
         if (entry != null) {
             return entry.data;
         } else {
@@ -165,7 +165,7 @@ namespace Mankala {
 
         private findMove() {
             var timeStart = new Date().getTime();
-            this.q = <IPositionList>Base.listMakeHead();
+            this.q = <IPositionList>Base.listMakeHead<Position>();
             this.scores = [NoScore, NoScore, NoScore, NoScore, NoScore, NoScore];
             pushPosition(this.position, this.q);
             var deltaTime = 0;
