fortran/

2010-07-21  Steven G. Kargl  <kargl@gcc.gnu.org>

        * simplify.c (gfc_simplify_bessel_n2): Fix indention
        and argument type.

testsuite/
2010-07-21  Steven G. Kargl  <kargl@gcc.gnu.org>
            Tobias Burnus  <burnus@net-b.de>

        * gfortran.dg/bessel_7.f90: Decrease required precision.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163615 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 9d86cea..669d9b4 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-21  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       * simplify.c (gfc_simplify_bessel_n2): Fix indention
+       and argument type.
+

 2010-08-28  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
        PR fortran/45436
 2010-08-28  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
        PR fortran/45436

diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index 98955bb..2fe7140 100644 (file)
--- a/gcc/fortran/simplify.c
+++ b/gcc/fortran/simplify.c
@@ -1241,7 +1241,7 @@ gfc_simplify_bessel_n2 (gfc_expr *order1, gfc_expr *order2, gfc_expr *x,
       if (jn && n1 == 0)
        {
          e = gfc_get_constant_expr (x->ts.type, x->ts.kind, &x->where);
       if (jn && n1 == 0)
        {
          e = gfc_get_constant_expr (x->ts.type, x->ts.kind, &x->where);

-         mpfr_set_ui (e->value.real, 1.0, GFC_RND_MODE);
+         mpfr_set_ui (e->value.real, 1, GFC_RND_MODE);

          gfc_constructor_append_expr (&result->value.constructor, e,
                                       &x->where);
          n1++;
          gfc_constructor_append_expr (&result->value.constructor, e,
                                       &x->where);
          n1++;


@@ -1251,7 +1251,7 @@ gfc_simplify_bessel_n2 (gfc_expr *order1, gfc_expr *order2, gfc_expr *x,
        {
          e = gfc_get_constant_expr (x->ts.type, x->ts.kind, &x->where);
          if (jn)
        {
          e = gfc_get_constant_expr (x->ts.type, x->ts.kind, &x->where);
          if (jn)

-           mpfr_set_ui (e->value.real, 0.0, GFC_RND_MODE);
+           mpfr_set_ui (e->value.real, 0, GFC_RND_MODE);

          else
            mpfr_set_inf (e->value.real, -1);
          gfc_constructor_append_expr (&result->value.constructor, e,
          else
            mpfr_set_inf (e->value.real, -1);
          gfc_constructor_append_expr (&result->value.constructor, e,


@@ -1315,7 +1315,7 @@ gfc_simplify_bessel_n2 (gfc_expr *order1, gfc_expr *order2, gfc_expr *x,
       return &gfc_bad_expr;
     }
   if (jn)
       return &gfc_bad_expr;
     }
   if (jn)

-     gfc_constructor_insert_expr (&result->value.constructor, e, &x->where, -2);
+    gfc_constructor_insert_expr (&result->value.constructor, e, &x->where, -2);

   else 
     gfc_constructor_append_expr (&result->value.constructor, e, &x->where);
 
   else 
     gfc_constructor_append_expr (&result->value.constructor, e, &x->where);
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3cf65f3..931dfb7 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-21  Steven G. Kargl  <kargl@gcc.gnu.org>
+           Tobias Burnus  <burnus@net-b.de>
+
+       * gfortran.dg/bessel_7.f90: Decrease required precision.
+

 2010-08-27  Naveen H.S  <naveen.S@kpitcummins.com>
            Kaz Kojima  <kkojima@gcc.gnu.org>
 
 2010-08-27  Naveen H.S  <naveen.S@kpitcummins.com>
            Kaz Kojima  <kkojima@gcc.gnu.org>
 

diff --git a/gcc/testsuite/gfortran.dg/bessel_7.f90 b/gcc/testsuite/gfortran.dg/bessel_7.f90
index 2377c86..9e91179 100644 (file)
--- a/gcc/testsuite/gfortran.dg/bessel_7.f90
+++ b/gcc/testsuite/gfortran.dg/bessel_7.f90
@@ -8,7 +8,7 @@
 implicit none
 real,parameter :: values(*) = [0.0, 0.5, 1.0, 0.9, 1.8,2.0,3.0,4.0,4.25,8.0,34.53, 475.78] 
 real,parameter :: myeps(size(values)) = epsilon(0.0) &
 implicit none
 real,parameter :: values(*) = [0.0, 0.5, 1.0, 0.9, 1.8,2.0,3.0,4.0,4.25,8.0,34.53, 475.78] 
 real,parameter :: myeps(size(values)) = epsilon(0.0) &

-                  * [2, 3, 3, 5, 7, 2, 12, 4, 7, 3, 30, 168 ]
+                  * [2, 3, 4, 5, 7, 2, 12, 4, 7, 6, 30, 168 ]

 ! The following is sufficient for me - the values above are a bit
 ! more tolerant
 !                  * [0, 0, 0, 3, 3, 0, 9, 0, 2, 1, 22, 130 ]
 ! The following is sufficient for me - the values above are a bit
 ! more tolerant
 !                  * [0, 0, 0, 3, 3, 0, 9, 0, 2, 1, 22, 130 ]


@@ -19,7 +19,7 @@ real :: rec(0:Nmax), lib(0:Nmax)
 integer :: i
 
 do i = 1, ubound(values,dim=1)
 integer :: i
 
 do i = 1, ubound(values,dim=1)

-  call compare(values(i), myeps(i), nit(i), 3*epsilon(0.0))
+  call compare(values(i), myeps(i), nit(i), 6*epsilon(0.0))

 end do
 
 contains
 end do
 
 contains