aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/io.c
diff options
context:
space:
mode:
authorJerry DeLisle <jvdelisle@gcc.gnu.org>2010-12-11 23:14:45 +0000
committerJerry DeLisle <jvdelisle@gcc.gnu.org>2010-12-11 23:14:45 +0000
commit696abb30d602208b316845bff9974e4b8b6e86ef (patch)
tree982b960730fe59e92f42e77b35659f096fb2a00c /gcc/fortran/io.c
parenta70de21ffba9c1c8b4c5096bf9faf3deeb054c76 (diff)
downloadgcc-696abb30d602208b316845bff9974e4b8b6e86ef.zip
gcc-696abb30d602208b316845bff9974e4b8b6e86ef.tar.gz
gcc-696abb30d602208b316845bff9974e4b8b6e86ef.tar.bz2
re PR fortran/46705 (Spurious "Missing '&' in continued character constant" warning occurs twice)
2010-12-11 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR fortran/46705 * gfortran.h: New enum gfc_instring. (gfc_next_char_literal): Update prototype. * scanner.c (gfc_next_char_literal): Use new enum. Only give missing '&' warning for INSTRING_WARN. (gfc_next_char): Use new enum. (gfc_gobble_whitespace): Likewise. * io.c (next_char): Use new enum. (next_char_not_space): Likewise. (format_lex): Likewise. * match.c (gfc_match_parens): Likewise. (gfc_match_special_char): Likewise. (gfc_match_name_C): Likewise. * parse.c (next_fixed): Likewise. * primary.c (match_hollerith_constant): Likewise. (next_string_char): Likewise. From-SVN: r167716
Diffstat (limited to 'gcc/fortran/io.c')
-rw-r--r--gcc/fortran/io.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c
index e80202f..938dc9a 100644
--- a/gcc/fortran/io.c
+++ b/gcc/fortran/io.c
@@ -136,7 +136,7 @@ mode;
/* Return the next character in the format string. */
static char
-next_char (int in_string)
+next_char (gfc_instring in_string)
{
static gfc_char_t c;
@@ -197,7 +197,7 @@ next_char_not_space (bool *error)
char c;
do
{
- error_element = c = next_char (0);
+ error_element = c = next_char (NONSTRING);
if (c == '\t')
{
if (gfc_option.allow_std & GFC_STD_GNU)
@@ -374,7 +374,7 @@ format_lex (void)
for (;;)
{
- c = next_char (1);
+ c = next_char (INSTRING_WARN);
if (c == '\0')
{
token = FMT_END;
@@ -383,7 +383,7 @@ format_lex (void)
if (c == delim)
{
- c = next_char (1);
+ c = next_char (INSTRING_NOWARN);
if (c == '\0')
{
@@ -981,7 +981,7 @@ data_desc:
{
while (repeat >0)
{
- next_char (1);
+ next_char (INSTRING_WARN);
repeat -- ;
}
}