diff options
| author | Nathan Sidwell <nathan@acm.org> | 2020-05-19 13:20:32 -0700 |
|---|---|---|
| committer | Nathan Sidwell <nathan@acm.org> | 2020-05-19 13:23:47 -0700 |
| commit | 7cf3f604fb102ba67ce3abe7e97440b4ed0da92e (patch) | |
| tree | ec6a6db751a99154923cb1cc9f884eaf244d7680 /libcpp/include/line-map.h | |
| parent | 98452668d362bb9e6358f7eb5cff69f4f5ab1d45 (diff) | |
| download | gcc-7cf3f604fb102ba67ce3abe7e97440b4ed0da92e.zip gcc-7cf3f604fb102ba67ce3abe7e97440b4ed0da92e.tar.gz gcc-7cf3f604fb102ba67ce3abe7e97440b4ed0da92e.tar.bz2 | |
preprocessor: Random cleanups
This fixes a bunch of poorly formatted decls, marks some getters as
PURE, deletes some C-relevant bool hackery, and finally uses a
passed-in location rather than deducing a closely-related but not
necessarily the same location.
* include/cpplib.h (cpp_get_otions, cpp_get_callbacks)
(cpp_get_deps): Mark as PURE.
* include/line-map.h (get_combined_adhoc_loc)
(get_location_from_adhoc_loc, get_pure_location): Reformat decls.
* internal.h (struct lexer_state): Clarify comment.
* system.h: Remove now-unneeded bool hackery.
* files.c (_cpp_find_file): Store LOC not highest_location.
Diffstat (limited to 'libcpp/include/line-map.h')
| -rw-r--r-- | libcpp/include/line-map.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h index dbbc137..217f916 100644 --- a/libcpp/include/line-map.h +++ b/libcpp/include/line-map.h @@ -1024,13 +1024,11 @@ LINEMAPS_LAST_ALLOCATED_MACRO_MAP (const line_maps *set) return (line_map_macro *)LINEMAPS_LAST_ALLOCATED_MAP (set, true); } -extern location_t get_combined_adhoc_loc (class line_maps *, - location_t, - source_range, - void *); +extern location_t get_combined_adhoc_loc (line_maps *, location_t, + source_range, void *); extern void *get_data_from_adhoc_loc (const line_maps *, location_t); extern location_t get_location_from_adhoc_loc (const line_maps *, - location_t); + location_t); extern source_range get_range_from_loc (line_maps *set, location_t loc); @@ -1043,8 +1041,7 @@ pure_location_p (line_maps *set, location_t loc); /* Given location LOC within SET, strip away any packed range information or ad-hoc information. */ -extern location_t get_pure_location (line_maps *set, - location_t loc); +extern location_t get_pure_location (line_maps *set, location_t loc); /* Combine LOC and BLOCK, giving a combined adhoc location. */ |