[PATCH] fix PR ada/80888

[PATCH] fix PR ada/80888

[Simon Wright]

[-- Attachment #1: Type: text/plain, Size: 1347 bytes --]

The GNAT reference manual says in 11.6 Wide_Text_IO
<https://gcc.gnu.org/onlinedocs/gnat_rm/Wide_005fText_005fIO.html>,

  "The default encoding method for the standard files, and for opened
  files for which no WCEM parameter is given in the FORM string matches
  the wide character encoding specified for the main program (the
  default being brackets encoding if no coding method was specified with
  -gnatW)."

This is not true; the default is brackets encoding regardless of the
coding method specified with -gnatW.

The attached patch (to 7.1.0) corrects this. Tested on
x86_84-apple-darwin15 by rebuilding the library (cd gcc; make gnatlib
gnatlib-shared) and make -j4 check-ada,

		=== acats Summary ===
# of expected passes		2320
# of unexpected failures	0
/Volumes/Miscellaneous/tmp/gcc-7.1.0/gcc/testsuite/ada/acats/run_all.sh completed at Fri 26 May 2017 15:44:52 BST

		=== gnat Summary ===

# of expected passes		2569
# of expected failures		24
# of unsupported tests		7
/Volumes/Miscellaneous/tmp/gcc-7.1.0-build/gcc/gnatmake version 7.1.0

gcc/ada/Changelog:

	2017-05-27 Simon Wright <simon@pushface.org>

	PR ada/80888
	* a-textio.adb (Set_WCEM): default the file's wide character encoding
	  method to Default_WCEM, not WCEM_Brackets.
	* a-witeio.adb: likewise.
	* a-ztexio.adb: likewise.


[-- Attachment #2: wcem-fix.diff --]
[-- Type: application/octet-stream, Size: 1485 bytes --]

diff --git a/gcc/ada/a-textio.adb b/gcc/ada/a-textio.adb
index f9219e3..8d22be8 100644
--- a/gcc/ada/a-textio.adb
+++ b/gcc/ada/a-textio.adb
@@ -1810,11 +1810,10 @@ package body Ada.Text_IO is
       Stop  : Natural;
 
    begin
-      File.WC_Method := WCEM_Brackets;
       FIO.Form_Parameter (File.Form.all, "wcem", Start, Stop);
 
       if Start = 0 then
-         File.WC_Method := WCEM_Brackets;
+         File.WC_Method := Default_WCEM;
 
       else
          if Stop = Start then
diff --git a/gcc/ada/a-witeio.adb b/gcc/ada/a-witeio.adb
index 59e06e2..dbae077 100644
--- a/gcc/ada/a-witeio.adb
+++ b/gcc/ada/a-witeio.adb
@@ -1652,11 +1652,10 @@ package body Ada.Wide_Text_IO is
       Stop  : Natural;
 
    begin
-      File.WC_Method := WCEM_Brackets;
       FIO.Form_Parameter (File.Form.all, "wcem", Start, Stop);
 
       if Start = 0 then
-         File.WC_Method := WCEM_Brackets;
+         File.WC_Method := Default_WCEM;
 
       else
          if Stop = Start then
diff --git a/gcc/ada/a-ztexio.adb b/gcc/ada/a-ztexio.adb
index 6102942..aff7fe0 100644
--- a/gcc/ada/a-ztexio.adb
+++ b/gcc/ada/a-ztexio.adb
@@ -1626,11 +1626,10 @@ package body Ada.Wide_Wide_Text_IO is
       Stop  : Natural;
 
    begin
-      File.WC_Method := WCEM_Brackets;
       FIO.Form_Parameter (File.Form.all, "wcem", Start, Stop);
 
       if Start = 0 then
-         File.WC_Method := WCEM_Brackets;
+         File.WC_Method := Default_WCEM;
 
       else
          if Stop = Start then

Re: [PATCH] fix PR ada/80888

[Simon Wright]

Ping
If OK, can it be applied please?
(patch applies cleanly to current sources)

> On 27 May 2017, at 16:58, Simon Wright <simon@pushface.org> wrote:
> 
> The GNAT reference manual says in 11.6 Wide_Text_IO
> <https://gcc.gnu.org/onlinedocs/gnat_rm/Wide_005fText_005fIO.html>,
> 
>  "The default encoding method for the standard files, and for opened
>  files for which no WCEM parameter is given in the FORM string matches
>  the wide character encoding specified for the main program (the
>  default being brackets encoding if no coding method was specified with
>  -gnatW)."
> 
> This is not true; the default is brackets encoding regardless of the
> coding method specified with -gnatW.
> 
> The attached patch (to 7.1.0) corrects this. Tested on
> x86_84-apple-darwin15 by rebuilding the library (cd gcc; make gnatlib
> gnatlib-shared) and make -j4 check-ada,
> 
> 		=== acats Summary ===
> # of expected passes		2320
> # of unexpected failures	0
> /Volumes/Miscellaneous/tmp/gcc-7.1.0/gcc/testsuite/ada/acats/run_all.sh completed at Fri 26 May 2017 15:44:52 BST
> 
> 		=== gnat Summary ===
> 
> # of expected passes		2569
> # of expected failures		24
> # of unsupported tests		7
> /Volumes/Miscellaneous/tmp/gcc-7.1.0-build/gcc/gnatmake version 7.1.0
> 
> gcc/ada/Changelog:
> 
> 	2017-05-27 Simon Wright <simon@pushface.org>
> 
> 	PR ada/80888
> 	* a-textio.adb (Set_WCEM): default the file's wide character encoding
> 	  method to Default_WCEM, not WCEM_Brackets.
> 	* a-witeio.adb: likewise.
> 	* a-ztexio.adb: likewise.
> 
> <wcem-fix.diff>

Re: [PATCH] fix PR ada/80888

[Arnaud Charlet]

> Ping
> If OK, can it be applied please?
> (patch applies cleanly to current sources)

Patch is OK. I'll apply it when I get a chance.

Arno