diff mbox

[libcpp] Use source_location where it is due

Message ID m3r55rcy4e.fsf@redhat.com
State New
Headers show

Commit Message

Dodji Seketeli July 15, 2011, 4:22 p.m. UTC 
Hello,

This is a [I believe obvious] cleanup patch that was done while
looking at libcpp. It just uses the source_location typedef in some
function declarations in lieu of unsigned int.

Tested on x86_64-unknown-linux-gnu against trunk.

libcpp/

	* directives.c (struct if_stack): Use source_location as type
	here.
	* include/cpplib.h (struct cpp_callbacks)<include, define, undef,
	indent, def_pragma, used_define, used_undef>: Properly use
	source_location as parameter type, rather than unsigned int.
---
 libcpp/directives.c     |    2 +-
 libcpp/include/cpplib.h |   14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

Comments

Tom Tromey July 15, 2011, 6:27 p.m. UTC | #1 
>>>>> "Dodji" == Dodji Seketeli <dodji@redhat.com> writes:

Dodji> libcpp/
Dodji> 	* directives.c (struct if_stack): Use source_location as type
Dodji> 	here.
Dodji> 	* include/cpplib.h (struct cpp_callbacks)<include, define, undef,
Dodji> 	indent, def_pragma, used_define, used_undef>: Properly use
Dodji> 	source_location as parameter type, rather than unsigned int.

Ok.

Tom
diff mbox

Patch

diff --git a/libcpp/directives.c b/libcpp/directives.c
index f18c1d6..04db855 100644
--- a/libcpp/directives.c
+++ b/libcpp/directives.c
@@ -32,7 +32,7 @@  along with this program; see the file COPYING3.  If not see
 struct if_stack
 {
   struct if_stack *next;
-  linenum_type line;		/* Line where condition started.  */
+  source_location line;		/* Line where condition started.  */
   const cpp_hashnode *mi_cmacro;/* macro name for #ifndef around entire file */
   bool skip_elses;		/* Can future #else / #elif be skipped?  */
   bool was_skipping;		/* If were skipping on entry.  */
diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h
index 98fa4bb..a295267 100644
--- a/libcpp/include/cpplib.h
+++ b/libcpp/include/cpplib.h
@@ -491,12 +491,12 @@  struct cpp_callbacks
   void (*file_change) (cpp_reader *, const struct line_map *);
 
   void (*dir_change) (cpp_reader *, const char *);
-  void (*include) (cpp_reader *, unsigned int, const unsigned char *,
+  void (*include) (cpp_reader *, source_location, const unsigned char *,
 		   const char *, int, const cpp_token **);
-  void (*define) (cpp_reader *, unsigned int, cpp_hashnode *);
-  void (*undef) (cpp_reader *, unsigned int, cpp_hashnode *);
-  void (*ident) (cpp_reader *, unsigned int, const cpp_string *);
-  void (*def_pragma) (cpp_reader *, unsigned int);
+  void (*define) (cpp_reader *, source_location, cpp_hashnode *);
+  void (*undef) (cpp_reader *, source_location, cpp_hashnode *);
+  void (*ident) (cpp_reader *, source_location, const cpp_string *);
+  void (*def_pragma) (cpp_reader *, source_location);
   int (*valid_pch) (cpp_reader *, const char *, int);
   void (*read_pch) (cpp_reader *, const char *, int, const char *);
   missing_header_cb missing_header;
@@ -513,8 +513,8 @@  struct cpp_callbacks
 
   /* Callbacks for when a macro is expanded, or tested (whether
      defined or not at the time) in #ifdef, #ifndef or "defined".  */
-  void (*used_define) (cpp_reader *, unsigned int, cpp_hashnode *);
-  void (*used_undef) (cpp_reader *, unsigned int, cpp_hashnode *);
+  void (*used_define) (cpp_reader *, source_location, cpp_hashnode *);
+  void (*used_undef) (cpp_reader *, source_location, cpp_hashnode *);
   /* Called before #define and #undef or other macro definition
      changes are processed.  */
   void (*before_define) (cpp_reader *);