amended previous commit

Author: mbrowne

samples/dci/js/Dijkstra-alt/Graph.ts

@@ -15,13 +15,13 @@ function Graph(edges) {
 	  var pairs = this.nodes.get(from);
 	  if (pairs == null) {
 	      pairs = new HashMap();
-	      pairs.add(to, dist);
-	      this.nodes.add(from, pairs);
+	      pairs.put(to, dist);
+	      this.nodes.put(from, pairs);
 	  }
 	  else {
-	      pairs.add(to, dist);
+	      pairs.put(to, dist);
 	  }
 
- 	  this.distances.add(from, Infinity);
+ 	  this.distances.put(from, Infinity);
   }
 }

samples/dci/js/Dijkstra-alt/Subgraph.ts

@@ -37,7 +37,7 @@ var Subgraph = DCI.Context.extend(function() {
 		}
 
 		setAsPreviousOf(node) {
-			Graph.previous.add(node, self);
+			Graph.previous.put(node, self);
 		}
 
 		distanceTo(otherNode) {

samples/dci/js/Dijkstra/CalculateShortestPath.ts

@@ -22,10 +22,10 @@ var CalculateShortestPath = DCI.Context.extend(function() {
 	//Run the use case
 	this.run = function() {	
 		Graph.nodes.each(function(node) {
-			Unvisited.add(node);
-			Tentative.add(node, Infinity);
+			Unvisited.put(node);
+			Tentative.put(node, Infinity);
 		});
-		Tentative.add(Initial, 0);
+		Tentative.put(Initial, 0);
 
 		Current = Initial;
 		Current.markVisited();
@@ -66,8 +66,8 @@ var CalculateShortestPath = DCI.Context.extend(function() {
 
 				var alternate = Tentative.get(self) + self.distanceTo(Neighbor);
 				if (alternate < Tentative.get(Neighbor)) {
-				  Tentative.add(Neighbor, alternate);
-				  Path.add(Neighbor, self);
+				  Tentative.put(Neighbor, alternate);
+				  Path.put(Neighbor, self);
 				}
 			});
 		}

samples/dci/js/Dijkstra/Graph.ts

@@ -12,15 +12,15 @@ function Graph(edges) {
 
 	  forceMap(this.nodes, to);
 	  var cur = forceMap(this.nodes, from);
-	  cur.add(to, dist);
+	  cur.put(to, dist);
   }
 }
 
 function forceMap(nodes, node) {
 	var map = nodes.get(node);
 	if (map === undefined) {
 	  map = new HashMap();
-	  nodes.add(node, map);
+	  nodes.put(node, map);
 	}
 	return map;
 }

samples/dci/js/TransferMoney/TransferMoney.js

@@ -15,14 +15,11 @@ var TransferMoney = DCI.Context.extend(function () {
 var __context = this;
 this.__$SourceAccount = {        transferOut: //transfer money out of this account and into the destination account
         function () {
-            var methodName = 'withdraw';
-            __dci_internal.getRoleMember(__context, __context.SourceAccount, "SourceAccount", methodName)();
+            var withdraw = __dci_internal.getRoleMember(__context, __context.SourceAccount, "SourceAccount", 'withdraw');
+            withdraw.call(__context.SourceAccount);
 
             //self.withdraw();
-            methodName = 'deposit';
-            __dci_internal.getRoleMember(__context, __context.DestinationAccount, "DestinationAccount", methodName)();
-            //self.withdraw();
-            //DestinationAccount.deposit();
+            __context.__$DestinationAccount.deposit.call(__context.DestinationAccount);
         }
         ,withdraw: function () {
             if (__context.SourceAccount.getBalance() < __context.Amount) {
@@ -43,9 +40,7 @@ this.__$Amount = {};
     };
     //Run the use case
     this.run = function () {
-        var methodName = 'transferOut';
-        __dci_internal.getRoleMember(__context, __context.SourceAccount, "SourceAccount", methodName)();
-        //SourceAccount.transferOut();
+        __context.__$SourceAccount.transferOut.call(__context.SourceAccount);
     };
 
 

samples/dci/js/TransferMoney/TransferMoney.ts

@@ -25,7 +25,10 @@ var TransferMoney = DCI.Context.extend(function() {
 	role SourceAccount {
 		//transfer money out of this account and into the destination account
 		transferOut() {
-			self.withdraw();
+			var withdraw = self['withdraw'];
+			withdraw.call(self);
+		
+			//self.withdraw();
 			DestinationAccount.deposit();
 		}
 

samples/dci/typescript/Dijkstra/HashMap.ts

@@ -26,7 +26,7 @@ class HashMap {
 		return -1;
 	}
 
-    add(key, value) {
+    put(key, value) {
         if (key === undefined && value === undefined) return undefined;
 
         var previous = undefined;

src/compiler/emitter.ts

@@ -643,6 +643,14 @@ module TypeScript {
 						this.writeToOutput("__dci_internal.callMethodOnSelf");
 						//this.writeToOutput("DCI.callMethodOnSelf");
 						this.writeToOutput("(__context, this, '" + roleName + "'");
+
+						//DCI TODO
+						//Check for dynamic role method call, e.g. this['withdraw'](); or:
+						//  var methodName = 'withdraw';
+						//  this[methodName]();
+						//
+						//if (target.nodeType() == NodeType.ElementAccessExpression) {
+
 						this.writeToOutput(", '" + operand2.actualText + "'");
 
 						if (args && args.members.length) this.writeToOutput(", ");
@@ -1290,11 +1298,20 @@ module TypeScript {
 	            //This allows us to support calling role methods dynamically, e.g.:
 	            //  var methodName = 'deposit';
 	            //  DestinationAccount[methodName]();
-				var isCallToSelf = false;
 				var dciContext = this.thisDCIContextNode;
 				var potentialRoleIdentifier: Identifier = <Identifier>operand1; //object identifier - potentially a role identifier
 				var roleName: string;
 
+				//DCI TODO
+				//Support `this` in addition to `self`
+				//
+				//Support dynamically retrieving a role method on `self`, e.g.:
+				//  var withdraw = self['withdraw'];
+				//  withdraw.call(self);
+				if (this.thisRoleNode && potentialRoleIdentifier.actualText == 'self') {
+					roleName = this.thisRoleNode.name.actualText;
+				}
+
 				if (!roleName) roleName = potentialRoleIdentifier.actualText;
 
 				//Is it a role identifier?