mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-20 08:20:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

decl.c (gfc_match_end): Check that the block name starts with "block@".

Browse Source 
2011-04-26  Thomas Koenig  <tkoenig@gcc.gnu.org>

	* decl.c (gfc_match_end):  Check that the block name starts
	with "block@".
	* parse.c (gfc_build_block_ns):  Make block names unique by
	numbering them.

From-SVN: r172990
This commit is contained in:
Thomas Koenig 2011-04-26 22:07:11 +00:00
parent 898b892746
commit 3a1fd30c8a
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/fortran/ChangeLog
View File

@ -1,3 +1,10 @@
2011-04-26 Thomas Koenig <tkoenig@gcc.gnu.org>
* decl.c (gfc_match_end): Check that the block name starts
with "block@".
* parse.c (gfc_build_block_ns): Make block names unique by
numbering them.
2011-04-26 Thomas Koenig <tkoenig@gcc.gnu.org>
* frontend-passes.c (inserted_block): New variable.

2
gcc/fortran/decl.c
View File

@ -5746,7 +5746,7 @@ gfc_match_end (gfc_statement *st)
{
case COMP_ASSOCIATE:
case COMP_BLOCK:
if (!strcmp (block_name, "block@"))
if (!strncmp (block_name, "block@", strlen("block@")))
block_name = NULL;
break;

5
gcc/fortran/parse.c
View File

@ -3135,6 +3135,7 @@ gfc_namespace*
gfc_build_block_ns (gfc_namespace *parent_ns)
{
gfc_namespace* my_ns;
static int numblock = 1;
my_ns = gfc_get_namespace (parent_ns, 1);
my_ns->construct_entities = 1;
@ -3149,8 +3150,10 @@ gfc_build_block_ns (gfc_namespace *parent_ns)
else
{
gfc_try t;
char buffer[20]; /* Enough to hold "block@2147483648\n". */
gfc_get_symbol ("block@", my_ns, &my_ns->proc_name);
snprintf(buffer, sizeof(buffer), "block@%d", numblock++);
gfc_get_symbol (buffer, my_ns, &my_ns->proc_name);
t = gfc_add_flavor (&my_ns->proc_name->attr, FL_LABEL,
my_ns->proc_name->name, NULL);
gcc_assert (t == SUCCESS);