toplev_obj->set ("egraph", eg.to_json ());
pretty_printer pp;
- toplev_obj->print (&pp);
+ toplev_obj->print (&pp, flag_diagnostics_json_formatting);
pp_formatted_text (&pp);
delete toplev_obj;
EnumValue
Enum(diagnostic_color_rule) String(auto) Value(DIAGNOSTICS_COLOR_AUTO)
+fdiagnostics-json-formatting
+Common Var(flag_diagnostics_json_formatting) Init(1)
+Enable formatting of JSON output.
+
fdiagnostics-urls=
Driver Common Joined RejectNegative Var(flag_diagnostics_show_urls) Enum(diagnostic_url_rule) Init(DIAGNOSTICS_URL_AUTO)
-fdiagnostics-urls=[never|always|auto] Embed URLs in diagnostics.
}
protected:
- json_output_format (diagnostic_context &context)
+ json_output_format (diagnostic_context &context,
+ bool formatted)
: diagnostic_output_format (context),
m_toplevel_array (new json::array ()),
m_cur_group (nullptr),
- m_cur_children_array (nullptr)
+ m_cur_children_array (nullptr),
+ m_formatted (formatted)
{
}
void
flush_to_file (FILE *outf)
{
- m_toplevel_array->dump (outf);
+ m_toplevel_array->dump (outf, m_formatted);
fprintf (outf, "\n");
delete m_toplevel_array;
m_toplevel_array = nullptr;
/* The JSON array for the "children" array within the current diagnostic
group. */
json::array *m_cur_children_array;
+
+ bool m_formatted;
};
/* Generate a JSON object for LOC. */
class json_stderr_output_format : public json_output_format
{
public:
- json_stderr_output_format (diagnostic_context &context)
- : json_output_format (context)
+ json_stderr_output_format (diagnostic_context &context,
+ bool formatted)
+ : json_output_format (context, formatted)
{
}
~json_stderr_output_format ()
{
public:
json_file_output_format (diagnostic_context &context,
+ bool formatted,
const char *base_file_name)
- : json_output_format (context),
+ : json_output_format (context, formatted),
m_base_file_name (xstrdup (base_file_name))
{
}
/* Populate CONTEXT in preparation for JSON output to stderr. */
void
-diagnostic_output_format_init_json_stderr (diagnostic_context *context)
+diagnostic_output_format_init_json_stderr (diagnostic_context *context,
+ bool formatted)
{
diagnostic_output_format_init_json (context);
- context->set_output_format (new json_stderr_output_format (*context));
+ context->set_output_format (new json_stderr_output_format (*context,
+ formatted));
}
/* Populate CONTEXT in preparation for JSON output to a file named
void
diagnostic_output_format_init_json_file (diagnostic_context *context,
+ bool formatted,
const char *base_file_name)
{
diagnostic_output_format_init_json (context);
context->set_output_format (new json_file_output_format (*context,
+ formatted,
base_file_name));
}
class sarif_builder
{
public:
- sarif_builder (diagnostic_context *context);
+ sarif_builder (diagnostic_context *context,
+ bool formatted);
void end_diagnostic (diagnostic_context *context,
const diagnostic_info &diagnostic,
hash_set <int_hash <int, 0, 1> > m_cwe_id_set;
int m_tabstop;
+
+ bool m_formatted;
};
/* class sarif_object : public json::object. */
/* sarif_builder's ctor. */
-sarif_builder::sarif_builder (diagnostic_context *context)
+sarif_builder::sarif_builder (diagnostic_context *context,
+ bool formatted)
: m_context (context),
m_invocation_obj (new sarif_invocation ()),
m_results_array (new json::array ()),
m_seen_any_relative_paths (false),
m_rule_id_set (),
m_rules_arr (new json::array ()),
- m_tabstop (context->m_tabstop)
+ m_tabstop (context->m_tabstop),
+ m_formatted (formatted)
{
}
{
m_invocation_obj->prepare_to_flush (m_context);
json::object *top = make_top_level_object (m_invocation_obj, m_results_array);
- top->dump (outf);
+ top->dump (outf, m_formatted);
m_invocation_obj = NULL;
m_results_array = NULL;
fprintf (outf, "\n");
}
protected:
- sarif_output_format (diagnostic_context &context)
+ sarif_output_format (diagnostic_context &context,
+ bool formatted)
: diagnostic_output_format (context),
- m_builder (&context)
+ m_builder (&context, formatted)
{}
sarif_builder m_builder;
class sarif_stream_output_format : public sarif_output_format
{
public:
- sarif_stream_output_format (diagnostic_context &context, FILE *stream)
- : sarif_output_format (context),
+ sarif_stream_output_format (diagnostic_context &context,
+ bool formatted,
+ FILE *stream)
+ : sarif_output_format (context, formatted),
m_stream (stream)
{
}
{
public:
sarif_file_output_format (diagnostic_context &context,
- const char *base_file_name)
- : sarif_output_format (context),
+ bool formatted,
+ const char *base_file_name)
+ : sarif_output_format (context, formatted),
m_base_file_name (xstrdup (base_file_name))
{
}
/* Populate CONTEXT in preparation for SARIF output to stderr. */
void
-diagnostic_output_format_init_sarif_stderr (diagnostic_context *context)
+diagnostic_output_format_init_sarif_stderr (diagnostic_context *context,
+ bool formatted)
{
diagnostic_output_format_init_sarif (context);
context->set_output_format (new sarif_stream_output_format (*context,
+ formatted,
stderr));
}
void
diagnostic_output_format_init_sarif_file (diagnostic_context *context,
+ bool formatted,
const char *base_file_name)
{
diagnostic_output_format_init_sarif (context);
context->set_output_format (new sarif_file_output_format (*context,
+ formatted,
base_file_name));
}
void
diagnostic_output_format_init_sarif_stream (diagnostic_context *context,
+ bool formatted,
FILE *stream)
{
diagnostic_output_format_init_sarif (context);
context->set_output_format (new sarif_stream_output_format (*context,
+ formatted,
stream));
}
void
diagnostic_output_format_init (diagnostic_context *context,
const char *base_file_name,
- enum diagnostics_output_format format)
+ enum diagnostics_output_format format,
+ bool json_formatting)
{
switch (format)
{
break;
case DIAGNOSTICS_OUTPUT_FORMAT_JSON_STDERR:
- diagnostic_output_format_init_json_stderr (context);
+ diagnostic_output_format_init_json_stderr (context,
+ json_formatting);
break;
case DIAGNOSTICS_OUTPUT_FORMAT_JSON_FILE:
- diagnostic_output_format_init_json_file (context, base_file_name);
+ diagnostic_output_format_init_json_file (context,
+ json_formatting,
+ base_file_name);
break;
case DIAGNOSTICS_OUTPUT_FORMAT_SARIF_STDERR:
- diagnostic_output_format_init_sarif_stderr (context);
+ diagnostic_output_format_init_sarif_stderr (context,
+ json_formatting);
break;
case DIAGNOSTICS_OUTPUT_FORMAT_SARIF_FILE:
- diagnostic_output_format_init_sarif_file (context, base_file_name);
+ diagnostic_output_format_init_sarif_file (context,
+ json_formatting,
+ base_file_name);
break;
}
}
extern void diagnostic_output_format_init (diagnostic_context *,
const char *base_file_name,
- enum diagnostics_output_format);
-extern void diagnostic_output_format_init_json_stderr (diagnostic_context *context);
+ enum diagnostics_output_format,
+ bool json_formatting);
+extern void diagnostic_output_format_init_json_stderr (diagnostic_context *context,
+ bool formatted);
extern void diagnostic_output_format_init_json_file (diagnostic_context *context,
+ bool formatted,
const char *base_file_name);
-extern void diagnostic_output_format_init_sarif_stderr (diagnostic_context *context);
+extern void diagnostic_output_format_init_sarif_stderr (diagnostic_context *context,
+ bool formatted);
extern void diagnostic_output_format_init_sarif_file (diagnostic_context *context,
+ bool formatted,
const char *base_file_name);
extern void diagnostic_output_format_init_sarif_stream (diagnostic_context *context,
+ bool formatted,
FILE *stream);
/* Compute the number of digits in the decimal representation of an integer. */
-fdiagnostics-color=@r{[}auto@r{|}never@r{|}always@r{]}
-fdiagnostics-urls=@r{[}auto@r{|}never@r{|}always@r{]}
-fdiagnostics-format=@r{[}text@r{|}sarif-stderr@r{|}sarif-file@r{|}json@r{|}json-stderr@r{|}json-file@r{]}
+-fno-diagnostics-json-formatting
-fno-diagnostics-show-option -fno-diagnostics-show-caret
-fno-diagnostics-show-labels -fno-diagnostics-show-line-numbers
-fno-diagnostics-show-cwe
whereas with @samp{json-file} it is written to @file{@var{source}.gcc.json}.
The emitted JSON consists of a top-level JSON array containing JSON objects
-representing the diagnostics. The JSON is emitted as one line, without
-formatting; the examples below have been formatted for clarity.
+representing the diagnostics.
Diagnostics can have child diagnostics. For example, this error and note:
non-ASCII bytes should be escaped when printing the pertinent lines of
source code (@code{true} for diagnostics involving source encoding issues).
+@opindex fno-diagnostics-json-formatting
+@opindex fdiagnostics-json-formatting
+@item -fno-diagnostics-json-formatting
+By default, when JSON is emitted for diagnostics (via
+@option{-fdiagnostics-format=sarif-stderr},
+@option{-fdiagnostics-format=sarif-file},
+@option{-fdiagnostics-format=json},
+@option{-fdiagnostics-format=json-stderr},
+@option{-fdiagnostics-format=json-file}),
+GCC will add newlines and indentation to visually emphasize the
+hierarchical structure of the JSON.
+
+Use @option{-fno-diagnostics-json-formatting} to suppress this whitespace.
+It must be passed before the option it is to affect.
+
+This is intended for compatibility with tools that do not expect the output
+to contain newlines, such as that emitted by older GCC releases.
+
@end table
@node Warning Options
const char *basename = (opts->x_dump_base_name ? opts->x_dump_base_name
: opts->x_main_input_basename);
diagnostic_output_format_init (dc, basename,
- (enum diagnostics_output_format)value);
+ (enum diagnostics_output_format)value,
+ opts->x_flag_diagnostics_json_formatting);
break;
}
{
if (flag_use_stdout)
{
- root->dump (stdout);
+ root->dump (stdout, false);
printf ("\n");
}
else
{
pretty_printer pp;
- root->print (&pp);
+ root->print (&pp, false);
pp_formatted_text (&pp);
fnotice (stdout, "Creating '%s'\n",
/* Dump this json::value tree to OUTF.
- No formatting is done.
-
The key/value pairs of json::objects are printed in the order
in which the keys were originally inserted. */
void
-value::dump (FILE *outf) const
+value::dump (FILE *outf, bool formatted) const
{
pretty_printer pp;
pp_buffer (&pp)->stream = outf;
- print (&pp);
+ print (&pp, formatted);
pp_flush (&pp);
}
/* Implementation of json::value::print for json::object. */
void
-object::print (pretty_printer *pp) const
+object::print (pretty_printer *pp, bool formatted) const
{
pp_character (pp, '{');
+ if (formatted)
+ pp_indentation (pp) += 1;
/* Iterate in the order that the keys were inserted. */
unsigned i;
FOR_EACH_VEC_ELT (m_keys, i, key)
{
if (i > 0)
- pp_string (pp, ", ");
+ {
+ pp_string (pp, ",");
+ if (formatted)
+ {
+ pp_newline (pp);
+ pp_indent (pp);
+ }
+ else
+ pp_space (pp);
+ }
map_t &mut_map = const_cast<map_t &> (m_map);
value *value = *mut_map.get (key);
pp_doublequote (pp);
pp_string (pp, key); // FIXME: escaping?
pp_doublequote (pp);
pp_string (pp, ": ");
- value->print (pp);
+ const int indent = strlen (key) + 4;
+ if (formatted)
+ pp_indentation (pp) += indent;
+ value->print (pp, formatted);
+ if (formatted)
+ pp_indentation (pp) -= indent;
}
+ if (formatted)
+ pp_indentation (pp) -= 1;
pp_character (pp, '}');
}
/* Implementation of json::value::print for json::array. */
void
-array::print (pretty_printer *pp) const
+array::print (pretty_printer *pp, bool formatted) const
{
pp_character (pp, '[');
+ if (formatted)
+ pp_indentation (pp) += 1;
unsigned i;
value *v;
FOR_EACH_VEC_ELT (m_elements, i, v)
{
if (i)
- pp_string (pp, ", ");
- v->print (pp);
+ {
+ pp_string (pp, ",");
+ if (formatted)
+ {
+ pp_newline (pp);
+ pp_indent (pp);
+ }
+ else
+ pp_space (pp);
+ }
+ v->print (pp, formatted);
}
+ if (formatted)
+ pp_indentation (pp) -= 1;
pp_character (pp, ']');
}
/* Implementation of json::value::print for json::float_number. */
void
-float_number::print (pretty_printer *pp) const
+float_number::print (pretty_printer *pp,
+ bool formatted ATTRIBUTE_UNUSED) const
{
char tmp[1024];
snprintf (tmp, sizeof (tmp), "%g", m_value);
/* Implementation of json::value::print for json::integer_number. */
void
-integer_number::print (pretty_printer *pp) const
+integer_number::print (pretty_printer *pp,
+ bool formatted ATTRIBUTE_UNUSED) const
{
char tmp[1024];
snprintf (tmp, sizeof (tmp), "%ld", m_value);
/* Implementation of json::value::print for json::string. */
void
-string::print (pretty_printer *pp) const
+string::print (pretty_printer *pp,
+ bool formatted ATTRIBUTE_UNUSED) const
{
pp_character (pp, '"');
for (size_t i = 0; i != m_len; ++i)
/* Implementation of json::value::print for json::literal. */
void
-literal::print (pretty_printer *pp) const
+literal::print (pretty_printer *pp,
+ bool formatted ATTRIBUTE_UNUSED) const
{
switch (m_kind)
{
/* Verify that JV->print () prints EXPECTED_JSON. */
static void
-assert_print_eq (const location &loc, const json::value &jv, const char *expected_json)
+assert_print_eq (const location &loc,
+ const json::value &jv,
+ bool formatted,
+ const char *expected_json)
{
pretty_printer pp;
- jv.print (&pp);
+ jv.print (&pp, formatted);
ASSERT_STREQ_AT (loc, expected_json, pp_formatted_text (&pp));
}
-#define ASSERT_PRINT_EQ(JV, EXPECTED_JSON) \
- assert_print_eq (SELFTEST_LOCATION, JV, EXPECTED_JSON)
+#define ASSERT_PRINT_EQ(JV, FORMATTED, EXPECTED_JSON) \
+ assert_print_eq (SELFTEST_LOCATION, JV, FORMATTED, EXPECTED_JSON)
/* Verify that object::get works as expected. */
obj.set_string ("baz", "quux");
/* This test relies on json::object writing out key/value pairs
in key-insertion order. */
- ASSERT_PRINT_EQ (obj, "{\"foo\": \"bar\", \"baz\": \"quux\"}");
+ ASSERT_PRINT_EQ (obj, true,
+ "{\"foo\": \"bar\",\n"
+ " \"baz\": \"quux\"}");
+ ASSERT_PRINT_EQ (obj, false,
+ "{\"foo\": \"bar\", \"baz\": \"quux\"}");
}
/* Verify that JSON arrays are written correctly. */
test_writing_arrays ()
{
array arr;
- ASSERT_PRINT_EQ (arr, "[]");
+ ASSERT_PRINT_EQ (arr, true, "[]");
arr.append (new json::string ("foo"));
- ASSERT_PRINT_EQ (arr, "[\"foo\"]");
+ ASSERT_PRINT_EQ (arr, true, "[\"foo\"]");
arr.append (new json::string ("bar"));
- ASSERT_PRINT_EQ (arr, "[\"foo\", \"bar\"]");
+ ASSERT_PRINT_EQ (arr, true,
+ "[\"foo\",\n"
+ " \"bar\"]");
+ ASSERT_PRINT_EQ (arr, false,
+ "[\"foo\", \"bar\"]");
}
/* Verify that JSON numbers are written correctly. */
static void
test_writing_float_numbers ()
{
- ASSERT_PRINT_EQ (float_number (0), "0");
- ASSERT_PRINT_EQ (float_number (42), "42");
- ASSERT_PRINT_EQ (float_number (-100), "-100");
- ASSERT_PRINT_EQ (float_number (123456789), "1.23457e+08");
+ ASSERT_PRINT_EQ (float_number (0), true, "0");
+ ASSERT_PRINT_EQ (float_number (42), true, "42");
+ ASSERT_PRINT_EQ (float_number (-100), true, "-100");
+ ASSERT_PRINT_EQ (float_number (123456789), true, "1.23457e+08");
}
static void
test_writing_integer_numbers ()
{
- ASSERT_PRINT_EQ (integer_number (0), "0");
- ASSERT_PRINT_EQ (integer_number (42), "42");
- ASSERT_PRINT_EQ (integer_number (-100), "-100");
- ASSERT_PRINT_EQ (integer_number (123456789), "123456789");
- ASSERT_PRINT_EQ (integer_number (-123456789), "-123456789");
+ ASSERT_PRINT_EQ (integer_number (0), true, "0");
+ ASSERT_PRINT_EQ (integer_number (42), true, "42");
+ ASSERT_PRINT_EQ (integer_number (-100), true, "-100");
+ ASSERT_PRINT_EQ (integer_number (123456789), true, "123456789");
+ ASSERT_PRINT_EQ (integer_number (-123456789), true, "-123456789");
}
/* Verify that JSON strings are written correctly. */
test_writing_strings ()
{
string foo ("foo");
- ASSERT_PRINT_EQ (foo, "\"foo\"");
+ ASSERT_PRINT_EQ (foo, true, "\"foo\"");
string contains_quotes ("before \"quoted\" after");
- ASSERT_PRINT_EQ (contains_quotes, "\"before \\\"quoted\\\" after\"");
+ ASSERT_PRINT_EQ (contains_quotes, true, "\"before \\\"quoted\\\" after\"");
const char data[] = {'a', 'b', 'c', 'd', '\0', 'e', 'f'};
string not_terminated (data, 3);
- ASSERT_PRINT_EQ (not_terminated, "\"abc\"");
+ ASSERT_PRINT_EQ (not_terminated, true, "\"abc\"");
string embedded_null (data, sizeof data);
- ASSERT_PRINT_EQ (embedded_null, "\"abcd\\0ef\"");
+ ASSERT_PRINT_EQ (embedded_null, true, "\"abcd\\0ef\"");
}
/* Verify that JSON literals are written correctly. */
static void
test_writing_literals ()
{
- ASSERT_PRINT_EQ (literal (JSON_TRUE), "true");
- ASSERT_PRINT_EQ (literal (JSON_FALSE), "false");
- ASSERT_PRINT_EQ (literal (JSON_NULL), "null");
+ ASSERT_PRINT_EQ (literal (JSON_TRUE), true, "true");
+ ASSERT_PRINT_EQ (literal (JSON_FALSE), true, "false");
+ ASSERT_PRINT_EQ (literal (JSON_NULL), true, "null");
- ASSERT_PRINT_EQ (literal (true), "true");
- ASSERT_PRINT_EQ (literal (false), "false");
+ ASSERT_PRINT_EQ (literal (true), true, "true");
+ ASSERT_PRINT_EQ (literal (false), true, "false");
+}
+
+/* Verify that nested values are formatted correctly when written. */
+
+static void
+test_formatting ()
+{
+ object obj;
+ object *child = new object;
+ object *grandchild = new object;
+
+ obj.set_string ("str", "bar");
+ obj.set ("child", child);
+ obj.set_integer ("int", 42);
+
+ child->set ("grandchild", grandchild);
+ child->set_integer ("int", 1776);
+
+ array *arr = new array;
+ for (int i = 0; i < 3; i++)
+ arr->append (new integer_number (i));
+ grandchild->set ("arr", arr);
+ grandchild->set_integer ("int", 1066);
+
+ /* This test relies on json::object writing out key/value pairs
+ in key-insertion order. */
+ ASSERT_PRINT_EQ (obj, true,
+ ("{\"str\": \"bar\",\n"
+ " \"child\": {\"grandchild\": {\"arr\": [0,\n"
+ " 1,\n"
+ " 2],\n"
+ " \"int\": 1066},\n"
+ " \"int\": 1776},\n"
+ " \"int\": 42}"));
+ ASSERT_PRINT_EQ (obj, false,
+ ("{\"str\": \"bar\", \"child\": {\"grandchild\":"
+ " {\"arr\": [0, 1, 2], \"int\": 1066},"
+ " \"int\": 1776}, \"int\": 42}"));
}
/* Run all of the selftests within this file. */
test_writing_integer_numbers ();
test_writing_strings ();
test_writing_literals ();
+ test_formatting ();
}
} // namespace selftest
public:
virtual ~value () {}
virtual enum kind get_kind () const = 0;
- virtual void print (pretty_printer *pp) const = 0;
+ virtual void print (pretty_printer *pp, bool formatted) const = 0;
- void dump (FILE *) const;
+ void dump (FILE *, bool formatted) const;
};
/* Subclass of value for objects: a collection of key/value pairs
~object ();
enum kind get_kind () const final override { return JSON_OBJECT; }
- void print (pretty_printer *pp) const final override;
+ void print (pretty_printer *pp, bool formatted) const final override;
void set (const char *key, value *v);
value *get (const char *key) const;
~array ();
enum kind get_kind () const final override { return JSON_ARRAY; }
- void print (pretty_printer *pp) const final override;
+ void print (pretty_printer *pp, bool formatted) const final override;
void append (value *v);
float_number (double value) : m_value (value) {}
enum kind get_kind () const final override { return JSON_FLOAT; }
- void print (pretty_printer *pp) const final override;
+ void print (pretty_printer *pp, bool formatted) const final override;
double get () const { return m_value; }
integer_number (long value) : m_value (value) {}
enum kind get_kind () const final override { return JSON_INTEGER; }
- void print (pretty_printer *pp) const final override;
+ void print (pretty_printer *pp, bool formatted) const final override;
long get () const { return m_value; }
~string () { free (m_utf8); }
enum kind get_kind () const final override { return JSON_STRING; }
- void print (pretty_printer *pp) const final override;
+ void print (pretty_printer *pp, bool formatted) const final override;
const char *get_string () const { return m_utf8; }
size_t get_length () const { return m_len; }
literal (bool value): m_kind (value ? JSON_TRUE : JSON_FALSE) {}
enum kind get_kind () const final override { return m_kind; }
- void print (pretty_printer *pp) const final override;
+ void print (pretty_printer *pp, bool formatted) const final override;
private:
enum kind m_kind;
optrecord_json_writer::write () const
{
pretty_printer pp;
- m_root_tuple->print (&pp);
+ m_root_tuple->print (&pp, false);
bool emitted_error = false;
char *filename = concat (dump_base_name, ".opt-record.json.gz", NULL);
/* Verify that the json is sane. */
pretty_printer pp;
- json_obj->print (&pp);
+ json_obj->print (&pp, false);
const char *json_str = pp_formatted_text (&pp);
ASSERT_STR_CONTAINS (json_str, "impl_location");
ASSERT_STR_CONTAINS (json_str, "\"kind\": \"note\"");
const char *basename = (opts->x_dump_base_name ? opts->x_dump_base_name
: opts->x_main_input_basename);
diagnostic_output_format_init (dc, basename,
- (enum diagnostics_output_format)value);
+ (enum diagnostics_output_format)value,
+ opts->x_flag_diagnostics_json_formatting);
break;
}
#error message
-/* Use dg-regexp to consume the JSON output starting with
- the innermost values, and working outwards. */
-
-/* { dg-regexp "\"kind\": \"error\"" } */
-/* { dg-regexp "\"column-origin\": 1" } */
-/* { dg-regexp "\"escape-source\": false" } */
-/* { dg-regexp "\"message\": \"#error message\"" } */
-
-/* { dg-regexp "\"caret\": \{" } */
-/* { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-1.c\"" } */
-/* { dg-regexp "\"line\": 4" } */
-/* { dg-regexp "\"column\": 2" } */
-/* { dg-regexp "\"display-column\": 2" } */
-/* { dg-regexp "\"byte-column\": 2" } */
-
-/* { dg-regexp "\"finish\": \{" } */
-/* { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-1.c\"" } */
-/* { dg-regexp "\"line\": 4" } */
-/* { dg-regexp "\"column\": 6" } */
-/* { dg-regexp "\"display-column\": 6" } */
-/* { dg-regexp "\"byte-column\": 6" } */
-
-/* { dg-regexp "\"locations\": \[\[\{\}, \]*\]" } */
-/* { dg-regexp "\"children\": \[\[\]\[\]\]" } */
-/* { dg-regexp "\[\[\{\}, \]*\]" } */
+/* { dg-begin-multiline-output "" }
+[{"kind": "error",
+ "message": "#error message",
+ "children": [],
+ "column-origin": 1,
+ "locations": [{"caret": {"file":
+ "line": 4,
+ "display-column": 2,
+ "byte-column": 2,
+ "column": 2},
+ "finish": {"file":
+ "line": 4,
+ "display-column": 6,
+ "byte-column": 6,
+ "column": 6}}],
+ "escape-source": false}]
+ { dg-end-multiline-output "" } */
#warning message
-/* Use dg-regexp to consume the JSON output starting with
- the innermost values, and working outwards. */
-
-/* { dg-regexp "\"kind\": \"warning\"" } */
-/* { dg-regexp "\"column-origin\": 1" } */
-/* { dg-regexp "\"escape-source\": false" } */
-/* { dg-regexp "\"message\": \"#warning message\"" } */
-/* { dg-regexp "\"option\": \"-Wcpp\"" } */
-/* { dg-regexp "\"option_url\": \"https:\[^\n\r\"\]*#index-Wcpp\"" } */
-
-/* { dg-regexp "\"caret\": \{" } */
-/* { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-2.c\"" } */
-/* { dg-regexp "\"line\": 4" } */
-/* { dg-regexp "\"column\": 2" } */
-/* { dg-regexp "\"display-column\": 2" } */
-/* { dg-regexp "\"byte-column\": 2" } */
-
-/* { dg-regexp "\"finish\": \{" } */
-/* { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-2.c\"" } */
-/* { dg-regexp "\"line\": 4" } */
-/* { dg-regexp "\"column\": 8" } */
-/* { dg-regexp "\"display-column\": 8" } */
-/* { dg-regexp "\"byte-column\": 8" } */
-
-/* { dg-regexp "\"locations\": \[\[\{\}, \]*\]" } */
-/* { dg-regexp "\"children\": \[\[\]\[\]\]" } */
-/* { dg-regexp "\[\[\{\}, \]*\]" } */
+/* { dg-begin-multiline-output "" }
+[{"kind": "warning",
+ "message": "#warning message",
+ "option": "-Wcpp",
+ { dg-end-multiline-output "" } */
+/* { dg-regexp " \"option_url\": \"https:\[^\n\r\"\]*#index-Wcpp\",\n" } */
+/* { dg-begin-multiline-output "" }
+ "children": [],
+ "column-origin": 1,
+ "locations": [{"caret": {"file":
+ "line": 4,
+ "display-column": 2,
+ "byte-column": 2,
+ "column": 2},
+ "finish": {"file":
+ "line": 4,
+ "display-column": 8,
+ "byte-column": 8,
+ "column": 8}}],
+ "escape-source": false}]
+ { dg-end-multiline-output "" } */
#warning message
-/* Use dg-regexp to consume the JSON output starting with
- the innermost values, and working outwards. */
-
-/* { dg-regexp "\"kind\": \"error\"" } */
-/* { dg-regexp "\"column-origin\": 1" } */
-/* { dg-regexp "\"escape-source\": false" } */
-/* { dg-regexp "\"message\": \"#warning message\"" } */
-/* { dg-regexp "\"option\": \"-Werror=cpp\"" } */
-/* { dg-regexp "\"option_url\": \"https:\[^\n\r\"\]*#index-Wcpp\"" } */
-
-/* { dg-regexp "\"caret\": \{" } */
-/* { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-3.c\"" } */
-/* { dg-regexp "\"line\": 4" } */
-/* { dg-regexp "\"column\": 2" } */
-/* { dg-regexp "\"display-column\": 2" } */
-/* { dg-regexp "\"byte-column\": 2" } */
-
-/* { dg-regexp "\"finish\": \{" } */
-/* { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-3.c\"" } */
-/* { dg-regexp "\"line\": 4" } */
-/* { dg-regexp "\"column\": 8" } */
-/* { dg-regexp "\"display-column\": 8" } */
-/* { dg-regexp "\"byte-column\": 8" } */
-
-/* { dg-regexp "\"locations\": \[\[\{\}, \]*\]" } */
-/* { dg-regexp "\"children\": \[\[\]\[\]\]" } */
-/* { dg-regexp "\[\[\{\}, \]*\]" } */
+/* { dg-begin-multiline-output "" }
+[{"kind": "error",
+ "message": "#warning message",
+ "option": "-Werror=cpp",
+ { dg-end-multiline-output "" } */
+/* { dg-regexp " \"option_url\": \"https:\[^\n\r\"\]*#index-Wcpp\",\n" } */
+/* { dg-begin-multiline-output "" }
+ "children": [],
+ "column-origin": 1,
+ "locations": [{"caret": {"file":
+ "line": 4,
+ "display-column": 2,
+ "byte-column": 2,
+ "column": 2},
+ "finish": {"file":
+ "line": 4,
+ "display-column": 8,
+ "byte-column": 8,
+ "column": 8}}],
+ "escape-source": false}]
+ { dg-end-multiline-output "" } */
return 5;
}
-/* Use dg-regexp to consume the JSON output starting with
- the innermost values, and working outwards. */
-
-/* Verify nested diagnostics. */
-
-/* The nested diagnostic. */
-
-/* { dg-regexp "\"kind\": \"note\"" } */
-/* { dg-regexp "\"message\": \"...this statement, but the latter is misleadingly indented as if it were guarded by the 'if'\"" } */
-/* { dg-regexp "\"escape-source\": false" } */
-
-/* { dg-regexp "\"caret\": \{" } */
-/* { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-4.c\"" } */
-/* { dg-regexp "\"line\": 8" } */
-/* { dg-regexp "\"column\": 5" } */
-/* { dg-regexp "\"display-column\": 5" } */
-/* { dg-regexp "\"byte-column\": 5" } */
-
-/* { dg-regexp "\"finish\": \{" } */
-/* { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-4.c\"" } */
-/* { dg-regexp "\"line\": 8" } */
-/* { dg-regexp "\"column\": 10" } */
-/* { dg-regexp "\"display-column\": 10" } */
-/* { dg-regexp "\"byte-column\": 10" } */
-
-/* The outer diagnostic. */
-
-/* { dg-regexp "\"kind\": \"warning\"" } */
-/* { dg-regexp "\"column-origin\": 1" } */
-/* { dg-regexp "\"message\": \"this 'if' clause does not guard...\"" } */
-/* { dg-regexp "\"escape-source\": false" } */
-/* { dg-regexp "\"option\": \"-Wmisleading-indentation\"" } */
-/* { dg-regexp "\"option_url\": \"https:\[^\n\r\"\]*#index-Wmisleading-indentation\"" } */
-
-/* { dg-regexp "\"caret\": \{" } */
-/* { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-4.c\"" } */
-/* { dg-regexp "\"line\": 6" } */
-/* { dg-regexp "\"column\": 3" } */
-/* { dg-regexp "\"display-column\": 3" } */
-/* { dg-regexp "\"byte-column\": 3" } */
-
-/* { dg-regexp "\"finish\": \{" } */
-/* { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-4.c\"" } */
-/* { dg-regexp "\"line\": 6" } */
-/* { dg-regexp "\"column\": 4" } */
-/* { dg-regexp "\"display-column\": 4" } */
-/* { dg-regexp "\"byte-column\": 4" } */
-
-/* More from the nested diagnostic (we can't guarantee what order the
- "file" keys are consumed). */
-
-/* { dg-regexp "\"locations\": \[\[\{\}, \]*\]" } */
-
-/* More from the outer diagnostic. */
-
-/* { dg-regexp "\"locations\": \[\[\{\}, \]*\]" } */
-
-/* { dg-regexp "\"children\": \[\[\{\}, \]*\]" } */
-/* { dg-regexp "\[\[\{\}, \]*\]" } */
-
+/* { dg-begin-multiline-output "" }
+[{"kind": "warning",
+ "message": "this 'if' clause does not guard...",
+ "option": "-Wmisleading-indentation",
+ { dg-end-multiline-output "" } */
+/* { dg-regexp " \"option_url\": \"https:\[^\n\r\"\]*#index-Wmisleading-indentation\",\n" } */
+/* { dg-begin-multiline-output "" }
+ "children": [{"kind": "note",
+ "message": "...this statement, but the latter is misleadingly indented as if it were guarded by the 'if'",
+ "locations": [{"caret": {"file":
+ "line": 8,
+ "display-column": 5,
+ "byte-column": 5,
+ "column": 5},
+ "finish": {"file":
+ "line": 8,
+ "display-column": 10,
+ "byte-column": 10,
+ "column": 10}}],
+ "escape-source": false}],
+ "column-origin": 1,
+ "locations": [{"caret": {"file":
+ "line": 6,
+ "display-column": 3,
+ "byte-column": 3,
+ "column": 3},
+ "finish": {"file":
+ "line": 6,
+ "display-column": 4,
+ "byte-column": 4,
+ "column": 4}}],
+ "escape-source": false}]
+ { dg-end-multiline-output "" } */
return ptr->colour;
}
-/* Verify fix-it hints.
-
- Use dg-regexp to consume the JSON output from start to
- finish, relying on the ordering of the keys.
- The following uses indentation to visualize the structure
- of the JSON (although the actual output is all on one line).
-
- { dg-regexp {\[} }
- { dg-regexp {\{} }
- { dg-regexp {"kind": "error"} }
- { dg-regexp {, "message": "'struct s' has no member named 'colour'; did you mean 'color'\?"} }
- { dg-regexp {, "children": \[\]} }
- { dg-regexp {, "column-origin": 1} }
- { dg-regexp {, "locations": } }
- { dg-regexp {\[} }
- { dg-regexp {\{} }
- { dg-regexp {"caret": } }
- { dg-regexp {\{} }
- { dg-regexp {"file": "[^\n\r"]*diagnostic-format-json-5.c"} }
- { dg-regexp {, "line": 8} }
- { dg-regexp {, "display-column": 15} }
- { dg-regexp {, "byte-column": 15} }
- { dg-regexp {, "column": 15} }
- { dg-regexp {\}} }
- { dg-regexp {, "finish": } }
- { dg-regexp {\{} }
- { dg-regexp {"file": "[^\n\r"]*diagnostic-format-json-5.c"} }
- { dg-regexp {, "line": 8} }
- { dg-regexp {, "display-column": 20} }
- { dg-regexp {, "byte-column": 20} }
- { dg-regexp {, "column": 20} }
- { dg-regexp {\}} }
- { dg-regexp {\}} }
- { dg-regexp {\]} }
- { dg-regexp {, "fixits": } }
- { dg-regexp {\[} }
- { dg-regexp {\{} }
- { dg-regexp {"start": } }
- { dg-regexp {\{} }
- { dg-regexp {"file": "[^\n\r"]*diagnostic-format-json-5.c"} }
- { dg-regexp {, "line": 8} }
- { dg-regexp {, "display-column": 15} }
- { dg-regexp {, "byte-column": 15} }
- { dg-regexp {, "column": 15} }
- { dg-regexp {\}} }
- { dg-regexp {, "next": } }
- { dg-regexp {\{} }
- { dg-regexp {"file": "[^\n\r"]*diagnostic-format-json-5.c"} }
- { dg-regexp {, "line": 8} }
- { dg-regexp {, "display-column": 21} }
- { dg-regexp {, "byte-column": 21} }
- { dg-regexp {, "column": 21} }
- { dg-regexp {\}} }
- { dg-regexp {, "string": "color"} }
- { dg-regexp {\}} }
- { dg-regexp {\]} }
- { dg-regexp {, "escape-source": false\}} }
- { dg-regexp {\]} } */
+/* { dg-begin-multiline-output "" }
+[{"kind": "error",
+ "message": "'struct s' has no member named 'colour'; did you mean 'color'?",
+ "children": [],
+ "column-origin": 1,
+ "locations": [{"caret": {"file":
+ "line": 8,
+ "display-column": 15,
+ "byte-column": 15,
+ "column": 15},
+ "finish": {"file":
+ "line": 8,
+ "display-column": 20,
+ "byte-column": 20,
+ "column": 20}}],
+ "fixits": [{"start": {"file":
+ "line": 8,
+ "display-column": 15,
+ "byte-column": 15,
+ "column": 15},
+ "next": {"file":
+ "line": 8,
+ "display-column": 21,
+ "byte-column": 21,
+ "column": 21},
+ "string": "color"}],
+ "escape-source": false}]
+ { dg-end-multiline-output "" } */
#error message
-/* Use dg-regexp to consume the JSON output starting with
- the innermost values, and working outwards. */
-
-/* { dg-regexp "\"kind\": \"error\"" } */
-/* { dg-regexp "\"column-origin\": 1" } */
-/* { dg-regexp "\"escape-source\": false" } */
-/* { dg-regexp "\"message\": \"#error message\"" } */
-
-/* { dg-regexp "\"caret\": \{" } */
-/* { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-stderr-1.c\"" } */
-/* { dg-regexp "\"line\": 6" } */
-/* { dg-regexp "\"column\": 2" } */
-/* { dg-regexp "\"display-column\": 2" } */
-/* { dg-regexp "\"byte-column\": 2" } */
-
-/* { dg-regexp "\"finish\": \{" } */
-/* { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-stderr-1.c\"" } */
-/* { dg-regexp "\"line\": 6" } */
-/* { dg-regexp "\"column\": 6" } */
-/* { dg-regexp "\"display-column\": 6" } */
-/* { dg-regexp "\"byte-column\": 6" } */
-
-/* { dg-regexp "\"locations\": \[\[\{\}, \]*\]" } */
-/* { dg-regexp "\"children\": \[\[\]\[\]\]" } */
-/* { dg-regexp "\[\[\{\}, \]*\]" } */
+/* { dg-begin-multiline-output "" }
+[{"kind": "error",
+ "message": "#error message",
+ "children": [],
+ "column-origin": 1,
+ "locations": [{"caret": {"file":
+ "line": 6,
+ "display-column": 2,
+ "byte-column": 2,
+ "column": 2},
+ "finish": {"file":
+ "line": 6,
+ "display-column": 6,
+ "byte-column": 6,
+ "column": 6}}],
+ "escape-source": false}]
+ { dg-end-multiline-output "" } */
-/* { dg-options "-Wdeprecated-copy -fdiagnostics-format=json" } */
+/* { dg-options "-Wdeprecated-copy -fno-diagnostics-json-formatting -fdiagnostics-format=json" } */
template <class> class b;
struct B {
/* { dg-do compile } */
-/* { dg-additional-options "-fdiagnostics-format=sarif-file" } */
+/* { dg-additional-options " -fno-diagnostics-json-formatting -fdiagnostics-format=sarif-file" } */
#include <stdlib.h>
return list;
}
-/* FIXME: test the events within a path. */
-/* { dg-regexp "\"kind\": \"error\"" } */
-/* { dg-regexp "\"path\": " } */
-/* { dg-regexp ".*" } */
+/* { dg-begin-multiline-output "" }
+[{"kind": "error",
+ "message": "passing NULL as argument 1 to 'PyList_Append' which requires a non-NULL parameter",
+ "children": [],
+ "column-origin": 1,
+ "locations": [{"caret": {"file": "
+ "line": 29,
+ "display-column": 5,
+ "byte-column": 5,
+ "column": 5},
+ "finish": {"file": "
+ "line": 29,
+ "display-column": 29,
+ "byte-column": 29,
+ "column": 29}}],
+ "path": [{"location": {"file": "
+ "line": 25,
+ "display-column": 10,
+ "byte-column": 10,
+ "column": 10},
+ "description": "when 'PyList_New' fails, returning NULL",
+ "function": "make_a_list_of_random_ints_badly",
+ "depth": 0},
+ {"location": {"file": "
+ "line": 27,
+ "display-column": 17,
+ "byte-column": 17,
+ "column": 17},
+ "description": "when 'i < count'",
+ "function": "make_a_list_of_random_ints_badly",
+ "depth": 0},
+ {"location": {"file": "
+ "line": 29,
+ "display-column": 5,
+ "byte-column": 5,
+ "column": 5},
+ "description": "when calling 'PyList_Append', passing NULL from (1) as argument 1",
+ "function": "make_a_list_of_random_ints_badly",
+ "depth": 0}],
+ "escape-source": false}]
+{ dg-end-multiline-output "" } */
#error message
-! Use dg-regexp to consume the JSON output starting with
-! the innermost values, and working outwards.
-! We can't rely on any ordering of the keys.
-
-! { dg-regexp "\"kind\": \"error\"" }
-! { dg-regexp "\"column-origin\": 1" }
-! { dg-regexp "\"escape-source\": false" }
-! { dg-regexp "\"message\": \"#error message\"" }
-
-! { dg-regexp "\"caret\": \{" }
-! { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-1.F90\"" }
-! { dg-regexp "\"line\": 4" }
-! { dg-regexp "\"column\": 2" }
-! { dg-regexp "\"display-column\": 2" }
-! { dg-regexp "\"byte-column\": 2" }
-
-! { dg-regexp "\"finish\": \{" }
-! { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-1.F90\"" }
-! { dg-regexp "\"line\": 4" }
-! { dg-regexp "\"column\": 6" }
-! { dg-regexp "\"display-column\": 6" }
-! { dg-regexp "\"byte-column\": 6" }
-
-! { dg-regexp "\"locations\": \[\[\{\}, \]*\]" }
-! { dg-regexp "\"children\": \[\[\]\[\]\]" }
-! { dg-regexp "\[\[\{\}, \]*\]" }
+#if 0
+{ dg-begin-multiline-output "" }
+[{"kind": "error",
+ "message": "#error message",
+ "children": [],
+ "column-origin": 1,
+ "locations": [{"caret": {"file":
+ "line": 4,
+ "display-column": 2,
+ "byte-column": 2,
+ "column": 2},
+ "finish": {"file":
+ "line": 4,
+ "display-column": 6,
+ "byte-column": 6,
+ "column": 6}}],
+ "escape-source": false}]
+{ dg-end-multiline-output "" }
+#endif
#warning message
-! Use dg-regexp to consume the JSON output starting with
-! the innermost values, and working outwards.
-! We can't rely on any ordering of the keys.
-
-! { dg-regexp "\"kind\": \"warning\"" }
-! { dg-regexp "\"column-origin\": 1" }
-! { dg-regexp "\"escape-source\": false" }
-! { dg-regexp "\"message\": \"#warning message\"" }
-! { dg-regexp "\"option\": \"-Wcpp\"" }
-! { dg-regexp "\"option_url\": \"\[^\n\r\"\]*#index-Wcpp\"" }
-
-! { dg-regexp "\"caret\": \{" }
-! { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-2.F90\"" }
-! { dg-regexp "\"line\": 4" }
-! { dg-regexp "\"column\": 2" }
-! { dg-regexp "\"display-column\": 2" }
-! { dg-regexp "\"byte-column\": 2" }
-
-! { dg-regexp "\"finish\": \{" }
-! { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-2.F90\"" }
-! { dg-regexp "\"line\": 4" }
-! { dg-regexp "\"column\": 8" }
-! { dg-regexp "\"display-column\": 8" }
-! { dg-regexp "\"byte-column\": 8" }
-
-! { dg-regexp "\"locations\": \[\[\{\}, \]*\]" }
-! { dg-regexp "\"children\": \[\[\]\[\]\]" }
-! { dg-regexp "\[\[\{\}, \]*\]" }
+#if 0
+{ dg-begin-multiline-output "" }
+[{"kind": "warning",
+ "message": "#warning message",
+ "option": "-Wcpp",
+ "option_url":
+ "children": [],
+ "column-origin": 1,
+ "locations": [{"caret": {"file":
+ "line": 4,
+ "display-column": 2,
+ "byte-column": 2,
+ "column": 2},
+ "finish": {"file":
+ "line": 4,
+ "display-column": 8,
+ "byte-column": 8,
+ "column": 8}}],
+ "escape-source": false}]
+{ dg-end-multiline-output "" }
+#endif
#warning message
-! Use dg-regexp to consume the JSON output starting with
-! the innermost values, and working outwards.
-! We can't rely on any ordering of the keys.
-
-! { dg-regexp "\"kind\": \"error\"" }
-! { dg-regexp "\"column-origin\": 1" }
-! { dg-regexp "\"escape-source\": false" }
-! { dg-regexp "\"message\": \"#warning message\"" }
-! { dg-regexp "\"option\": \"-Werror=cpp\"" }
-! { dg-regexp "\"option_url\": \"\[^\n\r\"\]*#index-Wcpp\"" }
-
-! { dg-regexp "\"caret\": \{" }
-! { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-3.F90\"" }
-! { dg-regexp "\"line\": 4" }
-! { dg-regexp "\"column\": 2" }
-! { dg-regexp "\"display-column\": 2" }
-! { dg-regexp "\"byte-column\": 2" }
-
-! { dg-regexp "\"finish\": \{" }
-! { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-3.F90\"" }
-! { dg-regexp "\"line\": 4" }
-! { dg-regexp "\"column\": 8" }
-! { dg-regexp "\"display-column\": 8" }
-! { dg-regexp "\"byte-column\": 8" }
-
-! { dg-regexp "\"locations\": \[\[\{\}, \]*\]" }
-! { dg-regexp "\"children\": \[\[\]\[\]\]" }
-! { dg-regexp "\[\[\{\}, \]*\]" }
+#if 0
+{ dg-begin-multiline-output "" }
+[{"kind": "error",
+ "message": "#warning message",
+ "option": "-Werror=cpp",
+ "option_url":
+ "children": [],
+ "column-origin": 1,
+ "locations": [{"caret": {"file":
+ "line": 4,
+ "display-column": 2,
+ "byte-column": 2,
+ "column": 2},
+ "finish": {"file":
+ "line": 4,
+ "display-column": 8,
+ "byte-column": 8,
+ "column": 8}}],
+ "escape-source": false}]
+{ dg-end-multiline-output "" }
+#endif
projects / thirdparty / gcc.git / commitdiff
