diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2016-06-22 15:29:21 +0000 |
|---|---|---|
| committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2016-06-22 15:29:21 +0000 |
| commit | ac81cf0b2bf5efdd716d10d1c218eb5a17e1035b (patch) | |
| tree | 895845f1cef79ed1f8c6a341ccf3973a27e22944 /libcpp/internal.h | |
| parent | 1a4f11c88ae761d4c618e540e07e4e32e85850d1 (diff) | |
| download | gcc-ac81cf0b2bf5efdd716d10d1c218eb5a17e1035b.zip gcc-ac81cf0b2bf5efdd716d10d1c218eb5a17e1035b.tar.gz gcc-ac81cf0b2bf5efdd716d10d1c218eb5a17e1035b.tar.bz2 | |
libcpp: Tweak to missing #include source location
This patch tweaks the error message location for missing header files.
Previously these read:
test.c:1:17: fatal error: 404.h: No such file or directory
#include "404.h"
^
compilation terminated.
With this patch, the pertinent string is underlined:
test.c:1:10: fatal error: 404.h: No such file or directory
#include "404.h"
^~~~~~~
compilation terminated.
gcc/testsuite/ChangeLog:
* c-c++-common/missing-header-1.c: New test case.
* c-c++-common/missing-header-2.c: New test case.
* c-c++-common/missing-header-3.c: New test case.
* c-c++-common/missing-header-4.c: New test case.
libcpp/ChangeLog:
* directives.c (do_include_common): Pass on "location" to
_cpp_stack_include.
* errors.c (cpp_diagnostic): Reimplement in terms of...
(cpp_diagnostic_at): New function.
(cpp_error_at): New function.
(cpp_errno_filename): Add "loc" param and use it by using
cpp_error_at rather than cpp_error.
* files.c (find_file_in_dir): Add "loc" param and pass it to
open_file_failed.
(_cpp_find_file): Add "loc" param. Use it to convert calls to
cpp_error to cpp_error_at, and pass it to find_file_in_dir and
open_file_failed.
(read_file_guts): Add "loc" param. Use it to convert calls to
cpp_error to cpp_error_at. Pass it to cpp_errno_filename.
(read_file): Add "loc" param. Pass it to open_file_failed and
read_file_guts.
(should_stack_file): Add "loc" param. Pass it to read_file.
(_cpp_stack_file): Add "loc" param. Pass it to should_stack_file.
(_cpp_stack_include): Add "loc" param. Pass it to
_cpp_find_file and _cpp_stack_file.
(open_file_failed): Add "loc" param. Pass it to
cpp_errno_filename.
(_cpp_fake_include): Add 0 as a source_location in call to
_cpp_find_file.
(_cpp_compare_file_date): Likewise.
(cpp_push_include): Likewise for call to _cpp_stack_include.
(cpp_push_default_include): Likewise.
(_cpp_save_file_entries): Likewise for call to open_file_failed.
(_cpp_has_header): Likewise for call to _cpp_find_file.
* include/cpplib.h (cpp_errno_filename): Add source_location
param.
(cpp_error_at): New declaration.
* init.c (cpp_read_main_file): Add 0 as a source_location in calls
to _cpp_find_file and _cpp_stack_file.
* internal.h (_cpp_find_file): Add source_location param.
(_cpp_stack_file): Likewise.
(_cpp_stack_include): Likewise.
From-SVN: r237715
Diffstat (limited to 'libcpp/internal.h')
| -rw-r--r-- | libcpp/internal.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libcpp/internal.h b/libcpp/internal.h index cea32ec..ca2b498 100644 --- a/libcpp/internal.h +++ b/libcpp/internal.h @@ -645,13 +645,14 @@ extern void _cpp_destroy_hashtable (cpp_reader *); /* In files.c */ typedef struct _cpp_file _cpp_file; extern _cpp_file *_cpp_find_file (cpp_reader *, const char *, cpp_dir *, - bool, int, bool); + bool, int, bool, source_location); extern bool _cpp_find_failed (_cpp_file *); extern void _cpp_mark_file_once_only (cpp_reader *, struct _cpp_file *); extern void _cpp_fake_include (cpp_reader *, const char *); -extern bool _cpp_stack_file (cpp_reader *, _cpp_file*, bool); +extern bool _cpp_stack_file (cpp_reader *, _cpp_file*, bool, + source_location); extern bool _cpp_stack_include (cpp_reader *, const char *, int, - enum include_type); + enum include_type, source_location); extern int _cpp_compare_file_date (cpp_reader *, const char *, int); extern void _cpp_report_missing_guards (cpp_reader *); extern void _cpp_init_files (cpp_reader *); |