more fixes of path display

This commit is contained in:
dzaima 2023-12-13 21:59:47 +02:00
parent a3a9403b59
commit 7268c11df4
2 changed files with 3 additions and 7 deletions

View File

@ -128,7 +128,7 @@ HArr* comps_curr;
B rt_undo, rt_select, rt_slash, rt_insert, rt_depth,
rt_group, rt_under, rt_find;
Block* load_buildBlock(B x, B src, B path, B name, Scope* sc, i32 nsResult) { // consumes x,src
B fullpath = q_N(name)? inc(path) : q_N(path)? inc(name) : path_rel(path, inc(name), "(load_buildBlock)");
B fullpath = q_N(name)? inc(path) : q_N(path)? inc(name) : IA(path)==1 && IGetU(path,0).u==m_c32('.').u? inc(name) : path_rel(path, inc(name), "(load_buildBlock)");
SGet(x)
usz xia = IA(x);
if (xia!=6 & xia!=4) thrM("load_buildBlock: bad item count");

View File

@ -1337,7 +1337,7 @@ NOINLINE B vm_fmtPoint(B src, B prepend, B path, usz cs, usz ce) { // consumes p
i64 ln = 1;
for (usz i = 0; i < srcS; i++) if(o2cG(GetU(src, i))=='\n') ln++;
B s = prepend;
if (isArr(path) && (IA(path)>1 || (IA(path)==1 && IGetU(path,0).u!=m_c32('.').u))) AFMT("%R:%l:\n ", path, ln);
if (isArr(path) && (IA(path)==0 || IGetU(path,0).u!=m_c32('(').u)) AFMT("%R:%l:\n ", path, ln);
else AFMT("at ");
i64 padEnd = (i64)IA(s);
i64 padStart = padEnd;
@ -1542,9 +1542,6 @@ bool profiler_stop(void) {
}
static bool isPathREPL(B path) {
return isArr(path) && IA(path)==1 && IGetU(path,0).u==m_c32('.').u;
}
usz profiler_getResults(B* compListRes, B* mapListRes, bool keyPath) {
if (profiler_mode!=1) fatal("profiler_getResults called on mode!=1");
Profiler_ent* c = profiler_buf_s;
@ -1558,7 +1555,7 @@ usz profiler_getResults(B* compListRes, B* mapListRes, bool keyPath) {
usz bcPos = c->bcPos;
Comp* comp = c->comp;
B path = comp->fullpath;
i32 idx = profiler_index(&map, q_N(path) || isPathREPL(path)? tag(comp, OBJ_TAG) : path);
i32 idx = profiler_index(&map, q_N(path)? tag(comp, OBJ_TAG) : path);
if (idx == compCount) {
compList = vec_addN(compList, tag(comp, OBJ_TAG));
i32* rp;
@ -1603,7 +1600,6 @@ void profiler_displayResults(void) {
for (usz i = 0; i < ia; i++) sum+= m[i];
if (q_N(c->fullpath)) printf("(anonymous)");
else if (isPathREPL(c->fullpath)) printf("(REPL)");
else printsB(c->fullpath);
if (q_N(c->src)) {
printf(": "N64d" samples\n", sum);