resources/RooUsage.txt

[app.Builder.js] / src / JsRender / Node.vala

diff --git a/src/JsRender/Node.vala b/src/JsRender/Node.vala
index 1f64f11..cd10119 100644 (file)
--- a/src/JsRender/Node.vala
+++ b/src/JsRender/Node.vala
@@ -131,60 +131,148 @@ public class JsRender.Node : Object {
        }
        
        public void setNodeLine(int line, Node node) {
-               print("Add node @ %d\n", line);
+               //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);
+               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");
+               //print("sortLines\n");
                this.lines.sort((a,b) => {   
-                       return (int)b-(int)a;
+                       return (int)a-(int)b;
                });
                this.node_lines.sort((a,b) => {   
-                       return (int)b-(int)a;
+                       return (int)a-(int)b;
                });
        }
        public Node? lineToNode(int line)
        {
-               print("Searching for line %d\n",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("all lines %d\n", el);
+               //}
                
                
                foreach(int el in this.node_lines) {
-                       print("?match %d\n", el);
+                       //print("?match %d\n", el);
                        if (el < line) {
                                
                                l = el;
-                               print("LESS\n");
+                               //print("LESS\n");
                                continue;
                        }
                        if (el == line) {
-                               print("SAME\n");
+                               //print("SAME\n");
                                l = el;
                                break;
                        }
                        if (l > -1) {
-                               print("RETURNING NODE ON LINE %d", l);
-                               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) {
-                       print("RETURNING NODE ON LINE %d", l);
-                       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()
        {
@@ -222,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());
                               
 
        }
@@ -293,7 +381,7 @@ public class JsRender.Node : Object {
                                kk+= kkv[i];
                        }
                }
-               print("normalize %s => %s\n", key,string.joinv("=:=",kk));
+               //print("normalize %s => %s\n", key,string.joinv("=:=",kk));
                
                switch(kk.length) {
                        case 1: