diff options
Diffstat (limited to 'gcc/fortran/expr.c')
| -rw-r--r-- | gcc/fortran/expr.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index fe4c746..a3a24b5 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -141,6 +141,12 @@ free_expr0 (gfc_expr * e) switch (e->expr_type) { case EXPR_CONSTANT: + if (e->from_H) + { + gfc_free (e->value.character.string); + break; + } + switch (e->ts.type) { case BT_INTEGER: @@ -152,6 +158,7 @@ free_expr0 (gfc_expr * e) break; case BT_CHARACTER: + case BT_HOLLERITH: gfc_free (e->value.character.string); break; @@ -393,6 +400,15 @@ gfc_copy_expr (gfc_expr * p) break; case EXPR_CONSTANT: + if (p->from_H) + { + s = gfc_getmem (p->value.character.length + 1); + q->value.character.string = s; + + memcpy (s, p->value.character.string, + p->value.character.length + 1); + break; + } switch (q->ts.type) { case BT_INTEGER: @@ -414,6 +430,7 @@ gfc_copy_expr (gfc_expr * p) break; case BT_CHARACTER: + case BT_HOLLERITH: s = gfc_getmem (p->value.character.length + 1); q->value.character.string = s; @@ -1813,7 +1830,10 @@ gfc_check_assign (gfc_expr * lvalue, gfc_expr * rvalue, int conform) if (!conform) { - if (gfc_numeric_ts (&lvalue->ts) && gfc_numeric_ts (&rvalue->ts)) + /* Numeric can be converted to any other numeric. And Hollerith can be + converted to any other type. */ + if ((gfc_numeric_ts (&lvalue->ts) && gfc_numeric_ts (&rvalue->ts)) + || rvalue->ts.type == BT_HOLLERITH) return SUCCESS; if (lvalue->ts.type == BT_LOGICAL && rvalue->ts.type == BT_LOGICAL) |