diff options
| author | jvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-05-26 15:19:36 +0000 |
|---|---|---|
| committer | jvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-05-26 15:19:36 +0000 |
| commit | 74f5b093fc9628b1494ee81680fc059befb13000 (patch) | |
| tree | e0feaad272b918928001fe12ba340e17a2ae7878 /gcc/fortran | |
| parent | c3fc0093289bb2312ccc8d82478951d80dfd73d3 (diff) | |
| download | gcc-74f5b093fc9628b1494ee81680fc059befb13000.tar.gz | |
2014-05-26 Tobias Burnus <burnus@net-b.de>
PR fortran/55117
* trans-io.c (nml_full_name, transfer_namelist_element): Insert
a '+' rather then '%' to differentiate namelist variable names
that are based on extended derived types.
2014-05-26 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/55117
* io/list_read.c (extended_look_ahead): New helper function to
scan the namelist name and look for matches with the new '+'
extended type parent indicator. (str_comp_extended): New
helper function to compare the namelist name with the varname
namelist. (find_nml_name): Use the new helper functions to match
the extended type varnames.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210934 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/trans-io.c | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 88c26ad3986..0a830a7ed6e 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2014-05-26 Tobias Burnus <burnus@net-b.de> + + PR fortran/55117 + * trans-io.c (nml_full_name, transfer_namelist_element): Insert + a '+' rather then '%' to differentiate namelist variable names + that are based on extended derived types. + 2014-05-25 Tobias Burnus <burnus@net-b.de> * check.c (gfc_check_num_images): New. diff --git a/gcc/fortran/trans-io.c b/gcc/fortran/trans-io.c index d15159857d0..fb6f69fa49c 100644 --- a/gcc/fortran/trans-io.c +++ b/gcc/fortran/trans-io.c @@ -1452,10 +1452,10 @@ gfc_trans_wait (gfc_code * code) /* nml_full_name builds up the fully qualified name of a - derived type component. */ + derived type component. '+' is used to denote a type extension. */ static char* -nml_full_name (const char* var_name, const char* cmp_name) +nml_full_name (const char* var_name, const char* cmp_name, bool parent) { int full_name_length; char * full_name; @@ -1463,7 +1463,7 @@ nml_full_name (const char* var_name, const char* cmp_name) full_name_length = strlen (var_name) + strlen (cmp_name) + 1; full_name = XCNEWVEC (char, full_name_length + 1); strcpy (full_name, var_name); - full_name = strcat (full_name, "%"); + full_name = strcat (full_name, parent ? "+" : "%"); full_name = strcat (full_name, cmp_name); return full_name; } @@ -1634,7 +1634,8 @@ transfer_namelist_element (stmtblock_t * block, const char * var_name, for (cmp = ts->u.derived->components; cmp; cmp = cmp->next) { - char *full_name = nml_full_name (var_name, cmp->name); + char *full_name = nml_full_name (var_name, cmp->name, + ts->u.derived->attr.extension); transfer_namelist_element (block, full_name, NULL, cmp, expr); |