OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR fortran/29067 (gfc_resolve_expr(): Bad expression type)

Browse Source 
PR fortran/29067

	* decl.c (gfc_set_constant_character_len): NULL-terminate the
	character constant string.
	* data.c (create_character_intializer): Likewise.
	* expr.c (gfc_simplify_expr): NULL-terminate the substring
	character constant.
	* primary.c (match_hollerith_constant): NULL-terminate the
	character constant string.

	* gfortran.dg/pr29067.f: New test.

From-SVN: r118338
This commit is contained in:
Francois-Xavier Coudert 2006-10-31 21:15:22 +01:00 committed by François-Xavier Coudert
parent 70198b9f22
commit 150675a88b
6 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/fortran/data.c
View File

@ -155,7 +155,8 @@ create_character_intializer (gfc_expr * init, gfc_typespec * ts,
init->expr_type = EXPR_CONSTANT;
init->ts = *ts;
dest = gfc_getmem (len);
dest = gfc_getmem (len + 1);
dest[len] = '\0';
init->value.character.length = len;
init->value.character.string = dest;
/* Blank the string if we're only setting a substring. */

3
gcc/fortran/decl.c
View File

@ -754,10 +754,11 @@ gfc_set_constant_character_len (int len, gfc_expr * expr)
slen = expr->value.character.length;
if (len != slen)
{
s = gfc_getmem (len);
s = gfc_getmem (len + 1);
memcpy (s, expr->value.character.string, MIN (len, slen));
if (len > slen)
memset (&s[slen], ' ', len - slen);
s[len] = '\0';
gfc_free (expr->value.character.string);
expr->value.character.string = s;
expr->value.character.length = len;

2
gcc/fortran/expr.c
View File

@ -1438,7 +1438,7 @@ gfc_simplify_expr (gfc_expr * p, int type)
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. */
s[end-start+1] = '\0'; /* TODO: C-style string for debugging. */
gfc_free (p->value.character.string);
p->value.character.string = s;
p->value.character.length = end - start;

1
gcc/fortran/primary.c
View File

@ -281,6 +281,7 @@ match_hollerith_constant (gfc_expr ** result)
gfc_default_character_kind, &gfc_current_locus);
e->value.character.string = gfc_getmem (num+1);
memcpy (e->value.character.string, buffer, num);
e->value.character.string[num] = '\0';
e->value.character.length = num;
*result = e;
return MATCH_YES;

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2006-10-31 Francois-Xavier Coudert <coudert@clipper.ens.fr>
PR fortran/29067
* gfortran.dg/pr29067.f: New test.
2006-10-31 Joseph Myers <joseph@codesourcery.com>
Richard Sandiford <richard@codesourcery.com>

18
gcc/testsuite/gfortran.dg/pr29067.f Normal file
View File

@ -0,0 +1,18 @@
! { dg-do compile }
! PR fortran/29067
implicit none
integer :: n, i
character(len=16),parameter :: s = "", s2 = "1234567890123456"
i = 0 ; n = 9
print *, s(9:16)
print *, s2(9:16)
if (s(9:16) == "90123456") then
endif
if (i > 0) then
write (i,*) n
call foo(0)
endif
do i = 1, n
end do
end