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;
public Gee.HashMap<int,string> line_map; // store of l:xxx or p:....
public Gee.ArrayList<int> node_lines;
- public Gee.HashMap<int,string> nodes_line_map; // store of l:xxx or p:....
+ public Gee.HashMap<int,Node> node_lines_map; // store of l:xxx or p:....
public Node()
this.line_end = -1;
this.lines = new Gee.ArrayList<int>();
this.line_map = new Gee.HashMap<int,string>();
+ this.node_lines = new Gee.ArrayList<int>();
+ this.node_lines_map = new Gee.HashMap<int,Node>();
}
-
+
+ public void setNodeLine(int line, Node node) {
+ //print("Add node @ %d\n", line);
+ 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);
+ this.line_map.set(line, type + ":" + prop);
}
public void sortLines() {
+ //print("sortLines\n");
this.lines.sort((a,b) => {
+ return (int)b-(int)a;
+ });
+ this.node_lines.sort((a,b) => {
return (int)a-(int)b;
- /*if (a == b) {
- return 0;
- }
- return a < b ? -1 : 1;
- */
});
}
+ 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) {
+ //print("RETURNING NODE ON LINE %d", l);
+ return this.node_lines_map.get(l);
+ }
+ return null;
+
+ }
+ if (l > -1) {
+ //print("RETURNING NODE ON LINE %d", l);
+ return this.node_lines_map.get(l);
+ }
+ return null;
+
+ }
public string uid()
{
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());
}
// $ 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];