200a8e1a38
PR c/89410 reports various issues with #line directives with very large numbers; one of them is an ICE inside diagnostic-show-locus.c when emitting a diagnostic at line 0xffffffff. The issue is that the arithmetic in layout::calculate_line_spans to determine if two line spans are sufficiently close to consolidate was using the unsigned 32-bit linenum_type, which was overflowing when comparing the line for the expanded location with those of the location range (all on line 0xffffffff), leading to it erroneously adding two spans for the same line, leading to an assertion failure. This patch fixes the ICE by generalizing the use of long long in line-map.h's comparison function for linenum_type into a new linenum_arith_t typedef, and using it here. Doing so uncovered a second problem: the loop to print the lines within the line_span for this case is infinite: looping from 0xfffffff upwards, overflowing to 0, and then never becoming greater than 0xfffffff. The patch fixes this by using linenum_arith_t there also. gcc/ChangeLog: PR c/89410 * diagnostic-show-locus.c (layout::calculate_line_spans): Use linenum_arith_t when determining if two adjacent line spans are close enough to merge. (diagnostic_show_locus): Use linenum_arith_t when iterating over lines within each line_span. gcc/testsuite/ChangeLog: PR c/89410 * gcc.dg/pr89410-1.c: New test. * gcc.dg/pr89410-2.c: New test. libcpp/ChangeLog: PR c/89410 * include/line-map.h (linenum_arith_t): New typedef. (compare): Use it. From-SVN: r269050
3743 lines
117 KiB
C
3743 lines
117 KiB
C
/* Diagnostic subroutines for printing source-code
|
|
Copyright (C) 1999-2019 Free Software Foundation, Inc.
|
|
Contributed by Gabriel Dos Reis <gdr@codesourcery.com>
|
|
|
|
This file is part of GCC.
|
|
|
|
GCC is free software; you can redistribute it and/or modify it under
|
|
the terms of the GNU General Public License as published by the Free
|
|
Software Foundation; either version 3, or (at your option) any later
|
|
version.
|
|
|
|
GCC is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GCC; see the file COPYING3. If not see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include "config.h"
|
|
#include "system.h"
|
|
#include "coretypes.h"
|
|
#include "version.h"
|
|
#include "demangle.h"
|
|
#include "intl.h"
|
|
#include "backtrace.h"
|
|
#include "diagnostic.h"
|
|
#include "diagnostic-color.h"
|
|
#include "gcc-rich-location.h"
|
|
#include "selftest.h"
|
|
#include "selftest-diagnostic.h"
|
|
|
|
#ifdef HAVE_TERMIOS_H
|
|
# include <termios.h>
|
|
#endif
|
|
|
|
#ifdef GWINSZ_IN_SYS_IOCTL
|
|
# include <sys/ioctl.h>
|
|
#endif
|
|
|
|
/* Classes for rendering source code and diagnostics, within an
|
|
anonymous namespace.
|
|
The work is done by "class layout", which embeds and uses
|
|
"class colorizer" and "class layout_range" to get things done. */
|
|
|
|
namespace {
|
|
|
|
/* The state at a given point of the source code, assuming that we're
|
|
in a range: which range are we in, and whether we should draw a caret at
|
|
this point. */
|
|
|
|
struct point_state
|
|
{
|
|
int range_idx;
|
|
bool draw_caret_p;
|
|
};
|
|
|
|
/* A class to inject colorization codes when printing the diagnostic locus.
|
|
|
|
It has one kind of colorization for each of:
|
|
- normal text
|
|
- range 0 (the "primary location")
|
|
- range 1
|
|
- range 2
|
|
|
|
The class caches the lookup of the color codes for the above.
|
|
|
|
The class also has responsibility for tracking which of the above is
|
|
active, filtering out unnecessary changes. This allows
|
|
layout::print_source_line and layout::print_annotation_line
|
|
to simply request a colorization code for *every* character they print,
|
|
via this class, and have the filtering be done for them here. */
|
|
|
|
class colorizer
|
|
{
|
|
public:
|
|
colorizer (diagnostic_context *context,
|
|
diagnostic_t diagnostic_kind);
|
|
~colorizer ();
|
|
|
|
void set_range (int range_idx) { set_state (range_idx); }
|
|
void set_normal_text () { set_state (STATE_NORMAL_TEXT); }
|
|
void set_fixit_insert () { set_state (STATE_FIXIT_INSERT); }
|
|
void set_fixit_delete () { set_state (STATE_FIXIT_DELETE); }
|
|
|
|
private:
|
|
void set_state (int state);
|
|
void begin_state (int state);
|
|
void finish_state (int state);
|
|
const char *get_color_by_name (const char *);
|
|
|
|
private:
|
|
static const int STATE_NORMAL_TEXT = -1;
|
|
static const int STATE_FIXIT_INSERT = -2;
|
|
static const int STATE_FIXIT_DELETE = -3;
|
|
|
|
diagnostic_context *m_context;
|
|
diagnostic_t m_diagnostic_kind;
|
|
int m_current_state;
|
|
const char *m_range1;
|
|
const char *m_range2;
|
|
const char *m_fixit_insert;
|
|
const char *m_fixit_delete;
|
|
const char *m_stop_color;
|
|
};
|
|
|
|
/* A point within a layout_range; similar to an expanded_location,
|
|
but after filtering on file. */
|
|
|
|
class layout_point
|
|
{
|
|
public:
|
|
layout_point (const expanded_location &exploc)
|
|
: m_line (exploc.line),
|
|
m_column (exploc.column) {}
|
|
|
|
linenum_type m_line;
|
|
int m_column;
|
|
};
|
|
|
|
/* A class for use by "class layout" below: a filtered location_range. */
|
|
|
|
class layout_range
|
|
{
|
|
public:
|
|
layout_range (const expanded_location *start_exploc,
|
|
const expanded_location *finish_exploc,
|
|
enum range_display_kind range_display_kind,
|
|
const expanded_location *caret_exploc,
|
|
unsigned original_idx,
|
|
const range_label *label);
|
|
|
|
bool contains_point (linenum_type row, int column) const;
|
|
bool intersects_line_p (linenum_type row) const;
|
|
|
|
layout_point m_start;
|
|
layout_point m_finish;
|
|
enum range_display_kind m_range_display_kind;
|
|
layout_point m_caret;
|
|
unsigned m_original_idx;
|
|
const range_label *m_label;
|
|
};
|
|
|
|
/* A struct for use by layout::print_source_line for telling
|
|
layout::print_annotation_line the extents of the source line that
|
|
it printed, so that underlines can be clipped appropriately. */
|
|
|
|
struct line_bounds
|
|
{
|
|
int m_first_non_ws;
|
|
int m_last_non_ws;
|
|
};
|
|
|
|
/* A range of contiguous source lines within a layout (e.g. "lines 5-10"
|
|
or "line 23"). During the layout ctor, layout::calculate_line_spans
|
|
splits the pertinent source lines into a list of disjoint line_span
|
|
instances (e.g. lines 5-10, lines 15-20, line 23). */
|
|
|
|
struct line_span
|
|
{
|
|
line_span (linenum_type first_line, linenum_type last_line)
|
|
: m_first_line (first_line), m_last_line (last_line)
|
|
{
|
|
gcc_assert (first_line <= last_line);
|
|
}
|
|
linenum_type get_first_line () const { return m_first_line; }
|
|
linenum_type get_last_line () const { return m_last_line; }
|
|
|
|
bool contains_line_p (linenum_type line) const
|
|
{
|
|
return line >= m_first_line && line <= m_last_line;
|
|
}
|
|
|
|
static int comparator (const void *p1, const void *p2)
|
|
{
|
|
const line_span *ls1 = (const line_span *)p1;
|
|
const line_span *ls2 = (const line_span *)p2;
|
|
int first_line_cmp = compare (ls1->m_first_line, ls2->m_first_line);
|
|
if (first_line_cmp)
|
|
return first_line_cmp;
|
|
return compare (ls1->m_last_line, ls2->m_last_line);
|
|
}
|
|
|
|
linenum_type m_first_line;
|
|
linenum_type m_last_line;
|
|
};
|
|
|
|
#if CHECKING_P
|
|
|
|
/* Selftests for line_span. */
|
|
|
|
static void
|
|
test_line_span ()
|
|
{
|
|
line_span line_one (1, 1);
|
|
ASSERT_EQ (1, line_one.get_first_line ());
|
|
ASSERT_EQ (1, line_one.get_last_line ());
|
|
ASSERT_FALSE (line_one.contains_line_p (0));
|
|
ASSERT_TRUE (line_one.contains_line_p (1));
|
|
ASSERT_FALSE (line_one.contains_line_p (2));
|
|
|
|
line_span lines_1_to_3 (1, 3);
|
|
ASSERT_EQ (1, lines_1_to_3.get_first_line ());
|
|
ASSERT_EQ (3, lines_1_to_3.get_last_line ());
|
|
ASSERT_TRUE (lines_1_to_3.contains_line_p (1));
|
|
ASSERT_TRUE (lines_1_to_3.contains_line_p (3));
|
|
|
|
ASSERT_EQ (0, line_span::comparator (&line_one, &line_one));
|
|
ASSERT_GT (line_span::comparator (&lines_1_to_3, &line_one), 0);
|
|
ASSERT_LT (line_span::comparator (&line_one, &lines_1_to_3), 0);
|
|
|
|
/* A linenum > 2^31. */
|
|
const linenum_type LARGEST_LINE = 0xffffffff;
|
|
line_span largest_line (LARGEST_LINE, LARGEST_LINE);
|
|
ASSERT_EQ (LARGEST_LINE, largest_line.get_first_line ());
|
|
ASSERT_EQ (LARGEST_LINE, largest_line.get_last_line ());
|
|
|
|
ASSERT_GT (line_span::comparator (&largest_line, &line_one), 0);
|
|
ASSERT_LT (line_span::comparator (&line_one, &largest_line), 0);
|
|
}
|
|
|
|
#endif /* #if CHECKING_P */
|
|
|
|
/* A class to control the overall layout when printing a diagnostic.
|
|
|
|
The layout is determined within the constructor.
|
|
It is then printed by repeatedly calling the "print_source_line",
|
|
"print_annotation_line" and "print_any_fixits" methods.
|
|
|
|
We assume we have disjoint ranges. */
|
|
|
|
class layout
|
|
{
|
|
public:
|
|
layout (diagnostic_context *context,
|
|
rich_location *richloc,
|
|
diagnostic_t diagnostic_kind);
|
|
|
|
bool maybe_add_location_range (const location_range *loc_range,
|
|
unsigned original_idx,
|
|
bool restrict_to_current_line_spans);
|
|
|
|
int get_num_line_spans () const { return m_line_spans.length (); }
|
|
const line_span *get_line_span (int idx) const { return &m_line_spans[idx]; }
|
|
|
|
void print_gap_in_line_numbering ();
|
|
bool print_heading_for_line_span_index_p (int line_span_idx) const;
|
|
|
|
expanded_location get_expanded_location (const line_span *) const;
|
|
|
|
void print_line (linenum_type row);
|
|
|
|
private:
|
|
bool will_show_line_p (linenum_type row) const;
|
|
void print_leading_fixits (linenum_type row);
|
|
void print_source_line (linenum_type row, const char *line, int line_width,
|
|
line_bounds *lbounds_out);
|
|
bool should_print_annotation_line_p (linenum_type row) const;
|
|
void start_annotation_line (char margin_char = ' ') const;
|
|
void print_annotation_line (linenum_type row, const line_bounds lbounds);
|
|
void print_any_labels (linenum_type row);
|
|
void print_trailing_fixits (linenum_type row);
|
|
|
|
bool annotation_line_showed_range_p (linenum_type line, int start_column,
|
|
int finish_column) const;
|
|
void show_ruler (int max_column) const;
|
|
|
|
bool validate_fixit_hint_p (const fixit_hint *hint);
|
|
|
|
void calculate_line_spans ();
|
|
|
|
void print_newline ();
|
|
|
|
bool
|
|
get_state_at_point (/* Inputs. */
|
|
linenum_type row, int column,
|
|
int first_non_ws, int last_non_ws,
|
|
/* Outputs. */
|
|
point_state *out_state);
|
|
|
|
int
|
|
get_x_bound_for_row (linenum_type row, int caret_column,
|
|
int last_non_ws);
|
|
|
|
void
|
|
move_to_column (int *column, int dest_column, bool add_left_margin);
|
|
|
|
private:
|
|
diagnostic_context *m_context;
|
|
pretty_printer *m_pp;
|
|
location_t m_primary_loc;
|
|
expanded_location m_exploc;
|
|
colorizer m_colorizer;
|
|
bool m_colorize_source_p;
|
|
bool m_show_labels_p;
|
|
bool m_show_line_numbers_p;
|
|
auto_vec <layout_range> m_layout_ranges;
|
|
auto_vec <const fixit_hint *> m_fixit_hints;
|
|
auto_vec <line_span> m_line_spans;
|
|
int m_linenum_width;
|
|
int m_x_offset;
|
|
};
|
|
|
|
/* Implementation of "class colorizer". */
|
|
|
|
/* The constructor for "colorizer". Lookup and store color codes for the
|
|
different kinds of things we might need to print. */
|
|
|
|
colorizer::colorizer (diagnostic_context *context,
|
|
diagnostic_t diagnostic_kind) :
|
|
m_context (context),
|
|
m_diagnostic_kind (diagnostic_kind),
|
|
m_current_state (STATE_NORMAL_TEXT)
|
|
{
|
|
m_range1 = get_color_by_name ("range1");
|
|
m_range2 = get_color_by_name ("range2");
|
|
m_fixit_insert = get_color_by_name ("fixit-insert");
|
|
m_fixit_delete = get_color_by_name ("fixit-delete");
|
|
m_stop_color = colorize_stop (pp_show_color (context->printer));
|
|
}
|
|
|
|
/* The destructor for "colorize". If colorization is on, print a code to
|
|
turn it off. */
|
|
|
|
colorizer::~colorizer ()
|
|
{
|
|
finish_state (m_current_state);
|
|
}
|
|
|
|
/* Update state, printing color codes if necessary if there's a state
|
|
change. */
|
|
|
|
void
|
|
colorizer::set_state (int new_state)
|
|
{
|
|
if (m_current_state != new_state)
|
|
{
|
|
finish_state (m_current_state);
|
|
m_current_state = new_state;
|
|
begin_state (new_state);
|
|
}
|
|
}
|
|
|
|
/* Turn on any colorization for STATE. */
|
|
|
|
void
|
|
colorizer::begin_state (int state)
|
|
{
|
|
switch (state)
|
|
{
|
|
case STATE_NORMAL_TEXT:
|
|
break;
|
|
|
|
case STATE_FIXIT_INSERT:
|
|
pp_string (m_context->printer, m_fixit_insert);
|
|
break;
|
|
|
|
case STATE_FIXIT_DELETE:
|
|
pp_string (m_context->printer, m_fixit_delete);
|
|
break;
|
|
|
|
case 0:
|
|
/* Make range 0 be the same color as the "kind" text
|
|
(error vs warning vs note). */
|
|
pp_string
|
|
(m_context->printer,
|
|
colorize_start (pp_show_color (m_context->printer),
|
|
diagnostic_get_color_for_kind (m_diagnostic_kind)));
|
|
break;
|
|
|
|
case 1:
|
|
pp_string (m_context->printer, m_range1);
|
|
break;
|
|
|
|
case 2:
|
|
pp_string (m_context->printer, m_range2);
|
|
break;
|
|
|
|
default:
|
|
/* For ranges beyond 2, alternate between color 1 and color 2. */
|
|
{
|
|
gcc_assert (state > 2);
|
|
pp_string (m_context->printer,
|
|
state % 2 ? m_range1 : m_range2);
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* Turn off any colorization for STATE. */
|
|
|
|
void
|
|
colorizer::finish_state (int state)
|
|
{
|
|
if (state != STATE_NORMAL_TEXT)
|
|
pp_string (m_context->printer, m_stop_color);
|
|
}
|
|
|
|
/* Get the color code for NAME (or the empty string if
|
|
colorization is disabled). */
|
|
|
|
const char *
|
|
colorizer::get_color_by_name (const char *name)
|
|
{
|
|
return colorize_start (pp_show_color (m_context->printer), name);
|
|
}
|
|
|
|
/* Implementation of class layout_range. */
|
|
|
|
/* The constructor for class layout_range.
|
|
Initialize various layout_point fields from expanded_location
|
|
equivalents; we've already filtered on file. */
|
|
|
|
layout_range::layout_range (const expanded_location *start_exploc,
|
|
const expanded_location *finish_exploc,
|
|
enum range_display_kind range_display_kind,
|
|
const expanded_location *caret_exploc,
|
|
unsigned original_idx,
|
|
const range_label *label)
|
|
: m_start (*start_exploc),
|
|
m_finish (*finish_exploc),
|
|
m_range_display_kind (range_display_kind),
|
|
m_caret (*caret_exploc),
|
|
m_original_idx (original_idx),
|
|
m_label (label)
|
|
{
|
|
}
|
|
|
|
/* Is (column, row) within the given range?
|
|
We've already filtered on the file.
|
|
|
|
Ranges are closed (both limits are within the range).
|
|
|
|
Example A: a single-line range:
|
|
start: (col=22, line=2)
|
|
finish: (col=38, line=2)
|
|
|
|
|00000011111111112222222222333333333344444444444
|
|
|34567890123456789012345678901234567890123456789
|
|
--+-----------------------------------------------
|
|
01|bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
|
|
02|bbbbbbbbbbbbbbbbbbbSwwwwwwwwwwwwwwwFaaaaaaaaaaa
|
|
03|aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
|
|
|
Example B: a multiline range with
|
|
start: (col=14, line=3)
|
|
finish: (col=08, line=5)
|
|
|
|
|00000011111111112222222222333333333344444444444
|
|
|34567890123456789012345678901234567890123456789
|
|
--+-----------------------------------------------
|
|
01|bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
|
|
02|bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
|
|
03|bbbbbbbbbbbSwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
|
|
04|wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
|
|
05|wwwwwFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
|
06|aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
|
--+-----------------------------------------------
|
|
|
|
Legend:
|
|
- 'b' indicates a point *before* the range
|
|
- 'S' indicates the start of the range
|
|
- 'w' indicates a point within the range
|
|
- 'F' indicates the finish of the range (which is
|
|
within it).
|
|
- 'a' indicates a subsequent point *after* the range. */
|
|
|
|
bool
|
|
layout_range::contains_point (linenum_type row, int column) const
|
|
{
|
|
gcc_assert (m_start.m_line <= m_finish.m_line);
|
|
/* ...but the equivalent isn't true for the columns;
|
|
consider example B in the comment above. */
|
|
|
|
if (row < m_start.m_line)
|
|
/* Points before the first line of the range are
|
|
outside it (corresponding to line 01 in example A
|
|
and lines 01 and 02 in example B above). */
|
|
return false;
|
|
|
|
if (row == m_start.m_line)
|
|
/* On same line as start of range (corresponding
|
|
to line 02 in example A and line 03 in example B). */
|
|
{
|
|
if (column < m_start.m_column)
|
|
/* Points on the starting line of the range, but
|
|
before the column in which it begins. */
|
|
return false;
|
|
|
|
if (row < m_finish.m_line)
|
|
/* This is a multiline range; the point
|
|
is within it (corresponds to line 03 in example B
|
|
from column 14 onwards) */
|
|
return true;
|
|
else
|
|
{
|
|
/* This is a single-line range. */
|
|
gcc_assert (row == m_finish.m_line);
|
|
return column <= m_finish.m_column;
|
|
}
|
|
}
|
|
|
|
/* The point is in a line beyond that containing the
|
|
start of the range: lines 03 onwards in example A,
|
|
and lines 04 onwards in example B. */
|
|
gcc_assert (row > m_start.m_line);
|
|
|
|
if (row > m_finish.m_line)
|
|
/* The point is beyond the final line of the range
|
|
(lines 03 onwards in example A, and lines 06 onwards
|
|
in example B). */
|
|
return false;
|
|
|
|
if (row < m_finish.m_line)
|
|
{
|
|
/* The point is in a line that's fully within a multiline
|
|
range (e.g. line 04 in example B). */
|
|
gcc_assert (m_start.m_line < m_finish.m_line);
|
|
return true;
|
|
}
|
|
|
|
gcc_assert (row == m_finish.m_line);
|
|
|
|
return column <= m_finish.m_column;
|
|
}
|
|
|
|
/* Does this layout_range contain any part of line ROW? */
|
|
|
|
bool
|
|
layout_range::intersects_line_p (linenum_type row) const
|
|
{
|
|
gcc_assert (m_start.m_line <= m_finish.m_line);
|
|
if (row < m_start.m_line)
|
|
return false;
|
|
if (row > m_finish.m_line)
|
|
return false;
|
|
return true;
|
|
}
|
|
|
|
#if CHECKING_P
|
|
|
|
/* A helper function for testing layout_range. */
|
|
|
|
static layout_range
|
|
make_range (int start_line, int start_col, int end_line, int end_col)
|
|
{
|
|
const expanded_location start_exploc
|
|
= {"test.c", start_line, start_col, NULL, false};
|
|
const expanded_location finish_exploc
|
|
= {"test.c", end_line, end_col, NULL, false};
|
|
return layout_range (&start_exploc, &finish_exploc, SHOW_RANGE_WITHOUT_CARET,
|
|
&start_exploc, 0, NULL);
|
|
}
|
|
|
|
/* Selftests for layout_range::contains_point and
|
|
layout_range::intersects_line_p. */
|
|
|
|
/* Selftest for layout_range, where the layout_range
|
|
is a range with start==end i.e. a single point. */
|
|
|
|
static void
|
|
test_layout_range_for_single_point ()
|
|
{
|
|
layout_range point = make_range (7, 10, 7, 10);
|
|
|
|
/* Tests for layout_range::contains_point. */
|
|
|
|
/* Before the line. */
|
|
ASSERT_FALSE (point.contains_point (6, 1));
|
|
|
|
/* On the line, but before start. */
|
|
ASSERT_FALSE (point.contains_point (7, 9));
|
|
|
|
/* At the point. */
|
|
ASSERT_TRUE (point.contains_point (7, 10));
|
|
|
|
/* On the line, after the point. */
|
|
ASSERT_FALSE (point.contains_point (7, 11));
|
|
|
|
/* After the line. */
|
|
ASSERT_FALSE (point.contains_point (8, 1));
|
|
|
|
/* Tests for layout_range::intersects_line_p. */
|
|
ASSERT_FALSE (point.intersects_line_p (6));
|
|
ASSERT_TRUE (point.intersects_line_p (7));
|
|
ASSERT_FALSE (point.intersects_line_p (8));
|
|
}
|
|
|
|
/* Selftest for layout_range, where the layout_range
|
|
is the single-line range shown as "Example A" above. */
|
|
|
|
static void
|
|
test_layout_range_for_single_line ()
|
|
{
|
|
layout_range example_a = make_range (2, 22, 2, 38);
|
|
|
|
/* Tests for layout_range::contains_point. */
|
|
|
|
/* Before the line. */
|
|
ASSERT_FALSE (example_a.contains_point (1, 1));
|
|
|
|
/* On the line, but before start. */
|
|
ASSERT_FALSE (example_a.contains_point (2, 21));
|
|
|
|
/* On the line, at the start. */
|
|
ASSERT_TRUE (example_a.contains_point (2, 22));
|
|
|
|
/* On the line, within the range. */
|
|
ASSERT_TRUE (example_a.contains_point (2, 23));
|
|
|
|
/* On the line, at the end. */
|
|
ASSERT_TRUE (example_a.contains_point (2, 38));
|
|
|
|
/* On the line, after the end. */
|
|
ASSERT_FALSE (example_a.contains_point (2, 39));
|
|
|
|
/* After the line. */
|
|
ASSERT_FALSE (example_a.contains_point (2, 39));
|
|
|
|
/* Tests for layout_range::intersects_line_p. */
|
|
ASSERT_FALSE (example_a.intersects_line_p (1));
|
|
ASSERT_TRUE (example_a.intersects_line_p (2));
|
|
ASSERT_FALSE (example_a.intersects_line_p (3));
|
|
}
|
|
|
|
/* Selftest for layout_range, where the layout_range
|
|
is the multi-line range shown as "Example B" above. */
|
|
|
|
static void
|
|
test_layout_range_for_multiple_lines ()
|
|
{
|
|
layout_range example_b = make_range (3, 14, 5, 8);
|
|
|
|
/* Tests for layout_range::contains_point. */
|
|
|
|
/* Before first line. */
|
|
ASSERT_FALSE (example_b.contains_point (1, 1));
|
|
|
|
/* On the first line, but before start. */
|
|
ASSERT_FALSE (example_b.contains_point (3, 13));
|
|
|
|
/* At the start. */
|
|
ASSERT_TRUE (example_b.contains_point (3, 14));
|
|
|
|
/* On the first line, within the range. */
|
|
ASSERT_TRUE (example_b.contains_point (3, 15));
|
|
|
|
/* On an interior line.
|
|
The column number should not matter; try various boundary
|
|
values. */
|
|
ASSERT_TRUE (example_b.contains_point (4, 1));
|
|
ASSERT_TRUE (example_b.contains_point (4, 7));
|
|
ASSERT_TRUE (example_b.contains_point (4, 8));
|
|
ASSERT_TRUE (example_b.contains_point (4, 9));
|
|
ASSERT_TRUE (example_b.contains_point (4, 13));
|
|
ASSERT_TRUE (example_b.contains_point (4, 14));
|
|
ASSERT_TRUE (example_b.contains_point (4, 15));
|
|
|
|
/* On the final line, before the end. */
|
|
ASSERT_TRUE (example_b.contains_point (5, 7));
|
|
|
|
/* On the final line, at the end. */
|
|
ASSERT_TRUE (example_b.contains_point (5, 8));
|
|
|
|
/* On the final line, after the end. */
|
|
ASSERT_FALSE (example_b.contains_point (5, 9));
|
|
|
|
/* After the line. */
|
|
ASSERT_FALSE (example_b.contains_point (6, 1));
|
|
|
|
/* Tests for layout_range::intersects_line_p. */
|
|
ASSERT_FALSE (example_b.intersects_line_p (2));
|
|
ASSERT_TRUE (example_b.intersects_line_p (3));
|
|
ASSERT_TRUE (example_b.intersects_line_p (4));
|
|
ASSERT_TRUE (example_b.intersects_line_p (5));
|
|
ASSERT_FALSE (example_b.intersects_line_p (6));
|
|
}
|
|
|
|
#endif /* #if CHECKING_P */
|
|
|
|
/* Given a source line LINE of length LINE_WIDTH, determine the width
|
|
without any trailing whitespace. */
|
|
|
|
static int
|
|
get_line_width_without_trailing_whitespace (const char *line, int line_width)
|
|
{
|
|
int result = line_width;
|
|
while (result > 0)
|
|
{
|
|
char ch = line[result - 1];
|
|
if (ch == ' ' || ch == '\t' || ch == '\r')
|
|
result--;
|
|
else
|
|
break;
|
|
}
|
|
gcc_assert (result >= 0);
|
|
gcc_assert (result <= line_width);
|
|
gcc_assert (result == 0 ||
|
|
(line[result - 1] != ' '
|
|
&& line[result -1] != '\t'
|
|
&& line[result -1] != '\r'));
|
|
return result;
|
|
}
|
|
|
|
#if CHECKING_P
|
|
|
|
/* A helper function for testing get_line_width_without_trailing_whitespace. */
|
|
|
|
static void
|
|
assert_eq (const char *line, int expected_width)
|
|
{
|
|
int actual_value
|
|
= get_line_width_without_trailing_whitespace (line, strlen (line));
|
|
ASSERT_EQ (actual_value, expected_width);
|
|
}
|
|
|
|
/* Verify that get_line_width_without_trailing_whitespace is sane for
|
|
various inputs. It is not required to handle newlines. */
|
|
|
|
static void
|
|
test_get_line_width_without_trailing_whitespace ()
|
|
{
|
|
assert_eq ("", 0);
|
|
assert_eq (" ", 0);
|
|
assert_eq ("\t", 0);
|
|
assert_eq ("\r", 0);
|
|
assert_eq ("hello world", 11);
|
|
assert_eq ("hello world ", 11);
|
|
assert_eq ("hello world \t\t ", 11);
|
|
assert_eq ("hello world\r", 11);
|
|
}
|
|
|
|
#endif /* #if CHECKING_P */
|
|
|
|
/* Helper function for layout's ctor, for sanitizing locations relative
|
|
to the primary location within a diagnostic.
|
|
|
|
Compare LOC_A and LOC_B to see if it makes sense to print underlines
|
|
connecting their expanded locations. Doing so is only guaranteed to
|
|
make sense if the locations share the same macro expansion "history"
|
|
i.e. they can be traced through the same macro expansions, eventually
|
|
reaching an ordinary map.
|
|
|
|
This may be too strong a condition, but it effectively sanitizes
|
|
PR c++/70105, which has an example of printing an expression where the
|
|
final location of the expression is in a different macro, which
|
|
erroneously was leading to hundreds of lines of irrelevant source
|
|
being printed. */
|
|
|
|
static bool
|
|
compatible_locations_p (location_t loc_a, location_t loc_b)
|
|
{
|
|
if (IS_ADHOC_LOC (loc_a))
|
|
loc_a = get_location_from_adhoc_loc (line_table, loc_a);
|
|
if (IS_ADHOC_LOC (loc_b))
|
|
loc_b = get_location_from_adhoc_loc (line_table, loc_b);
|
|
|
|
/* If either location is one of the special locations outside of a
|
|
linemap, they are only compatible if they are equal. */
|
|
if (loc_a < RESERVED_LOCATION_COUNT
|
|
|| loc_b < RESERVED_LOCATION_COUNT)
|
|
return loc_a == loc_b;
|
|
|
|
const line_map *map_a = linemap_lookup (line_table, loc_a);
|
|
linemap_assert (map_a);
|
|
|
|
const line_map *map_b = linemap_lookup (line_table, loc_b);
|
|
linemap_assert (map_b);
|
|
|
|
/* Are they within the same map? */
|
|
if (map_a == map_b)
|
|
{
|
|
/* Are both within the same macro expansion? */
|
|
if (linemap_macro_expansion_map_p (map_a))
|
|
{
|
|
/* Expand each location towards the spelling location, and
|
|
recurse. */
|
|
const line_map_macro *macro_map = linemap_check_macro (map_a);
|
|
location_t loc_a_toward_spelling
|
|
= linemap_macro_map_loc_unwind_toward_spelling (line_table,
|
|
macro_map,
|
|
loc_a);
|
|
location_t loc_b_toward_spelling
|
|
= linemap_macro_map_loc_unwind_toward_spelling (line_table,
|
|
macro_map,
|
|
loc_b);
|
|
return compatible_locations_p (loc_a_toward_spelling,
|
|
loc_b_toward_spelling);
|
|
}
|
|
|
|
/* Otherwise they are within the same ordinary map. */
|
|
return true;
|
|
}
|
|
else
|
|
{
|
|
/* Within different maps. */
|
|
|
|
/* If either is within a macro expansion, they are incompatible. */
|
|
if (linemap_macro_expansion_map_p (map_a)
|
|
|| linemap_macro_expansion_map_p (map_b))
|
|
return false;
|
|
|
|
/* Within two different ordinary maps; they are compatible iff they
|
|
are in the same file. */
|
|
const line_map_ordinary *ord_map_a = linemap_check_ordinary (map_a);
|
|
const line_map_ordinary *ord_map_b = linemap_check_ordinary (map_b);
|
|
return ord_map_a->to_file == ord_map_b->to_file;
|
|
}
|
|
}
|
|
|
|
/* Comparator for sorting fix-it hints. */
|
|
|
|
static int
|
|
fixit_cmp (const void *p_a, const void *p_b)
|
|
{
|
|
const fixit_hint * hint_a = *static_cast<const fixit_hint * const *> (p_a);
|
|
const fixit_hint * hint_b = *static_cast<const fixit_hint * const *> (p_b);
|
|
return hint_a->get_start_loc () - hint_b->get_start_loc ();
|
|
}
|
|
|
|
/* Implementation of class layout. */
|
|
|
|
/* Constructor for class layout.
|
|
|
|
Filter the ranges from the rich_location to those that we can
|
|
sanely print, populating m_layout_ranges and m_fixit_hints.
|
|
Determine the range of lines that we will print, splitting them
|
|
up into an ordered list of disjoint spans of contiguous line numbers.
|
|
Determine m_x_offset, to ensure that the primary caret
|
|
will fit within the max_width provided by the diagnostic_context. */
|
|
|
|
layout::layout (diagnostic_context * context,
|
|
rich_location *richloc,
|
|
diagnostic_t diagnostic_kind)
|
|
: m_context (context),
|
|
m_pp (context->printer),
|
|
m_primary_loc (richloc->get_range (0)->m_loc),
|
|
m_exploc (richloc->get_expanded_location (0)),
|
|
m_colorizer (context, diagnostic_kind),
|
|
m_colorize_source_p (context->colorize_source_p),
|
|
m_show_labels_p (context->show_labels_p),
|
|
m_show_line_numbers_p (context->show_line_numbers_p),
|
|
m_layout_ranges (richloc->get_num_locations ()),
|
|
m_fixit_hints (richloc->get_num_fixit_hints ()),
|
|
m_line_spans (1 + richloc->get_num_locations ()),
|
|
m_linenum_width (0),
|
|
m_x_offset (0)
|
|
{
|
|
for (unsigned int idx = 0; idx < richloc->get_num_locations (); idx++)
|
|
{
|
|
/* This diagnostic printer can only cope with "sufficiently sane" ranges.
|
|
Ignore any ranges that are awkward to handle. */
|
|
const location_range *loc_range = richloc->get_range (idx);
|
|
maybe_add_location_range (loc_range, idx, false);
|
|
}
|
|
|
|
/* Populate m_fixit_hints, filtering to only those that are in the
|
|
same file. */
|
|
for (unsigned int i = 0; i < richloc->get_num_fixit_hints (); i++)
|
|
{
|
|
const fixit_hint *hint = richloc->get_fixit_hint (i);
|
|
if (validate_fixit_hint_p (hint))
|
|
m_fixit_hints.safe_push (hint);
|
|
}
|
|
|
|
/* Sort m_fixit_hints. */
|
|
m_fixit_hints.qsort (fixit_cmp);
|
|
|
|
/* Populate m_line_spans. */
|
|
calculate_line_spans ();
|
|
|
|
/* Determine m_linenum_width. */
|
|
gcc_assert (m_line_spans.length () > 0);
|
|
const line_span *last_span = &m_line_spans[m_line_spans.length () - 1];
|
|
int highest_line = last_span->m_last_line;
|
|
if (highest_line < 0)
|
|
highest_line = 0;
|
|
m_linenum_width = num_digits (highest_line);
|
|
/* If we're showing jumps in the line-numbering, allow at least 3 chars. */
|
|
if (m_line_spans.length () > 1)
|
|
m_linenum_width = MAX (m_linenum_width, 3);
|
|
/* If there's a minimum margin width, apply it (subtracting 1 for the space
|
|
after the line number. */
|
|
m_linenum_width = MAX (m_linenum_width, context->min_margin_width - 1);
|
|
|
|
/* Adjust m_x_offset.
|
|
Center the primary caret to fit in max_width; all columns
|
|
will be adjusted accordingly. */
|
|
size_t max_width = m_context->caret_max_width;
|
|
char_span line = location_get_source_line (m_exploc.file, m_exploc.line);
|
|
if (line && (size_t)m_exploc.column <= line.length ())
|
|
{
|
|
size_t right_margin = CARET_LINE_MARGIN;
|
|
size_t column = m_exploc.column;
|
|
if (m_show_line_numbers_p)
|
|
column += m_linenum_width + 2;
|
|
right_margin = MIN (line.length () - column, right_margin);
|
|
right_margin = max_width - right_margin;
|
|
if (line.length () >= max_width && column > right_margin)
|
|
m_x_offset = column - right_margin;
|
|
gcc_assert (m_x_offset >= 0);
|
|
}
|
|
|
|
if (context->show_ruler_p)
|
|
show_ruler (m_x_offset + max_width);
|
|
}
|
|
|
|
/* Attempt to add LOC_RANGE to m_layout_ranges, filtering them to
|
|
those that we can sanely print.
|
|
|
|
ORIGINAL_IDX is the index of LOC_RANGE within its rich_location,
|
|
(for use as extrinsic state by label ranges FIXME).
|
|
|
|
If RESTRICT_TO_CURRENT_LINE_SPANS is true, then LOC_RANGE is also
|
|
filtered against this layout instance's current line spans: it
|
|
will only be added if the location is fully within the lines
|
|
already specified by other locations.
|
|
|
|
Return true iff LOC_RANGE was added. */
|
|
|
|
bool
|
|
layout::maybe_add_location_range (const location_range *loc_range,
|
|
unsigned original_idx,
|
|
bool restrict_to_current_line_spans)
|
|
{
|
|
gcc_assert (loc_range);
|
|
|
|
/* Split the "range" into caret and range information. */
|
|
source_range src_range = get_range_from_loc (line_table, loc_range->m_loc);
|
|
|
|
/* Expand the various locations. */
|
|
expanded_location start
|
|
= linemap_client_expand_location_to_spelling_point
|
|
(src_range.m_start, LOCATION_ASPECT_START);
|
|
expanded_location finish
|
|
= linemap_client_expand_location_to_spelling_point
|
|
(src_range.m_finish, LOCATION_ASPECT_FINISH);
|
|
expanded_location caret
|
|
= linemap_client_expand_location_to_spelling_point
|
|
(loc_range->m_loc, LOCATION_ASPECT_CARET);
|
|
|
|
/* If any part of the range isn't in the same file as the primary
|
|
location of this diagnostic, ignore the range. */
|
|
if (start.file != m_exploc.file)
|
|
return false;
|
|
if (finish.file != m_exploc.file)
|
|
return false;
|
|
if (loc_range->m_range_display_kind == SHOW_RANGE_WITH_CARET)
|
|
if (caret.file != m_exploc.file)
|
|
return false;
|
|
|
|
/* Sanitize the caret location for non-primary ranges. */
|
|
if (m_layout_ranges.length () > 0)
|
|
if (loc_range->m_range_display_kind == SHOW_RANGE_WITH_CARET)
|
|
if (!compatible_locations_p (loc_range->m_loc, m_primary_loc))
|
|
/* Discard any non-primary ranges that can't be printed
|
|
sanely relative to the primary location. */
|
|
return false;
|
|
|
|
/* Everything is now known to be in the correct source file,
|
|
but it may require further sanitization. */
|
|
layout_range ri (&start, &finish, loc_range->m_range_display_kind, &caret,
|
|
original_idx, loc_range->m_label);
|
|
|
|
/* If we have a range that finishes before it starts (perhaps
|
|
from something built via macro expansion), printing the
|
|
range is likely to be nonsensical. Also, attempting to do so
|
|
breaks assumptions within the printing code (PR c/68473).
|
|
Similarly, don't attempt to print ranges if one or both ends
|
|
of the range aren't sane to print relative to the
|
|
primary location (PR c++/70105). */
|
|
if (start.line > finish.line
|
|
|| !compatible_locations_p (src_range.m_start, m_primary_loc)
|
|
|| !compatible_locations_p (src_range.m_finish, m_primary_loc))
|
|
{
|
|
/* Is this the primary location? */
|
|
if (m_layout_ranges.length () == 0)
|
|
{
|
|
/* We want to print the caret for the primary location, but
|
|
we must sanitize away m_start and m_finish. */
|
|
ri.m_start = ri.m_caret;
|
|
ri.m_finish = ri.m_caret;
|
|
}
|
|
else
|
|
/* This is a non-primary range; ignore it. */
|
|
return false;
|
|
}
|
|
|
|
/* Potentially filter to just the lines already specified by other
|
|
locations. This is for use by gcc_rich_location::add_location_if_nearby.
|
|
The layout ctor doesn't use it, and can't because m_line_spans
|
|
hasn't been set up at that point. */
|
|
if (restrict_to_current_line_spans)
|
|
{
|
|
if (!will_show_line_p (start.line))
|
|
return false;
|
|
if (!will_show_line_p (finish.line))
|
|
return false;
|
|
if (loc_range->m_range_display_kind == SHOW_RANGE_WITH_CARET)
|
|
if (!will_show_line_p (caret.line))
|
|
return false;
|
|
}
|
|
|
|
/* Passed all the tests; add the range to m_layout_ranges so that
|
|
it will be printed. */
|
|
m_layout_ranges.safe_push (ri);
|
|
return true;
|
|
}
|
|
|
|
/* Return true iff ROW is within one of the line spans for this layout. */
|
|
|
|
bool
|
|
layout::will_show_line_p (linenum_type row) const
|
|
{
|
|
for (int line_span_idx = 0; line_span_idx < get_num_line_spans ();
|
|
line_span_idx++)
|
|
{
|
|
const line_span *line_span = get_line_span (line_span_idx);
|
|
if (line_span->contains_line_p (row))
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/* Print a line showing a gap in the line numbers, for showing the boundary
|
|
between two line spans. */
|
|
|
|
void
|
|
layout::print_gap_in_line_numbering ()
|
|
{
|
|
gcc_assert (m_show_line_numbers_p);
|
|
|
|
for (int i = 0; i < m_linenum_width + 1; i++)
|
|
pp_character (m_pp, '.');
|
|
|
|
pp_newline (m_pp);
|
|
}
|
|
|
|
/* Return true iff we should print a heading when starting the
|
|
line span with the given index. */
|
|
|
|
bool
|
|
layout::print_heading_for_line_span_index_p (int line_span_idx) const
|
|
{
|
|
/* We print a heading for every change of line span, hence for every
|
|
line span after the initial one. */
|
|
if (line_span_idx > 0)
|
|
return true;
|
|
|
|
/* We also do it for the initial span if the primary location of the
|
|
diagnostic is in a different span. */
|
|
if (m_exploc.line > (int)get_line_span (0)->m_last_line)
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
/* Get an expanded_location for the first location of interest within
|
|
the given line_span.
|
|
Used when printing a heading to indicate a new line span. */
|
|
|
|
expanded_location
|
|
layout::get_expanded_location (const line_span *line_span) const
|
|
{
|
|
/* Whenever possible, use the caret location. */
|
|
if (line_span->contains_line_p (m_exploc.line))
|
|
return m_exploc;
|
|
|
|
/* Otherwise, use the start of the first range that's present
|
|
within the line_span. */
|
|
for (unsigned int i = 0; i < m_layout_ranges.length (); i++)
|
|
{
|
|
const layout_range *lr = &m_layout_ranges[i];
|
|
if (line_span->contains_line_p (lr->m_start.m_line))
|
|
{
|
|
expanded_location exploc = m_exploc;
|
|
exploc.line = lr->m_start.m_line;
|
|
exploc.column = lr->m_start.m_column;
|
|
return exploc;
|
|
}
|
|
}
|
|
|
|
/* Otherwise, use the location of the first fixit-hint present within
|
|
the line_span. */
|
|
for (unsigned int i = 0; i < m_fixit_hints.length (); i++)
|
|
{
|
|
const fixit_hint *hint = m_fixit_hints[i];
|
|
location_t loc = hint->get_start_loc ();
|
|
expanded_location exploc = expand_location (loc);
|
|
if (line_span->contains_line_p (exploc.line))
|
|
return exploc;
|
|
}
|
|
|
|
/* It should not be possible to have a line span that didn't
|
|
contain any of the layout_range or fixit_hint instances. */
|
|
gcc_unreachable ();
|
|
return m_exploc;
|
|
}
|
|
|
|
/* Determine if HINT is meaningful to print within this layout. */
|
|
|
|
bool
|
|
layout::validate_fixit_hint_p (const fixit_hint *hint)
|
|
{
|
|
if (LOCATION_FILE (hint->get_start_loc ()) != m_exploc.file)
|
|
return false;
|
|
if (LOCATION_FILE (hint->get_next_loc ()) != m_exploc.file)
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
/* Determine the range of lines affected by HINT.
|
|
This assumes that HINT has already been filtered by
|
|
validate_fixit_hint_p, and so affects the correct source file. */
|
|
|
|
static line_span
|
|
get_line_span_for_fixit_hint (const fixit_hint *hint)
|
|
{
|
|
gcc_assert (hint);
|
|
|
|
int start_line = LOCATION_LINE (hint->get_start_loc ());
|
|
|
|
/* For line-insertion fix-it hints, add the previous line to the
|
|
span, to give the user more context on the proposed change. */
|
|
if (hint->ends_with_newline_p ())
|
|
if (start_line > 1)
|
|
start_line--;
|
|
|
|
return line_span (start_line,
|
|
LOCATION_LINE (hint->get_next_loc ()));
|
|
}
|
|
|
|
/* We want to print the pertinent source code at a diagnostic. The
|
|
rich_location can contain multiple locations. This will have been
|
|
filtered into m_exploc (the caret for the primary location) and
|
|
m_layout_ranges, for those ranges within the same source file.
|
|
|
|
We will print a subset of the lines within the source file in question,
|
|
as a collection of "spans" of lines.
|
|
|
|
This function populates m_line_spans with an ordered, disjoint list of
|
|
the line spans of interest.
|
|
|
|
Printing a gap between line spans takes one line, so, when printing
|
|
line numbers, we allow a gap of up to one line between spans when
|
|
merging, since it makes more sense to print the source line rather than a
|
|
"gap-in-line-numbering" line. When not printing line numbers, it's
|
|
better to be more explicit about what's going on, so keeping them as
|
|
separate spans is preferred.
|
|
|
|
For example, if the primary range is on lines 8-10, with secondary ranges
|
|
covering lines 5-6 and lines 13-15:
|
|
|
|
004
|
|
005 |RANGE 1
|
|
006 |RANGE 1
|
|
007
|
|
008 |PRIMARY RANGE
|
|
009 |PRIMARY CARET
|
|
010 |PRIMARY RANGE
|
|
011
|
|
012
|
|
013 |RANGE 2
|
|
014 |RANGE 2
|
|
015 |RANGE 2
|
|
016
|
|
|
|
With line numbering on, we want two spans: lines 5-10 and lines 13-15.
|
|
|
|
With line numbering off (with span headers), we want three spans: lines 5-6,
|
|
lines 8-10, and lines 13-15. */
|
|
|
|
void
|
|
layout::calculate_line_spans ()
|
|
{
|
|
/* This should only be called once, by the ctor. */
|
|
gcc_assert (m_line_spans.length () == 0);
|
|
|
|
/* Populate tmp_spans with individual spans, for each of
|
|
m_exploc, and for m_layout_ranges. */
|
|
auto_vec<line_span> tmp_spans (1 + m_layout_ranges.length ());
|
|
tmp_spans.safe_push (line_span (m_exploc.line, m_exploc.line));
|
|
for (unsigned int i = 0; i < m_layout_ranges.length (); i++)
|
|
{
|
|
const layout_range *lr = &m_layout_ranges[i];
|
|
gcc_assert (lr->m_start.m_line <= lr->m_finish.m_line);
|
|
tmp_spans.safe_push (line_span (lr->m_start.m_line,
|
|
lr->m_finish.m_line));
|
|
}
|
|
|
|
/* Also add spans for any fix-it hints, in case they cover other lines. */
|
|
for (unsigned int i = 0; i < m_fixit_hints.length (); i++)
|
|
{
|
|
const fixit_hint *hint = m_fixit_hints[i];
|
|
gcc_assert (hint);
|
|
tmp_spans.safe_push (get_line_span_for_fixit_hint (hint));
|
|
}
|
|
|
|
/* Sort them. */
|
|
tmp_spans.qsort(line_span::comparator);
|
|
|
|
/* Now iterate through tmp_spans, copying into m_line_spans, and
|
|
combining where possible. */
|
|
gcc_assert (tmp_spans.length () > 0);
|
|
m_line_spans.safe_push (tmp_spans[0]);
|
|
for (unsigned int i = 1; i < tmp_spans.length (); i++)
|
|
{
|
|
line_span *current = &m_line_spans[m_line_spans.length () - 1];
|
|
const line_span *next = &tmp_spans[i];
|
|
gcc_assert (next->m_first_line >= current->m_first_line);
|
|
const int merger_distance = m_show_line_numbers_p ? 1 : 0;
|
|
if ((linenum_arith_t)next->m_first_line
|
|
<= (linenum_arith_t)current->m_last_line + 1 + merger_distance)
|
|
{
|
|
/* We can merge them. */
|
|
if (next->m_last_line > current->m_last_line)
|
|
current->m_last_line = next->m_last_line;
|
|
}
|
|
else
|
|
{
|
|
/* No merger possible. */
|
|
m_line_spans.safe_push (*next);
|
|
}
|
|
}
|
|
|
|
/* Verify the result, in m_line_spans. */
|
|
gcc_assert (m_line_spans.length () > 0);
|
|
for (unsigned int i = 1; i < m_line_spans.length (); i++)
|
|
{
|
|
const line_span *prev = &m_line_spans[i - 1];
|
|
const line_span *next = &m_line_spans[i];
|
|
/* The individual spans must be sane. */
|
|
gcc_assert (prev->m_first_line <= prev->m_last_line);
|
|
gcc_assert (next->m_first_line <= next->m_last_line);
|
|
/* The spans must be ordered. */
|
|
gcc_assert (prev->m_first_line < next->m_first_line);
|
|
/* There must be a gap of at least one line between separate spans. */
|
|
gcc_assert ((prev->m_last_line + 1) < next->m_first_line);
|
|
}
|
|
}
|
|
|
|
/* Print line ROW of source code, potentially colorized at any ranges, and
|
|
populate *LBOUNDS_OUT.
|
|
LINE is the source line (not necessarily 0-terminated) and LINE_WIDTH
|
|
is its width. */
|
|
|
|
void
|
|
layout::print_source_line (linenum_type row, const char *line, int line_width,
|
|
line_bounds *lbounds_out)
|
|
{
|
|
m_colorizer.set_normal_text ();
|
|
|
|
/* We will stop printing the source line at any trailing
|
|
whitespace. */
|
|
line_width = get_line_width_without_trailing_whitespace (line,
|
|
line_width);
|
|
line += m_x_offset;
|
|
|
|
if (m_show_line_numbers_p)
|
|
{
|
|
int width = num_digits (row);
|
|
for (int i = 0; i < m_linenum_width - width; i++)
|
|
pp_space (m_pp);
|
|
pp_printf (m_pp, "%i | ", row);
|
|
}
|
|
else
|
|
pp_space (m_pp);
|
|
int first_non_ws = INT_MAX;
|
|
int last_non_ws = 0;
|
|
int column;
|
|
for (column = 1 + m_x_offset; column <= line_width; column++)
|
|
{
|
|
/* Assuming colorization is enabled for the caret and underline
|
|
characters, we may also colorize the associated characters
|
|
within the source line.
|
|
|
|
For frontends that generate range information, we color the
|
|
associated characters in the source line the same as the
|
|
carets and underlines in the annotation line, to make it easier
|
|
for the reader to see the pertinent code.
|
|
|
|
For frontends that only generate carets, we don't colorize the
|
|
characters above them, since this would look strange (e.g.
|
|
colorizing just the first character in a token). */
|
|
if (m_colorize_source_p)
|
|
{
|
|
bool in_range_p;
|
|
point_state state;
|
|
in_range_p = get_state_at_point (row, column,
|
|
0, INT_MAX,
|
|
&state);
|
|
if (in_range_p)
|
|
m_colorizer.set_range (state.range_idx);
|
|
else
|
|
m_colorizer.set_normal_text ();
|
|
}
|
|
char c = *line;
|
|
if (c == '\0' || c == '\t' || c == '\r')
|
|
c = ' ';
|
|
if (c != ' ')
|
|
{
|
|
last_non_ws = column;
|
|
if (first_non_ws == INT_MAX)
|
|
first_non_ws = column;
|
|
}
|
|
pp_character (m_pp, c);
|
|
line++;
|
|
}
|
|
print_newline ();
|
|
|
|
lbounds_out->m_first_non_ws = first_non_ws;
|
|
lbounds_out->m_last_non_ws = last_non_ws;
|
|
}
|
|
|
|
/* Determine if we should print an annotation line for ROW.
|
|
i.e. if any of m_layout_ranges contains ROW. */
|
|
|
|
bool
|
|
layout::should_print_annotation_line_p (linenum_type row) const
|
|
{
|
|
layout_range *range;
|
|
int i;
|
|
FOR_EACH_VEC_ELT (m_layout_ranges, i, range)
|
|
{
|
|
if (range->m_range_display_kind == SHOW_LINES_WITHOUT_RANGE)
|
|
return false;
|
|
if (range->intersects_line_p (row))
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/* Begin an annotation line. If m_show_line_numbers_p, print the left
|
|
margin, which is empty for annotation lines. Otherwise, do nothing. */
|
|
|
|
void
|
|
layout::start_annotation_line (char margin_char) const
|
|
{
|
|
if (m_show_line_numbers_p)
|
|
{
|
|
/* Print the margin. If MARGIN_CHAR != ' ', then print up to 3
|
|
of it, right-aligned, padded with spaces. */
|
|
int i;
|
|
for (i = 0; i < m_linenum_width - 3; i++)
|
|
pp_space (m_pp);
|
|
for (; i < m_linenum_width; i++)
|
|
pp_character (m_pp, margin_char);
|
|
pp_string (m_pp, " |");
|
|
}
|
|
}
|
|
|
|
/* Print a line consisting of the caret/underlines for the given
|
|
source line. */
|
|
|
|
void
|
|
layout::print_annotation_line (linenum_type row, const line_bounds lbounds)
|
|
{
|
|
int x_bound = get_x_bound_for_row (row, m_exploc.column,
|
|
lbounds.m_last_non_ws);
|
|
|
|
start_annotation_line ();
|
|
pp_space (m_pp);
|
|
|
|
for (int column = 1 + m_x_offset; column < x_bound; column++)
|
|
{
|
|
bool in_range_p;
|
|
point_state state;
|
|
in_range_p = get_state_at_point (row, column,
|
|
lbounds.m_first_non_ws,
|
|
lbounds.m_last_non_ws,
|
|
&state);
|
|
if (in_range_p)
|
|
{
|
|
/* Within a range. Draw either the caret or an underline. */
|
|
m_colorizer.set_range (state.range_idx);
|
|
if (state.draw_caret_p)
|
|
{
|
|
/* Draw the caret. */
|
|
char caret_char;
|
|
if (state.range_idx < rich_location::STATICALLY_ALLOCATED_RANGES)
|
|
caret_char = m_context->caret_chars[state.range_idx];
|
|
else
|
|
caret_char = '^';
|
|
pp_character (m_pp, caret_char);
|
|
}
|
|
else
|
|
pp_character (m_pp, '~');
|
|
}
|
|
else
|
|
{
|
|
/* Not in a range. */
|
|
m_colorizer.set_normal_text ();
|
|
pp_character (m_pp, ' ');
|
|
}
|
|
}
|
|
print_newline ();
|
|
}
|
|
|
|
/* Implementation detail of layout::print_any_labels.
|
|
|
|
A label within the given row of source. */
|
|
|
|
struct line_label
|
|
{
|
|
line_label (int state_idx, int column, label_text text)
|
|
: m_state_idx (state_idx), m_column (column),
|
|
m_text (text), m_length (strlen (text.m_buffer)),
|
|
m_label_line (0)
|
|
{}
|
|
|
|
/* Sorting is primarily by column, then by state index. */
|
|
static int comparator (const void *p1, const void *p2)
|
|
{
|
|
const line_label *ll1 = (const line_label *)p1;
|
|
const line_label *ll2 = (const line_label *)p2;
|
|
int column_cmp = compare (ll1->m_column, ll2->m_column);
|
|
if (column_cmp)
|
|
return column_cmp;
|
|
return compare (ll1->m_state_idx, ll2->m_state_idx);
|
|
}
|
|
|
|
int m_state_idx;
|
|
int m_column;
|
|
label_text m_text;
|
|
size_t m_length;
|
|
int m_label_line;
|
|
};
|
|
|
|
/* Print any labels in this row. */
|
|
void
|
|
layout::print_any_labels (linenum_type row)
|
|
{
|
|
int i;
|
|
auto_vec<line_label> labels;
|
|
|
|
/* Gather the labels that are to be printed into "labels". */
|
|
{
|
|
layout_range *range;
|
|
FOR_EACH_VEC_ELT (m_layout_ranges, i, range)
|
|
{
|
|
/* Most ranges don't have labels, so reject this first. */
|
|
if (range->m_label == NULL)
|
|
continue;
|
|
|
|
/* The range's caret must be on this line. */
|
|
if (range->m_caret.m_line != row)
|
|
continue;
|
|
|
|
/* Reject labels that aren't fully visible due to clipping
|
|
by m_x_offset. */
|
|
if (range->m_caret.m_column <= m_x_offset)
|
|
continue;
|
|
|
|
label_text text;
|
|
text = range->m_label->get_text (range->m_original_idx);
|
|
|
|
/* Allow for labels that return NULL from their get_text
|
|
implementation (so e.g. such labels can control their own
|
|
visibility). */
|
|
if (text.m_buffer == NULL)
|
|
continue;
|
|
|
|
labels.safe_push (line_label (i, range->m_caret.m_column, text));
|
|
}
|
|
}
|
|
|
|
/* Bail out if there are no labels on this row. */
|
|
if (labels.length () == 0)
|
|
return;
|
|
|
|
/* Sort them. */
|
|
labels.qsort(line_label::comparator);
|
|
|
|
/* Figure out how many "label lines" we need, and which
|
|
one each label is printed in.
|
|
|
|
For example, if the labels aren't too densely packed,
|
|
we can fit them on the same line, giving two "label lines":
|
|
|
|
foo + bar
|
|
~~~ ~~~
|
|
| | : label line 0
|
|
l0 l1 : label line 1
|
|
|
|
If they would touch each other or overlap, then we need
|
|
additional "label lines":
|
|
|
|
foo + bar
|
|
~~~ ~~~
|
|
| | : label line 0
|
|
| label 1 : label line 1
|
|
label 0 : label line 2
|
|
|
|
Place the final label on label line 1, and work backwards, adding
|
|
label lines as needed.
|
|
|
|
If multiple labels are at the same place, put them on separate
|
|
label lines:
|
|
|
|
foo + bar
|
|
^ : label line 0
|
|
| : label line 1
|
|
label 1 : label line 2
|
|
label 0 : label line 3. */
|
|
|
|
int max_label_line = 1;
|
|
{
|
|
int next_column = INT_MAX;
|
|
line_label *label;
|
|
FOR_EACH_VEC_ELT_REVERSE (labels, i, label)
|
|
{
|
|
/* Would this label "touch" or overlap the next label? */
|
|
if (label->m_column + label->m_length >= (size_t)next_column)
|
|
max_label_line++;
|
|
|
|
label->m_label_line = max_label_line;
|
|
next_column = label->m_column;
|
|
}
|
|
}
|
|
|
|
/* Print the "label lines". For each label within the line, print
|
|
either a vertical bar ('|') for the labels that are lower down, or the
|
|
labels themselves once we've reached their line. */
|
|
{
|
|
/* Keep track of in which column we last printed a vertical bar.
|
|
This allows us to suppress duplicate vertical bars for the case
|
|
where multiple labels are on one column. */
|
|
int last_vbar = 0;
|
|
for (int label_line = 0; label_line <= max_label_line; label_line++)
|
|
{
|
|
start_annotation_line ();
|
|
pp_space (m_pp);
|
|
int column = 1 + m_x_offset;
|
|
line_label *label;
|
|
FOR_EACH_VEC_ELT (labels, i, label)
|
|
{
|
|
if (label_line > label->m_label_line)
|
|
/* We've printed all the labels for this label line. */
|
|
break;
|
|
|
|
if (label_line == label->m_label_line)
|
|
{
|
|
gcc_assert (column <= label->m_column);
|
|
move_to_column (&column, label->m_column, true);
|
|
m_colorizer.set_range (label->m_state_idx);
|
|
pp_string (m_pp, label->m_text.m_buffer);
|
|
m_colorizer.set_normal_text ();
|
|
column += label->m_length;
|
|
}
|
|
else if (label->m_column != last_vbar)
|
|
{
|
|
gcc_assert (column <= label->m_column);
|
|
move_to_column (&column, label->m_column, true);
|
|
m_colorizer.set_range (label->m_state_idx);
|
|
pp_character (m_pp, '|');
|
|
m_colorizer.set_normal_text ();
|
|
last_vbar = column;
|
|
column++;
|
|
}
|
|
}
|
|
print_newline ();
|
|
}
|
|
}
|
|
|
|
/* Clean up. */
|
|
{
|
|
line_label *label;
|
|
FOR_EACH_VEC_ELT (labels, i, label)
|
|
label->m_text.maybe_free ();
|
|
}
|
|
}
|
|
|
|
/* If there are any fixit hints inserting new lines before source line ROW,
|
|
print them.
|
|
|
|
They are printed on lines of their own, before the source line
|
|
itself, with a leading '+'. */
|
|
|
|
void
|
|
layout::print_leading_fixits (linenum_type row)
|
|
{
|
|
for (unsigned int i = 0; i < m_fixit_hints.length (); i++)
|
|
{
|
|
const fixit_hint *hint = m_fixit_hints[i];
|
|
|
|
if (!hint->ends_with_newline_p ())
|
|
/* Not a newline fixit; print it in print_trailing_fixits. */
|
|
continue;
|
|
|
|
gcc_assert (hint->insertion_p ());
|
|
|
|
if (hint->affects_line_p (m_exploc.file, row))
|
|
{
|
|
/* Printing the '+' with normal colorization
|
|
and the inserted line with "insert" colorization
|
|
helps them stand out from each other, and from
|
|
the surrounding text. */
|
|
m_colorizer.set_normal_text ();
|
|
start_annotation_line ('+');
|
|
pp_character (m_pp, '+');
|
|
m_colorizer.set_fixit_insert ();
|
|
/* Print all but the trailing newline of the fix-it hint.
|
|
We have to print the newline separately to avoid
|
|
getting additional pp prefixes printed. */
|
|
for (size_t i = 0; i < hint->get_length () - 1; i++)
|
|
pp_character (m_pp, hint->get_string ()[i]);
|
|
m_colorizer.set_normal_text ();
|
|
pp_newline (m_pp);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Subroutine of layout::print_trailing_fixits.
|
|
|
|
Determine if the annotation line printed for LINE contained
|
|
the exact range from START_COLUMN to FINISH_COLUMN. */
|
|
|
|
bool
|
|
layout::annotation_line_showed_range_p (linenum_type line, int start_column,
|
|
int finish_column) const
|
|
{
|
|
layout_range *range;
|
|
int i;
|
|
FOR_EACH_VEC_ELT (m_layout_ranges, i, range)
|
|
if (range->m_start.m_line == line
|
|
&& range->m_start.m_column == start_column
|
|
&& range->m_finish.m_line == line
|
|
&& range->m_finish.m_column == finish_column)
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
/* Classes for printing trailing fix-it hints i.e. those that
|
|
don't add new lines.
|
|
|
|
For insertion, these can look like:
|
|
|
|
new_text
|
|
|
|
For replacement, these can look like:
|
|
|
|
------------- : underline showing affected range
|
|
new_text
|
|
|
|
For deletion, these can look like:
|
|
|
|
------------- : underline showing affected range
|
|
|
|
This can become confusing if they overlap, and so we need
|
|
to do some preprocessing to decide what to print.
|
|
We use the list of fixit_hint instances affecting the line
|
|
to build a list of "correction" instances, and print the
|
|
latter.
|
|
|
|
For example, consider a set of fix-its for converting
|
|
a C-style cast to a C++ const_cast.
|
|
|
|
Given:
|
|
|
|
..000000000111111111122222222223333333333.
|
|
..123456789012345678901234567890123456789.
|
|
foo *f = (foo *)ptr->field;
|
|
^~~~~
|
|
|
|
and the fix-it hints:
|
|
- replace col 10 (the open paren) with "const_cast<"
|
|
- replace col 16 (the close paren) with "> ("
|
|
- insert ")" before col 27
|
|
|
|
then we would get odd-looking output:
|
|
|
|
foo *f = (foo *)ptr->field;
|
|
^~~~~
|
|
-
|
|
const_cast<
|
|
-
|
|
> ( )
|
|
|
|
It would be better to detect when fixit hints are going to
|
|
overlap (those that require new lines), and to consolidate
|
|
the printing of such fixits, giving something like:
|
|
|
|
foo *f = (foo *)ptr->field;
|
|
^~~~~
|
|
-----------------
|
|
const_cast<foo *> (ptr->field)
|
|
|
|
This works by detecting when the printing would overlap, and
|
|
effectively injecting no-op replace hints into the gaps between
|
|
such fix-its, so that the printing joins up.
|
|
|
|
In the above example, the overlap of:
|
|
- replace col 10 (the open paren) with "const_cast<"
|
|
and:
|
|
- replace col 16 (the close paren) with "> ("
|
|
is fixed by injecting a no-op:
|
|
- replace cols 11-15 with themselves ("foo *")
|
|
and consolidating these, making:
|
|
- replace cols 10-16 with "const_cast<" + "foo *" + "> ("
|
|
i.e.:
|
|
- replace cols 10-16 with "const_cast<foo *> ("
|
|
|
|
This overlaps with the final fix-it hint:
|
|
- insert ")" before col 27
|
|
and so we repeat the consolidation process, by injecting
|
|
a no-op:
|
|
- replace cols 17-26 with themselves ("ptr->field")
|
|
giving:
|
|
- replace cols 10-26 with "const_cast<foo *> (" + "ptr->field" + ")"
|
|
i.e.:
|
|
- replace cols 10-26 with "const_cast<foo *> (ptr->field)"
|
|
|
|
and is thus printed as desired. */
|
|
|
|
/* A range of columns within a line. */
|
|
|
|
struct column_range
|
|
{
|
|
column_range (int start_, int finish_) : start (start_), finish (finish_)
|
|
{
|
|
/* We must have either a range, or an insertion. */
|
|
gcc_assert (start <= finish || finish == start - 1);
|
|
}
|
|
|
|
bool operator== (const column_range &other) const
|
|
{
|
|
return start == other.start && finish == other.finish;
|
|
}
|
|
|
|
int start;
|
|
int finish;
|
|
};
|
|
|
|
/* Get the range of columns that HINT would affect. */
|
|
|
|
static column_range
|
|
get_affected_columns (const fixit_hint *hint)
|
|
{
|
|
int start_column = LOCATION_COLUMN (hint->get_start_loc ());
|
|
int finish_column = LOCATION_COLUMN (hint->get_next_loc ()) - 1;
|
|
|
|
return column_range (start_column, finish_column);
|
|
}
|
|
|
|
/* Get the range of columns that would be printed for HINT. */
|
|
|
|
static column_range
|
|
get_printed_columns (const fixit_hint *hint)
|
|
{
|
|
int start_column = LOCATION_COLUMN (hint->get_start_loc ());
|
|
int final_hint_column = start_column + hint->get_length () - 1;
|
|
if (hint->insertion_p ())
|
|
{
|
|
return column_range (start_column, final_hint_column);
|
|
}
|
|
else
|
|
{
|
|
int finish_column = LOCATION_COLUMN (hint->get_next_loc ()) - 1;
|
|
|
|
return column_range (start_column,
|
|
MAX (finish_column, final_hint_column));
|
|
}
|
|
}
|
|
|
|
/* A correction on a particular line.
|
|
This describes a plan for how to print one or more fixit_hint
|
|
instances that affected the line, potentially consolidating hints
|
|
into corrections to make the result easier for the user to read. */
|
|
|
|
struct correction
|
|
{
|
|
correction (column_range affected_columns,
|
|
column_range printed_columns,
|
|
const char *new_text, size_t new_text_len)
|
|
: m_affected_columns (affected_columns),
|
|
m_printed_columns (printed_columns),
|
|
m_text (xstrdup (new_text)),
|
|
m_len (new_text_len),
|
|
m_alloc_sz (new_text_len + 1)
|
|
{
|
|
}
|
|
|
|
~correction () { free (m_text); }
|
|
|
|
bool insertion_p () const
|
|
{
|
|
return m_affected_columns.start == m_affected_columns.finish + 1;
|
|
}
|
|
|
|
void ensure_capacity (size_t len);
|
|
void ensure_terminated ();
|
|
|
|
void overwrite (int dst_offset, const char_span &src_span)
|
|
{
|
|
gcc_assert (dst_offset >= 0);
|
|
gcc_assert (dst_offset + src_span.length () < m_alloc_sz);
|
|
memcpy (m_text + dst_offset, src_span.get_buffer (),
|
|
src_span.length ());
|
|
}
|
|
|
|
/* If insert, then start: the column before which the text
|
|
is to be inserted, and finish is offset by the length of
|
|
the replacement.
|
|
If replace, then the range of columns affected. */
|
|
column_range m_affected_columns;
|
|
|
|
/* If insert, then start: the column before which the text
|
|
is to be inserted, and finish is offset by the length of
|
|
the replacement.
|
|
If replace, then the range of columns affected. */
|
|
column_range m_printed_columns;
|
|
|
|
/* The text to be inserted/used as replacement. */
|
|
char *m_text;
|
|
size_t m_len;
|
|
size_t m_alloc_sz;
|
|
};
|
|
|
|
/* Ensure that m_text can hold a string of length LEN
|
|
(plus 1 for 0-termination). */
|
|
|
|
void
|
|
correction::ensure_capacity (size_t len)
|
|
{
|
|
/* Allow 1 extra byte for 0-termination. */
|
|
if (m_alloc_sz < (len + 1))
|
|
{
|
|
size_t new_alloc_sz = (len + 1) * 2;
|
|
m_text = (char *)xrealloc (m_text, new_alloc_sz);
|
|
m_alloc_sz = new_alloc_sz;
|
|
}
|
|
}
|
|
|
|
/* Ensure that m_text is 0-terminated. */
|
|
|
|
void
|
|
correction::ensure_terminated ()
|
|
{
|
|
/* 0-terminate the buffer. */
|
|
gcc_assert (m_len < m_alloc_sz);
|
|
m_text[m_len] = '\0';
|
|
}
|
|
|
|
/* A list of corrections affecting a particular line.
|
|
This is used by layout::print_trailing_fixits for planning
|
|
how to print the fix-it hints affecting the line. */
|
|
|
|
struct line_corrections
|
|
{
|
|
line_corrections (const char *filename, linenum_type row)
|
|
: m_filename (filename), m_row (row)
|
|
{}
|
|
~line_corrections ();
|
|
|
|
void add_hint (const fixit_hint *hint);
|
|
|
|
const char *m_filename;
|
|
linenum_type m_row;
|
|
auto_vec <correction *> m_corrections;
|
|
};
|
|
|
|
/* struct line_corrections. */
|
|
|
|
line_corrections::~line_corrections ()
|
|
{
|
|
unsigned i;
|
|
correction *c;
|
|
FOR_EACH_VEC_ELT (m_corrections, i, c)
|
|
delete c;
|
|
}
|
|
|
|
/* A struct wrapping a particular source line, allowing
|
|
run-time bounds-checking of accesses in a checked build. */
|
|
|
|
struct source_line
|
|
{
|
|
source_line (const char *filename, int line);
|
|
|
|
char_span as_span () { return char_span (chars, width); }
|
|
|
|
const char *chars;
|
|
int width;
|
|
};
|
|
|
|
/* source_line's ctor. */
|
|
|
|
source_line::source_line (const char *filename, int line)
|
|
{
|
|
char_span span = location_get_source_line (filename, line);
|
|
chars = span.get_buffer ();
|
|
width = span.length ();
|
|
}
|
|
|
|
/* Add HINT to the corrections for this line.
|
|
Attempt to consolidate nearby hints so that they will not
|
|
overlap with printed. */
|
|
|
|
void
|
|
line_corrections::add_hint (const fixit_hint *hint)
|
|
{
|
|
column_range affected_columns = get_affected_columns (hint);
|
|
column_range printed_columns = get_printed_columns (hint);
|
|
|
|
/* Potentially consolidate. */
|
|
if (!m_corrections.is_empty ())
|
|
{
|
|
correction *last_correction
|
|
= m_corrections[m_corrections.length () - 1];
|
|
|
|
/* The following consolidation code assumes that the fix-it hints
|
|
have been sorted by start (done within layout's ctor). */
|
|
gcc_assert (affected_columns.start
|
|
>= last_correction->m_affected_columns.start);
|
|
gcc_assert (printed_columns.start
|
|
>= last_correction->m_printed_columns.start);
|
|
|
|
if (printed_columns.start <= last_correction->m_printed_columns.finish)
|
|
{
|
|
/* We have two hints for which the printed forms of the hints
|
|
would touch or overlap, so we need to consolidate them to avoid
|
|
confusing the user.
|
|
Attempt to inject a "replace" correction from immediately
|
|
after the end of the last hint to immediately before the start
|
|
of the next hint. */
|
|
column_range between (last_correction->m_affected_columns.finish + 1,
|
|
printed_columns.start - 1);
|
|
|
|
/* Try to read the source. */
|
|
source_line line (m_filename, m_row);
|
|
if (line.chars && between.finish < line.width)
|
|
{
|
|
/* Consolidate into the last correction:
|
|
add a no-op "replace" of the "between" text, and
|
|
add the text from the new hint. */
|
|
int old_len = last_correction->m_len;
|
|
gcc_assert (old_len >= 0);
|
|
int between_len = between.finish + 1 - between.start;
|
|
gcc_assert (between_len >= 0);
|
|
int new_len = old_len + between_len + hint->get_length ();
|
|
gcc_assert (new_len >= 0);
|
|
last_correction->ensure_capacity (new_len);
|
|
last_correction->overwrite
|
|
(old_len,
|
|
line.as_span ().subspan (between.start - 1,
|
|
between.finish + 1 - between.start));
|
|
last_correction->overwrite (old_len + between_len,
|
|
char_span (hint->get_string (),
|
|
hint->get_length ()));
|
|
last_correction->m_len = new_len;
|
|
last_correction->ensure_terminated ();
|
|
last_correction->m_affected_columns.finish
|
|
= affected_columns.finish;
|
|
last_correction->m_printed_columns.finish
|
|
+= between_len + hint->get_length ();
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* If no consolidation happened, add a new correction instance. */
|
|
m_corrections.safe_push (new correction (affected_columns,
|
|
printed_columns,
|
|
hint->get_string (),
|
|
hint->get_length ()));
|
|
}
|
|
|
|
/* If there are any fixit hints on source line ROW, print them.
|
|
They are printed in order, attempting to combine them onto lines, but
|
|
starting new lines if necessary.
|
|
Fix-it hints that insert new lines are handled separately,
|
|
in layout::print_leading_fixits. */
|
|
|
|
void
|
|
layout::print_trailing_fixits (linenum_type row)
|
|
{
|
|
/* Build a list of correction instances for the line,
|
|
potentially consolidating hints (for the sake of readability). */
|
|
line_corrections corrections (m_exploc.file, row);
|
|
for (unsigned int i = 0; i < m_fixit_hints.length (); i++)
|
|
{
|
|
const fixit_hint *hint = m_fixit_hints[i];
|
|
|
|
/* Newline fixits are handled by layout::print_leading_fixits. */
|
|
if (hint->ends_with_newline_p ())
|
|
continue;
|
|
|
|
if (hint->affects_line_p (m_exploc.file, row))
|
|
corrections.add_hint (hint);
|
|
}
|
|
|
|
/* Now print the corrections. */
|
|
unsigned i;
|
|
correction *c;
|
|
int column = m_x_offset;
|
|
|
|
if (!corrections.m_corrections.is_empty ())
|
|
start_annotation_line ();
|
|
|
|
FOR_EACH_VEC_ELT (corrections.m_corrections, i, c)
|
|
{
|
|
/* For now we assume each fixit hint can only touch one line. */
|
|
if (c->insertion_p ())
|
|
{
|
|
/* This assumes the insertion just affects one line. */
|
|
int start_column = c->m_printed_columns.start;
|
|
move_to_column (&column, start_column, true);
|
|
m_colorizer.set_fixit_insert ();
|
|
pp_string (m_pp, c->m_text);
|
|
m_colorizer.set_normal_text ();
|
|
column += c->m_len;
|
|
}
|
|
else
|
|
{
|
|
/* If the range of the replacement wasn't printed in the
|
|
annotation line, then print an extra underline to
|
|
indicate exactly what is being replaced.
|
|
Always show it for removals. */
|
|
int start_column = c->m_affected_columns.start;
|
|
int finish_column = c->m_affected_columns.finish;
|
|
if (!annotation_line_showed_range_p (row, start_column,
|
|
finish_column)
|
|
|| c->m_len == 0)
|
|
{
|
|
move_to_column (&column, start_column, true);
|
|
m_colorizer.set_fixit_delete ();
|
|
for (; column <= finish_column; column++)
|
|
pp_character (m_pp, '-');
|
|
m_colorizer.set_normal_text ();
|
|
}
|
|
/* Print the replacement text. REPLACE also covers
|
|
removals, so only do this extra work (potentially starting
|
|
a new line) if we have actual replacement text. */
|
|
if (c->m_len > 0)
|
|
{
|
|
move_to_column (&column, start_column, true);
|
|
m_colorizer.set_fixit_insert ();
|
|
pp_string (m_pp, c->m_text);
|
|
m_colorizer.set_normal_text ();
|
|
column += c->m_len;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Add a trailing newline, if necessary. */
|
|
move_to_column (&column, 0, false);
|
|
}
|
|
|
|
/* Disable any colorization and emit a newline. */
|
|
|
|
void
|
|
layout::print_newline ()
|
|
{
|
|
m_colorizer.set_normal_text ();
|
|
pp_newline (m_pp);
|
|
}
|
|
|
|
/* Return true if (ROW/COLUMN) is within a range of the layout.
|
|
If it returns true, OUT_STATE is written to, with the
|
|
range index, and whether we should draw the caret at
|
|
(ROW/COLUMN) (as opposed to an underline). */
|
|
|
|
bool
|
|
layout::get_state_at_point (/* Inputs. */
|
|
linenum_type row, int column,
|
|
int first_non_ws, int last_non_ws,
|
|
/* Outputs. */
|
|
point_state *out_state)
|
|
{
|
|
layout_range *range;
|
|
int i;
|
|
FOR_EACH_VEC_ELT (m_layout_ranges, i, range)
|
|
{
|
|
if (range->m_range_display_kind == SHOW_LINES_WITHOUT_RANGE)
|
|
/* Bail out early, so that such ranges don't affect underlining or
|
|
source colorization. */
|
|
continue;
|
|
|
|
if (range->contains_point (row, column))
|
|
{
|
|
out_state->range_idx = i;
|
|
|
|
/* Are we at the range's caret? is it visible? */
|
|
out_state->draw_caret_p = false;
|
|
if (range->m_range_display_kind == SHOW_RANGE_WITH_CARET
|
|
&& row == range->m_caret.m_line
|
|
&& column == range->m_caret.m_column)
|
|
out_state->draw_caret_p = true;
|
|
|
|
/* Within a multiline range, don't display any underline
|
|
in any leading or trailing whitespace on a line.
|
|
We do display carets, however. */
|
|
if (!out_state->draw_caret_p)
|
|
if (column < first_non_ws || column > last_non_ws)
|
|
return false;
|
|
|
|
/* We are within a range. */
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
/* Helper function for use by layout::print_line when printing the
|
|
annotation line under the source line.
|
|
Get the column beyond the rightmost one that could contain a caret or
|
|
range marker, given that we stop rendering at trailing whitespace.
|
|
ROW is the source line within the given file.
|
|
CARET_COLUMN is the column of range 0's caret.
|
|
LAST_NON_WS_COLUMN is the last column containing a non-whitespace
|
|
character of source (as determined when printing the source line). */
|
|
|
|
int
|
|
layout::get_x_bound_for_row (linenum_type row, int caret_column,
|
|
int last_non_ws_column)
|
|
{
|
|
int result = caret_column + 1;
|
|
|
|
layout_range *range;
|
|
int i;
|
|
FOR_EACH_VEC_ELT (m_layout_ranges, i, range)
|
|
{
|
|
if (row >= range->m_start.m_line)
|
|
{
|
|
if (range->m_finish.m_line == row)
|
|
{
|
|
/* On the final line within a range; ensure that
|
|
we render up to the end of the range. */
|
|
if (result <= range->m_finish.m_column)
|
|
result = range->m_finish.m_column + 1;
|
|
}
|
|
else if (row < range->m_finish.m_line)
|
|
{
|
|
/* Within a multiline range; ensure that we render up to the
|
|
last non-whitespace column. */
|
|
if (result <= last_non_ws_column)
|
|
result = last_non_ws_column + 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
/* Given *COLUMN as an x-coordinate, print spaces to position
|
|
successive output at DEST_COLUMN, printing a newline if necessary,
|
|
and updating *COLUMN. If ADD_LEFT_MARGIN, then print the (empty)
|
|
left margin after any newline. */
|
|
|
|
void
|
|
layout::move_to_column (int *column, int dest_column, bool add_left_margin)
|
|
{
|
|
/* Start a new line if we need to. */
|
|
if (*column > dest_column)
|
|
{
|
|
print_newline ();
|
|
if (add_left_margin)
|
|
start_annotation_line ();
|
|
*column = m_x_offset;
|
|
}
|
|
|
|
while (*column < dest_column)
|
|
{
|
|
pp_space (m_pp);
|
|
(*column)++;
|
|
}
|
|
}
|
|
|
|
/* For debugging layout issues, render a ruler giving column numbers
|
|
(after the 1-column indent). */
|
|
|
|
void
|
|
layout::show_ruler (int max_column) const
|
|
{
|
|
/* Hundreds. */
|
|
if (max_column > 99)
|
|
{
|
|
start_annotation_line ();
|
|
pp_space (m_pp);
|
|
for (int column = 1 + m_x_offset; column <= max_column; column++)
|
|
if (column % 10 == 0)
|
|
pp_character (m_pp, '0' + (column / 100) % 10);
|
|
else
|
|
pp_space (m_pp);
|
|
pp_newline (m_pp);
|
|
}
|
|
|
|
/* Tens. */
|
|
start_annotation_line ();
|
|
pp_space (m_pp);
|
|
for (int column = 1 + m_x_offset; column <= max_column; column++)
|
|
if (column % 10 == 0)
|
|
pp_character (m_pp, '0' + (column / 10) % 10);
|
|
else
|
|
pp_space (m_pp);
|
|
pp_newline (m_pp);
|
|
|
|
/* Units. */
|
|
start_annotation_line ();
|
|
pp_space (m_pp);
|
|
for (int column = 1 + m_x_offset; column <= max_column; column++)
|
|
pp_character (m_pp, '0' + (column % 10));
|
|
pp_newline (m_pp);
|
|
}
|
|
|
|
/* Print leading fix-its (for new lines inserted before the source line)
|
|
then the source line, followed by an annotation line
|
|
consisting of any caret/underlines, then any fixits.
|
|
If the source line can't be read, print nothing. */
|
|
void
|
|
layout::print_line (linenum_type row)
|
|
{
|
|
char_span line = location_get_source_line (m_exploc.file, row);
|
|
if (!line)
|
|
return;
|
|
|
|
line_bounds lbounds;
|
|
print_leading_fixits (row);
|
|
print_source_line (row, line.get_buffer (), line.length (), &lbounds);
|
|
if (should_print_annotation_line_p (row))
|
|
print_annotation_line (row, lbounds);
|
|
if (m_show_labels_p)
|
|
print_any_labels (row);
|
|
print_trailing_fixits (row);
|
|
}
|
|
|
|
} /* End of anonymous namespace. */
|
|
|
|
/* If LOC is within the spans of lines that will already be printed for
|
|
this gcc_rich_location, then add it as a secondary location and return true.
|
|
|
|
Otherwise return false. */
|
|
|
|
bool
|
|
gcc_rich_location::add_location_if_nearby (location_t loc)
|
|
{
|
|
/* Use the layout location-handling logic to sanitize LOC,
|
|
filtering it to the current line spans within a temporary
|
|
layout instance. */
|
|
layout layout (global_dc, this, DK_ERROR);
|
|
location_range loc_range;
|
|
loc_range.m_loc = loc;
|
|
loc_range.m_range_display_kind = SHOW_RANGE_WITHOUT_CARET;
|
|
if (!layout.maybe_add_location_range (&loc_range, 0, true))
|
|
return false;
|
|
|
|
add_range (loc);
|
|
return true;
|
|
}
|
|
|
|
/* Print the physical source code corresponding to the location of
|
|
this diagnostic, with additional annotations. */
|
|
|
|
void
|
|
diagnostic_show_locus (diagnostic_context * context,
|
|
rich_location *richloc,
|
|
diagnostic_t diagnostic_kind)
|
|
{
|
|
pp_newline (context->printer);
|
|
|
|
location_t loc = richloc->get_loc ();
|
|
/* Do nothing if source-printing has been disabled. */
|
|
if (!context->show_caret)
|
|
return;
|
|
|
|
/* Don't attempt to print source for UNKNOWN_LOCATION and for builtins. */
|
|
if (loc <= BUILTINS_LOCATION)
|
|
return;
|
|
|
|
/* Don't print the same source location twice in a row, unless we have
|
|
fix-it hints. */
|
|
if (loc == context->last_location
|
|
&& richloc->get_num_fixit_hints () == 0)
|
|
return;
|
|
|
|
context->last_location = loc;
|
|
|
|
char *saved_prefix = pp_take_prefix (context->printer);
|
|
pp_set_prefix (context->printer, NULL);
|
|
|
|
layout layout (context, richloc, diagnostic_kind);
|
|
for (int line_span_idx = 0; line_span_idx < layout.get_num_line_spans ();
|
|
line_span_idx++)
|
|
{
|
|
const line_span *line_span = layout.get_line_span (line_span_idx);
|
|
if (context->show_line_numbers_p)
|
|
{
|
|
/* With line numbers, we should show whenever the line-numbering
|
|
"jumps". */
|
|
if (line_span_idx > 0)
|
|
layout.print_gap_in_line_numbering ();
|
|
}
|
|
else
|
|
{
|
|
/* Without line numbers, we print headings for some line spans. */
|
|
if (layout.print_heading_for_line_span_index_p (line_span_idx))
|
|
{
|
|
expanded_location exploc
|
|
= layout.get_expanded_location (line_span);
|
|
context->start_span (context, exploc);
|
|
}
|
|
}
|
|
/* Iterate over the lines within this span (using linenum_arith_t to
|
|
avoid overflow with 0xffffffff causing an infinite loop). */
|
|
linenum_arith_t last_line = line_span->get_last_line ();
|
|
for (linenum_arith_t row = line_span->get_first_line ();
|
|
row <= last_line; row++)
|
|
layout.print_line (row);
|
|
}
|
|
|
|
pp_set_prefix (context->printer, saved_prefix);
|
|
}
|
|
|
|
#if CHECKING_P
|
|
|
|
namespace selftest {
|
|
|
|
/* Selftests for diagnostic_show_locus. */
|
|
|
|
/* Verify that diagnostic_show_locus works sanely on UNKNOWN_LOCATION. */
|
|
|
|
static void
|
|
test_diagnostic_show_locus_unknown_location ()
|
|
{
|
|
test_diagnostic_context dc;
|
|
rich_location richloc (line_table, UNKNOWN_LOCATION);
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n", pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Verify that diagnostic_show_locus works sanely for various
|
|
single-line cases.
|
|
|
|
All of these work on the following 1-line source file:
|
|
.0000000001111111
|
|
.1234567890123456
|
|
"foo = bar.field;\n"
|
|
which is set up by test_diagnostic_show_locus_one_liner and calls
|
|
them. */
|
|
|
|
/* Just a caret. */
|
|
|
|
static void
|
|
test_one_liner_simple_caret ()
|
|
{
|
|
test_diagnostic_context dc;
|
|
location_t caret = linemap_position_for_column (line_table, 10);
|
|
rich_location richloc (line_table, caret);
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ^\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Caret and range. */
|
|
|
|
static void
|
|
test_one_liner_caret_and_range ()
|
|
{
|
|
test_diagnostic_context dc;
|
|
location_t caret = linemap_position_for_column (line_table, 10);
|
|
location_t start = linemap_position_for_column (line_table, 7);
|
|
location_t finish = linemap_position_for_column (line_table, 15);
|
|
location_t loc = make_location (caret, start, finish);
|
|
rich_location richloc (line_table, loc);
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ~~~^~~~~~\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Multiple ranges and carets. */
|
|
|
|
static void
|
|
test_one_liner_multiple_carets_and_ranges ()
|
|
{
|
|
test_diagnostic_context dc;
|
|
location_t foo
|
|
= make_location (linemap_position_for_column (line_table, 2),
|
|
linemap_position_for_column (line_table, 1),
|
|
linemap_position_for_column (line_table, 3));
|
|
dc.caret_chars[0] = 'A';
|
|
|
|
location_t bar
|
|
= make_location (linemap_position_for_column (line_table, 8),
|
|
linemap_position_for_column (line_table, 7),
|
|
linemap_position_for_column (line_table, 9));
|
|
dc.caret_chars[1] = 'B';
|
|
|
|
location_t field
|
|
= make_location (linemap_position_for_column (line_table, 13),
|
|
linemap_position_for_column (line_table, 11),
|
|
linemap_position_for_column (line_table, 15));
|
|
dc.caret_chars[2] = 'C';
|
|
|
|
rich_location richloc (line_table, foo);
|
|
richloc.add_range (bar, SHOW_RANGE_WITH_CARET);
|
|
richloc.add_range (field, SHOW_RANGE_WITH_CARET);
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ~A~ ~B~ ~~C~~\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Insertion fix-it hint: adding an "&" to the front of "bar.field". */
|
|
|
|
static void
|
|
test_one_liner_fixit_insert_before ()
|
|
{
|
|
test_diagnostic_context dc;
|
|
location_t caret = linemap_position_for_column (line_table, 7);
|
|
rich_location richloc (line_table, caret);
|
|
richloc.add_fixit_insert_before ("&");
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ^\n"
|
|
" &\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Insertion fix-it hint: adding a "[0]" after "foo". */
|
|
|
|
static void
|
|
test_one_liner_fixit_insert_after ()
|
|
{
|
|
test_diagnostic_context dc;
|
|
location_t start = linemap_position_for_column (line_table, 1);
|
|
location_t finish = linemap_position_for_column (line_table, 3);
|
|
location_t foo = make_location (start, start, finish);
|
|
rich_location richloc (line_table, foo);
|
|
richloc.add_fixit_insert_after ("[0]");
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ^~~\n"
|
|
" [0]\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Removal fix-it hint: removal of the ".field". */
|
|
|
|
static void
|
|
test_one_liner_fixit_remove ()
|
|
{
|
|
test_diagnostic_context dc;
|
|
location_t start = linemap_position_for_column (line_table, 10);
|
|
location_t finish = linemap_position_for_column (line_table, 15);
|
|
location_t dot = make_location (start, start, finish);
|
|
rich_location richloc (line_table, dot);
|
|
richloc.add_fixit_remove ();
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ^~~~~~\n"
|
|
" ------\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Replace fix-it hint: replacing "field" with "m_field". */
|
|
|
|
static void
|
|
test_one_liner_fixit_replace ()
|
|
{
|
|
test_diagnostic_context dc;
|
|
location_t start = linemap_position_for_column (line_table, 11);
|
|
location_t finish = linemap_position_for_column (line_table, 15);
|
|
location_t field = make_location (start, start, finish);
|
|
rich_location richloc (line_table, field);
|
|
richloc.add_fixit_replace ("m_field");
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ^~~~~\n"
|
|
" m_field\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Replace fix-it hint: replacing "field" with "m_field",
|
|
but where the caret was elsewhere. */
|
|
|
|
static void
|
|
test_one_liner_fixit_replace_non_equal_range ()
|
|
{
|
|
test_diagnostic_context dc;
|
|
location_t equals = linemap_position_for_column (line_table, 5);
|
|
location_t start = linemap_position_for_column (line_table, 11);
|
|
location_t finish = linemap_position_for_column (line_table, 15);
|
|
rich_location richloc (line_table, equals);
|
|
source_range range;
|
|
range.m_start = start;
|
|
range.m_finish = finish;
|
|
richloc.add_fixit_replace (range, "m_field");
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
/* The replacement range is not indicated in the annotation line, so
|
|
it should be indicated via an additional underline. */
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ^\n"
|
|
" -----\n"
|
|
" m_field\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Replace fix-it hint: replacing "field" with "m_field",
|
|
where the caret was elsewhere, but where a secondary range
|
|
exactly covers "field". */
|
|
|
|
static void
|
|
test_one_liner_fixit_replace_equal_secondary_range ()
|
|
{
|
|
test_diagnostic_context dc;
|
|
location_t equals = linemap_position_for_column (line_table, 5);
|
|
location_t start = linemap_position_for_column (line_table, 11);
|
|
location_t finish = linemap_position_for_column (line_table, 15);
|
|
rich_location richloc (line_table, equals);
|
|
location_t field = make_location (start, start, finish);
|
|
richloc.add_range (field);
|
|
richloc.add_fixit_replace (field, "m_field");
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
/* The replacement range is indicated in the annotation line,
|
|
so it shouldn't be indicated via an additional underline. */
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ^ ~~~~~\n"
|
|
" m_field\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Verify that we can use ad-hoc locations when adding fixits to a
|
|
rich_location. */
|
|
|
|
static void
|
|
test_one_liner_fixit_validation_adhoc_locations ()
|
|
{
|
|
/* Generate a range that's too long to be packed, so must
|
|
be stored as an ad-hoc location (given the defaults
|
|
of 5 bits or 0 bits of packed range); 41 columns > 2**5. */
|
|
const location_t c7 = linemap_position_for_column (line_table, 7);
|
|
const location_t c47 = linemap_position_for_column (line_table, 47);
|
|
const location_t loc = make_location (c7, c7, c47);
|
|
|
|
if (c47 > LINE_MAP_MAX_LOCATION_WITH_COLS)
|
|
return;
|
|
|
|
ASSERT_TRUE (IS_ADHOC_LOC (loc));
|
|
|
|
/* Insert. */
|
|
{
|
|
rich_location richloc (line_table, loc);
|
|
richloc.add_fixit_insert_before (loc, "test");
|
|
/* It should not have been discarded by the validator. */
|
|
ASSERT_EQ (1, richloc.get_num_fixit_hints ());
|
|
|
|
test_diagnostic_context dc;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ^~~~~~~~~~ \n"
|
|
" test\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Remove. */
|
|
{
|
|
rich_location richloc (line_table, loc);
|
|
source_range range = source_range::from_locations (loc, c47);
|
|
richloc.add_fixit_remove (range);
|
|
/* It should not have been discarded by the validator. */
|
|
ASSERT_EQ (1, richloc.get_num_fixit_hints ());
|
|
|
|
test_diagnostic_context dc;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ^~~~~~~~~~ \n"
|
|
" -----------------------------------------\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Replace. */
|
|
{
|
|
rich_location richloc (line_table, loc);
|
|
source_range range = source_range::from_locations (loc, c47);
|
|
richloc.add_fixit_replace (range, "test");
|
|
/* It should not have been discarded by the validator. */
|
|
ASSERT_EQ (1, richloc.get_num_fixit_hints ());
|
|
|
|
test_diagnostic_context dc;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ^~~~~~~~~~ \n"
|
|
" test\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
}
|
|
|
|
/* Test of consolidating insertions at the same location. */
|
|
|
|
static void
|
|
test_one_liner_many_fixits_1 ()
|
|
{
|
|
test_diagnostic_context dc;
|
|
location_t equals = linemap_position_for_column (line_table, 5);
|
|
rich_location richloc (line_table, equals);
|
|
for (int i = 0; i < 19; i++)
|
|
richloc.add_fixit_insert_before ("a");
|
|
ASSERT_EQ (1, richloc.get_num_fixit_hints ());
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ^\n"
|
|
" aaaaaaaaaaaaaaaaaaa\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Ensure that we can add an arbitrary number of fix-it hints to a
|
|
rich_location, even if they are not consolidated. */
|
|
|
|
static void
|
|
test_one_liner_many_fixits_2 ()
|
|
{
|
|
test_diagnostic_context dc;
|
|
location_t equals = linemap_position_for_column (line_table, 5);
|
|
rich_location richloc (line_table, equals);
|
|
for (int i = 0; i < 19; i++)
|
|
{
|
|
location_t loc = linemap_position_for_column (line_table, i * 2);
|
|
richloc.add_fixit_insert_before (loc, "a");
|
|
}
|
|
ASSERT_EQ (19, richloc.get_num_fixit_hints ());
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ^\n"
|
|
"a a a a a a a a a a a a a a a a a a a\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Test of labeling the ranges within a rich_location. */
|
|
|
|
static void
|
|
test_one_liner_labels ()
|
|
{
|
|
location_t foo
|
|
= make_location (linemap_position_for_column (line_table, 1),
|
|
linemap_position_for_column (line_table, 1),
|
|
linemap_position_for_column (line_table, 3));
|
|
location_t bar
|
|
= make_location (linemap_position_for_column (line_table, 7),
|
|
linemap_position_for_column (line_table, 7),
|
|
linemap_position_for_column (line_table, 9));
|
|
location_t field
|
|
= make_location (linemap_position_for_column (line_table, 11),
|
|
linemap_position_for_column (line_table, 11),
|
|
linemap_position_for_column (line_table, 15));
|
|
|
|
/* Example where all the labels fit on one line. */
|
|
{
|
|
text_range_label label0 ("0");
|
|
text_range_label label1 ("1");
|
|
text_range_label label2 ("2");
|
|
gcc_rich_location richloc (foo, &label0);
|
|
richloc.add_range (bar, SHOW_RANGE_WITHOUT_CARET, &label1);
|
|
richloc.add_range (field, SHOW_RANGE_WITHOUT_CARET, &label2);
|
|
|
|
{
|
|
test_diagnostic_context dc;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ^~~ ~~~ ~~~~~\n"
|
|
" | | |\n"
|
|
" 0 1 2\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Verify that we can disable label-printing. */
|
|
{
|
|
test_diagnostic_context dc;
|
|
dc.show_labels_p = false;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ^~~ ~~~ ~~~~~\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
}
|
|
|
|
/* Example where the labels need extra lines. */
|
|
{
|
|
text_range_label label0 ("label 0");
|
|
text_range_label label1 ("label 1");
|
|
text_range_label label2 ("label 2");
|
|
gcc_rich_location richloc (foo, &label0);
|
|
richloc.add_range (bar, SHOW_RANGE_WITHOUT_CARET, &label1);
|
|
richloc.add_range (field, SHOW_RANGE_WITHOUT_CARET, &label2);
|
|
|
|
test_diagnostic_context dc;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ^~~ ~~~ ~~~~~\n"
|
|
" | | |\n"
|
|
" | | label 2\n"
|
|
" | label 1\n"
|
|
" label 0\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Example of boundary conditions: label 0 and 1 have just enough clearance,
|
|
but label 1 just touches label 2. */
|
|
{
|
|
text_range_label label0 ("aaaaa");
|
|
text_range_label label1 ("bbbb");
|
|
text_range_label label2 ("c");
|
|
gcc_rich_location richloc (foo, &label0);
|
|
richloc.add_range (bar, SHOW_RANGE_WITHOUT_CARET, &label1);
|
|
richloc.add_range (field, SHOW_RANGE_WITHOUT_CARET, &label2);
|
|
|
|
test_diagnostic_context dc;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ^~~ ~~~ ~~~~~\n"
|
|
" | | |\n"
|
|
" | | c\n"
|
|
" aaaaa bbbb\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Example of out-of-order ranges (thus requiring a sort). */
|
|
{
|
|
text_range_label label0 ("0");
|
|
text_range_label label1 ("1");
|
|
text_range_label label2 ("2");
|
|
gcc_rich_location richloc (field, &label0);
|
|
richloc.add_range (bar, SHOW_RANGE_WITHOUT_CARET, &label1);
|
|
richloc.add_range (foo, SHOW_RANGE_WITHOUT_CARET, &label2);
|
|
|
|
test_diagnostic_context dc;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ~~~ ~~~ ^~~~~\n"
|
|
" | | |\n"
|
|
" 2 1 0\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Ensure we don't ICE if multiple ranges with labels are on
|
|
the same point. */
|
|
{
|
|
text_range_label label0 ("label 0");
|
|
text_range_label label1 ("label 1");
|
|
text_range_label label2 ("label 2");
|
|
gcc_rich_location richloc (bar, &label0);
|
|
richloc.add_range (bar, SHOW_RANGE_WITHOUT_CARET, &label1);
|
|
richloc.add_range (bar, SHOW_RANGE_WITHOUT_CARET, &label2);
|
|
|
|
test_diagnostic_context dc;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ^~~\n"
|
|
" |\n"
|
|
" label 2\n"
|
|
" label 1\n"
|
|
" label 0\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Verify that a NULL result from range_label::get_text is
|
|
handled gracefully. */
|
|
{
|
|
text_range_label label (NULL);
|
|
gcc_rich_location richloc (bar, &label);
|
|
|
|
test_diagnostic_context dc;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar.field;\n"
|
|
" ^~~\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* TODO: example of formatted printing (needs to be in
|
|
gcc-rich-location.c due to Makefile.in issues). */
|
|
}
|
|
|
|
/* Run the various one-liner tests. */
|
|
|
|
static void
|
|
test_diagnostic_show_locus_one_liner (const line_table_case &case_)
|
|
{
|
|
/* Create a tempfile and write some text to it.
|
|
....................0000000001111111.
|
|
....................1234567890123456. */
|
|
const char *content = "foo = bar.field;\n";
|
|
temp_source_file tmp (SELFTEST_LOCATION, ".c", content);
|
|
line_table_test ltt (case_);
|
|
|
|
linemap_add (line_table, LC_ENTER, false, tmp.get_filename (), 1);
|
|
|
|
location_t line_end = linemap_position_for_column (line_table, 16);
|
|
|
|
/* Don't attempt to run the tests if column data might be unavailable. */
|
|
if (line_end > LINE_MAP_MAX_LOCATION_WITH_COLS)
|
|
return;
|
|
|
|
ASSERT_STREQ (tmp.get_filename (), LOCATION_FILE (line_end));
|
|
ASSERT_EQ (1, LOCATION_LINE (line_end));
|
|
ASSERT_EQ (16, LOCATION_COLUMN (line_end));
|
|
|
|
test_one_liner_simple_caret ();
|
|
test_one_liner_caret_and_range ();
|
|
test_one_liner_multiple_carets_and_ranges ();
|
|
test_one_liner_fixit_insert_before ();
|
|
test_one_liner_fixit_insert_after ();
|
|
test_one_liner_fixit_remove ();
|
|
test_one_liner_fixit_replace ();
|
|
test_one_liner_fixit_replace_non_equal_range ();
|
|
test_one_liner_fixit_replace_equal_secondary_range ();
|
|
test_one_liner_fixit_validation_adhoc_locations ();
|
|
test_one_liner_many_fixits_1 ();
|
|
test_one_liner_many_fixits_2 ();
|
|
test_one_liner_labels ();
|
|
}
|
|
|
|
/* Verify that gcc_rich_location::add_location_if_nearby works. */
|
|
|
|
static void
|
|
test_add_location_if_nearby (const line_table_case &case_)
|
|
{
|
|
/* Create a tempfile and write some text to it.
|
|
...000000000111111111122222222223333333333.
|
|
...123456789012345678901234567890123456789. */
|
|
const char *content
|
|
= ("struct same_line { double x; double y; ;\n" /* line 1. */
|
|
"struct different_line\n" /* line 2. */
|
|
"{\n" /* line 3. */
|
|
" double x;\n" /* line 4. */
|
|
" double y;\n" /* line 5. */
|
|
";\n"); /* line 6. */
|
|
temp_source_file tmp (SELFTEST_LOCATION, ".c", content);
|
|
line_table_test ltt (case_);
|
|
|
|
const line_map_ordinary *ord_map
|
|
= linemap_check_ordinary (linemap_add (line_table, LC_ENTER, false,
|
|
tmp.get_filename (), 0));
|
|
|
|
linemap_line_start (line_table, 1, 100);
|
|
|
|
const location_t final_line_end
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 6, 7);
|
|
|
|
/* Don't attempt to run the tests if column data might be unavailable. */
|
|
if (final_line_end > LINE_MAP_MAX_LOCATION_WITH_COLS)
|
|
return;
|
|
|
|
/* Test of add_location_if_nearby on the same line as the
|
|
primary location. */
|
|
{
|
|
const location_t missing_close_brace_1_39
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 1, 39);
|
|
const location_t matching_open_brace_1_18
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 1, 18);
|
|
gcc_rich_location richloc (missing_close_brace_1_39);
|
|
bool added = richloc.add_location_if_nearby (matching_open_brace_1_18);
|
|
ASSERT_TRUE (added);
|
|
ASSERT_EQ (2, richloc.get_num_locations ());
|
|
test_diagnostic_context dc;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" struct same_line { double x; double y; ;\n"
|
|
" ~ ^\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Test of add_location_if_nearby on a different line to the
|
|
primary location. */
|
|
{
|
|
const location_t missing_close_brace_6_1
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 6, 1);
|
|
const location_t matching_open_brace_3_1
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 3, 1);
|
|
gcc_rich_location richloc (missing_close_brace_6_1);
|
|
bool added = richloc.add_location_if_nearby (matching_open_brace_3_1);
|
|
ASSERT_FALSE (added);
|
|
ASSERT_EQ (1, richloc.get_num_locations ());
|
|
}
|
|
}
|
|
|
|
/* Verify that we print fixits even if they only affect lines
|
|
outside those covered by the ranges in the rich_location. */
|
|
|
|
static void
|
|
test_diagnostic_show_locus_fixit_lines (const line_table_case &case_)
|
|
{
|
|
/* Create a tempfile and write some text to it.
|
|
...000000000111111111122222222223333333333.
|
|
...123456789012345678901234567890123456789. */
|
|
const char *content
|
|
= ("struct point { double x; double y; };\n" /* line 1. */
|
|
"struct point origin = {x: 0.0,\n" /* line 2. */
|
|
" y\n" /* line 3. */
|
|
"\n" /* line 4. */
|
|
"\n" /* line 5. */
|
|
" : 0.0};\n"); /* line 6. */
|
|
temp_source_file tmp (SELFTEST_LOCATION, ".c", content);
|
|
line_table_test ltt (case_);
|
|
|
|
const line_map_ordinary *ord_map
|
|
= linemap_check_ordinary (linemap_add (line_table, LC_ENTER, false,
|
|
tmp.get_filename (), 0));
|
|
|
|
linemap_line_start (line_table, 1, 100);
|
|
|
|
const location_t final_line_end
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 6, 36);
|
|
|
|
/* Don't attempt to run the tests if column data might be unavailable. */
|
|
if (final_line_end > LINE_MAP_MAX_LOCATION_WITH_COLS)
|
|
return;
|
|
|
|
/* A pair of tests for modernizing the initializers to C99-style. */
|
|
|
|
/* The one-liner case (line 2). */
|
|
{
|
|
test_diagnostic_context dc;
|
|
const location_t x
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 2, 24);
|
|
const location_t colon
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 2, 25);
|
|
rich_location richloc (line_table, colon);
|
|
richloc.add_fixit_insert_before (x, ".");
|
|
richloc.add_fixit_replace (colon, "=");
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" struct point origin = {x: 0.0,\n"
|
|
" ^\n"
|
|
" .=\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* The multiline case. The caret for the rich_location is on line 6;
|
|
verify that insertion fixit on line 3 is still printed (and that
|
|
span starts are printed due to the gap between the span at line 3
|
|
and that at line 6). */
|
|
{
|
|
test_diagnostic_context dc;
|
|
const location_t y
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 3, 24);
|
|
const location_t colon
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 6, 25);
|
|
rich_location richloc (line_table, colon);
|
|
richloc.add_fixit_insert_before (y, ".");
|
|
richloc.add_fixit_replace (colon, "=");
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
"FILENAME:3:24:\n"
|
|
" y\n"
|
|
" .\n"
|
|
"FILENAME:6:25:\n"
|
|
" : 0.0};\n"
|
|
" ^\n"
|
|
" =\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* As above, but verify the behavior of multiple line spans
|
|
with line-numbering enabled. */
|
|
{
|
|
const location_t y
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 3, 24);
|
|
const location_t colon
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 6, 25);
|
|
rich_location richloc (line_table, colon);
|
|
richloc.add_fixit_insert_before (y, ".");
|
|
richloc.add_fixit_replace (colon, "=");
|
|
test_diagnostic_context dc;
|
|
dc.show_line_numbers_p = true;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" 3 | y\n"
|
|
" | .\n"
|
|
"......\n"
|
|
" 6 | : 0.0};\n"
|
|
" | ^\n"
|
|
" | =\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
}
|
|
|
|
|
|
/* Verify that fix-it hints are appropriately consolidated.
|
|
|
|
If any fix-it hints in a rich_location involve locations beyond
|
|
LINE_MAP_MAX_LOCATION_WITH_COLS, then we can't reliably apply
|
|
the fix-it as a whole, so there should be none.
|
|
|
|
Otherwise, verify that consecutive "replace" and "remove" fix-its
|
|
are merged, and that other fix-its remain separate. */
|
|
|
|
static void
|
|
test_fixit_consolidation (const line_table_case &case_)
|
|
{
|
|
line_table_test ltt (case_);
|
|
|
|
linemap_add (line_table, LC_ENTER, false, "test.c", 1);
|
|
|
|
const location_t c10 = linemap_position_for_column (line_table, 10);
|
|
const location_t c15 = linemap_position_for_column (line_table, 15);
|
|
const location_t c16 = linemap_position_for_column (line_table, 16);
|
|
const location_t c17 = linemap_position_for_column (line_table, 17);
|
|
const location_t c20 = linemap_position_for_column (line_table, 20);
|
|
const location_t c21 = linemap_position_for_column (line_table, 21);
|
|
const location_t caret = c10;
|
|
|
|
/* Insert + insert. */
|
|
{
|
|
rich_location richloc (line_table, caret);
|
|
richloc.add_fixit_insert_before (c10, "foo");
|
|
richloc.add_fixit_insert_before (c15, "bar");
|
|
|
|
if (c15 > LINE_MAP_MAX_LOCATION_WITH_COLS)
|
|
/* Bogus column info for 2nd fixit, so no fixits. */
|
|
ASSERT_EQ (0, richloc.get_num_fixit_hints ());
|
|
else
|
|
/* They should not have been merged. */
|
|
ASSERT_EQ (2, richloc.get_num_fixit_hints ());
|
|
}
|
|
|
|
/* Insert + replace. */
|
|
{
|
|
rich_location richloc (line_table, caret);
|
|
richloc.add_fixit_insert_before (c10, "foo");
|
|
richloc.add_fixit_replace (source_range::from_locations (c15, c17),
|
|
"bar");
|
|
|
|
if (c17 > LINE_MAP_MAX_LOCATION_WITH_COLS)
|
|
/* Bogus column info for 2nd fixit, so no fixits. */
|
|
ASSERT_EQ (0, richloc.get_num_fixit_hints ());
|
|
else
|
|
/* They should not have been merged. */
|
|
ASSERT_EQ (2, richloc.get_num_fixit_hints ());
|
|
}
|
|
|
|
/* Replace + non-consecutive insert. */
|
|
{
|
|
rich_location richloc (line_table, caret);
|
|
richloc.add_fixit_replace (source_range::from_locations (c10, c15),
|
|
"bar");
|
|
richloc.add_fixit_insert_before (c17, "foo");
|
|
|
|
if (c17 > LINE_MAP_MAX_LOCATION_WITH_COLS)
|
|
/* Bogus column info for 2nd fixit, so no fixits. */
|
|
ASSERT_EQ (0, richloc.get_num_fixit_hints ());
|
|
else
|
|
/* They should not have been merged. */
|
|
ASSERT_EQ (2, richloc.get_num_fixit_hints ());
|
|
}
|
|
|
|
/* Replace + non-consecutive replace. */
|
|
{
|
|
rich_location richloc (line_table, caret);
|
|
richloc.add_fixit_replace (source_range::from_locations (c10, c15),
|
|
"foo");
|
|
richloc.add_fixit_replace (source_range::from_locations (c17, c20),
|
|
"bar");
|
|
|
|
if (c20 > LINE_MAP_MAX_LOCATION_WITH_COLS)
|
|
/* Bogus column info for 2nd fixit, so no fixits. */
|
|
ASSERT_EQ (0, richloc.get_num_fixit_hints ());
|
|
else
|
|
/* They should not have been merged. */
|
|
ASSERT_EQ (2, richloc.get_num_fixit_hints ());
|
|
}
|
|
|
|
/* Replace + consecutive replace. */
|
|
{
|
|
rich_location richloc (line_table, caret);
|
|
richloc.add_fixit_replace (source_range::from_locations (c10, c15),
|
|
"foo");
|
|
richloc.add_fixit_replace (source_range::from_locations (c16, c20),
|
|
"bar");
|
|
|
|
if (c20 > LINE_MAP_MAX_LOCATION_WITH_COLS)
|
|
/* Bogus column info for 2nd fixit, so no fixits. */
|
|
ASSERT_EQ (0, richloc.get_num_fixit_hints ());
|
|
else
|
|
{
|
|
/* They should have been merged into a single "replace". */
|
|
ASSERT_EQ (1, richloc.get_num_fixit_hints ());
|
|
const fixit_hint *hint = richloc.get_fixit_hint (0);
|
|
ASSERT_STREQ ("foobar", hint->get_string ());
|
|
ASSERT_EQ (c10, hint->get_start_loc ());
|
|
ASSERT_EQ (c21, hint->get_next_loc ());
|
|
}
|
|
}
|
|
|
|
/* Replace + consecutive removal. */
|
|
{
|
|
rich_location richloc (line_table, caret);
|
|
richloc.add_fixit_replace (source_range::from_locations (c10, c15),
|
|
"foo");
|
|
richloc.add_fixit_remove (source_range::from_locations (c16, c20));
|
|
|
|
if (c20 > LINE_MAP_MAX_LOCATION_WITH_COLS)
|
|
/* Bogus column info for 2nd fixit, so no fixits. */
|
|
ASSERT_EQ (0, richloc.get_num_fixit_hints ());
|
|
else
|
|
{
|
|
/* They should have been merged into a single replace, with the
|
|
range extended to cover that of the removal. */
|
|
ASSERT_EQ (1, richloc.get_num_fixit_hints ());
|
|
const fixit_hint *hint = richloc.get_fixit_hint (0);
|
|
ASSERT_STREQ ("foo", hint->get_string ());
|
|
ASSERT_EQ (c10, hint->get_start_loc ());
|
|
ASSERT_EQ (c21, hint->get_next_loc ());
|
|
}
|
|
}
|
|
|
|
/* Consecutive removals. */
|
|
{
|
|
rich_location richloc (line_table, caret);
|
|
richloc.add_fixit_remove (source_range::from_locations (c10, c15));
|
|
richloc.add_fixit_remove (source_range::from_locations (c16, c20));
|
|
|
|
if (c20 > LINE_MAP_MAX_LOCATION_WITH_COLS)
|
|
/* Bogus column info for 2nd fixit, so no fixits. */
|
|
ASSERT_EQ (0, richloc.get_num_fixit_hints ());
|
|
else
|
|
{
|
|
/* They should have been merged into a single "replace-with-empty". */
|
|
ASSERT_EQ (1, richloc.get_num_fixit_hints ());
|
|
const fixit_hint *hint = richloc.get_fixit_hint (0);
|
|
ASSERT_STREQ ("", hint->get_string ());
|
|
ASSERT_EQ (c10, hint->get_start_loc ());
|
|
ASSERT_EQ (c21, hint->get_next_loc ());
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Verify that the line_corrections machinery correctly prints
|
|
overlapping fixit-hints. */
|
|
|
|
static void
|
|
test_overlapped_fixit_printing (const line_table_case &case_)
|
|
{
|
|
/* Create a tempfile and write some text to it.
|
|
...000000000111111111122222222223333333333.
|
|
...123456789012345678901234567890123456789. */
|
|
const char *content
|
|
= (" foo *f = (foo *)ptr->field;\n");
|
|
temp_source_file tmp (SELFTEST_LOCATION, ".C", content);
|
|
line_table_test ltt (case_);
|
|
|
|
const line_map_ordinary *ord_map
|
|
= linemap_check_ordinary (linemap_add (line_table, LC_ENTER, false,
|
|
tmp.get_filename (), 0));
|
|
|
|
linemap_line_start (line_table, 1, 100);
|
|
|
|
const location_t final_line_end
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 6, 36);
|
|
|
|
/* Don't attempt to run the tests if column data might be unavailable. */
|
|
if (final_line_end > LINE_MAP_MAX_LOCATION_WITH_COLS)
|
|
return;
|
|
|
|
/* A test for converting a C-style cast to a C++-style cast. */
|
|
const location_t open_paren
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 1, 12);
|
|
const location_t close_paren
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 1, 18);
|
|
const location_t expr_start
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 1, 19);
|
|
const location_t expr_finish
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 1, 28);
|
|
const location_t expr = make_location (expr_start, expr_start, expr_finish);
|
|
|
|
/* Various examples of fix-it hints that aren't themselves consolidated,
|
|
but for which the *printing* may need consolidation. */
|
|
|
|
/* Example where 3 fix-it hints are printed as one. */
|
|
{
|
|
test_diagnostic_context dc;
|
|
rich_location richloc (line_table, expr);
|
|
richloc.add_fixit_replace (open_paren, "const_cast<");
|
|
richloc.add_fixit_replace (close_paren, "> (");
|
|
richloc.add_fixit_insert_after (")");
|
|
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo *f = (foo *)ptr->field;\n"
|
|
" ^~~~~~~~~~\n"
|
|
" -----------------\n"
|
|
" const_cast<foo *> (ptr->field)\n",
|
|
pp_formatted_text (dc.printer));
|
|
|
|
/* Unit-test the line_corrections machinery. */
|
|
ASSERT_EQ (3, richloc.get_num_fixit_hints ());
|
|
const fixit_hint *hint_0 = richloc.get_fixit_hint (0);
|
|
ASSERT_EQ (column_range (12, 12), get_affected_columns (hint_0));
|
|
ASSERT_EQ (column_range (12, 22), get_printed_columns (hint_0));
|
|
const fixit_hint *hint_1 = richloc.get_fixit_hint (1);
|
|
ASSERT_EQ (column_range (18, 18), get_affected_columns (hint_1));
|
|
ASSERT_EQ (column_range (18, 20), get_printed_columns (hint_1));
|
|
const fixit_hint *hint_2 = richloc.get_fixit_hint (2);
|
|
ASSERT_EQ (column_range (29, 28), get_affected_columns (hint_2));
|
|
ASSERT_EQ (column_range (29, 29), get_printed_columns (hint_2));
|
|
|
|
/* Add each hint in turn to a line_corrections instance,
|
|
and verify that they are consolidated into one correction instance
|
|
as expected. */
|
|
line_corrections lc (tmp.get_filename (), 1);
|
|
|
|
/* The first replace hint by itself. */
|
|
lc.add_hint (hint_0);
|
|
ASSERT_EQ (1, lc.m_corrections.length ());
|
|
ASSERT_EQ (column_range (12, 12), lc.m_corrections[0]->m_affected_columns);
|
|
ASSERT_EQ (column_range (12, 22), lc.m_corrections[0]->m_printed_columns);
|
|
ASSERT_STREQ ("const_cast<", lc.m_corrections[0]->m_text);
|
|
|
|
/* After the second replacement hint, they are printed together
|
|
as a replacement (along with the text between them). */
|
|
lc.add_hint (hint_1);
|
|
ASSERT_EQ (1, lc.m_corrections.length ());
|
|
ASSERT_STREQ ("const_cast<foo *> (", lc.m_corrections[0]->m_text);
|
|
ASSERT_EQ (column_range (12, 18), lc.m_corrections[0]->m_affected_columns);
|
|
ASSERT_EQ (column_range (12, 30), lc.m_corrections[0]->m_printed_columns);
|
|
|
|
/* After the final insertion hint, they are all printed together
|
|
as a replacement (along with the text between them). */
|
|
lc.add_hint (hint_2);
|
|
ASSERT_STREQ ("const_cast<foo *> (ptr->field)",
|
|
lc.m_corrections[0]->m_text);
|
|
ASSERT_EQ (1, lc.m_corrections.length ());
|
|
ASSERT_EQ (column_range (12, 28), lc.m_corrections[0]->m_affected_columns);
|
|
ASSERT_EQ (column_range (12, 41), lc.m_corrections[0]->m_printed_columns);
|
|
}
|
|
|
|
/* Example where two are consolidated during printing. */
|
|
{
|
|
test_diagnostic_context dc;
|
|
rich_location richloc (line_table, expr);
|
|
richloc.add_fixit_replace (open_paren, "CAST (");
|
|
richloc.add_fixit_replace (close_paren, ") (");
|
|
richloc.add_fixit_insert_after (")");
|
|
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo *f = (foo *)ptr->field;\n"
|
|
" ^~~~~~~~~~\n"
|
|
" -\n"
|
|
" CAST (-\n"
|
|
" ) ( )\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Example where none are consolidated during printing. */
|
|
{
|
|
test_diagnostic_context dc;
|
|
rich_location richloc (line_table, expr);
|
|
richloc.add_fixit_replace (open_paren, "CST (");
|
|
richloc.add_fixit_replace (close_paren, ") (");
|
|
richloc.add_fixit_insert_after (")");
|
|
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo *f = (foo *)ptr->field;\n"
|
|
" ^~~~~~~~~~\n"
|
|
" -\n"
|
|
" CST ( -\n"
|
|
" ) ( )\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Example of deletion fix-it hints. */
|
|
{
|
|
test_diagnostic_context dc;
|
|
rich_location richloc (line_table, expr);
|
|
richloc.add_fixit_insert_before (open_paren, "(bar *)");
|
|
source_range victim = {open_paren, close_paren};
|
|
richloc.add_fixit_remove (victim);
|
|
|
|
/* This case is actually handled by fixit-consolidation,
|
|
rather than by line_corrections. */
|
|
ASSERT_EQ (1, richloc.get_num_fixit_hints ());
|
|
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo *f = (foo *)ptr->field;\n"
|
|
" ^~~~~~~~~~\n"
|
|
" -------\n"
|
|
" (bar *)\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Example of deletion fix-it hints that would overlap. */
|
|
{
|
|
test_diagnostic_context dc;
|
|
rich_location richloc (line_table, expr);
|
|
richloc.add_fixit_insert_before (open_paren, "(longer *)");
|
|
source_range victim = {expr_start, expr_finish};
|
|
richloc.add_fixit_remove (victim);
|
|
|
|
/* These fixits are not consolidated. */
|
|
ASSERT_EQ (2, richloc.get_num_fixit_hints ());
|
|
|
|
/* But the corrections are. */
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo *f = (foo *)ptr->field;\n"
|
|
" ^~~~~~~~~~\n"
|
|
" -----------------\n"
|
|
" (longer *)(foo *)\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Example of insertion fix-it hints that would overlap. */
|
|
{
|
|
test_diagnostic_context dc;
|
|
rich_location richloc (line_table, expr);
|
|
richloc.add_fixit_insert_before (open_paren, "LONGER THAN THE CAST");
|
|
richloc.add_fixit_insert_after (close_paren, "TEST");
|
|
|
|
/* The first insertion is long enough that if printed naively,
|
|
it would overlap with the second.
|
|
Verify that they are printed as a single replacement. */
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo *f = (foo *)ptr->field;\n"
|
|
" ^~~~~~~~~~\n"
|
|
" -------\n"
|
|
" LONGER THAN THE CAST(foo *)TEST\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
}
|
|
|
|
/* Verify that the line_corrections machinery correctly prints
|
|
overlapping fixit-hints that have been added in the wrong
|
|
order.
|
|
Adapted from PR c/81405 seen on gcc.dg/init-excess-1.c*/
|
|
|
|
static void
|
|
test_overlapped_fixit_printing_2 (const line_table_case &case_)
|
|
{
|
|
/* Create a tempfile and write some text to it.
|
|
...000000000111111111122222222223333333333.
|
|
...123456789012345678901234567890123456789. */
|
|
const char *content
|
|
= ("int a5[][0][0] = { 1, 2 };\n");
|
|
temp_source_file tmp (SELFTEST_LOCATION, ".c", content);
|
|
line_table_test ltt (case_);
|
|
|
|
const line_map_ordinary *ord_map
|
|
= linemap_check_ordinary (linemap_add (line_table, LC_ENTER, false,
|
|
tmp.get_filename (), 0));
|
|
|
|
linemap_line_start (line_table, 1, 100);
|
|
|
|
const location_t final_line_end
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 1, 100);
|
|
|
|
/* Don't attempt to run the tests if column data might be unavailable. */
|
|
if (final_line_end > LINE_MAP_MAX_LOCATION_WITH_COLS)
|
|
return;
|
|
|
|
const location_t col_1
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 1, 1);
|
|
const location_t col_20
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 1, 20);
|
|
const location_t col_21
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 1, 21);
|
|
const location_t col_23
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 1, 23);
|
|
const location_t col_25
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 1, 25);
|
|
|
|
/* Two insertions, in the wrong order. */
|
|
{
|
|
rich_location richloc (line_table, col_20);
|
|
richloc.add_fixit_insert_before (col_23, "{");
|
|
richloc.add_fixit_insert_before (col_21, "}");
|
|
|
|
/* These fixits should be accepted; they can't be consolidated. */
|
|
ASSERT_EQ (2, richloc.get_num_fixit_hints ());
|
|
const fixit_hint *hint_0 = richloc.get_fixit_hint (0);
|
|
ASSERT_EQ (column_range (23, 22), get_affected_columns (hint_0));
|
|
ASSERT_EQ (column_range (23, 23), get_printed_columns (hint_0));
|
|
const fixit_hint *hint_1 = richloc.get_fixit_hint (1);
|
|
ASSERT_EQ (column_range (21, 20), get_affected_columns (hint_1));
|
|
ASSERT_EQ (column_range (21, 21), get_printed_columns (hint_1));
|
|
|
|
/* Verify that they're printed correctly. */
|
|
test_diagnostic_context dc;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" int a5[][0][0] = { 1, 2 };\n"
|
|
" ^\n"
|
|
" } {\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Various overlapping insertions, some occurring "out of order"
|
|
(reproducing the fix-it hints from PR c/81405). */
|
|
{
|
|
test_diagnostic_context dc;
|
|
rich_location richloc (line_table, col_20);
|
|
|
|
richloc.add_fixit_insert_before (col_20, "{{");
|
|
richloc.add_fixit_insert_before (col_21, "}}");
|
|
richloc.add_fixit_insert_before (col_23, "{");
|
|
richloc.add_fixit_insert_before (col_21, "}");
|
|
richloc.add_fixit_insert_before (col_23, "{{");
|
|
richloc.add_fixit_insert_before (col_25, "}");
|
|
richloc.add_fixit_insert_before (col_21, "}");
|
|
richloc.add_fixit_insert_before (col_1, "{");
|
|
richloc.add_fixit_insert_before (col_25, "}");
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" int a5[][0][0] = { 1, 2 };\n"
|
|
" ^\n"
|
|
" { -----\n"
|
|
" {{1}}}}, {{{2 }}\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
}
|
|
|
|
/* Insertion fix-it hint: adding a "break;" on a line by itself. */
|
|
|
|
static void
|
|
test_fixit_insert_containing_newline (const line_table_case &case_)
|
|
{
|
|
/* Create a tempfile and write some text to it.
|
|
.........................0000000001111111.
|
|
.........................1234567890123456. */
|
|
const char *old_content = (" case 'a':\n" /* line 1. */
|
|
" x = a;\n" /* line 2. */
|
|
" case 'b':\n" /* line 3. */
|
|
" x = b;\n");/* line 4. */
|
|
|
|
temp_source_file tmp (SELFTEST_LOCATION, ".c", old_content);
|
|
line_table_test ltt (case_);
|
|
linemap_add (line_table, LC_ENTER, false, tmp.get_filename (), 3);
|
|
|
|
location_t case_start = linemap_position_for_column (line_table, 5);
|
|
location_t case_finish = linemap_position_for_column (line_table, 13);
|
|
location_t case_loc = make_location (case_start, case_start, case_finish);
|
|
location_t line_start = linemap_position_for_column (line_table, 1);
|
|
|
|
if (case_finish > LINE_MAP_MAX_LOCATION_WITH_COLS)
|
|
return;
|
|
|
|
/* Add a "break;" on a line by itself before line 3 i.e. before
|
|
column 1 of line 3. */
|
|
{
|
|
rich_location richloc (line_table, case_loc);
|
|
richloc.add_fixit_insert_before (line_start, " break;\n");
|
|
|
|
/* Without line numbers. */
|
|
{
|
|
test_diagnostic_context dc;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" x = a;\n"
|
|
"+ break;\n"
|
|
" case 'b':\n"
|
|
" ^~~~~~~~~\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* With line numbers. */
|
|
{
|
|
test_diagnostic_context dc;
|
|
dc.show_line_numbers_p = true;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" 2 | x = a;\n"
|
|
" +++ |+ break;\n"
|
|
" 3 | case 'b':\n"
|
|
" | ^~~~~~~~~\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
}
|
|
|
|
/* Verify that attempts to add text with a newline fail when the
|
|
insertion point is *not* at the start of a line. */
|
|
{
|
|
rich_location richloc (line_table, case_loc);
|
|
richloc.add_fixit_insert_before (case_start, "break;\n");
|
|
ASSERT_TRUE (richloc.seen_impossible_fixit_p ());
|
|
test_diagnostic_context dc;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" case 'b':\n"
|
|
" ^~~~~~~~~\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
}
|
|
|
|
/* Insertion fix-it hint: adding a "#include <stdio.h>\n" to the top
|
|
of the file, where the fix-it is printed in a different line-span
|
|
to the primary range of the diagnostic. */
|
|
|
|
static void
|
|
test_fixit_insert_containing_newline_2 (const line_table_case &case_)
|
|
{
|
|
/* Create a tempfile and write some text to it.
|
|
.........................0000000001111111.
|
|
.........................1234567890123456. */
|
|
const char *old_content = ("test (int ch)\n" /* line 1. */
|
|
"{\n" /* line 2. */
|
|
" putchar (ch);\n" /* line 3. */
|
|
"}\n"); /* line 4. */
|
|
|
|
temp_source_file tmp (SELFTEST_LOCATION, ".c", old_content);
|
|
line_table_test ltt (case_);
|
|
|
|
const line_map_ordinary *ord_map = linemap_check_ordinary
|
|
(linemap_add (line_table, LC_ENTER, false, tmp.get_filename (), 0));
|
|
linemap_line_start (line_table, 1, 100);
|
|
|
|
/* The primary range is the "putchar" token. */
|
|
location_t putchar_start
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 3, 2);
|
|
location_t putchar_finish
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 3, 8);
|
|
location_t putchar_loc
|
|
= make_location (putchar_start, putchar_start, putchar_finish);
|
|
rich_location richloc (line_table, putchar_loc);
|
|
|
|
/* Add a "#include <stdio.h>" on a line by itself at the top of the file. */
|
|
location_t file_start
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 1, 1);
|
|
richloc.add_fixit_insert_before (file_start, "#include <stdio.h>\n");
|
|
|
|
if (putchar_finish > LINE_MAP_MAX_LOCATION_WITH_COLS)
|
|
return;
|
|
|
|
{
|
|
test_diagnostic_context dc;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
"FILENAME:1:1:\n"
|
|
"+#include <stdio.h>\n"
|
|
" test (int ch)\n"
|
|
"FILENAME:3:2:\n"
|
|
" putchar (ch);\n"
|
|
" ^~~~~~~\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* With line-numbering, the line spans are close enough to be
|
|
consolidated, since it makes little sense to skip line 2. */
|
|
{
|
|
test_diagnostic_context dc;
|
|
dc.show_line_numbers_p = true;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" +++ |+#include <stdio.h>\n"
|
|
" 1 | test (int ch)\n"
|
|
" 2 | {\n"
|
|
" 3 | putchar (ch);\n"
|
|
" | ^~~~~~~\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
}
|
|
|
|
/* Replacement fix-it hint containing a newline.
|
|
This will fail, as newlines are only supported when inserting at the
|
|
beginning of a line. */
|
|
|
|
static void
|
|
test_fixit_replace_containing_newline (const line_table_case &case_)
|
|
{
|
|
/* Create a tempfile and write some text to it.
|
|
.........................0000000001111.
|
|
.........................1234567890123. */
|
|
const char *old_content = "foo = bar ();\n";
|
|
|
|
temp_source_file tmp (SELFTEST_LOCATION, ".c", old_content);
|
|
line_table_test ltt (case_);
|
|
linemap_add (line_table, LC_ENTER, false, tmp.get_filename (), 1);
|
|
|
|
/* Replace the " = " with "\n = ", as if we were reformatting an
|
|
overly long line. */
|
|
location_t start = linemap_position_for_column (line_table, 4);
|
|
location_t finish = linemap_position_for_column (line_table, 6);
|
|
location_t loc = linemap_position_for_column (line_table, 13);
|
|
rich_location richloc (line_table, loc);
|
|
source_range range = source_range::from_locations (start, finish);
|
|
richloc.add_fixit_replace (range, "\n =");
|
|
|
|
/* Arbitrary newlines are not yet supported within fix-it hints, so
|
|
the fix-it should not be displayed. */
|
|
ASSERT_TRUE (richloc.seen_impossible_fixit_p ());
|
|
|
|
if (finish > LINE_MAP_MAX_LOCATION_WITH_COLS)
|
|
return;
|
|
|
|
test_diagnostic_context dc;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar ();\n"
|
|
" ^\n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Fix-it hint, attempting to delete a newline.
|
|
This will fail, as we currently only support fix-it hints that
|
|
affect one line at a time. */
|
|
|
|
static void
|
|
test_fixit_deletion_affecting_newline (const line_table_case &case_)
|
|
{
|
|
/* Create a tempfile and write some text to it.
|
|
..........................0000000001111.
|
|
..........................1234567890123. */
|
|
const char *old_content = ("foo = bar (\n"
|
|
" );\n");
|
|
|
|
temp_source_file tmp (SELFTEST_LOCATION, ".c", old_content);
|
|
line_table_test ltt (case_);
|
|
const line_map_ordinary *ord_map = linemap_check_ordinary
|
|
(linemap_add (line_table, LC_ENTER, false, tmp.get_filename (), 0));
|
|
linemap_line_start (line_table, 1, 100);
|
|
|
|
/* Attempt to delete the " (\n...)". */
|
|
location_t start
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 1, 10);
|
|
location_t caret
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 1, 11);
|
|
location_t finish
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 2, 7);
|
|
location_t loc = make_location (caret, start, finish);
|
|
rich_location richloc (line_table, loc);
|
|
richloc. add_fixit_remove ();
|
|
|
|
/* Fix-it hints that affect more than one line are not yet supported, so
|
|
the fix-it should not be displayed. */
|
|
ASSERT_TRUE (richloc.seen_impossible_fixit_p ());
|
|
|
|
if (finish > LINE_MAP_MAX_LOCATION_WITH_COLS)
|
|
return;
|
|
|
|
test_diagnostic_context dc;
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" foo = bar (\n"
|
|
" ~^\n"
|
|
" );\n"
|
|
" ~ \n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Verify that line numbers are correctly printed for the case of
|
|
a multiline range in which the width of the line numbers changes
|
|
(e.g. from "9" to "10"). */
|
|
|
|
static void
|
|
test_line_numbers_multiline_range ()
|
|
{
|
|
/* Create a tempfile and write some text to it. */
|
|
pretty_printer pp;
|
|
for (int i = 0; i < 20; i++)
|
|
/* .........0000000001111111.
|
|
.............1234567890123456. */
|
|
pp_printf (&pp, "this is line %i\n", i + 1);
|
|
temp_source_file tmp (SELFTEST_LOCATION, ".txt", pp_formatted_text (&pp));
|
|
line_table_test ltt;
|
|
|
|
const line_map_ordinary *ord_map = linemap_check_ordinary
|
|
(linemap_add (line_table, LC_ENTER, false, tmp.get_filename (), 0));
|
|
linemap_line_start (line_table, 1, 100);
|
|
|
|
/* Create a multi-line location, starting at the "line" of line 9, with
|
|
a caret on the "is" of line 10, finishing on the "this" line 11. */
|
|
|
|
location_t start
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 9, 9);
|
|
location_t caret
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 10, 6);
|
|
location_t finish
|
|
= linemap_position_for_line_and_column (line_table, ord_map, 11, 4);
|
|
location_t loc = make_location (caret, start, finish);
|
|
|
|
test_diagnostic_context dc;
|
|
dc.show_line_numbers_p = true;
|
|
dc.min_margin_width = 0;
|
|
gcc_rich_location richloc (loc);
|
|
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
|
|
ASSERT_STREQ ("\n"
|
|
" 9 | this is line 9\n"
|
|
" | ~~~~~~\n"
|
|
"10 | this is line 10\n"
|
|
" | ~~~~~^~~~~~~~~~\n"
|
|
"11 | this is line 11\n"
|
|
" | ~~~~ \n",
|
|
pp_formatted_text (dc.printer));
|
|
}
|
|
|
|
/* Run all of the selftests within this file. */
|
|
|
|
void
|
|
diagnostic_show_locus_c_tests ()
|
|
{
|
|
test_line_span ();
|
|
|
|
test_layout_range_for_single_point ();
|
|
test_layout_range_for_single_line ();
|
|
test_layout_range_for_multiple_lines ();
|
|
|
|
test_get_line_width_without_trailing_whitespace ();
|
|
|
|
test_diagnostic_show_locus_unknown_location ();
|
|
|
|
for_each_line_table_case (test_diagnostic_show_locus_one_liner);
|
|
for_each_line_table_case (test_add_location_if_nearby);
|
|
for_each_line_table_case (test_diagnostic_show_locus_fixit_lines);
|
|
for_each_line_table_case (test_fixit_consolidation);
|
|
for_each_line_table_case (test_overlapped_fixit_printing);
|
|
for_each_line_table_case (test_overlapped_fixit_printing_2);
|
|
for_each_line_table_case (test_fixit_insert_containing_newline);
|
|
for_each_line_table_case (test_fixit_insert_containing_newline_2);
|
|
for_each_line_table_case (test_fixit_replace_containing_newline);
|
|
for_each_line_table_case (test_fixit_deletion_affecting_newline);
|
|
|
|
test_line_numbers_multiline_range ();
|
|
}
|
|
|
|
} // namespace selftest
|
|
|
|
#endif /* #if CHECKING_P */
|