[Bug fortran/36355] New: matmul argument-check: wrong error messages

[Bug fortran/36355] New: matmul argument-check: wrong error messages

[dfranke at gcc dot gnu dot org]

$> cat matmul.f90
  REAL, DIMENSION(2,2) :: a
  character(1) :: b

  print *, MATMUL(a, b)      ! line 4: argument matrix_b is wrong
  print *, MATMUL(b, a)      ! line 5: argument matrix_a is wrong
end

$> gfortran-svn matmul.f90
matmul.f90:4.18:

  print *, MATMUL(a, b)
                 1
Error: 'matrix_a' argument of 'matmul' intrinsic at (1) must be numeric or
LOGICAL
matmul.f90:5.20:

  print *, MATMUL(b, a)
                   1
Error: 'matrix_b' argument of 'matmul' intrinsic at (1) must be numeric or
LOGICAL


Proposed change (untested):
Index: check.c
===================================================================
--- check.c     (revision 136058)
+++ check.c     (working copy)
@@ -1761,7 +1761,7 @@ gfc_check_malloc (gfc_expr *size)
 try
 gfc_check_matmul (gfc_expr *matrix_a, gfc_expr *matrix_b)
 {
-  if ((matrix_a->ts.type != BT_LOGICAL) && !gfc_numeric_ts (&matrix_b->ts))
+  if ((matrix_a->ts.type != BT_LOGICAL) && !gfc_numeric_ts (&matrix_a->ts))
     {
       gfc_error ("'%s' argument of '%s' intrinsic at %L must be numeric "
                 "or LOGICAL", gfc_current_intrinsic_arg[0],
@@ -1769,7 +1769,7 @@ gfc_check_matmul (gfc_expr *matrix_a, gf
       return FAILURE;
     }

-  if ((matrix_b->ts.type != BT_LOGICAL) && !gfc_numeric_ts (&matrix_a->ts))
+  if ((matrix_b->ts.type != BT_LOGICAL) && !gfc_numeric_ts (&matrix_b->ts))
     {
       gfc_error ("'%s' argument of '%s' intrinsic at %L must be numeric "
                 "or LOGICAL", gfc_current_intrinsic_arg[1],


-- 
           Summary: matmul argument-check: wrong error messages
           Product: gcc
           Version: 4.4.0
            Status: UNCONFIRMED
          Keywords: diagnostic
          Severity: normal
          Priority: P3
         Component: fortran
        AssignedTo: unassigned at gcc dot gnu dot org
        ReportedBy: dfranke at gcc dot gnu dot org


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36355

[Bug fortran/36355] matmul argument-check: wrong error messages

[dfranke at gcc dot gnu dot org]

------- Comment #1 from dfranke at gcc dot gnu dot org  2008-05-28 11:53 -------
Proposed patch passed regression test on i686-pc-linux-gnu..


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36355

[Bug fortran/36355] matmul argument-check: wrong error messages

[tkoenig at gcc dot gnu dot org]

------- Comment #2 from tkoenig at gcc dot gnu dot org  2008-07-22 12:30 -------
(In reply to comment #1)
> Proposed patch passed regression test on i686-pc-linux-gnu..

Patch is approved (or obvious and simple, whatever you prefer :-)


-- 

tkoenig at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |NEW
     Ever Confirmed|0                           |1
   Last reconfirmed|0000-00-00 00:00:00         |2008-07-22 12:30:06
               date|                            |


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36355

[Bug fortran/36355] matmul argument-check: wrong error messages

[tkoenig at gcc dot gnu dot org]

------- Comment #3 from tkoenig at gcc dot gnu dot org  2008-10-25 08:40 -------
Daniel, do you want to apply this patch?


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36355

[Bug fortran/36355] matmul argument-check: wrong error messages

[dfranke at gcc dot gnu dot org]

------- Comment #4 from dfranke at gcc dot gnu dot org  2008-10-25 12:29 -------
Not yet. IIRC, there was an issue left not addressed by this.

Judging from the latest status reports, I'll find the time to look into it
again in December before 4.4 is released.


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36355

[Bug fortran/36355] matmul argument-check: wrong error messages

[mikael at gcc dot gnu dot org]

------- Comment #5 from mikael at gcc dot gnu dot org  2008-12-08 22:35 -------
(In reply to comment #4)
> Judging from the latest status reports, I'll find the time to look into it
> again in December before 4.4 is released.
> 
We are in December, and 4.4 is not yet released. :p


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36355

[Bug fortran/36355] matmul argument-check: wrong error messages

[dfranke at gcc dot gnu dot org]

-- 

dfranke at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at gcc dot gnu   |dfranke at gcc dot gnu dot
                   |dot org                     |org
                URL|                            |http://gcc.gnu.org/ml/fortra
                   |                            |n/2008-12/msg00138.html
             Status|NEW                         |ASSIGNED
           Keywords|                            |patch
   Last reconfirmed|2008-07-22 12:30:06         |2008-12-09 17:48:14
               date|                            |


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36355

[Bug fortran/36355] matmul argument-check: wrong error messages

[dfranke at gcc dot gnu dot org]

------- Comment #6 from dfranke at gcc dot gnu dot org  2008-12-12 13:24 -------
Subject: Bug 36355

Author: dfranke
Date: Fri Dec 12 13:22:55 2008
New Revision: 142709

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=142709
Log:
gcc/fortran:
2008-12-12  Daniel Franke  <franke.daniel@gmail.com>

        PR fortran/36355
        * check.c (gfc_check_matmul): Fixed error message for invalid
        types to correctly identify the offending argument, added check
        for mismatching types.


gcc/testsuite:
2008-12-12 Daniel Franke  <franke.daniel@gmail.com>

        PR fortran/36355
        * gfortran.dg/matmul_argument_types.f90: New.


Added:
    trunk/gcc/testsuite/gfortran.dg/matmul_argument_types.f90
Modified:
    trunk/gcc/fortran/ChangeLog
    trunk/gcc/fortran/check.c
    trunk/gcc/testsuite/ChangeLog


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36355

[Bug fortran/36355] matmul argument-check: wrong error messages

[dfranke at gcc dot gnu dot org]

------- Comment #7 from dfranke at gcc dot gnu dot org  2008-12-12 13:26 -------
Fixed in trunk. Closing.


-- 

dfranke at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|ASSIGNED                    |RESOLVED
         Resolution|                            |FIXED
   Target Milestone|---                         |4.4.0


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36355