OSDN Git Service

For the 60th anniversary of Chinese people��s Anti-Japan war victory.
authorfengwang <fengwang@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 7 Jul 2005 07:54:58 +0000 (07:54 +0000)
committerfengwang <fengwang@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 7 Jul 2005 07:54:58 +0000 (07:54 +0000)
commit169f9d09e5d61b72aebc64c5a6632bc376ba2081
tree7bfda0a20b79d65d1ac562cb286d5799c84e43db
parentbbe50a5a148bb7e80ca9447e91950e7be867ea9f
For the 60th anniversary of Chinese people��s Anti-Japan war victory.

2005-07-07  Feng Wang  <fengwang@nudt.edu.cn>

PR fortran/16531
PR fortran/15966
PR fortran/18781
* arith.c (gfc_hollerith2int, gfc_hollerith2real,
gfc_hollerith2complex, gfc_hollerith2character, gfc_hollerith2logical):
New functions.
(eval_intrinsic): Don't evaluate if Hollerith constant arguments exist.
* arith.h (gfc_hollerith2int, gfc_hollerith2real,
gfc_hollerith2complex, gfc_hollerith2character, gfc_hollerith2logical):
Add prototypes.
* expr.c (free_expr0): Free memery allocated for Hollerith constant.
(gfc_copy_expr): Allocate and copy string if Expr is from Hollerith.
(gfc_check_assign): Enable conversion from Hollerith to other.
* gfortran.h (bt): Add BT_HOLLERITH.
(gfc_expr): Add from_H flag.
* intrinsic.c (gfc_type_letter): Return 'h' for BT_HOLLERITH.
(add_conversions): Add conversions from Hollerith constant to other.
(do_simplify): Don't simplify if  Hollerith constant arguments exist.
* io.c (resolve_tag): Enable array in FORMAT tag under GFC_STD_GNU.
* misc.c (gfc_basetype_name): Return "HOLLERITH" for BT_HOLLERITH.
(gfc_type_name): Print "HOLLERITH" for BT_HOLLERITH.
* primary.c (match_hollerith_constant): New function.
(gfc_match_literal_constant): Add match Hollerith before Integer.
* simplify.c (gfc_convert_constant): Add conversion from Hollerith
to other.
* trans-const.c (gfc_conv_constant_to_tree): Use VIEW_CONVERT_EXPR to
convert Hollerith constant to tree.
* trans-io.c (gfc_convert_array_to_string): Get array's address and
length to set string expr.
(set_string): Deal with array assigned Hollerith constant and character
array.
* gfortran.texi: Document Hollerith constants as extention support.

2005-07-07  Feng Wang  <fengwang@nudt.edu.cn>

PR fortran/16531
PR fortran/15966
PR fortran/18781
* gfortran.dg/hollerith.f90: New.
* gfortran.dg/hollerith2.f90: New.
* gfortran.dg/hollerith3.f90: New.
* gfortran.dg/hollerith4.f90: New.
* gfortran.dg/hollerith_f95.f90: New.
* gfortran.dg/hollerith_legacy.f90: New.
* gfortran.dg/g77/cpp4.F: New. Port from g77.

2005-07-07  Feng Wang  <fengwang@nudt.edu.cn>

PR fortran/16531
* io/transfer.c (formatted_transfer): Enable FMT_A on other types to
support Hollerith constants.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@101688 138bc75d-0d04-0410-961f-82ee72b054a4
21 files changed:
gcc/fortran/arith.c
gcc/fortran/arith.h
gcc/fortran/expr.c
gcc/fortran/gfortran.h
gcc/fortran/intrinsic.c
gcc/fortran/io.c
gcc/fortran/misc.c
gcc/fortran/primary.c
gcc/fortran/simplify.c
gcc/fortran/trans-const.c
gcc/fortran/trans-io.c
gcc/testsuite/ChangeLog
gcc/testsuite/gfortran.dg/g77/cpp4.F [new file with mode: 0644]
gcc/testsuite/gfortran.dg/hollerith.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/hollerith2.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/hollerith3.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/hollerith4.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/hollerith_f95.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/hollerith_legacy.f90 [new file with mode: 0644]
libgfortran/ChangeLog
libgfortran/io/transfer.c