intrin.c (ffeintrin_check_): No longer ignore explicit omitted trailing args.

        * intrin.c (ffeintrin_check_): No longer ignore explicit
        omitted trailing args.
        * intrin.c (ffeintrin_fulfill_generic): Don't generate
        FFEBAD_INTRINSIC_TYPE for CHARACTER*(*) intrinsic.
More patches from Craig

From-SVN: r18186

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 321df48..beb3c94 100644 (file)
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -22,8 +22,16 @@ Sun Jan 11 02:14:47 1998  Craig Burley  <burley@gnu.org>
        * stb.c (ffestb_R10014_, ffestb_R10016_, ffestb_R10018_,
        ffestb_R100110_): Restructure `for' loop for style.
 
+Fri Jan  9 19:09:07 1998  Craig Burley  <burley@gnu.org>
+
+       * intrin.c (ffeintrin_check_): No longer ignore explicit
+       omitted trailing args.
+
 Tue Dec 23 14:58:04 1997  Craig Burley  <burley@gnu.org>
 
+       * intrin.c (ffeintrin_fulfill_generic): Don't generate
+       FFEBAD_INTRINSIC_TYPE for CHARACTER*(*) intrinsic.
+
        * com.c (ffecom_gfrt_basictype):
        (ffecom_gfrt_kindtype):
        (ffecom_make_gfrt_):

diff --git a/gcc/f/intrin.c b/gcc/f/intrin.c
index 553a6d6..0b699b7 100644 (file)
--- a/gcc/f/intrin.c
+++ b/gcc/f/intrin.c
@@ -523,11 +523,6 @@ ffeintrin_check_ (ffeintrinImp imp, ffebldOp op,
        } while (TRUE);
     }
 
-  /* Ignore explicit trailing omitted args.  */
-
-  while ((arg != NULL) && (ffebld_head (arg) == NULL))
-    arg = ffebld_trail (arg);
-
   if (arg != NULL)
     return FFEBAD_INTRINSIC_TOOMANY;
 
@@ -1371,7 +1366,8 @@ ffeintrin_fulfill_generic (ffebld *expr, ffeinfo *info, ffelexToken t)
       if ((ffesymbol_attrs (ffebld_symter (symter)) & FFESYMBOL_attrsTYPE)
          && (((bt != ffesymbol_basictype (ffebld_symter (symter)))
               || (kt != ffesymbol_kindtype (ffebld_symter (symter)))
-              || (sz != ffesymbol_size (ffebld_symter (symter))))))
+              || ((sz != FFETARGET_charactersizeNONE)
+                  && (sz != ffesymbol_size (ffebld_symter (symter)))))))
        {
          ffebad_start (FFEBAD_INTRINSIC_TYPE);
          ffebad_here (0, ffelex_token_where_line (t),