1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 01:11:15 +02:00

Merge branch 'master' into add-trace

This commit is contained in:
Ben Burdette 2020-06-30 12:21:45 -06:00
commit ddb81ca126
19 changed files with 125 additions and 55 deletions

View file

@ -82,7 +82,11 @@ struct ErrPos {
origin = pos.origin;
line = pos.line;
column = pos.column;
file = pos.file;
// is file symbol null?
if (pos.file.set())
file = pos.file;
else
file = "";
return *this;
}