select.c: Moved content to select_inc.c.

        * runtime/select.c: Moved content to select_inc.c. Include it. 
        Add macros for different character types.
        * runtime/select_inc.c: New file.
        * runtime/convert_char.c: New file.
        * intrinsics/pack_generic.c (pack_char4, pack_s_char4): New
        functions.
        * intrinsics/transpose_generic.c (transpose_char4): New function.
        * intrinsics/spread_generic.c (spread_char4, spread_char4_scalar):
        New functions.
        * intrinsics/unpack_generic.c (unpack1_char4, unpack0_char4): 
        New functions.
        * intrinsics/reshape_generic.c (reshape_char): Use
        gfc_charlen_type as type for length variables.
        (reshape_char4): New function.
        * gfortran.map (GFORTRAN_1.1): Add _gfortran_select_string_char4,
        _gfortran_convert_char1_to_char4, _gfortran_convert_char4_to_char1,
        _gfortran_transpose_char4, _gfortran_spread_char4,
        _gfortran_spread_char4_scalar, _gfortran_reshape_char4,
        _gfortran_pack_char4, _gfortran_pack_s_char4,
        _gfortran_unpack0_char4 and _gfortran_unpack1_char4.
        * Makefile.am: Add runtime/convert_char.c.
        * Makefile.in: Regenerate.

From-SVN: r135496

3 files changed, 236 insertions, 108 deletions

diff --git a/libgfortran/runtime/convert_char.c b/libgfortran/runtime/convert_char.c
new file mode 100644
index 0000000..aa500bb
--- /dev/null
+++ b/libgfortran/runtime/convert_char.c
@@ -0,0 +1,74 @@
+/* Runtime conversion of strings from one character kind to another.
+   Copyright 2008 Free Software Foundation, Inc.
+
+This file is part of the GNU Fortran runtime library (libgfortran).
+
+Libgfortran is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+In addition to the permissions in the GNU General Public License, the
+Free Software Foundation gives you unlimited permission to link the
+compiled version of this file into combinations with other programs,
+and to distribute those combinations without any restriction coming
+from the use of this file.  (The General Public License restrictions
+do apply in other respects; for example, they cover modification of
+the file, and distribution when not linked into a combine
+executable.)
+
+Libgfortran is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with libgfortran; see the file COPYING.  If not,
+write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#include "libgfortran.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+
+extern void convert_char1_to_char4 (gfc_char4_t **, gfc_charlen_type,
+				    const unsigned char *);
+export_proto(convert_char1_to_char4);
+
+extern void convert_char4_to_char1 (unsigned char **, gfc_charlen_type,
+				    const gfc_char4_t *);
+export_proto(convert_char4_to_char1);
+
+
+void
+convert_char1_to_char4 (gfc_char4_t **dst, gfc_charlen_type len,
+			const unsigned char *src)
+{
+  gfc_charlen_type i, l;
+
+  l = len > 0 ? len : 0;
+  *dst = get_mem ((l + 1) * sizeof (gfc_char4_t));
+
+  for (i = 0; i < l; i++)
+    (*dst)[i] = src[i];
+
+  (*dst)[l] = '\0';
+}
+
+
+void
+convert_char4_to_char1 (unsigned char **dst, gfc_charlen_type len,
+			const gfc_char4_t *src)
+{
+  gfc_charlen_type i, l;
+
+  l = len > 0 ? len : 0;
+  *dst = get_mem ((l + 1) * sizeof (unsigned char));
+
+  for (i = 0; i < l; i++)
+    (*dst)[i] = src[i];
+
+  (*dst)[l] = '\0';
+}
diff --git a/libgfortran/runtime/select.c b/libgfortran/runtime/select.c
index 44c3532..688acfc 100644
--- a/libgfortran/runtime/select.c
+++ b/libgfortran/runtime/select.c
@@ -1,12 +1,12 @@
 /* Implement the SELECT statement for character variables.
-   Contributed by Andy Vaught
+   Copyright 2008 Free Software Foundation, Inc.
 
-This file is part of the GNU Fortran 95 runtime library (libgfortran).
+This file is part of the GNU Fortran runtime library (libgfortran).
 
-Libgfortran is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+Libgfortran is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
 
 In addition to the permissions in the GNU General Public License, the
 Free Software Foundation gives you unlimited permission to link the
@@ -22,116 +22,31 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with libgfortran; see the file COPYING.  If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+You should have received a copy of the GNU General Public
+License along with libgfortran; see the file COPYING.  If not,
+write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-#include "libgfortran.h"
-
-typedef struct
-{
-  char *low;
-  int low_len;
-  char *high;
-  int high_len;
-  int address;
-}
-select_struct;
-
-extern int select_string (select_struct *table, int table_len,
-			  const char *selector, int selector_len);
-export_proto(select_string);
-
-
-/* select_string()-- Given a selector string and a table of
- * select_struct structures, return the address to jump to. */
-
-int
-select_string (select_struct *table, int table_len, const char *selector,
-	       int selector_len)
-{
-  select_struct *t;
-  int i, low, high, mid;
-  int default_jump = -1;
-
-  if (table_len == 0)
-    return -1;
-
-  /* Record the default address if present */
-
-  if (table->low == NULL && table->high == NULL)
-    {
-      default_jump = table->address;
 
-      table++;
-      table_len--;
-      if (table_len == 0)
-        return default_jump;
-    }
-
-  /* Try the high and low bounds if present. */
-
-  if (table->low == NULL)
-    {
-      if (compare_string (table->high_len, table->high,
-			        selector_len, selector) >= 0)
-        return table->address;
-
-      table++;
-      table_len--;
-      if (table_len == 0)
-        return default_jump;
-    }
-
-  t = table + table_len - 1;
-
-  if (t->high == NULL)
-    {
-      if (compare_string (t->low_len, t->low,
-			        selector_len, selector) <= 0)
-        return t->address;
-
-      table_len--;
-      if (table_len == 0)
-        return default_jump;
-    }
-
-  /* At this point, the only table entries are bounded entries.  Find
-     the right entry with a binary chop. */
-
-  low = -1;
-  high = table_len;
+#include "libgfortran.h"
 
-  while (low + 1 < high)
-    {
-      mid = (low + high) / 2;
 
-      t = table + mid;
-      i = compare_string (t->low_len, t->low, selector_len, selector);
+/* The string selection function is defined using a few generic macros
+   in select_inc.c, so we avoid code duplication between the various
+   character type kinds.  */
 
-      if (i == 0)
-        return t->address;
+#undef  CHARTYPE
+#define CHARTYPE char
+#undef  SUFFIX
+#define SUFFIX(x) x
 
-      if (i < 0)
-        low = mid;
-      else
-        high = mid;
-    }
+#include "select_inc.c"
 
-  /* The string now lies between the low indeces of the now-adjacent
-     high and low entries.  Because it is less than the low entry of
-     'high', it can't be that one.  If low is still -1, then no
-     entries match.  Otherwise, we have to check the high entry of
-     'low'. */
 
-  if (low == -1)
-    return default_jump;
+#undef  CHARTYPE
+#define CHARTYPE gfc_char4_t
+#undef  SUFFIX
+#define SUFFIX(x) x ## _char4
 
-  t = table + low;
-  if (compare_string (selector_len, selector,
-			    t->high_len, t->high) <= 0)
-    return t->address;
+#include "select_inc.c"
 
-  return default_jump;
-}
diff --git a/libgfortran/runtime/select_inc.c b/libgfortran/runtime/select_inc.c
new file mode 100644
index 0000000..81a8dab
--- /dev/null
+++ b/libgfortran/runtime/select_inc.c
@@ -0,0 +1,139 @@
+/* Implement the SELECT statement for character variables.
+   Copyright 2008 Free Software Foundation, Inc.
+
+This file is part of the GNU Fortran runtime library (libgfortran).
+
+Libgfortran is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+In addition to the permissions in the GNU General Public License, the
+Free Software Foundation gives you unlimited permission to link the
+compiled version of this file into combinations with other programs,
+and to distribute those combinations without any restriction coming
+from the use of this file.  (The General Public License restrictions
+do apply in other respects; for example, they cover modification of
+the file, and distribution when not linked into a combine
+executable.)
+
+Libgfortran is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with libgfortran; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+
+#define select_string SUFFIX(select_string)
+#define select_struct SUFFIX(select_struct)
+#define compare_string SUFFIX(compare_string)
+
+typedef struct
+{
+  CHARTYPE *low;
+  gfc_charlen_type low_len;
+  CHARTYPE *high;
+  gfc_charlen_type high_len;
+  int address;
+}
+select_struct;
+
+extern int select_string (select_struct *table, int table_len,
+			  const CHARTYPE *selector,
+			  gfc_charlen_type selector_len);
+export_proto(select_string);
+
+
+/* select_string()-- Given a selector string and a table of
+ * select_struct structures, return the address to jump to. */
+
+int
+select_string (select_struct *table, int table_len, const CHARTYPE *selector,
+	       gfc_charlen_type selector_len)
+{
+  select_struct *t;
+  int i, low, high, mid;
+  int default_jump = -1;
+
+  if (table_len == 0)
+    return -1;
+
+  /* Record the default address if present */
+
+  if (table->low == NULL && table->high == NULL)
+    {
+      default_jump = table->address;
+
+      table++;
+      table_len--;
+      if (table_len == 0)
+        return default_jump;
+    }
+
+  /* Try the high and low bounds if present. */
+
+  if (table->low == NULL)
+    {
+      if (compare_string (table->high_len, table->high,
+			  selector_len, selector) >= 0)
+        return table->address;
+
+      table++;
+      table_len--;
+      if (table_len == 0)
+        return default_jump;
+    }
+
+  t = table + table_len - 1;
+
+  if (t->high == NULL)
+    {
+      if (compare_string (t->low_len, t->low, selector_len, selector) <= 0)
+        return t->address;
+
+      table_len--;
+      if (table_len == 0)
+        return default_jump;
+    }
+
+  /* At this point, the only table entries are bounded entries.  Find
+     the right entry with a binary chop. */
+
+  low = -1;
+  high = table_len;
+
+  while (low + 1 < high)
+    {
+      mid = (low + high) / 2;
+
+      t = table + mid;
+      i = compare_string (t->low_len, t->low, selector_len, selector);
+
+      if (i == 0)
+        return t->address;
+
+      if (i < 0)
+        low = mid;
+      else
+        high = mid;
+    }
+
+  /* The string now lies between the low indeces of the now-adjacent
+     high and low entries.  Because it is less than the low entry of
+     'high', it can't be that one.  If low is still -1, then no
+     entries match.  Otherwise, we have to check the high entry of
+     'low'. */
+
+  if (low == -1)
+    return default_jump;
+
+  t = table + low;
+  if (compare_string (selector_len, selector, t->high_len, t->high) <= 0)
+    return t->address;
+
+  return default_jump;
+}