diff options
Diffstat (limited to 'gcc/fortran/data.c')
| -rw-r--r-- | gcc/fortran/data.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/gcc/fortran/data.c b/gcc/fortran/data.c index 70a7151..75e4241 100644 --- a/gcc/fortran/data.c +++ b/gcc/fortran/data.c @@ -154,7 +154,7 @@ create_character_intializer (gfc_expr *init, gfc_typespec *ts, int len; int start; int end; - char *dest; + char *dest, *rvalue_string; gfc_extract_int (ts->cl->length, &len); @@ -207,7 +207,17 @@ create_character_intializer (gfc_expr *init, gfc_typespec *ts, } /* Copy the initial value. */ - len = rvalue->value.character.length; + if (rvalue->ts.type == BT_HOLLERITH) + { + len = rvalue->representation.length; + rvalue_string = rvalue->representation.string; + } + else + { + len = rvalue->value.character.length; + rvalue_string = rvalue->value.character.string; + } + if (len > end - start) { len = end - start; @@ -215,14 +225,17 @@ create_character_intializer (gfc_expr *init, gfc_typespec *ts, "at %L", &rvalue->where); } - memcpy (&dest[start], rvalue->value.character.string, len); + memcpy (&dest[start], rvalue_string, len); /* Pad with spaces. Substrings will already be blanked. */ if (len < end - start && ref == NULL) memset (&dest[start + len], ' ', end - (start + len)); if (rvalue->ts.type == BT_HOLLERITH) - init->from_H = 1; + { + init->representation.length = init->value.character.length; + init->representation.string = init->value.character.string; + } return init; } |