[Patch, fortran] PR48298 - [F03] User-Defined Derived-Type IO (DTIO)
Paul Richard Thomas
paul.richard.thomas@gmail.com
Tue Aug 23 21:42:00 GMT 2016
Dear all,
Jerry has tried to submit a couple of times today but the messages
disappear into the luminferous ether. Perhaps the NSA is reviewing the
patch? (If so, please give us your review!)
As Jerry says below, the modified patch fixes the problem identified
by Dominique, add some editorial changes and permits DTIO recursion.
Bootstraps and regtests on FC2[1,3]/x86_64 - OK for trunk?
Paul and Jerry
---------- Forwarded message ----------
From: Jerry DeLisle <jvdelisle@charter.net>
Date: 23 August 2016 at 19:38
Subject: Fwd: Re: [Patch, fortran] PR48298 - [F03] User-Defined
Derived-Type IO (DTIO)
To: Paul Richard Thomas <paul.richard.thomas@gmail.com>
Paul,
This is what I attempted to send to list this morning with it not
getting through.
Sending to you as backup. I will try agin a little later today.
Jerry
-------- Forwarded Message --------
Subject: Re: [Patch, fortran] PR48298 - [F03] User-Defined
Derived-Type IO (DTIO)
Date: Tue, 23 Aug 2016 10:06:33 -0700
From: Jerry DeLisle <jvdelisle@charter.net>
To: fortran@gcc.gnu.org <fortran@gcc.gnu.org>, GCC Patches
<gcc-patches@gcc.gnu.org>
Hi All,
The attached is the overall patch and ChangeLogs updated.
The correction for the mutex lock issue found by Dominique is included
with some minor editorial changes.
I will be adding a few test cases as we move along.
We plan to commit this coming weekend if no objections.
Regards,
Jerry
--
The difference between genius and stupidity is; genius has its limits.
Albert Einstein
-------------- next part --------------
2016-08-23 Paul Thomas <pault@gcc.gnu.org>
Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/48298
* decl.c (access_attr_decl): Include case INTERFACE_DTIO as
appropriate.
* gfortran.h : Add INTRINSIC_FORMATTED and
INTRINSIC_UNFORMATTED to gfc_intrinsic_op. Add INTERFACE_DTIO
to interface type. Add new enum 'dtio_codes'. Add bitfield
'has_dtio_procs' to symbol_attr. Add prototypes
'gfc_check_dtio_interfaces' and 'gfc_find_specific_dtio_proc'.
* interface.c (dtio_op): New function.
(gfc_match_generic_spec): Match generic DTIO interfaces.
(gfc_match_interface): Treat DTIO interfaces in the same way as
(gfc_current_interface_head): Add INTERFACE_DTIO appropriately.
(check_dtio_arg_TKR_intent): New function.
(check_dtio_interface1): New function.
(gfc_check_dtio_interfaces): New function.
(gfc_find_specific_dtio_proc): New function.
* io.c : Add FMT_DT to format_token.
(format_lex): Handle DTIO formatting.
* match.c (gfc_op2string): Add DTIO operators.
* resolve.c (derived_inaccessible): Ignore pointer components
to enclosing derived type.
(resolve_transfer): Resolve transfers that involve DTIO.
procedures. Find the specific subroutine for the transfer and
use its existence to over-ride some of the constraints on
derived types. If the transfer is recursive, require that the
subroutine be so qualified.
(dtio_procs_present): New function.
(resolve_fl_namelist): Remove inhibition of polymorphic objects
in namelists if DTIO read and write subroutines exist. Likewise
for derived types.
(resolve_types): Invoke 'gfc_verify_dtio_procedures'.
* symbol.c : Set 'dtio_procs' using 'minit'.
* trans-decl.c (gfc_finish_var_decl): If a derived-type/class
object is associated with DTIO procedures, make it TREE_STATIC.
* trans-expr.c (gfc_get_vptr_from_expr): If the expression
drills down to a PARM_DECL, extract the vptr correctly.
(gfc_conv_derived_to_class): Check 'info' in the test for
'useflags'. If the se expression exists and is a pointer, use
it as the class _data.
* trans-io.c : Add IOCALL_X_DERIVED to iocall and the function
prototype. Add two new arguments to IOCALL_SET_NML_VAL.
(set_parameter_tree): Renamed from 'set_parameter_const', now
returns void and has new tree argument. Calls modified to match
new interface.
(transfer_namelist_element): Transfer DTIO procedure pointer
and the table to the vpointer, using the two new arguments of
IOCALL_SET_NML_VAL.
(get_dtio_proc): New function.
(transfer_expr): Add new argument for the vptr field of class
objects. Add the code to call the specific DTIO proc, convert
derived types to class and call IOCALL_X_DERIVED.
(trans_transfer): Add BT_CLASS to structures for treatment by
the scalarizer. Obtain the vptr for the dynamic type, both for
scalar and array transfer.
2016-08-23 Jerry DeLisle <jvdelisle@gcc.gnu.org>
Paul Thomas <pault@gcc.gnu.org>
PR libgfortran/48298
* gfortran.map : Flag _gfortran_transfer_derived.
* io/format.c (format_lex): Detect DTIO formatting.
(parse_format_list): Parse the DTIO format.
(next_format): Include FMT_DT.
* io/format.h : Likewise. Add structure 'udf' to structure
'fnode' to carry the IOTYPE string and the 'vlist'.
* io/io.h : Add prototypes for the two types of DTIO subroutine
and a typedef for gfc_class. Also, add to 'namelist_type'
fields for the pointer to the DTIO procedure and the vtable.
Add fields to struct st_parameter_dt for pointers to the two
types of DTIO subroutine. Add to gfc_unit DTIO specific fields.
* io/list_read.c (check_buffers): Use the 'current_unit' field.
(unget_char): Likewise.
(eat_spaces): Likewise.
(list_formatted_read_scalar): For case BT_CLASS, call the DTIO
procedure.
(nml_get_obj_data): Likewise when DTIO procedure is present.
* io/transfer.c : Export prototypes for 'transfer_derived' and
'transfer_derived_write'.
(unformatted_read): For case BT_CLASS, call the DTIO procedure.
(unformatted_write): Likewise.
(formatted_transfer_scalar_read): Likewise.
(formatted_transfer_scalar_write: Likewise.
(transfer_derived): New function.
(data_transfer_init): Set last_char if no child_dtio.
(finalize_transfer): Return if child_dtio set.
(st_write_done): Add condition for child_dtio not set.
Add extra arguments for st_set_nml_var prototype.
(st_set_nml_var): Set the 'dtio_sub' and 'vtable' fields of the
'nml' structure.
* io/unit.c (get_external_unit): If the found unit child_dtio
is non zero, don't do any mutex locking/unlocking. Just
return the unit.
* io/unix.c (tempfile_open): Revert to C style comment.
* io/write.c (list_formatted_write_scalar): Do the DTIO call.
(nml_write_obj): Add BT_CLASS and do the DTIO call.
2016-08-23 Jerry DeLisle <jvdelisle@gcc.gnu.org>
Paul Thomas <pault@gcc.gnu.org>
PR fortran/48298
* gfortran.dg/dtio_1.f90: New test.
* gfortran.dg/dtio_2.f90: New test.
* gfortran.dg/dtio_5.f90: New test.
* gfortran.dg/dtio_6.f90: New test.
* gfortran.dg/dtio_7.f90: New test.
* gfortran.dg/dtio_8.f90: New test.
* gfortran.dg/dtio_9.f90: New test.
* gfortran.dg/dtio_10.f90: New test.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: submit-a.diff
Type: text/x-patch
Size: 141605 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/fortran/attachments/20160823/dc805b1d/attachment.bin>
More information about the Fortran
mailing list