From: jpbruyere <jp.bruyere@hotmail.com>
Date: Wed, 21 Dec 2016 15:01:28 +0000 (+0100)
Subject: Named node resolution, code clean and debug
X-Git-Tag: v0.5.1~63^2~19
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=e93697acd920c593e82dd232f0e6f28d434d9e49;p=jp%2Fcrow.git

Named node resolution, code clean and debug
	modifié :         Crow.csproj
	modifié :         src/IML/BindingDefinition.cs
	modifié :         src/IML/Context.cs
	modifié :         src/Instantiator.cs
	modifié :         src/ItemTemplate.cs
---

diff --git a/Crow.csproj b/Crow.csproj
index 35a755a7..fd5ed612 100644
--- a/Crow.csproj
+++ b/Crow.csproj
@@ -156,18 +156,10 @@
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Drawing" />
-    <Reference Include="cairo-sharp">
-      <Package>GtkSharp.3.1.3</Package>
-    </Reference>
-    <Reference Include="gdk-sharp">
-      <Package>GtkSharp.3.1.3</Package>
-    </Reference>
-    <Reference Include="gio-sharp">
-      <Package>GtkSharp.3.1.3</Package>
-    </Reference>
-    <Reference Include="glib-sharp">
-      <Package>GtkSharp.3.1.3</Package>
-    </Reference>
+    <Reference Include="cairo-sharp" />
+    <Reference Include="gdk-sharp" />
+    <Reference Include="gio-sharp" />
+    <Reference Include="glib-sharp" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/IML/BindingDefinition.cs b/src/IML/BindingDefinition.cs
index e357fcac..19a54d09 100644
--- a/src/IML/BindingDefinition.cs
+++ b/src/IML/BindingDefinition.cs
@@ -50,6 +50,9 @@ namespace Crow.IML
 		}
 		#endregion
 
+		public bool IsDataSourceBinding { get { return TargetNA == null; }}
+		public bool HasUnresolvedTargetName { get { return !string.IsNullOrEmpty(TargetName); }}
+
 		/// <summary>
 		/// replace the target node address with corresponding named node address, and clear the target name once resolved
 		/// </summary>
diff --git a/src/IML/Context.cs b/src/IML/Context.cs
index 09329e1b..104633c6 100644
--- a/src/IML/Context.cs
+++ b/src/IML/Context.cs
@@ -48,10 +48,8 @@ namespace Crow.IML
 
 		public Dictionary<NodeAddress, Dictionary<string, List<MemberAddress>>> Bindings =
 			new Dictionary<NodeAddress, Dictionary<string, List<MemberAddress>>>();
-		//public List<DataSourceBinding> DataSourceBindings = new List<DataSourceBinding>();
-		public Dictionary<NamedNodeAddress, Dictionary<string, MemberAddress>> NamedBindings =
-			new Dictionary<NamedNodeAddress, Dictionary<string, MemberAddress>>();
-		
+		public List<BindingDefinition> UnresolvedTargets = new List<BindingDefinition>();
+
 		public Context (Type rootType)
 		{
 			RootType = rootType;
@@ -86,10 +84,45 @@ namespace Crow.IML
 			nodeBindings [origMember].Add (new MemberAddress (destNA, destMember));
 		}
 		public void StorePropertyBinding(BindingDefinition bindDef){
+			if (bindDef.HasUnresolvedTargetName) {
+				UnresolvedTargets.Add (bindDef);
+				return;
+			}
 			StorePropertyBinding (bindDef.TargetNA, bindDef.TargetMember, bindDef.SourceNA, bindDef.SourceMember);
-			if (bindDef.TwoWay)
-				StorePropertyBinding (bindDef.SourceNA, bindDef.SourceMember, bindDef.TargetNA, bindDef.TargetMember);
+//			if (bindDef.TwoWay)
+//				StorePropertyBinding (bindDef.SourceNA, bindDef.SourceMember, bindDef.TargetNA, bindDef.TargetMember);
 		}
+		public void StoreCurrentName(string name){
+			if (!Names.ContainsKey(name))
+				Names[name] = new List<NodeAddress>();
+			Names[name].Add(CurrentNodeAddress);
+		}
+		public void ResolveNames (){
+			foreach (BindingDefinition bd in UnresolvedTargets) {
+				if (!Names.ContainsKey (bd.TargetName))
+					throw new Exception ("Target Name '" + bd.TargetName + "' not found");
+				NodeAddress resolvedNA = null;
+				foreach (NodeAddress na in Names[bd.TargetName]) {
+					bool naMatch = true;
+					for (int i = 0; i < bd.TargetNA.Count; i++) {
+						if (bd.TargetNA [i] != na [i]) {
+							naMatch = false;
+							break;
+						}
+					}
+					if (naMatch) {
+						resolvedNA = na;
+						break;
+					}
+				}
+				if (resolvedNA == null)
+					throw new Exception ("Target Name '" + bd.TargetName + "' not found");
+
+				bd.ResolveTargetName (resolvedNA);
+				StorePropertyBinding (bd);
+			}
+		}
+
 		void initILGen ()
 		{
 			il.DeclareLocal (typeof (GraphicObject));
diff --git a/src/Instantiator.cs b/src/Instantiator.cs
index c546e633..490faaad 100644
--- a/src/Instantiator.cs
+++ b/src/Instantiator.cs
@@ -108,6 +108,7 @@ namespace Crow
 			emitLoader (reader, ctx);
 			ctx.nodesStack.Pop ();
 
+
 			emitBindingDelegates (ctx);
 
 			ctx.il.Emit(OpCodes.Ret);
@@ -154,7 +155,7 @@ namespace Crow
 		void emitTemplateLoad (Context ctx, string tmpXml) {
 			//if its a template, first read template elements
 			using (XmlTextReader reader = new XmlTextReader (tmpXml, XmlNodeType.Element, null)) {
-				List<string []> itemTemplateIds = new List<string []> ();
+				List<string[]> itemTemplateIds = new List<string[]> ();
 				bool inlineTemplate = false;
 
 				string templatePath = reader.GetAttribute ("Template");
@@ -230,9 +231,7 @@ namespace Crow
 					}
 				}
 			}
-			ctx.nodesStack.IncrementCurrentNodeIndex ();
 		}
-
 		void emitGOLoad (Context ctx, string tmpXml) {
 			using (XmlTextReader reader = new XmlTextReader (tmpXml, XmlNodeType.Element, null)) {
 				reader.Read ();
@@ -273,11 +272,8 @@ namespace Crow
 						if (pi == null)
 							throw new Exception ("Member '" + reader.Name + "' is not a property in " + ctx.CurrentNodeType.Name);
 
-						if (pi.Name == "Name"){
-							if (!ctx.Names.ContainsKey(reader.Value))
-								ctx.Names[reader.Value] = new List<NodeAddress>();
-							ctx.Names[reader.Value].Add(ctx.CurrentNodeAddress);
-						}
+						if (pi.Name == "Name")
+							ctx.StoreCurrentName (reader.Value);
 
 						if (reader.Value.StartsWith ("{", StringComparison.OrdinalIgnoreCase))
 							readPropertyBinding (ctx, reader.Name, reader.Value.Substring (1, reader.Value.Length - 2));
@@ -294,30 +290,7 @@ namespace Crow
 				ctx.nodesStack.ResetCurrentNodeIndex ();
 			}
 		}
-		string[] splitOnSemiColumnOutsideAccolades (string expression){
-			List<String> exps = new List<string>();
-			int accCount = 0;
-			int expPtr = 0;
-			for (int c = 0; c < expression.Length; c++) {
-				switch (expression[c]){
-				case '{':
-					accCount++;
-					break;
-				case '}':
-					accCount--;
-					break;
-				case ';':
-					if (accCount > 0)
-						break;
-					exps.Add(expression.Substring(expPtr, c - expPtr - 1));
-					expPtr = c + 1;
-					break;
-				}
-			}
-			if (exps.Count == 0)
-				exps.Add(expression);
-			return exps.ToArray ();
-		}
+
 		/// <summary>
 		/// Parse child node an generate corresponding msil
 		/// </summary>
@@ -376,36 +349,65 @@ namespace Crow
 		}
 		#endregion
 
-		void emitCheckAndBindValueChanged(Context ctx){
-			System.Reflection.Emit.Label labContinue = ctx.il.DefineLabel ();
-			string strNA = ctx.CurrentNodeAddress.ToString ();
-			//first, test if current node is in bindingDelegate dictionnary
-			ctx.il.Emit(OpCodes.Ldarg_0);//load ref to this instanciator onto the stack
-			ctx.il.Emit(OpCodes.Ldfld, typeof(Instantiator).GetField("bindingDelegates", BindingFlags.Instance | BindingFlags.NonPublic));
-			ctx.il.Emit (OpCodes.Ldstr, strNA);//load binding id for current node
-			ctx.il.Emit (OpCodes.Call, typeof(Dictionary<string,Delegate>).GetMethod ("ContainsKey"));
-
-			ctx.il.Emit (OpCodes.Brfalse, labContinue);//if not present, do nothing
-
-			ctx.il.Emit (OpCodes.Ldloc_0);//load current instance for event add
-			//fetch delegate
-			ctx.il.Emit(OpCodes.Ldarg_0);//load ref to this instanciator onto the stack
-			ctx.il.Emit(OpCodes.Ldfld, typeof(Instantiator).GetField("bindingDelegates", BindingFlags.Instance | BindingFlags.NonPublic));
-			ctx.il.Emit (OpCodes.Ldstr, strNA);//load binding id for current node
-			ctx.il.Emit (OpCodes.Callvirt, typeof(Dictionary<string, Delegate>).GetMethod ("get_Item", new Type[] { typeof(string) }));
-
-			//attach to valuechanged handler
-			ctx.il.Emit(OpCodes.Callvirt, typeof(IValueChange).GetEvent("ValueChanged").AddMethod);
+		string[] splitOnSemiColumnOutsideAccolades (string expression){
+			List<String> exps = new List<string>();
+			int accCount = 0;
+			int expPtr = 0;
+			for (int c = 0; c < expression.Length; c++) {
+				switch (expression[c]){
+				case '{':
+					accCount++;
+					break;
+				case '}':
+					accCount--;
+					break;
+				case ';':
+					if (accCount > 0)
+						break;
+					exps.Add(expression.Substring(expPtr, c - expPtr - 1));
+					expPtr = c + 1;
+					break;
+				}
+			}
+			if (exps.Count == 0)
+				exps.Add(expression);
+			return exps.ToArray ();
+		}
+		void readPropertyBinding (Context ctx, string sourceMember, string expression)
+		{
+			NodeAddress sourceNA = ctx.CurrentNodeAddress;
+			BindingDefinition bindingDef = splitBindingExp (sourceNA, sourceMember, expression);
 
-			//call initializer
-			ctx.il.Emit(OpCodes.Ldarg_0);//load ref to this instanciator onto the stack
-			ctx.il.Emit(OpCodes.Ldfld, typeof(Instantiator).GetField("bindingInitializer", BindingFlags.Instance | BindingFlags.NonPublic));
-			ctx.il.Emit (OpCodes.Ldstr, strNA);//load binding id for current node
-			ctx.il.Emit (OpCodes.Call, typeof(Dictionary<string, Delegate>).GetMethod ("get_Item", new Type[] { typeof(string) }));
-			ctx.il.Emit (OpCodes.Ldloc_0);//load current instance, passed as arg to invoke initializer
-			ctx.il.Emit(OpCodes.Callvirt, typeof(Action<object>).GetMethod("Invoke"));
+			if (bindingDef.IsDataSourceBinding)//bind on data source
+				emitDataSourceBindingDelegate (ctx, sourceMember, bindingDef.TargetMember);
+			else
+				ctx.StorePropertyBinding (bindingDef);
+		}
+		/// <summary>
+		/// Gets the node adress from binding expression splitted with '/' starting at a given node
+		/// </summary>
+		NodeAddress getNodeAdressFromBindingExp(NodeAddress sourceAddr, string[] bindingExp){
+			int ptr = sourceAddr.Count - 1;
 
-			ctx.il.MarkLabel (labContinue);
+			//if exp start with '/' => Graphic tree parsing start at source
+			if (string.IsNullOrEmpty (bindingExp [0])) {
+				//TODO:
+			} else if (bindingExp [0] == ".") { //search template root
+				ptr--;
+				while (ptr >= 0) {
+					if (typeof(TemplatedControl).IsAssignableFrom (sourceAddr [ptr].CrowType))
+						break;
+					ptr--;
+				}
+			} else if (bindingExp [0] == "..") { //search starting at current node
+				int levelUp = bindingExp.Length - 1;
+				if (levelUp > ptr)
+					throw new Exception ("Binding error: try to bind outside IML source");
+				ptr -= levelUp;
+			}
+			Node[] targetNode = new Node[ptr+1];
+			Array.Copy (sourceAddr.ToArray (), targetNode, ptr + 1);
+			return new NodeAddress (targetNode);
 		}
 		/// <summary>
 		/// Splits the binding expression
@@ -445,43 +447,6 @@ namespace Crow
 			return bindingDef;
 		}
 
-		void readPropertyBinding (Context ctx, string sourceMember, string expression)
-		{			
-			NodeAddress sourceNA = ctx.CurrentNodeAddress;
-			BindingDefinition bindingDef = splitBindingExp (sourceNA, sourceMember, expression);
-
-			if (bindingDef.TargetNA == null)//bind on data source
-				emitDataSourceBindingDelegate (ctx, sourceMember, bindingDef.TargetMember);
-			else
-				ctx.StorePropertyBinding (bindingDef);
-		}
-		/// <summary>
-		/// Gets the node adress from binding expression splitted with '/' starting at a given node
-		/// </summary>
-		NodeAddress getNodeAdressFromBindingExp(NodeAddress sourceAddr, string[] bindingExp){
-			int ptr = sourceAddr.Count - 1;
-
-			//if exp start with '/' => Graphic tree parsing start at source
-			if (string.IsNullOrEmpty (bindingExp [0])) {
-				//TODO:
-			} else if (bindingExp [0] == ".") { //search template root
-				ptr--;
-				while (ptr >= 0) {
-					if (typeof(TemplatedControl).IsAssignableFrom (sourceAddr [ptr].CrowType))
-						break;
-					ptr--;
-				}
-			} else if (bindingExp [0] == "..") { //search starting at current node
-				int levelUp = bindingExp.Length - 1;
-				if (levelUp > ptr)
-					throw new Exception ("Binding error: try to bind outside IML source");
-				ptr -= levelUp;
-			}
-			Node[] targetNode = new Node[ptr+1];
-			Array.Copy (sourceAddr.ToArray (), targetNode, ptr + 1);
-			return new NodeAddress (targetNode);
-		}
-
 		#region Emit Helper
 		void dataSourceChangedEmitHelper(object dscSource, object dataSource, int dynMethIdx){
 			if (dataSource is IValueChange)
@@ -490,6 +455,37 @@ namespace Crow
 		}
 		#endregion
 
+		void emitCheckAndBindValueChanged(Context ctx){
+			System.Reflection.Emit.Label labContinue = ctx.il.DefineLabel ();
+			string strNA = ctx.CurrentNodeAddress.ToString ();
+			//first, test if current node is in bindingDelegate dictionnary
+			ctx.il.Emit(OpCodes.Ldarg_0);//load ref to this instanciator onto the stack
+			ctx.il.Emit(OpCodes.Ldfld, typeof(Instantiator).GetField("bindingDelegates", BindingFlags.Instance | BindingFlags.NonPublic));
+			ctx.il.Emit (OpCodes.Ldstr, strNA);//load binding id for current node
+			ctx.il.Emit (OpCodes.Call, typeof(Dictionary<string,Delegate>).GetMethod ("ContainsKey"));
+
+			ctx.il.Emit (OpCodes.Brfalse, labContinue);//if not present, do nothing
+
+			ctx.il.Emit (OpCodes.Ldloc_0);//load current instance for event add
+			//fetch delegate
+			ctx.il.Emit(OpCodes.Ldarg_0);//load ref to this instanciator onto the stack
+			ctx.il.Emit(OpCodes.Ldfld, typeof(Instantiator).GetField("bindingDelegates", BindingFlags.Instance | BindingFlags.NonPublic));
+			ctx.il.Emit (OpCodes.Ldstr, strNA);//load binding id for current node
+			ctx.il.Emit (OpCodes.Callvirt, typeof(Dictionary<string, Delegate>).GetMethod ("get_Item", new Type[] { typeof(string) }));
+
+			//attach to valuechanged handler
+			ctx.il.Emit(OpCodes.Callvirt, typeof(IValueChange).GetEvent("ValueChanged").AddMethod);
+
+			//call initializer
+			ctx.il.Emit(OpCodes.Ldarg_0);//load ref to this instanciator onto the stack
+			ctx.il.Emit(OpCodes.Ldfld, typeof(Instantiator).GetField("bindingInitializer", BindingFlags.Instance | BindingFlags.NonPublic));
+			ctx.il.Emit (OpCodes.Ldstr, strNA);//load binding id for current node
+			ctx.il.Emit (OpCodes.Call, typeof(Dictionary<string, Delegate>).GetMethod ("get_Item", new Type[] { typeof(string) }));
+			ctx.il.Emit (OpCodes.Ldloc_0);//load current instance, passed as arg to invoke initializer
+			ctx.il.Emit(OpCodes.Callvirt, typeof(Action<object>).GetMethod("Invoke"));
+
+			ctx.il.MarkLabel (labContinue);
+		}
 
 		/// <summary>
 		/// Compile events expression in IML attributes, and store the result in the instanciator
@@ -623,8 +619,7 @@ namespace Crow
 			cachedDelegates.Add (dm.CreateDelegate (sourceEvent.EventHandlerType));
 			ctx.emitCachedDelegateHandlerAddition(dmIdx, sourceEvent);
 		}
-
-		void emitHandlerBinding (Context ctx, EventInfo sourceEvent, string expression){			
+		void emitHandlerBinding (Context ctx, EventInfo sourceEvent, string expression){
 			NodeAddress currentNode = ctx.CurrentNodeAddress;
 			BindingDefinition bindingDef = splitBindingExp (currentNode, sourceEvent.Name, expression);
 
@@ -680,7 +675,6 @@ namespace Crow
 				ctx.emitCachedDelegateHandlerAddition(delDSIndex, typeof(GraphicObject).GetEvent(bindOnEventName));
 			}
 		}
-
 		/// <summary>
 		/// Create and store in the instanciator the ValueChanged delegates
 		/// those delegates uses grtree functions to set destination value so they don't
@@ -774,9 +768,9 @@ namespace Crow
 					ilPC.Emit (OpCodes.Ldloc_1);//push mi for value fetching
 					ilPC.Emit (OpCodes.Call, typeof(CompilerServices).GetMethod("getValueWithReflexion", BindingFlags.Static | BindingFlags.Public));
 
-					emitCeckAndConvert (il, ma.Property.PropertyType);
+					emitConvert (il, ma.Property.PropertyType);
 
-					emitCeckAndConvert (ilPC, ma.Property.PropertyType);
+					emitConvert (ilPC, ma.Property.PropertyType);
 
 					il.Emit (OpCodes.Callvirt, ma.Property.GetSetMethod());
 					ilPC.Emit (OpCodes.Callvirt, ma.Property.GetSetMethod());
@@ -836,7 +830,7 @@ namespace Crow
 			System.Reflection.Emit.Label endMethod = il.DefineLabel ();
 
 			il.DeclareLocal (typeof(object));
-			LocalBuilder lb = ilInit.DeclareLocal (typeof(object));
+			ilInit.DeclareLocal (typeof(object));
 
 			il.Emit (OpCodes.Nop);
 
@@ -879,13 +873,6 @@ namespace Crow
 						//init dynmeth: load actual value
 						ilInit.Emit (OpCodes.Ldarg_0);
 						ilInit.Emit (OpCodes.Callvirt, origineNodeType.GetProperty (bindingCase.Key).GetGetMethod());
-						ilInit.Emit (OpCodes.Dup);
-						//ilInit.Emit (OpCodes.Pop);
-						if (origineNodeType.GetProperty (bindingCase.Key).PropertyType.IsValueType)
-							ilInit.Emit (OpCodes.Box, origineNodeType.GetProperty (bindingCase.Key).PropertyType);
-						ilInit.Emit (OpCodes.Stloc_0);//, lb.LocalIndex);
-
-						ilInit.EmitWriteLine (lb);
 					}
 					//load new value
 					il.Emit (OpCodes.Ldarg_1);
@@ -961,7 +948,7 @@ namespace Crow
 				//memberless binding, if targetMember exists, it will be used to determine target
 				//value type for conversion
 
-				emitCeckAndConvert (il, piOrigine.PropertyType);
+				emitConvert (il, piOrigine.PropertyType);
 
 				il.Emit (OpCodes.Callvirt, piOrigine.GetSetMethod ());
 
@@ -1019,7 +1006,7 @@ namespace Crow
 				il.Emit (OpCodes.Ldloc_1);//push mi for value fetching
 				il.Emit (OpCodes.Call, typeof(CompilerServices).GetMethod("getValueWithReflexion", BindingFlags.Static | BindingFlags.Public));
 			}
-			emitCeckAndConvert (il, piOrigine.PropertyType);
+			emitConvert (il, piOrigine.PropertyType);
 			il.Emit (OpCodes.Callvirt, piOrigine.GetSetMethod ());
 
 			if (!string.IsNullOrEmpty(dataSourceMember)){
@@ -1044,8 +1031,6 @@ namespace Crow
 			ctx.emitCachedDelegateHandlerAddition(delDSIndex, typeof(GraphicObject).GetEvent("DataSourceChanged"));
 		}
 
-
-
 		void emitGetInstance (ILGenerator il, NodeAddress orig, NodeAddress dest){
 			if (orig.Count < dest.Count) {
 				for (int i = orig.Count - 1; i < dest.Count - 1; i++)
@@ -1081,6 +1066,9 @@ namespace Crow
 				return;
 			}
 		}
+		/// <summary>
+		/// Emit conversion from orig type to dest type
+		/// </summary>
 		void emitConvert(ILGenerator il, Type origType, Type destType){
 			if (destType == typeof(string))
 				il.Emit (OpCodes.Callvirt, CompilerServices.miObjToString);
@@ -1099,21 +1087,11 @@ namespace Crow
 				}
 			}
 		}
-		void emitConvert(ILGenerator il, Type dstType){
-			if (dstType == typeof (string))
-				il.Emit (OpCodes.Callvirt, CompilerServices.miObjToString);
-			else if (dstType.IsValueType)
-				il.Emit (OpCodes.Unbox_Any, dstType);
-			else
-				il.Emit (OpCodes.Castclass, dstType);
-		}
 		/// <summary>
-		/// check type of current object on the stack, use loc_0 so store it
+		/// check type of current object on the stack and convert to dest type,
+		/// use loc_0 so store it as object!!!
 		/// </summary>
-		/// <returns>The ceck and convert.</returns>
-		/// <param name="il">Il.</param>
-		/// <param name="dstType">Dst type.</param>
-		void emitCeckAndConvert(ILGenerator il, Type dstType){
+		void emitConvert(ILGenerator il, Type dstType){
 			System.Reflection.Emit.Label endConvert = il.DefineLabel ();
 			System.Reflection.Emit.Label convert = il.DefineLabel ();
 
diff --git a/src/ItemTemplate.cs b/src/ItemTemplate.cs
index 9c48a2db..3ce24906 100644
--- a/src/ItemTemplate.cs
+++ b/src/ItemTemplate.cs
@@ -43,7 +43,7 @@ namespace Crow
 			fetchMethodName = _fetchDataMethod;
 
 		}
-		public ItemTemplate (Stream ImlFragment,string _dataType, string _fetchDataMethod)
+		public ItemTemplate (Stream ImlFragment, string _dataType, string _fetchDataMethod)
 			:base(ImlFragment)
 		{
 			strDataType = _dataType;