mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-01-04 20:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #3744 from Mango0x45/master"

Browse Source 
This reverts commit 45044de0b7, reversing
changes made to 20c17ba6f9.
This commit is contained in:
Jeroen van Rijn
2024-06-14 00:06:55 +02:00
parent 54a3cfb540
commit ff4787070d
1 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/error.cpp
View File

@@ -296,7 +296,7 @@ gb_internal isize show_error_on_line(TokenPos const &pos, TokenPos end) {
terminal_set_colours(TerminalStyle_Bold, TerminalColour_White);
i32 squiggle_extra = 0;
isize squiggle_extra = 0;
if (line_len > MAX_LINE_LENGTH_PADDED) {
i32 left = MAX_TAB_WIDTH;
@@ -323,39 +323,23 @@ gb_internal isize show_error_on_line(TokenPos const &pos, TokenPos end) {
}
error_out("\n\t");
for (i32 rune_width, off = 0; off < offset; off += rune_width) {
i32 rune;
rune_width = cast(i32)utf8proc_iterate((u8 const *)line_text + off, line_len - off, &rune);
int w = utf8proc_charwidth(rune);
if (w > 0) {
error_out("%.*s", w, " ");
}
for (i32 i = 0; i < offset; i++) {
error_out(" ");
}
terminal_set_colours(TerminalStyle_Bold, TerminalColour_Green);
error_out("^");
if (end.file_id == pos.file_id) {
i32 rune;
if (end.line > pos.line) {
for (i32 rune, rune_width, off = offset; off < line_len; off += rune_width) {
rune_width = cast(i32)utf8proc_iterate((u8 const *)line_text + off, line_len - off, &rune);
int w = utf8proc_charwidth(rune);
if (w > 0) {
error_out("%.*s", w, "~~~~");
}
}
} else if (end.line == pos.line && end.column > pos.column) {
i32 columns = squiggle_extra;
for (i32 rune, rune_width, off = offset; off < offset + error_length - 1; off += rune_width) {
rune_width = cast(i32)utf8proc_iterate((u8 const *)line_text + off, line_len - off, &rune);
columns += utf8proc_charwidth(rune);
}
for (i32 i = 1; i < columns; i++) {
for (i32 i = offset; i < line_len; i++) {
error_out("~");
}
if (columns > 0 && squiggle_extra == 0) {
} else if (end.line == pos.line && end.column > pos.column) {
for (i32 i = 1; i < error_length-1+squiggle_extra; i++) {
error_out("~");
}
if (error_length > 1 && squiggle_extra == 0) {
error_out("^");
}
}