2008-04-05 Basile Starynkevitch <basile@starynkevitch.net>

	MELT branch merged with trunk r133930



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

2 files changed, 179 insertions, 3 deletions

diff --git a/libgfortran/intrinsics/associated.c b/libgfortran/intrinsics/associated.c
index 0d32fd7d002..dc1da1df6f6 100644
--- a/libgfortran/intrinsics/associated.c
+++ b/libgfortran/intrinsics/associated.c
@@ -48,10 +48,12 @@ associated (const gfc_array_void *pointer, const gfc_array_void *target)
   rank = GFC_DESCRIPTOR_RANK (pointer);
   for (n = 0; n < rank; n++)
     {
-      if (pointer->dim[n].stride != target->dim[n].stride)
+      long diff;
+      diff = pointer->dim[n].ubound - pointer->dim[n].lbound;
+
+      if (diff != (target->dim[n].ubound - target->dim[n].lbound))
         return 0;
-      if ((pointer->dim[n].ubound - pointer->dim[n].lbound)
-          != (target->dim[n].ubound - target->dim[n].lbound))
+      if (pointer->dim[n].stride != target->dim[n].stride && diff != 0)
         return 0;
       if (pointer->dim[n].ubound < pointer->dim[n].lbound)
 	return 0;
diff --git a/libgfortran/intrinsics/spread_generic.c b/libgfortran/intrinsics/spread_generic.c
index 4be0a164c8a..16578f788fc 100644
--- a/libgfortran/intrinsics/spread_generic.c
+++ b/libgfortran/intrinsics/spread_generic.c
@@ -276,6 +276,92 @@ void
 spread (gfc_array_char *ret, const gfc_array_char *source,
 	const index_type *along, const index_type *pncopies)
 {
+  index_type type_size;
+
+  type_size = GFC_DTYPE_TYPE_SIZE(ret);
+  switch(type_size)
+    {
+    case GFC_DTYPE_LOGICAL_1:
+    case GFC_DTYPE_INTEGER_1:
+      spread_i1 ((gfc_array_i1 *) ret, (gfc_array_i1 *) source,
+		 *along, *pncopies);
+      return;
+
+    case GFC_DTYPE_LOGICAL_2:
+    case GFC_DTYPE_INTEGER_2:
+      spread_i2 ((gfc_array_i2 *) ret, (gfc_array_i2 *) source,
+		 *along, *pncopies);
+      return;
+
+    case GFC_DTYPE_LOGICAL_4:
+    case GFC_DTYPE_INTEGER_4:
+      spread_i4 ((gfc_array_i4 *) ret, (gfc_array_i4 *) source,
+		 *along, *pncopies);
+      return;
+
+    case GFC_DTYPE_LOGICAL_8:
+    case GFC_DTYPE_INTEGER_8:
+      spread_i8 ((gfc_array_i8 *) ret, (gfc_array_i8 *) source,
+		 *along, *pncopies);
+      return;
+
+#ifdef HAVE_GFC_INTEGER_16
+    case GFC_DTYPE_LOGICAL_16:
+    case GFC_DTYPE_INTEGER_16:
+      spread_i16 ((gfc_array_i16 *) ret, (gfc_array_i16 *) source,
+		 *along, *pncopies);
+      return;
+#endif
+
+    case GFC_DTYPE_REAL_4:
+      spread_r4 ((gfc_array_r4 *) ret, (gfc_array_r4 *) source,
+		 *along, *pncopies);
+      return;
+
+    case GFC_DTYPE_REAL_8:
+      spread_r8 ((gfc_array_r8 *) ret, (gfc_array_r8 *) source,
+		 *along, *pncopies);
+      return;
+
+#ifdef GFC_HAVE_REAL_10
+    case GFC_DTYPE_REAL_10:
+      spread_r10 ((gfc_array_r10 *) ret, (gfc_array_r10 *) source,
+		 *along, *pncopies);
+      return;
+#endif
+
+#ifdef GFC_HAVE_REAL_16
+    case GFC_DTYPE_REAL_16:
+      spread_r16 ((gfc_array_r16 *) ret, (gfc_array_r16 *) source,
+		 *along, *pncopies);
+      return;
+#endif
+
+    case GFC_DTYPE_COMPLEX_4:
+      spread_c4 ((gfc_array_c4 *) ret, (gfc_array_c4 *) source,
+		 *along, *pncopies);
+      return;
+
+    case GFC_DTYPE_COMPLEX_8:
+      spread_c8 ((gfc_array_c8 *) ret, (gfc_array_c8 *) source,
+		 *along, *pncopies);
+      return;
+
+#ifdef GFC_HAVE_COMPLEX_10
+    case GFC_DTYPE_COMPLEX_10:
+      spread_c10 ((gfc_array_c10 *) ret, (gfc_array_c10 *) source,
+		 *along, *pncopies);
+      return;
+#endif
+
+#ifdef GFC_HAVE_COMPLEX_16
+    case GFC_DTYPE_COMPLEX_16:
+      spread_c16 ((gfc_array_c16 *) ret, (gfc_array_c16 *) source,
+		 *along, *pncopies);
+      return;
+#endif
+
+    }
   spread_internal (ret, source, along, pncopies, GFC_DESCRIPTOR_SIZE (source));
 }
 
@@ -304,8 +390,96 @@ void
 spread_scalar (gfc_array_char *ret, const char *source,
 	       const index_type *along, const index_type *pncopies)
 {
+  index_type type_size;
+
   if (!ret->dtype)
     runtime_error ("return array missing descriptor in spread()");
+
+  type_size = GFC_DTYPE_TYPE_SIZE(ret);
+  switch(type_size)
+    {
+    case GFC_DTYPE_LOGICAL_1:
+    case GFC_DTYPE_INTEGER_1:
+      spread_scalar_i1 ((gfc_array_i1 *) ret, (GFC_INTEGER_1 *) source,
+			*along, *pncopies);
+      return;
+
+    case GFC_DTYPE_LOGICAL_2:
+    case GFC_DTYPE_INTEGER_2:
+      spread_scalar_i2 ((gfc_array_i2 *) ret, (GFC_INTEGER_2 *) source,
+			*along, *pncopies);
+      return;
+
+    case GFC_DTYPE_LOGICAL_4:
+    case GFC_DTYPE_INTEGER_4:
+      spread_scalar_i4 ((gfc_array_i4 *) ret, (GFC_INTEGER_4 *) source,
+			*along, *pncopies);
+      return;
+
+    case GFC_DTYPE_LOGICAL_8:
+    case GFC_DTYPE_INTEGER_8:
+      spread_scalar_i8 ((gfc_array_i8 *) ret, (GFC_INTEGER_8 *) source,
+			*along, *pncopies);
+      return;
+
+#ifdef HAVE_GFC_INTEGER_16
+    case GFC_DTYPE_LOGICAL_16:
+    case GFC_DTYPE_INTEGER_16:
+      spread_scalar_i16 ((gfc_array_i16 *) ret, (GFC_INTEGER_16 *) source,
+			*along, *pncopies);
+      return;
+#endif
+
+    case GFC_DTYPE_REAL_4:
+      spread_scalar_r4 ((gfc_array_r4 *) ret, (GFC_REAL_4 *) source,
+			*along, *pncopies);
+      return;
+
+    case GFC_DTYPE_REAL_8:
+      spread_scalar_r8 ((gfc_array_r8 *) ret, (GFC_REAL_8 *) source,
+			*along, *pncopies);
+      return;
+
+#ifdef HAVE_GFC_REAL_10
+    case GFC_DTYPE_REAL_10:
+      spread_scalar_r10 ((gfc_array_r10 *) ret, (GFC_REAL_10 *) source,
+			*along, *pncopies);
+      return;
+#endif
+
+#ifdef HAVE_GFC_REAL_16
+    case GFC_DTYPE_REAL_16:
+      spread_scalar_r16 ((gfc_array_r16 *) ret, (GFC_REAL_16 *) source,
+			*along, *pncopies);
+      return;
+#endif
+
+    case GFC_DTYPE_COMPLEX_4:
+      spread_scalar_c4 ((gfc_array_c4 *) ret, (GFC_COMPLEX_4 *) source,
+			*along, *pncopies);
+      return;
+
+    case GFC_DTYPE_COMPLEX_8:
+      spread_scalar_c8 ((gfc_array_c8 *) ret, (GFC_COMPLEX_8 *) source,
+			*along, *pncopies);
+      return;
+
+#ifdef HAVE_GFC_COMPLEX_10
+    case GFC_DTYPE_COMPLEX_10:
+      spread_scalar_c10 ((gfc_array_c10 *) ret, (GFC_COMPLEX_10 *) source,
+			*along, *pncopies);
+      return;
+#endif
+
+#ifdef HAVE_GFC_COMPLEX_16
+    case GFC_DTYPE_COMPLEX_16:
+      spread_scalar_c16 ((gfc_array_c16 *) ret, (GFC_COMPLEX_16 *) source,
+			*along, *pncopies);
+      return;
+#endif
+
+    }
+
   spread_internal_scalar (ret, source, along, pncopies, GFC_DESCRIPTOR_SIZE (ret));
 }