fortran/

        PR fortran/58007
        * module.c (skip_list): Don't use default argument value.
        (load_derived_extensions, read_module): Update callers.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@207152 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 3e39f88..e3988a0 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-27  Mikael Morin  <mikael@gcc.gnu.org>
+
+       PR fortran/58007
+       * module.c (skip_list): Don't use default argument value.
+       (load_derived_extensions, read_module): Update callers.
+

 2014-01-26  Mikael Morin  <mikael@gcc.gnu.org>
 
        PR fortran/58007
 2014-01-26  Mikael Morin  <mikael@gcc.gnu.org>
 
        PR fortran/58007

diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c
index 5e4739f..d959ddb 100644 (file)
--- a/gcc/fortran/module.c
+++ b/gcc/fortran/module.c
@@ -3860,12 +3860,12 @@ find_symbol (gfc_symtree *st, const char *name,
 
 
 /* Skip a list between balanced left and right parens.
 
 
 /* Skip a list between balanced left and right parens.

-   By setting NEST_LEVEL one assumes that a number of NEST_LEVEL opening parens
-   have been already parsed by hand, and the remaining of the content is to be
-   skipped here.  The default value is 0 (balanced parens).  */
+   By setting NEST_LEVEL to a non-zero value one assumes that a number of
+   NEST_LEVEL opening parens have been already parsed by hand, and the remaining
+   of the content is to be skipped here.   */

 
 static void
 
 static void

-skip_list (int nest_level = 0)
+skip_list (int nest_level)

 {
   int level;
 
 {
   int level;
 


@@ -4228,7 +4228,7 @@ load_derived_extensions (void)
       if (!info || !derived)
        {
          while (peek_atom () != ATOM_RPAREN)
       if (!info || !derived)
        {
          while (peek_atom () != ATOM_RPAREN)

-           skip_list ();
+           skip_list (0);

          continue;
        }
 
          continue;
        }
 


@@ -4465,18 +4465,18 @@ read_module (void)
   gfc_symbol *sym;
 
   get_module_locus (&operator_interfaces);     /* Skip these for now.  */
   gfc_symbol *sym;
 
   get_module_locus (&operator_interfaces);     /* Skip these for now.  */

-  skip_list ();
+  skip_list (0);

 
   get_module_locus (&user_operators);
 
   get_module_locus (&user_operators);

-  skip_list ();
-  skip_list ();
+  skip_list (0);
+  skip_list (0);

 
   /* Skip commons, equivalences and derived type extensions for now.  */
 
   /* Skip commons, equivalences and derived type extensions for now.  */

-  skip_list ();
-  skip_list ();
+  skip_list (0);
+  skip_list (0);

 
   get_module_locus (&extensions);
 
   get_module_locus (&extensions);

-  skip_list ();
+  skip_list (0);

 
   mio_lparen ();
 
 
   mio_lparen ();
 


@@ -4514,7 +4514,7 @@ read_module (void)
       if (sym == NULL
          || (sym->attr.flavor == FL_VARIABLE && info->u.rsym.ns !=1))
        {
       if (sym == NULL
          || (sym->attr.flavor == FL_VARIABLE && info->u.rsym.ns !=1))
        {

-         skip_list ();
+         skip_list (0);

          continue;
        }
 
          continue;
        }
 


@@ -4531,13 +4531,13 @@ read_module (void)
 
          /* First seek to the symbol's component list.  */
          mio_lparen (); /* symbol opening.  */
 
          /* First seek to the symbol's component list.  */
          mio_lparen (); /* symbol opening.  */

-         skip_list (); /* skip symbol attribute.  */
-         skip_list (); /* typespec.  */
+         skip_list (0); /* skip symbol attribute.  */
+         skip_list (0); /* typespec.  */

          require_atom (ATOM_INTEGER); /* namespace ref.  */
          require_atom (ATOM_INTEGER); /* common ref.  */
          require_atom (ATOM_INTEGER); /* namespace ref.  */
          require_atom (ATOM_INTEGER); /* common ref.  */

-         skip_list (); /* formal args.  */
+         skip_list (0); /* formal args.  */

          /* no value.  */
          /* no value.  */

-         skip_list (); /* array_spec.  */
+         skip_list (0); /* array_spec.  */

          require_atom (ATOM_INTEGER); /* result.  */
          /* not a cray pointer.  */
 
          require_atom (ATOM_INTEGER); /* result.  */
          /* not a cray pointer.  */
 


@@ -4562,7 +4562,7 @@ read_module (void)
          skip_list (1); /* symbol end.  */
        }
       else
          skip_list (1); /* symbol end.  */
        }
       else

-       skip_list ();
+       skip_list (0);

 
       /* Some symbols do not have a namespace (eg. formal arguments),
         so the automatic "unique symtree" mechanism must be suppressed
 
       /* Some symbols do not have a namespace (eg. formal arguments),
         so the automatic "unique symtree" mechanism must be suppressed


@@ -4725,7 +4725,7 @@ read_module (void)
 
          if (u == NULL)
            {
 
          if (u == NULL)
            {

-             skip_list ();
+             skip_list (0);

              continue;
            }
 
              continue;
            }