fortran/

* dump-parse-tree.c (show_char_const): New function.
(gfc_show_expr): Use it.
* expr.c (find_substring_ref): Rework to not keep characters
dangling beyond end of string.
testsuite/
* gfortran.dg/substr_6.f90: New test.


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

1 files changed, 25 insertions, 24 deletions

diff --git a/gcc/fortran/dump-parse-tree.c b/gcc/fortran/dump-parse-tree.c
index d9fbbfab3ed..ce46e3513f7 100644
--- a/gcc/fortran/dump-parse-tree.c
+++ b/gcc/fortran/dump-parse-tree.c
@@ -290,6 +290,28 @@ gfc_show_constructor (gfc_constructor *c)
 }
 
 
+static void
+show_char_const (const char *c, int length)
+{
+  int i;
+
+  gfc_status_char ('\'');
+  for (i = 0; i < length; i++)
+    {
+      if (c[i] == '\'')
+	gfc_status ("''");
+      else if (ISPRINT (c[i]))
+	gfc_status_char (c[i]);
+      else
+	{
+	  gfc_status ("' // ACHAR(");
+	  printf ("%d", c[i]);
+	  gfc_status (") // '");
+	}
+    }
+  gfc_status_char ('\'');
+}
+
 /* Show an expression.  */
 
 void
@@ -307,16 +329,7 @@ gfc_show_expr (gfc_expr *p)
   switch (p->expr_type)
     {
     case EXPR_SUBSTRING:
-      c = p->value.character.string;
-
-      for (i = 0; i < p->value.character.length; i++, c++)
-	{
-	  if (*c == '\'')
-	    gfc_status ("''");
-	  else
-	    gfc_status ("%c", *c);
-	}
-
+      show_char_const (p->value.character.string, p->value.character.length);
       gfc_show_ref (p->ref);
       break;
 
@@ -362,20 +375,8 @@ gfc_show_expr (gfc_expr *p)
 	  break;
 
 	case BT_CHARACTER:
-	  c = p->value.character.string;
-
-	  gfc_status_char ('\'');
-
-	  for (i = 0; i < p->value.character.length; i++, c++)
-	    {
-	      if (*c == '\'')
-		gfc_status ("''");
-	      else
-		gfc_status_char (*c);
-	    }
-
-	  gfc_status_char ('\'');
-
+	  show_char_const (p->value.character.string, 
+			   p->value.character.length);
 	  break;
 
 	case BT_COMPLEX: