Merge remote-tracking branch 'refs/remotes/origin/dev'

engine/Container.js

@@ -1,5 +1,6 @@
 import {StringValue} from './Value';
 import {StoryException} from './StoryException';
+import {StringBuilder} from './StringBuilder';
 import {Object as InkObject} from './Object';
 
 export class Container extends InkObject{//also implements INamedContent. Not sure how to do it cleanly in JS.
@@ -210,28 +211,30 @@ export class Container extends InkObject{//also implements INamedContent. Not su
 	}
 	BuildStringOfHierarchy(sb, indentation, pointedObj){
 		if (arguments.length == 0){
-			return this.BuildStringOfHierarchy('', 0, null);
+			var sb = new StringBuilder();
+			this.BuildStringOfHierarchy(sb, 0, null);
+			return sb.toString();
 		}
 
 		function appendIndentation(){
 			var spacesPerIndent = 4;
 			for(var i = 0; i < spacesPerIndent*indentation; ++i) { 
-				sb += " "; 
+				sb.Append(" "); 
 			}
 		}
 
 		appendIndentation();
-		sb += "[";
+		sb.Append("[");
 
 		if (this.hasValidName) {
-			sb += " (" + this.name + ")";
+			sb.AppendFormat(" ({0})", this.name);
 		}
 
 		if (this == pointedObj) {
-			sb += "  <---";
+			sb.Append("  <---");
 		}
 
-		sb += "\n";
+		sb.AppendLine();
 
 		indentation++;
 
@@ -248,23 +251,23 @@ export class Container extends InkObject{//also implements INamedContent. Not su
 			} else {
 				appendIndentation();
 				if (obj instanceof StringValue) {
-					sb += "\"";
-					sb += obj.toString().replace("\n", "\\n");
-					sb += "\"";
+					sb.Append("\"");
+					sb.Append(obj.toString().replace("\n", "\\n"));
+					sb.Append("\"");
 				} else {
-					sb += obj.toString();
+					sb.Append(obj.toString());
 				}
 			}
 
 			if (i != this.content.length - 1) {
-				sb += ",";
+				sb.Append(",");
 			}
 
 			if ( !(obj instanceof Container) && obj == pointedObj ) {
-				sb += "  <---";
+				sb.Append("  <---");
 			}
 
-			sb += "\n";
+			sb.AppendLine();
 		}
 
 
@@ -280,22 +283,21 @@ export class Container extends InkObject{//also implements INamedContent. Not su
 
 		if (Object.keys(onlyNamed).length > 0) {
 			appendIndentation();
-			sb += "\n";
-			sb += "-- named: --";
+			sb.AppendLine("-- named: --");
 
 			for (var key in onlyNamed){
 				if (!(onlyNamed[key] instanceof Container)) console.warn("Can only print out named Containers");
 
 				var container = onlyNamed[key];
 				container.BuildStringOfHierarchy(sb, indentation, pointedObj);
-				sb += "\n";
+				sb.Append("\n");
 			}
 		}
 
 
 		indentation--;
 
 		appendIndentation();
-		sb += "]";
+		sb.Append("]");
 	}
 }

engine/Divert.js

@@ -1,5 +1,6 @@
 import {Path} from './Path';
 import {PushPopType} from './PushPop';
+import {StringBuilder} from './StringBuilder';
 import {Object as InkObject} from './Object';
 
 export class Divert extends InkObject{
@@ -84,7 +85,7 @@ export class Divert extends InkObject{
 			return "Divert(null)";
 		} else {
 
-			var sb = '';
+			var sb = new StringBuilder;
 
 			var targetStr = this.targetPath.toString();
 //			int? targetLineNum = DebugLineNumberOfPath (targetPath);
@@ -93,20 +94,20 @@ export class Divert extends InkObject{
 				targetStr = "line " + targetLineNum;
 			}
 
-			sb += "Divert";
+			sb.Append("Divert");
 			if (this.pushesToStack) {
 				if (this.stackPushType == PushPopType.Function) {
-					sb += " function";
+					sb.Append(" function");
 				} else {
-					sb += " tunnel";
+					sb.Append(" tunnel");
 				}
 			}
 
-			sb += " (";
-			sb += targetStr;
-			sb += ")";
+			sb.Append(" (");
+			sb.Append(targetStr);
+			sb.Append(")");
 
-			return sb;
+			return sb.toString();
 		}
 	}
 }

engine/JsonSerialisation.js

@@ -9,6 +9,7 @@ import {VariableReference} from './VariableReference';
 import {VariableAssignment} from './VariableAssignment';
 import {NativeFunctionCall} from './NativeFunctionCall';
 import {Void} from './Void';
+import {Tag} from './Tag';
 import {Path} from './Path';
 import {Choice} from './Choice';
 import {Object as InkObject} from './Object';
@@ -223,6 +224,9 @@ export class JsonSerialisation{
 				varAss.isGlobal = isGlobalVar;
 				return varAss;
 			}
+			if (propValue = obj["#"]){
+				return new Tag(propValue.toString());
+			}
 
 			if (obj["originalChoicePath"] != null)
 				return this.JObjectToChoice(obj);
@@ -378,6 +382,14 @@ export class JsonSerialisation{
 		var voidObj = obj;
 		if (voidObj instanceof Void)
 			return "void";
+
+//		var tag = obj as Tag;
+		var tag = obj;
+		if (tag instanceof Tag) {
+			var jObj = {};
+			jObj["#"] = tag.text;
+			return jObj;
+		}
 
 		// Used when serialising save state only
 //		var choice = obj as Choice;