bit
/
taskman_bhl
25
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Making error place routines more robust

This commit is contained in:
Pavel Shevaev 2022-08-25 14:49:22 +03:00
parent 8979ac0cc8
commit c96a08808f
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bhl.inc.php
View File

@ -359,21 +359,10 @@ function bhl_clean_cache()
function bhl_show_position($line, $row, array $lines) function bhl_show_position($line, $row, array $lines)
{ {
if($line > 0 && $line < count($lines)) if($line > 0 && $line <= count($lines))
{ return $lines[$line-1].str_repeat('-', $row)."^";
$txt = $lines[$line-1];
$c = str_repeat('-', $row);
return "{$txt}{$c}^";
}
//weird special case
else if($line-1 == count($lines))
{
$txt = $lines[count($lines)-1];
$c = str_repeat('-', $row);
return "{$txt}{$c}^";
}
else else
return "???"; return "??? @($line:$row)";
} }
function bhl_line_row_to_pos($file, $line, $row) function bhl_line_row_to_pos($file, $line, $row)
@ -381,8 +370,8 @@ function bhl_line_row_to_pos($file, $line, $row)
$pos = 0; $pos = 0;
$lines = file($file); $lines = file($file);
//something went wrong //something went wrong
if(count($lines) < $line) if($line <= 0 || $line > count($lines))
return null; return null;
for($i=0;$i<($line-1);++$i) for($i=0;$i<($line-1);++$i)
$pos += strlen($lines[$i]); $pos += strlen($lines[$i]);
$pos += $row; $pos += $row;