Add backward compatibility for skin.

Assets/Cryville/Common/Pdt/PdtInterpreter.cs

@@ -54,15 +54,14 @@ namespace Cryville.Common.Pdt {
 		/// <param name="binder">The binder.</param>
 		/// <returns>The interpreted object.</returns>
 		public static T Interpret<T>(string src, Binder binder) {
-			return (T)new PdtInterpreter(src, typeof(T), binder).Interpret();
+			return (T)new PdtInterpreter(src, binder).Interpret(typeof(T));
 		}
 
 		/// <summary>
 		/// The source string.
 		/// </summary>
 		public string Source { get; private set; }
-		readonly Type _type;
+		Binder _binder;
-		readonly Binder _binder;
 		/// <summary>
 		/// The current position in the string being parsed by the interpreter.
 		/// </summary>
@@ -167,23 +166,27 @@ namespace Cryville.Common.Pdt {
 		/// Creates an instance of the <see cref="PdtInterpreter" /> class.
 		/// </summary>
 		/// <param name="src">The source string.</param>
-		/// <param name="type">The destination type.</param>
 		/// <param name="binder">The binder. May be <c>null</c>.</param>
-		public PdtInterpreter(string src, Type type, Binder binder) {
+		public PdtInterpreter(string src, Binder binder) {
 			Source = src;
-			_type = type;
 			_binder = binder;
-			if (_binder == null)
+		}
-				_binder = BinderAttribute.CreateBinderOfType(_type);
+		int[] m_formatVersion;
+		public int[] GetFormatVersion() {
+			if (m_formatVersion == null) InterpretDirectives();
+			return m_formatVersion;
 		}
 		/// <summary>
 		/// Interprets the source to an object.
 		/// </summary>
+		/// <param name="type">The output type.</param>
 		/// <returns>The interpreted object.</returns>
-		public object Interpret() {
+		public object Interpret(Type type) {
 			try {
-				InterpretDirectives();
+				if (m_formatVersion == null) InterpretDirectives();
-				return InterpretObject(_type);
+				if (_binder == null)
+					_binder = BinderAttribute.CreateBinderOfType(type);
+				return InterpretObject(type);
 			}
 			catch (Exception ex) {
 				throw new PdtParsingException(this, ex);
@@ -201,7 +204,10 @@ namespace Cryville.Common.Pdt {
 						break;
 					case "format":
 						ws();
-						if (GetNumber() != "1")
+						m_formatVersion = (from i in GetNumber().Split('.') select int.Parse(i)).ToArray();
+						if (m_formatVersion.Length == 0)
+							throw new FormatException("Invalid format version");
+						if (m_formatVersion[0] != 1)
 							throw new NotSupportedException("Format not supported");
 						flag = true;
 						break;

Assets/Cryville/Crtr/Ruleset.cs

@@ -22,7 +22,7 @@ namespace Cryville.Crtr {
 		public void LoadPdt(DirectoryInfo dir) {
 			using (StreamReader pdtreader = new StreamReader(dir.FullName + "/" + data + ".pdt", Encoding.UTF8)) {
 				var src = pdtreader.ReadToEnd();
-				Root = (PdtRuleset)new RulesetInterpreter(src, null).Interpret();
+				Root = (PdtRuleset)new RulesetInterpreter(src, null).Interpret(typeof(PdtRuleset));
 			}
 		}
 	}

Assets/Cryville/Crtr/RulesetInterpreter.cs

@@ -5,7 +5,7 @@ using System.Reflection;
 
 namespace Cryville.Crtr {
 	internal class RulesetInterpreter : PdtInterpreter {
-		public RulesetInterpreter(string src, Binder binder) : base(src, typeof(PdtRuleset), binder) { }
+		public RulesetInterpreter(string src, Binder binder) : base(src, binder) { }
 
 		readonly List<RulesetSelector> s = new List<RulesetSelector>();
 		readonly List<string> a = new List<string>();

Assets/Cryville/Crtr/Skin.cs

@@ -26,12 +26,21 @@ namespace Cryville.Crtr {
 		public void LoadPdt(DirectoryInfo dir) {
 			using (StreamReader pdtreader = new StreamReader(dir.FullName + "/" + data + ".pdt", Encoding.UTF8)) {
 				var src = pdtreader.ReadToEnd();
-				Root = (PdtSkin)new SkinInterpreter(src, null).Interpret();
+				var interpreter = new SkinInterpreter(src, null);
+				var format = interpreter.GetFormatVersion();
+				if (format.Length == 1) {
+					Root = new PdtSkin();
+					Root.elements = (SkinElement)new SkinInterpreter(src, new PdtBinder()).Interpret(typeof(SkinElement));
+				}
+				else {
+					if (format[1] == 1) {
+						Root = (PdtSkin)new SkinInterpreter(src, new PdtBinder()).Interpret(typeof(PdtSkin));
+					}
+				}
 			}
 		}
 	}
 
-	[Binder(typeof(PdtBinder))]
 	public class PdtSkin {
 		public Dictionary<Identifier, AnimationSpan> animations
 			= new Dictionary<Identifier, AnimationSpan>();

Assets/Cryville/Crtr/SkinInterpreter.cs

@@ -7,7 +7,7 @@ using System.Reflection;
 
 namespace Cryville.Crtr {
 	public class SkinInterpreter : PdtInterpreter {
-		public SkinInterpreter(string src, Binder binder) : base(src, typeof(PdtSkin), binder) { }
+		public SkinInterpreter(string src, Binder binder) : base(src, binder) { }
 
 		readonly List<SkinSelector> s = new List<SkinSelector>();
 		readonly HashSet<string> a = new HashSet<string>();