cosmetics and stuff
This commit is contained in:
parent
dee6a551cf
commit
80b188706f
1 changed files with 15 additions and 16 deletions
|
@ -37,15 +37,14 @@ _varname = func(s) { _c("1", s) } # variable_name
|
||||||
|
|
||||||
|
|
||||||
_dump_prop = func(p) {
|
_dump_prop = func(p) {
|
||||||
var attrib =
|
var r = p.getAttribute("read") ? "" : "r";
|
||||||
(!p.getAttribute("read") ? "r" : "") ~
|
var w = p.getAttribute("write") ? "" : "w";
|
||||||
(!p.getAttribute("write") ? "w" : "") ~
|
var R = p.getAttribute("trace-read") ? "R" : "";
|
||||||
(p.getAttribute("trace-read") ? "R" : "") ~
|
var W = p.getAttribute("trace-write") ? "W" : "";
|
||||||
(p.getAttribute("trace-write") ? "W" : "") ~
|
var A = p.getAttribute("archive") ? "A" : "";
|
||||||
(p.getAttribute("archive") ? "A" : "") ~
|
var U = p.getAttribute("userarchive") ? "U" : "";
|
||||||
(p.getAttribute("userarchive") ? "U" : "") ~
|
var T = p.getAttribute("tied") ? "T" : "";
|
||||||
(p.getAttribute("tied") ? "T" : "");
|
var attrib = r ~ w ~ R ~ W ~ A ~ U ~ T;
|
||||||
|
|
||||||
var type = "(" ~ _proptype(p.getType()) ~ (size(attrib) ? ", " ~ attrib : "") ~ ")";
|
var type = "(" ~ _proptype(p.getType()) ~ (size(attrib) ? ", " ~ attrib : "") ~ ")";
|
||||||
return _path(p.getPath()) ~ "=" ~ _dump(p.getValue()) ~ " " ~ type;
|
return _path(p.getPath()) ~ "=" ~ _dump(p.getValue()) ~ " " ~ type;
|
||||||
}
|
}
|
||||||
|
@ -67,22 +66,22 @@ _dump = func(o) {
|
||||||
} elsif (t == "scalar") {
|
} elsif (t == "scalar") {
|
||||||
return num(o) == nil ? _string('"' ~ o ~ '"') : _num(o);
|
return num(o) == nil ? _string('"' ~ o ~ '"') : _num(o);
|
||||||
} elsif (t == "vector") {
|
} elsif (t == "vector") {
|
||||||
var result = _bracket("[") ~ " ";
|
var s = "";
|
||||||
forindex (var i; o) {
|
forindex (var i; o) {
|
||||||
result ~= (i == 0 ? "" : ", ") ~ _dump(o[i]);
|
s ~= (i == 0 ? "" : ", ") ~ _dump(o[i]);
|
||||||
}
|
}
|
||||||
return result ~ " " ~ _bracket("]");
|
return _bracket("[") ~ " " ~ s ~ " " ~ _bracket("]");
|
||||||
} elsif (t == "hash") {
|
} elsif (t == "hash") {
|
||||||
if (contains(o, "parents") and typeof(o.parents) == "vector"
|
if (contains(o, "parents") and typeof(o.parents) == "vector"
|
||||||
and size(o.parents) == 1 and o.parents[0] == props.Node) {
|
and size(o.parents) == 1 and o.parents[0] == props.Node) {
|
||||||
return _angle("<") ~ _dump_prop(o) ~ _angle(">");
|
return _angle("<") ~ _dump_prop(o) ~ _angle(">");
|
||||||
}
|
}
|
||||||
var k = keys(o);
|
var k = keys(o);
|
||||||
var result = _brace("{") ~ " ";
|
var s = "";
|
||||||
forindex (var i; k) {
|
forindex (var i; k) {
|
||||||
result ~= (i == 0 ? "" : ", ") ~ _dump_var(k[i]) ~ " : " ~ _dump(o[k[i]]);
|
s ~= (i == 0 ? "" : ", ") ~ _dump_var(k[i]) ~ " : " ~ _dump(o[k[i]]);
|
||||||
}
|
}
|
||||||
return result ~ " " ~ _brace("}");
|
return _brace("{") ~ " " ~ s ~ " " ~ _brace("}");
|
||||||
} else {
|
} else {
|
||||||
return _angle("<") ~ _vartype(t) ~ _angle(">");
|
return _angle("<") ~ _vartype(t) ~ _angle(">");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue