X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=src%2FJsRender%2FNode.vala;h=cd101190f84b60f4572a2e350cae2d9021e8df46;hb=HEAD;hp=807082c2adf55edbba0c0ff366fcd386d33b6f58;hpb=5c7d188db923f58a19558cbbdd6b50714b2ba4e8;p=app.Builder.js

diff --git a/src/JsRender/Node.vala b/src/JsRender/Node.vala
index 807082c2a..cd101190f 100644
--- a/src/JsRender/Node.vala
+++ b/src/JsRender/Node.vala
@@ -102,6 +102,8 @@ public class JsRender.Node : Object {
 	public string  xvala_cls;
 	public string xvala_xcls; // 'Xcls_' + id;
 	public string xvala_id; // item id or ""
+	
+	// line markers..
 	public int line_start;
 	public int line_end;
 	public Gee.ArrayList<int> lines;
@@ -129,15 +131,28 @@ public class JsRender.Node : Object {
 	}
 	
 	public void setNodeLine(int line, Node node) {
+		//print("Add node @ %d\n", line);
+		if (this.node_lines_map.has_key(line)) {
+			return;
+		}
 		this.node_lines.add(line);
 		this.node_lines_map.set(line, node);
+		
 	}
 	
 	public void setLine(int line, string type, string prop) {
-		this.lines.add(line);
-		this.line_map.set(line, type +":" + prop);
+		if (this.line_map.has_key(line)) {
+			if  (this.line_map.get(line) != "e:"  ) {
+				return;
+			}
+		} else {
+			this.lines.add(line);
+		}
+		this.line_map.set(line, type + ":" + prop);
+		GLib.debug("setLine %d, %s", line, type + ":" + prop);
 	}
 	public void sortLines() {
+		//print("sortLines\n");
 		this.lines.sort((a,b) => {   
 			return (int)a-(int)b;
 		});
@@ -147,27 +162,117 @@ public class JsRender.Node : Object {
 	}
 	public Node? lineToNode(int line)
 	{
+		//print("Searching for line %d\n",line);
 		var l = -1;
+		//foreach(int el in this.node_lines) {
+			//print("all lines %d\n", el);
+		//}
+		
+		
 		foreach(int el in this.node_lines) {
+			//print("?match %d\n", el);
 			if (el < line) {
+				
 				l = el;
+				//print("LESS\n");
 				continue;
 			}
 			if (el == line) {
+				//print("SAME\n");
 				l = el;
+				break;
 			}
 			if (l > -1) {
-				return this.node_lines_map.get(l);
+				var ret = this.node_lines_map.get(l);
+				if (line > ret.line_end) {
+					return null;
+				}
+				//print("RETURNING NODE ON LINE %d", l);
+				return ret;
 			}
 			return null;
 			
 		}
 		if (l > -1) {
-			return this.node_lines_map.get(l);
+			var ret = this.node_lines_map.get(l);
+			if (line > ret.line_end) {
+				return null;
+			}
+			//print("RETURNING NODE ON LINE %d", l);
+			return ret;
+
 		}
 		return null;
 		
 	}
+	public string lineToProp(int line)
+	{
+		// assume lineToNode called first...
+		var l = -1;
+		//foreach(int el in this.lines) {
+		//	//print("all lines %d\n", el);
+		//
+		
+		
+		foreach(int el in this.lines) {
+			//print("?match %d\n", el);
+			if (el < line) {
+				
+				l = el;
+				//print("LESS\n");
+				continue;
+			}
+			if (el == line) {
+				//print("SAME\n");
+				l = el;
+				break;
+			}
+			if (l > -1) {
+				//print("RETURNING NODE ON LINE %d", l);
+				return this.line_map.get(l);
+			}
+			return null;
+			
+		}
+		if (l > -1) {
+			//print("RETURNING NODE ON LINE %d", l);
+			return this.line_map.get(l);
+		}
+		return null;
+	
+	}
+	
+	public bool getPropertyRange(string prop, out int start, out int end)
+	{
+		start = -1;
+		foreach(int el in this.lines) {
+			if (start < 0) {
+				if (this.line_map.get(el) == prop) {
+					start = el;
+					end = el;
+				}
+				continue;
+			}
+			end = el -1;
+			break;
+		}
+		return start > -1;
+	
+	
+	}
+	
+	public void dumpProps(string indent = "")
+	{
+		print("%s:\n" , this.fqn());
+		foreach(int el in this.lines) {
+			print("%d: %s%s\n", el, indent, this.line_map.get(el));
+		}
+		foreach(Node n in this.items) {
+			n.dumpProps(indent + "  ");
+		}
+	}
+	
+	
 	
 	public string uid()
 	{
@@ -205,7 +310,7 @@ public class JsRender.Node : Object {
 		this.props.set("xtype", ar[ar.length-1]);
 		var l = name.length - (ar[ar.length-1].length +1);
 		this.props.set("$ xns", name.substring(0, l));
-		print("setFQN %s to %s\n", name , this.fqn());
+		//print("setFQN %s to %s\n", name , this.fqn());
 		               
 
 	}
@@ -267,9 +372,17 @@ public class JsRender.Node : Object {
 		// $ XXX - with flag (no type)
 		// $ string XXX - with flag
 		kname = "";
-		ktype = "-";
-		kflag = "-";
-		var kk = key.strip().split(" ");
+		ktype = ""; // these used to contain '-' ???
+		kflag = ""; // these used to contain '-' ???
+		var kkv = key.strip().split(" ");
+		string[] kk = {};
+		for (var i = 0; i < kkv.length; i++) {
+			if (kkv[i].length > 0 ) {
+				kk+= kkv[i];
+			}
+		}
+		//print("normalize %s => %s\n", key,string.joinv("=:=",kk));
+		
 		switch(kk.length) {
 			case 1: 
 				kname = kk[0];