This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Minor patch to the diagnostic library


This patchlet is applied to mainline.  It is preparatory for a
pretty-printer component for the C and C++ front-end.

Bootstrapped and tested on an i686-pc-linu.  No regression.

-- Gaby

2002-07-29  Gabriel Dos Reis  <gdr@nerim.net>

	* pretty-print.h: Define more macros.
	* diagnostic.h (output_formatted_integer): Moved from...
	* diagnostic.c: ... here.

Index: diagnostic.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/diagnostic.c,v
retrieving revision 1.93
diff -p -r1.93 diagnostic.c
*** diagnostic.c	23 Jul 2002 06:21:52 -0000	1.93
--- diagnostic.c	29 Jul 2002 08:06:22 -0000
*************** Software Foundation, 59 Temple Place - S
*** 37,50 ****
  #include "langhooks.h"
  #include "langhooks-def.h"
  
- #define output_formatted_integer(BUFFER, FORMAT, INTEGER)	\
-   do								\
-     {								\
-       sprintf ((BUFFER)->digit_buffer, FORMAT, INTEGER);	\
-       output_add_string (BUFFER, (BUFFER)->digit_buffer);	\
-     }								\
-   while (0)
- 
  #define output_text_length(BUFFER) (BUFFER)->line_length
  #define is_starting_newline(BUFFER) (output_text_length (BUFFER) == 0)
  #define line_wrap_cutoff(BUFFER) (BUFFER)->state.maximum_length
--- 37,42 ----
Index: diagnostic.h
===================================================================
RCS file: /cvs/gcc/egcs/gcc/diagnostic.h,v
retrieving revision 1.45
diff -p -r1.45 diagnostic.h
*** diagnostic.h	10 Jul 2002 10:36:27 -0000	1.45
--- diagnostic.h	29 Jul 2002 08:06:22 -0000
*************** struct output_buffer
*** 160,165 ****
--- 160,173 ----
  /* True if BUFFER is in line-wrapping mode.  */
  #define output_is_line_wrapping(BUFFER) (output_line_cutoff (BUFFER) > 0)
  
+ #define output_formatted_integer(BUFFER, FORMAT, INTEGER)	\
+   do								\
+     {								\
+       sprintf ((BUFFER)->digit_buffer, FORMAT, INTEGER);	\
+       output_add_string (BUFFER, (BUFFER)->digit_buffer);	\
+     }								\
+   while (0)
+ 
  /*  Forward declarations.  */
  typedef struct diagnostic_context diagnostic_context;
  typedef void (*diagnostic_starter_fn) PARAMS ((diagnostic_context *,
Index: pretty-print.h
===================================================================
RCS file: /cvs/gcc/egcs/gcc/pretty-print.h,v
retrieving revision 1.2
diff -p -r1.2 pretty-print.h
*** pretty-print.h	24 Jul 2002 12:17:53 -0000	1.2
--- pretty-print.h	29 Jul 2002 08:06:22 -0000
*************** Software Foundation, 59 Temple Place - S
*** 24,67 ****
  
  #include "diagnostic.h"
  
- typedef struct pretty_print_info pretty_print_info;
- 
  /* The type of pretty-printer flags passed to clients.  */
  typedef unsigned int pp_flags;
  
! enum pp_padding
  {
    pp_none, pp_before, pp_after
! };
  
  struct pretty_print_info
  {
-   /* The entity to pretty-print.  */
-   tree entity;
-   pp_flags flags;
-   /* Where to put whitespace around the entity being formatted.  */
-   enum pp_padding padding;
    /* Where we print external representation of ENTITY.  */
    output_buffer *buffer;
  };
  
  
! #define pp_sorry_for_unsupported_tree(PPI, T) \
!   output_verbatim ((PPI)->buffer, "\nsorry: `%s' not supported by %s\n",\
!                    tree_code_name[(int) TREE_CODE (T)], __FUNCTION__)
! 
! #define pp_left_paren(PPI)    output_add_character ((PPI)->buffer, '(')
! #define pp_right_paren(PPI)   output_add_character ((PPI)->buffer, ')')
! #define pp_left_bracket(PPI)  output_add_character ((PPI)->buffer, '[')
! #define pp_right_bracket(PPI) output_add_character ((PPI)->buffer, '[')
! #define pp_semi_colon(PPI)    output_add_character ((PPI)->buffer, ';')
! #define pp_comma(PPI)         output_add_string ((PPI)->buffer, ", ")
! #define pp_dot(PPI)           output_add_character ((PPI)->buffer, '.')
! #define pp_colon(PPI)         output_add_character ((PPI)->buffer, ':')
! #define pp_colon_colon(PPI)   output_add_string ((PPI)->buffer, "::")
! #define pp_quote(PPI)         output_add_character ((PPI)->buffer, '\'')
! #define pp_backquote(PPI)     output_add_character ((PPI)->buffer, '`')
! #define pp_doublequote(PPI)   output_add_character ((PPI)->buffer, '"')
  
  
  #endif /* GCC_PRETTY_PRINT_H */
--- 24,86 ----
  
  #include "diagnostic.h"
  
  /* The type of pretty-printer flags passed to clients.  */
  typedef unsigned int pp_flags;
  
! typedef enum
  {
    pp_none, pp_before, pp_after
! } pp_padding;
  
  struct pretty_print_info
  {
    /* Where we print external representation of ENTITY.  */
    output_buffer *buffer;
+   pp_flags flags;
+   /* Where to put whitespace around the entity being formatted.  */
+   pp_padding padding;
  };
  
+ #define pp_left_paren(PPI)      output_add_character (pp_buffer (PPI), '(')
+ #define pp_right_paren(PPI)     output_add_character (pp_buffer (PPI), ')')
+ #define pp_left_bracket(PPI)    output_add_character (pp_buffer (PPI), '[')
+ #define pp_right_bracket(PPI)   output_add_character (pp_buffer (PPI), ']')
+ #define pp_left_brace(PPI)      output_add_character (pp_buffer (PPI), '{')
+ #define pp_right_brace(PPI)     output_add_character (pp_buffer (PPI), '}')
+ #define pp_semicolon(PPI)       output_add_character (pp_buffer (PPI), ';')
+ #define pp_comma(PPI)           output_add_string (pp_buffer (PPI), ", ")
+ #define pp_dot(PPI)             output_add_character (pp_buffer (PPI), '.')
+ #define pp_colon(PPI)           output_add_character (pp_buffer (PPI), ':')
+ #define pp_colon_colon(PPI)     output_add_string (pp_buffer (PPI), "::")
+ #define pp_arrow(PPI)           output_add_string (pp_buffer (PPI), "->")
+ #define pp_star(PPI)            output_add_character (pp_buffer (PPI), '*')
+ #define pp_quote(PPI)           output_add_character (pp_buffer (PPI), '\'')
+ #define pp_backquote(PPI)       output_add_character (pp_buffer (PPI), '`')
+ #define pp_doublequote(PPI)     output_add_character (pp_buffer (PPI), '"')
+ #define pp_newline(PPI)         output_add_newline (pp_buffer (PPI))
+ #define pp_character(PPI, C)    output_add_character (pp_buffer (PPI), C)
+ #define pp_whitespace(PPI)      output_add_space (pp_buffer (PPI))
+ #define pp_indentation(PPI)     output_indentation (pp_buffer (PPI))
+ #define pp_newline_and_indent(PPI, N) \
+   do {                                \
+     pp_indentation (PPI) += N;        \
+     pp_newline (PPI);                 \
+   } while (0)
+ #define pp_separate_with(PPI, C) \
+    do {                          \
+      pp_character (PPI, C);      \
+      pp_whitespace (PPI);        \
+    } while (0)
+ #define pp_format_integer(PPI, F, I) \
+    output_formatted_integer (pp_buffer (PPI), F, I)
+ #define pp_wide_integer(PPI, I) \
+    pp_format_integer (PPI, HOST_WIDE_INT_PRINT_DEC, (HOST_WIDE_INT) I)
  
! #define pp_identifier(PPI, ID)  output_add_string (pp_buffer (PPI), ID)
! #define pp_tree_identifier(PPI, T) pp_identifier(PPI, IDENTIFIER_POINTER (T))
  
+ #define pp_unsupported_tree(PPI, T) \
+   output_verbatim (pp_buffer((PPI), "#`%s' not supported by %s#",\
+                    tree_code_name[(int) TREE_CODE (T)], __FUNCTION__)
  
  #endif /* GCC_PRETTY_PRINT_H */


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]