Skip to content

R
riscv-gcc-1
Commit a481c9b4 by Bob Duff Committed by Arnaud Charlet
Options

re PR ada/80888 (Wide_Text_IO defaults to bracket encoding even if -gnatW8 specified) 

2017-09-08  Bob Duff  <duff@adacore.com>

PR ada/80888
	* a-textio.adb, a-witeio.adb, a-ztexio.adb (Set_WCEM): Use
	Default_WCEM by default (i.e. if the encoding is not specified
	by the Form string).

From-SVN: r251874
parent 1c912574
Showing with 6 additions and 9 deletions
gcc/ada/a-textio.adb
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 1992-2016, Free Software Foundation, Inc. -- -- Copyright (C) 1992-2017, Free Software Foundation, Inc. --
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -1810,11 +1810,10 @@ package body Ada.Text_IO is ...@@ -1810,11 +1810,10 @@ package body Ada.Text_IO is
Stop : Natural; Stop : Natural;
begin begin
File.WC_Method := WCEM_Brackets;
FIO.Form_Parameter (File.Form.all, "wcem", Start, Stop); FIO.Form_Parameter (File.Form.all, "wcem", Start, Stop);
if Start = 0 then if Start = 0 then
File.WC_Method := WCEM_Brackets; File.WC_Method := Default_WCEM;
else else
if Stop = Start then if Stop = Start then
......
gcc/ada/a-witeio.adb
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 1992-2014, Free Software Foundation, Inc. -- -- Copyright (C) 1992-2017, Free Software Foundation, Inc. --
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -1652,11 +1652,10 @@ package body Ada.Wide_Text_IO is ...@@ -1652,11 +1652,10 @@ package body Ada.Wide_Text_IO is
Stop : Natural; Stop : Natural;
begin begin
File.WC_Method := WCEM_Brackets;
FIO.Form_Parameter (File.Form.all, "wcem", Start, Stop); FIO.Form_Parameter (File.Form.all, "wcem", Start, Stop);
if Start = 0 then if Start = 0 then
File.WC_Method := WCEM_Brackets; File.WC_Method := Default_WCEM;
else else
if Stop = Start then if Stop = Start then
......
gcc/ada/a-ztexio.adb
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 1992-2014, Free Software Foundation, Inc. -- -- Copyright (C) 1992-2017, Free Software Foundation, Inc. --
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -1626,11 +1626,10 @@ package body Ada.Wide_Wide_Text_IO is ...@@ -1626,11 +1626,10 @@ package body Ada.Wide_Wide_Text_IO is
Stop : Natural; Stop : Natural;
begin begin
File.WC_Method := WCEM_Brackets;
FIO.Form_Parameter (File.Form.all, "wcem", Start, Stop); FIO.Form_Parameter (File.Form.all, "wcem", Start, Stop);
if Start = 0 then if Start = 0 then
File.WC_Method := WCEM_Brackets; File.WC_Method := Default_WCEM;
else else
if Stop = Start then if Stop = Start then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment