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]

[C++] misc patches call.c


All,

All,

This patch tidies up the macros in call.c w.r.t parenthesis, whitespace, etc.

Bootstrapped i686-pc-linux-gnu, all languages, no regressions.

Grahan

cp/ChangeLog

	* call.c (convert_like): Add parenthesis and wrap.
	(convert_like_with_context): Likewise.
	(ICS_RANK): Whitespace.
	(NEED_TEMPORARY_P): Remove parenthesis.

-------------------------------------------------------------------
Index: call.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/call.c,v
retrieving revision 1.302
diff -c -p -r1.302 call.c
*** call.c      2002/01/02 15:17:05     1.302
--- call.c      2002/01/06 08:59:00
*************** static int joust PARAMS ((struct z_candi
*** 47,54 ****
  static int compare_ics PARAMS ((tree, tree));
  static tree build_over_call PARAMS ((struct z_candidate *, tree, int));
  static tree build_java_interface_fn_ref PARAMS ((tree, tree));
! #define convert_like(CONV, EXPR) convert_like_real (CONV, EXPR, NULL_TREE, 0, 0)
! #define convert_like_with_context(CONV, EXPR, FN, ARGNO) convert_like_real (CONV, EXPR, FN, ARGNO, 0)
  static tree convert_like_real PARAMS ((tree, tree, tree, int, int));
  static void op_error PARAMS ((enum tree_code, enum tree_code, tree, tree,
                            tree, const char *));
--- 47,56 ----
  static int compare_ics PARAMS ((tree, tree));
  static tree build_over_call PARAMS ((struct z_candidate *, tree, int));
  static tree build_java_interface_fn_ref PARAMS ((tree, tree));
! #define convert_like(CONV, EXPR) \
!   convert_like_real ((CONV), (EXPR), NULL_TREE, 0, 0)
! #define convert_like_with_context(CONV, EXPR, FN, ARGNO) \
!   convert_like_real ((CONV), (EXPR), (FN), (ARGNO), 0)
  static tree convert_like_real PARAMS ((tree, tree, tree, int, int));
  static void op_error PARAMS ((enum tree_code, enum tree_code, tree, tree,
                            tree, const char *));

*************** struct z_candidate {
*** 564,570 ****
  #define BAD_RANK 7

  #define ICS_RANK(NODE)                                \
!   (ICS_BAD_FLAG (NODE) ? BAD_RANK   \
     : ICS_ELLIPSIS_FLAG (NODE) ? ELLIPSIS_RANK \
     : ICS_USER_FLAG (NODE) ? USER_RANK         \
     : ICS_STD_RANK (NODE))
--- 566,572 ----
  #define BAD_RANK 7

  #define ICS_RANK(NODE)                                \
!   (ICS_BAD_FLAG (NODE) ? BAD_RANK             \
     : ICS_ELLIPSIS_FLAG (NODE) ? ELLIPSIS_RANK \
     : ICS_USER_FLAG (NODE) ? USER_RANK         \
     : ICS_STD_RANK (NODE))
*************** struct z_candidate {
*** 578,584 ****

  /* In a REF_BIND or a BASE_CONV, this indicates that a temporary
     should be created to hold the result of the conversion.  */
! #define NEED_TEMPORARY_P(NODE) (TREE_LANG_FLAG_4 ((NODE)))

  #define USER_CONV_CAND(NODE) \
    ((struct z_candidate *)WRAPPER_PTR (TREE_OPERAND (NODE, 1)))
--- 580,586 ----

  /* In a REF_BIND or a BASE_CONV, this indicates that a temporary
     should be created to hold the result of the conversion.  */
! #define NEED_TEMPORARY_P(NODE) TREE_LANG_FLAG_4 (NODE)

  #define USER_CONV_CAND(NODE) \
    ((struct z_candidate *)WRAPPER_PTR (TREE_OPERAND (NODE, 1)))
-----------------------------------------------------------------


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