Merge pull request microsoft#24 from Microsoft/namespace

paulvanbrenk · paulvanbrenk · commit 723baaf1c56c · 2015-08-06T16:16:43.000-07:00
Update sample to use namespace for 'internal modules'
diff --git a/mankala/Base.ts b/mankala/Base.ts
@@ -1,39 +1,35 @@
 ///<reference path="Driver.ts"/>
 
-module Base {
-    export interface IList {
+namespace Base {
+    export interface IList<T> {
         isHead: boolean;
-        next: IList;
-        prev: IList;
-        insertAfter(entry: IList): IList;
-        insertBefore(entry: IList): IList;
-        item();
+        next: IList<T>;
+        prev: IList<T>;
+        data: T;
+        insertAfter(entry: IList<T>): IList<T>;
+        insertBefore(entry: IList<T>): IList<T>;
         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>;
 
-        item() {
-            return this.data;
-        }
+        constructor(public isHead: boolean, public data: T) { }
 
         empty(): boolean {
             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 +38,21 @@ module 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/Features.ts b/mankala/Features.ts
@@ -1,6 +1,6 @@
 ///<reference path="Driver.ts"/>
 
-module Mankala {
+namespace Mankala {
     export class Features {
         public turnContinues = false;
         public seedStoredCount = 0;
diff --git a/mankala/Game.ts b/mankala/Game.ts
@@ -1,6 +1,6 @@
 ///<reference path="Driver.ts"/>
 
-module Mankala {
+namespace Mankala {
     export var NoSpace = -1;
     export var homeSpaces = [[0, 1, 2, 3, 4, 5],
                              [7, 8, 9, 10, 11, 12]];
@@ -14,18 +14,12 @@ module Mankala {
     const humanScoreId = "humanScore";
     const computerScoreId = "computerScore"
 
-    export interface IPositionList extends Base.IList {
-        data: Position;
-        push(pos: Position);
-        pop(): Position;
-    }
-
-    function pushPosition(pos: Position, l: IPositionList) {
+    function pushPosition(pos: Position, l: Base.IList<Position>) {
         l.insertAfter(Base.listMakeEntry(pos));
     }
 
-    function popPosition(l: IPositionList) {
-        var entry: IPositionList = <IPositionList>Base.listRemove(l.next);
+    function popPosition(l: Base.IList<Position>) {
+        var entry = Base.listRemove(l.next);
         if (entry != null) {
             return entry.data;
         } else {
@@ -43,7 +37,7 @@ module Mankala {
     export class Game {
         private position = new DisplayPosition([3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 0], NoMove, 0);
         private prevConfig: SeedCoords[][];
-        private q: IPositionList = null;
+        private q: Base.IList<Position> = null;
         private scores: number[] = null;
         private positionCount = 0;
         private moveCount = 0;
@@ -165,7 +159,7 @@ module Mankala {
 
         private findMove() {
             var timeStart = new Date().getTime();
-            this.q = <IPositionList>Base.listMakeHead();
+            this.q = Base.listMakeHead<Position>();
             this.scores = [NoScore, NoScore, NoScore, NoScore, NoScore, NoScore];
             pushPosition(this.position, this.q);
             var deltaTime = 0;
diff --git a/mankala/Position.ts b/mankala/Position.ts
@@ -1,6 +1,6 @@
 ///<reference path="Driver.ts"/>
 
-module Mankala {
+namespace Mankala {
     export var storeHouses = [6, 13];
     var svgNS = "http://www.w3.org/2000/svg";
 
diff --git a/mankala/geometry.ts b/mankala/geometry.ts
@@ -1,6 +1,6 @@
 ///<reference path="Driver.ts"/>
 
-module Mankala {
+namespace Mankala {
     export class Rectangle {
 
         constructor (public x: number, public y: number,
