* [Obvious] ARI fixes: OP eol rules files starting with d, e or f
@ 2009-10-06 23:30 Pierre Muller
2009-10-07 16:18 ` Joel Brobecker
0 siblings, 1 reply; 2+ messages in thread
From: Pierre Muller @ 2009-10-06 23:30 UTC (permalink / raw)
To: gdb-patches
Fix operators on end of line problems
on files starting with d, e or f.
Checked in as obvious,
Pierre
PS: The dwarf_decode_macros
code still is a bit "non-conformant"
as lines stop with "?" with his also an operator, no?
But these are not yet listed as errors
by the ARI script, should it?
If yet, how should the "clean" code look like?
2009-10-07 Pierre Muller <muller@ics.u-strasbg.fr>
ARI fix: OP eol rule.
* doublest.c (floatformat_from_length): Avoid operator at end of
line.
* dwarf2-frame.c (dwarf2_build_frame_info): Idem.
* dwarf2read.c (read_array_order, dwarf_decode_macros): Idem.
* eval.c (evaluate_subexp_standard): Idem.
* event-loop.c (create_timer, handle_timer_event): Idem.
* expprint.c (print_subexp_standard): Idem.
* f-exp.y (variable): Idem.
* f-typeprint.c (f_print_type): Idem.
Index: doublest.c
===================================================================
RCS file: /cvs/src/src/gdb/doublest.c,v
retrieving revision 1.41
diff -u -p -r1.41 doublest.c
--- doublest.c 2 Jul 2009 12:57:14 -0000 1.41
+++ doublest.c 6 Oct 2009 23:15:28 -0000
@@ -778,8 +778,8 @@ floatformat_from_length (struct gdbarch
both in processor and in memory.
The code below accepts the real bit size. */
else if ((gdbarch_long_double_format (gdbarch) != NULL)
- && (len * TARGET_CHAR_BIT ==
- gdbarch_long_double_format (gdbarch)[0]->totalsize))
+ && (len * TARGET_CHAR_BIT
+ == gdbarch_long_double_format (gdbarch)[0]->totalsize))
format = gdbarch_long_double_format (gdbarch)
[gdbarch_byte_order (gdbarch)];
else
Index: dwarf2-frame.c
===================================================================
RCS file: /cvs/src/src/gdb/dwarf2-frame.c,v
retrieving revision 1.99
diff -u -p -r1.99 dwarf2-frame.c
--- dwarf2-frame.c 15 Sep 2009 16:20:53 -0000 1.99
+++ dwarf2-frame.c 6 Oct 2009 23:15:29 -0000
@@ -2112,8 +2112,8 @@ dwarf2_build_frame_info (struct objfile
obstack_grow (&objfile->objfile_obstack, &fde_table.entries[j],
sizeof (fde_table.entries[0]));
while (++j < fde_table.num_entries
- && (fde_table.entries[k]->initial_location ==
- fde_table.entries[j]->initial_location))
+ && (fde_table.entries[k]->initial_location
+ == fde_table.entries[j]->initial_location))
/* Skip. */;
}
fde_table2->entries = obstack_finish (&objfile->objfile_obstack);
Index: dwarf2read.c
===================================================================
RCS file: /cvs/src/src/gdb/dwarf2read.c,v
retrieving revision 1.327
diff -u -p -r1.327 dwarf2read.c
--- dwarf2read.c 15 Sep 2009 16:09:32 -0000 1.327
+++ dwarf2read.c 6 Oct 2009 23:15:34 -0000
@@ -5383,8 +5383,8 @@ read_array_order (struct die_info *die,
version checking.
*/
- if (cu->language == language_fortran &&
- cu->producer && strstr (cu->producer, "GNU F77"))
+ if (cu->language == language_fortran
+ && cu->producer && strstr (cu->producer, "GNU F77"))
{
return DW_ORD_row_major;
}
@@ -11156,20 +11156,22 @@ dwarf_decode_macros (struct line_header
complaint (&symfile_complaints,
_("debug info with no main source gives macro %s
"
"on line %d: %s"),
- macinfo_type ==
- DW_MACINFO_define ? _("definition") :
macinfo_type ==
- DW_MACINFO_undef ? _("undefinition") :
- "something-or-other", line, body);
+ macinfo_type == DW_MACINFO_define ?
+ _("definition") :
+ macinfo_type == DW_MACINFO_undef ?
+ _("undefinition") :
+ _("something-or-other"), line, body);
break;
}
if ((line == 0 && !at_commandline) || (line != 0 &&
at_commandline))
complaint (&symfile_complaints,
_("debug info gives %s macro %s with %s line %d:
%s"),
at_commandline ? _("command-line") : _("in-file"),
- macinfo_type ==
- DW_MACINFO_define ? _("definition") : macinfo_type
==
- DW_MACINFO_undef ? _("undefinition") :
- "something-or-other",
+ macinfo_type == DW_MACINFO_define ?
+ _("definition") :
+ macinfo_type == DW_MACINFO_undef ?
+ _("undefinition") :
+ _("something-or-other"),
line == 0 ? _("zero") : _("non-zero"), line, body);
if (macinfo_type == DW_MACINFO_define)
Index: eval.c
===================================================================
RCS file: /cvs/src/src/gdb/eval.c,v
retrieving revision 1.121
diff -u -p -r1.121 eval.c
--- eval.c 29 Sep 2009 00:48:31 -0000 1.121
+++ eval.c 6 Oct 2009 23:15:42 -0000
@@ -884,8 +884,8 @@ evaluate_subexp_standard (struct type *e
LONGEST low_bound, high_bound;
/* get targettype of elementtype */
- while (TYPE_CODE (check_type) == TYPE_CODE_RANGE ||
- TYPE_CODE (check_type) == TYPE_CODE_TYPEDEF)
+ while (TYPE_CODE (check_type) == TYPE_CODE_RANGE
+ || TYPE_CODE (check_type) == TYPE_CODE_TYPEDEF)
check_type = TYPE_TARGET_TYPE (check_type);
if (get_discrete_bounds (element_type, &low_bound, &high_bound) <
0)
@@ -919,14 +919,14 @@ evaluate_subexp_standard (struct type *e
range_low_type = TYPE_TARGET_TYPE (range_low_type);
if (TYPE_CODE (range_high_type) == TYPE_CODE_RANGE)
range_high_type = TYPE_TARGET_TYPE (range_high_type);
- if ((TYPE_CODE (range_low_type) != TYPE_CODE
(range_high_type)) ||
- (TYPE_CODE (range_low_type) == TYPE_CODE_ENUM &&
- (range_low_type != range_high_type)))
+ if ((TYPE_CODE (range_low_type) != TYPE_CODE
(range_high_type))
+ || (TYPE_CODE (range_low_type) == TYPE_CODE_ENUM
+ && (range_low_type != range_high_type)))
/* different element modes */
error (_("POWERSET tuple elements of different mode"));
- if ((TYPE_CODE (check_type) != TYPE_CODE (range_low_type)) ||
- (TYPE_CODE (check_type) == TYPE_CODE_ENUM &&
- range_low_type != check_type))
+ if ((TYPE_CODE (check_type) != TYPE_CODE (range_low_type))
+ || (TYPE_CODE (check_type) == TYPE_CODE_ENUM
+ && range_low_type != check_type))
error (_("incompatible POWERSET tuple elements"));
if (range_low > range_high)
{
@@ -1662,8 +1662,8 @@ evaluate_subexp_standard (struct type *e
struct value_print_options opts;
get_user_print_options (&opts);
- if (opts.objectprint && TYPE_TARGET_TYPE(type) &&
- (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_CLASS))
+ if (opts.objectprint && TYPE_TARGET_TYPE(type)
+ && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_CLASS))
{
real_type = value_rtti_target_type (arg1, &full, &top,
&using_enc);
if (real_type)
Index: event-loop.c
===================================================================
RCS file: /cvs/src/src/gdb/event-loop.c,v
retrieving revision 1.39
diff -u -p -r1.39 event-loop.c
--- event-loop.c 3 Jan 2009 05:57:51 -0000 1.39
+++ event-loop.c 6 Oct 2009 23:15:43 -0000
@@ -1212,9 +1212,9 @@ create_timer (int milliseconds, timer_ha
{
/* If the seconds field is greater or if it is the same, but the
microsecond field is greater. */
- if ((timer_index->when.tv_sec > timer_ptr->when.tv_sec) ||
- ((timer_index->when.tv_sec == timer_ptr->when.tv_sec)
- && (timer_index->when.tv_usec > timer_ptr->when.tv_usec)))
+ if ((timer_index->when.tv_sec > timer_ptr->when.tv_sec)
+ || ((timer_index->when.tv_sec == timer_ptr->when.tv_sec)
+ && (timer_index->when.tv_usec > timer_ptr->when.tv_usec)))
break;
}
@@ -1288,9 +1288,9 @@ handle_timer_event (event_data dummy)
while (timer_ptr != NULL)
{
- if ((timer_ptr->when.tv_sec > time_now.tv_sec) ||
- ((timer_ptr->when.tv_sec == time_now.tv_sec) &&
- (timer_ptr->when.tv_usec > time_now.tv_usec)))
+ if ((timer_ptr->when.tv_sec > time_now.tv_sec)
+ || ((timer_ptr->when.tv_sec == time_now.tv_sec)
+ && (timer_ptr->when.tv_usec > time_now.tv_usec)))
break;
/* Get rid of the timer from the beginning of the list. */
Index: expprint.c
===================================================================
RCS file: /cvs/src/src/gdb/expprint.c,v
retrieving revision 1.38
diff -u -p -r1.38 expprint.c
--- expprint.c 3 Jun 2009 18:16:44 -0000 1.38
+++ expprint.c 6 Oct 2009 23:15:44 -0000
@@ -413,8 +413,8 @@ print_subexp_standard (struct expression
(*pos) += 2;
if ((int) prec > (int) PREC_PREFIX)
fputs_filtered ("(", stream);
- if (TYPE_CODE (exp->elts[pc + 1].type) == TYPE_CODE_FUNC &&
- exp->elts[pc + 3].opcode == OP_LONG)
+ if (TYPE_CODE (exp->elts[pc + 1].type) == TYPE_CODE_FUNC
+ && exp->elts[pc + 3].opcode == OP_LONG)
{
struct value_print_options opts;
Index: f-exp.y
===================================================================
RCS file: /cvs/src/src/gdb/f-exp.y,v
retrieving revision 1.29
diff -u -p -r1.29 f-exp.y
--- f-exp.y 18 Mar 2009 08:51:11 -0000 1.29
+++ f-exp.y 6 Oct 2009 23:15:45 -0000
@@ -492,9 +492,9 @@ variable: name_not_typename
{
if (symbol_read_needs_frame (sym))
{
- if (innermost_block == 0 ||
- contained_in (block_found,
- innermost_block))
+ if (innermost_block == 0
+ || contained_in (block_found,
+ innermost_block))
innermost_block = block_found;
}
write_exp_elt_opcode (OP_VAR_VALUE);
Index: f-typeprint.c
===================================================================
RCS file: /cvs/src/src/gdb/f-typeprint.c,v
retrieving revision 1.27
diff -u -p -r1.27 f-typeprint.c
--- f-typeprint.c 11 Jan 2009 21:39:02 -0000 1.27
+++ f-typeprint.c 6 Oct 2009 23:15:45 -0000
@@ -60,15 +60,13 @@ f_print_type (struct type *type, char *v
f_type_print_base (type, stream, show, level);
code = TYPE_CODE (type);
if ((varstring != NULL && *varstring != '\0')
- ||
/* Need a space if going to print stars or brackets;
but not if we will print just a type name. */
- ((show > 0 || TYPE_NAME (type) == 0)
- &&
- (code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC
- || code == TYPE_CODE_METHOD
- || code == TYPE_CODE_ARRAY
- || code == TYPE_CODE_REF)))
+ || ((show > 0 || TYPE_NAME (type) == 0)
+ && (code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC
+ || code == TYPE_CODE_METHOD
+ || code == TYPE_CODE_ARRAY
+ || code == TYPE_CODE_REF)))
fputs_filtered (" ", stream);
f_type_print_varspec_prefix (type, stream, show, 0);
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [Obvious] ARI fixes: OP eol rules files starting with d, e or f
2009-10-06 23:30 [Obvious] ARI fixes: OP eol rules files starting with d, e or f Pierre Muller
@ 2009-10-07 16:18 ` Joel Brobecker
0 siblings, 0 replies; 2+ messages in thread
From: Joel Brobecker @ 2009-10-07 16:18 UTC (permalink / raw)
To: Pierre Muller; +Cc: gdb-patches
> PS: The dwarf_decode_macros code still is a bit "non-conformant" as
> lines stop with "?" with his also an operator, no? But these are not
> yet listed as errors by the ARI script, should it? If yet, how should
> the "clean" code look like?
(I'm not a big fan of the "?" operator, even if I see how it can be
convenient).
The GNU Coding Standards confirm that we should split before the "?"
operator. I initially had no preference wrt the ARI, but since the GCS
shows examples involving that operator, I guess we should add a rule
for it.
How it should look:
complaint (&symfile_complaints,
_("debug info with no main source gives macro %s "
"on line %d: %s"),
macinfo_type == DW_MACINFO_define ?
_("definition") :
macinfo_type == DW_MACINFO_undef ?
_("undefinition") :
_("something-or-other"), line, body);
Honestly, it seems to me that a local variable and if statements will
make the code more readable than it is right now.
Other, I believe the formatting that the GCS recommends the use of
extra parents in order to help tools such as emacs. So I propose
the following formatting:
complaint (&symfile_complaints,
_("debug info with no main source gives macro %s "
"on line %d: %s"),
(macinfo_type == DW_MACINFO_define
? _("definition")
: (macinfo_type == DW_MACINFO_undef
? _("undefinition")
: _("something-or-other"))),
line, body);
My 2 cents...
--
Joel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-10-07 16:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-10-06 23:30 [Obvious] ARI fixes: OP eol rules files starting with d, e or f Pierre Muller
2009-10-07 16:18 ` Joel Brobecker
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox