mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-12-25 12:05:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

re PR fortran/22491 (character array parameters do not reduce)

Browse Source 
PR fortran/22491
	* expr.c (simplify_parameter_variable): Do not copy the subobject
	references if the expression value is a constant.

	* expr.c (gfc_simplify_expr): Evaluate constant substrings.

From-SVN: r102676
This commit is contained in:
David Edelsohn 2005-08-03 01:55:37 +00:00 committed by David Edelsohn
parent 75ec95c8cd
commit c2fee3de3b
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/fortran/ChangeLog
View File

@ -1,3 +1,11 @@
2005-08-02 David Edelsohn <edelsohn@gnu.org>
PR fortran/22491
* expr.c (simplify_parameter_variable): Do not copy the subobject
references if the expression value is a constant.
* expr.c (gfc_simplify_expr): Evaluate constant substrings.
2005-07-31 Jerry DeLisle <jvdelisle@verizon.net> 2005-07-31 Jerry DeLisle <jvdelisle@verizon.net>
* intrinsic.texi: Add documentation for exponent, floor, and fnum and * intrinsic.texi: Add documentation for exponent, floor, and fnum and

26
gcc/fortran/expr.c
View File

@ -1068,7 +1068,8 @@ simplify_parameter_variable (gfc_expr * p, int type)
try t; try t;
e = gfc_copy_expr (p->symtree->n.sym->value); e = gfc_copy_expr (p->symtree->n.sym->value);
if (p->ref) /* Do not copy subobject refs for constant. */
if (e->expr_type != EXPR_CONSTANT && p->ref != NULL)
e->ref = copy_ref (p->ref); e->ref = copy_ref (p->ref);
t = gfc_simplify_expr (e, type); t = gfc_simplify_expr (e, type);
@ -1130,7 +1131,28 @@ gfc_simplify_expr (gfc_expr * p, int type)
if (simplify_ref_chain (p->ref, type) == FAILURE) if (simplify_ref_chain (p->ref, type) == FAILURE)
return FAILURE; return FAILURE;
/* TODO: evaluate constant substrings. */ if (gfc_is_constant_expr (p))
{
char *s;
int start, end;
gfc_extract_int (p->ref->u.ss.start, &start);
start--; /* Convert from one-based to zero-based. */
gfc_extract_int (p->ref->u.ss.end, &end);
s = gfc_getmem (end - start + 1);
memcpy (s, p->value.character.string + start, end - start);
s[end] = '\0'; /* TODO: C-style string for debugging. */
gfc_free (p->value.character.string);
p->value.character.string = s;
p->value.character.length = end - start;
p->ts.cl = gfc_get_charlen ();
p->ts.cl->next = gfc_current_ns->cl_list;
gfc_current_ns->cl_list = p->ts.cl;
p->ts.cl->length = gfc_int_expr (p->value.character.length);
gfc_free_ref_list (p->ref);
p->ref = NULL;
p->expr_type = EXPR_CONSTANT;
}
break; break;
case EXPR_OP: case EXPR_OP: