From 477b2425006ba2c296fc3c0e64cfd0146f99a7dd Mon Sep 17 00:00:00 2001 From: Stan Shebs Date: Tue, 14 Mar 1995 02:37:20 +0000 Subject: [PATCH] * ch-valprint.c (annotate.h): Include. * eval.c (evaluate_subexp_standard): Remove unused variable. (calc_f77_array_dims): Add parens to expression. * f-exp.y (yylex): Add parens to expression, remove unused label. * f-lang.h (calc_f77_array_dims): Declare. * f-valprint.c (f_val_print): Remove unused variables. --- gdb/ChangeLog | 11 ++++++++++- gdb/ch-valprint.c | 1 + gdb/eval.c | 10 +++------- gdb/f-exp.y | 5 ++--- gdb/f-lang.h | 2 ++ gdb/f-valprint.c | 2 -- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3a604d8acf..9902cb1ed3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,11 +1,20 @@ +Mon Mar 13 18:27:25 1995 Stan Shebs + + * ch-valprint.c (annotate.h): Include. + * eval.c (evaluate_subexp_standard): Remove unused variable. + (calc_f77_array_dims): Add parens to expression. + * f-exp.y (yylex): Add parens to expression, remove unused label. + * f-lang.h (calc_f77_array_dims): Declare. + * f-valprint.c (f_val_print): Remove unused variables. + Mon Mar 13 15:25:47 1995 Jim Kingdon * alpha-tdep.c (find_proc_desc): If pdr.framereg field is -1, don't use the PDR, just examine prologues instead. +start-sanitize-arc Fri Mar 10 16:13:18 1995 Kung Hsu -start-sanitize-arc * config/tm-arc.h: Change arc register names. end-sanitize-arc diff --git a/gdb/ch-valprint.c b/gdb/ch-valprint.c index e6a15022c8..31eeb1289a 100644 --- a/gdb/ch-valprint.c +++ b/gdb/ch-valprint.c @@ -30,6 +30,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "c-lang.h" /* For c_val_print */ #include "typeprint.h" #include "ch-lang.h" +#include "annotate.h" static void chill_print_value_fields PARAMS ((struct type *, char *, GDB_FILE *, int, int, diff --git a/gdb/eval.c b/gdb/eval.c index 3d3e201bc9..7563c59112 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1,5 +1,5 @@ /* Evaluate expressions for GDB. - Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994 + Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. This file is part of GDB. @@ -28,16 +28,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "frame.h" #include "demangle.h" #include "language.h" /* For CAST_IS_CONVERSION */ -#include "f-lang.h" /* for array bound stuff */ +#include "f-lang.h" /* for array bound stuff */ /* Prototypes for local functions. */ static value_ptr evaluate_subexp_for_sizeof PARAMS ((struct expression *, int *)); -value_ptr evaluate_subexp_with_coercion PARAMS ((struct expression *, - int *, enum noside)); - static value_ptr evaluate_subexp_for_address PARAMS ((struct expression *, int *, enum noside)); @@ -951,7 +948,6 @@ evaluate_subexp_standard (expect_type, exp, pos, noside) int ndimensions=1,i; struct type *tmp_type; int offset_item; /* The array offset where the item lives */ - int fixed_subscript; if (nargs > MAX_FORTRAN_DIMS) error ("Too many subscripts for F77 (%d Max)", MAX_FORTRAN_DIMS); @@ -1579,7 +1575,7 @@ calc_f77_array_dims (array_type) tmp_type = array_type; - while (tmp_type = TYPE_TARGET_TYPE (tmp_type)) + while ((tmp_type = TYPE_TARGET_TYPE (tmp_type))) { if (TYPE_CODE (tmp_type) == TYPE_CODE_ARRAY) ++ndimen; diff --git a/gdb/f-exp.y b/gdb/f-exp.y index 71a219d159..857b742b53 100644 --- a/gdb/f-exp.y +++ b/gdb/f-exp.y @@ -1039,8 +1039,8 @@ yylex () got_dot = got_d = 1; else if (!hex && !got_dot && *p == '.') got_dot = 1; - else if ((got_e && (p[-1] == 'e' || p[-1] == 'E')) - || (got_d && (p[-1] == 'd' || p[-1] == 'D')) + else if (((got_e && (p[-1] == 'e' || p[-1] == 'E')) + || (got_d && (p[-1] == 'd' || p[-1] == 'D'))) && (*p == '-' || *p == '+')) /* This is the sign of the exponent, not the end of the number. */ @@ -1114,7 +1114,6 @@ yylex () and $$digits (equivalent to $<-digits> if you could type that). Make token type LAST, and put the number (the digits) in yylval. */ - tryname: if (*tokstart == '$') { register int negate = 0; diff --git a/gdb/f-lang.h b/gdb/f-lang.h index edcf035d72..3ae9af3a43 100644 --- a/gdb/f-lang.h +++ b/gdb/f-lang.h @@ -86,6 +86,8 @@ extern int f77_get_dynamic_lowerbound PARAMS ((struct type *, int *)); extern void f77_get_dynamic_array_length PARAMS ((struct type *)); +extern int calc_f77_array_dims PARAMS ((struct type *)); + #define DEFAULT_DOTMAIN_NAME_IN_MF77 ".MAIN_" #define DEFAULT_MAIN_NAME_IN_MF77 "MAIN_" #define DEFAULT_DOTMAIN_NAME_IN_XLF_BUGGY ".main " diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c index 32d46c0922..5c936e8d84 100644 --- a/gdb/f-valprint.c +++ b/gdb/f-valprint.c @@ -372,10 +372,8 @@ f_val_print (type, valaddr, address, stream, format, deref_ref, recurse, enum val_prettyprint pretty; { register unsigned int i = 0; /* Number of characters printed */ - unsigned len; struct type *elttype; LONGEST val; - char *localstr; char *straddr; CORE_ADDR addr; -- 2.34.1