From b5e2413e4ae0da5e9dfb18073ecb9737fff4fadf Mon Sep 17 00:00:00 2001 From: charlet Date: Fri, 31 Aug 2007 10:25:05 +0000 Subject: [PATCH] 2007-08-31 Vincent Celier * fmap.ads: Minor comment updates 2007-08-31 GNAT Script * Make-lang.in: Makefile automatically updated 2007-08-31 Bob Duff * sinfo.ads: Minor comment fix. 2007-08-31 Thomas Quinot * stand.ads: (Standard_Debug_Renaming_Type): Make comment consistent with implementation. Documentation cleanup only. 2007-08-31 Sergey Rybin * vms_data.ads: Add new qualifier /STMT_NAME_ON_NEW_LINE for the new gnatpp '--separate-stmt-name' option. Add new qualifier /USE_ON_NEW_LIN for the new gnatpp '--use-on-new-line' option. * gnat_ugn.texi: Add description for the new gnatpp '--separate-stmt-name' and '--use-on-new-line' options. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127984 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/Make-lang.in | 111 +++++++++++++++++++++++++------------------------- gcc/ada/fmap.ads | 6 +-- gcc/ada/gnat_ugn.texi | 16 ++++++++ gcc/ada/sinfo.ads | 4 +- gcc/ada/stand.ads | 2 +- gcc/ada/vms_data.ads | 93 +++++++++++++++++++++++++----------------- 6 files changed, 133 insertions(+), 99 deletions(-) diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in index c7d5ff69ed8..a2c8363fad5 100644 --- a/gcc/ada/Make-lang.in +++ b/gcc/ada/Make-lang.in @@ -1240,8 +1240,8 @@ ada/back_end.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/a-uncdea.ads ada/alloc.ads ada/atree.ads ada/atree.adb \ ada/back_end.ads ada/back_end.adb ada/casing.ads ada/debug.ads \ ada/einfo.ads ada/einfo.adb ada/elists.ads ada/fname.ads ada/gnat.ads \ - ada/g-hesora.ads ada/g-htable.ads ada/hostparm.ads ada/lib.ads \ - ada/lib.adb ada/lib-list.adb ada/lib-sort.adb ada/namet.ads \ + ada/g-hesora.ads ada/g-htable.ads ada/gnatvsn.ads ada/hostparm.ads \ + ada/lib.ads ada/lib.adb ada/lib-list.adb ada/lib-sort.adb ada/namet.ads \ ada/nlists.ads ada/nlists.adb ada/opt.ads ada/osint.ads ada/osint-c.ads \ ada/output.ads ada/sinfo.ads ada/sinfo.adb ada/sinput.ads \ ada/sinput.adb ada/snames.ads ada/stand.ads ada/stringt.ads \ @@ -3833,32 +3833,30 @@ ada/sem_util.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/casing.ads ada/casing.adb ada/checks.ads ada/csets.ads \ ada/debug.ads ada/einfo.ads ada/einfo.adb ada/elists.ads ada/elists.adb \ ada/err_vars.ads ada/errout.ads ada/erroutc.ads ada/eval_fat.ads \ - ada/exp_tss.ads ada/exp_util.ads ada/fname.ads ada/fname-uf.ads \ - ada/freeze.ads ada/get_targ.ads ada/gnat.ads ada/g-hesora.ads \ - ada/g-htable.ads ada/gnatvsn.ads ada/hostparm.ads ada/interfac.ads \ - ada/lib.ads ada/lib.adb ada/lib-list.adb ada/lib-load.ads \ - ada/lib-sort.adb ada/lib-xref.ads ada/namet.ads ada/namet.adb \ - ada/nlists.ads ada/nlists.adb ada/nmake.ads ada/nmake.adb ada/opt.ads \ - ada/output.ads ada/restrict.ads ada/rident.ads ada/rtsfind.ads \ - ada/rtsfind.adb ada/scans.ads ada/scn.ads ada/scng.ads ada/scng.adb \ + ada/exp_tss.ads ada/exp_util.ads ada/fname.ads ada/freeze.ads \ + ada/get_targ.ads ada/gnat.ads ada/g-hesora.ads ada/g-htable.ads \ + ada/hostparm.ads ada/interfac.ads ada/lib.ads ada/lib.adb \ + ada/lib-list.adb ada/lib-sort.adb ada/lib-xref.ads ada/namet.ads \ + ada/namet.adb ada/nlists.ads ada/nlists.adb ada/nmake.ads ada/nmake.adb \ + ada/opt.ads ada/output.ads ada/restrict.ads ada/rident.ads \ + ada/rtsfind.ads ada/scans.ads ada/scn.ads ada/scng.ads ada/scng.adb \ ada/sem.ads ada/sem_attr.ads ada/sem_cat.ads ada/sem_ch6.ads \ - ada/sem_ch7.ads ada/sem_ch8.ads ada/sem_dist.ads ada/sem_eval.ads \ - ada/sem_eval.adb ada/sem_res.ads ada/sem_type.ads ada/sem_util.ads \ - ada/sem_util.adb ada/sem_warn.ads ada/sinfo.ads ada/sinfo.adb \ - ada/sinput.ads ada/sinput.adb ada/snames.ads ada/stand.ads \ - ada/stringt.ads ada/stringt.adb ada/style.ads ada/styleg.ads \ - ada/styleg.adb ada/styleg-c.ads ada/stylesw.ads ada/system.ads \ - ada/s-carun8.ads ada/s-crc32.ads ada/s-crc32.adb ada/s-exctab.ads \ - ada/s-htable.ads ada/s-imgenu.ads ada/s-memory.ads ada/s-os_lib.ads \ - ada/s-parame.ads ada/s-rident.ads ada/s-secsta.ads ada/s-soflin.ads \ - ada/s-stache.ads ada/s-stalib.ads ada/s-stoele.ads ada/s-stoele.adb \ - ada/s-strops.ads ada/s-sopco3.ads ada/s-sopco4.ads ada/s-sopco5.ads \ - ada/s-string.ads ada/s-traent.ads ada/s-unstyp.ads ada/s-utf_32.ads \ - ada/s-wchcon.ads ada/table.ads ada/table.adb ada/targparm.ads \ - ada/tbuild.ads ada/tbuild.adb ada/tree_io.ads ada/ttypes.ads \ - ada/types.ads ada/types.adb ada/uintp.ads ada/uintp.adb ada/uname.ads \ - ada/unchconv.ads ada/unchdeal.ads ada/urealp.ads ada/urealp.adb \ - ada/widechar.ads + ada/sem_ch8.ads ada/sem_eval.ads ada/sem_eval.adb ada/sem_res.ads \ + ada/sem_type.ads ada/sem_util.ads ada/sem_util.adb ada/sem_warn.ads \ + ada/sinfo.ads ada/sinfo.adb ada/sinput.ads ada/sinput.adb \ + ada/snames.ads ada/stand.ads ada/stringt.ads ada/stringt.adb \ + ada/style.ads ada/styleg.ads ada/styleg.adb ada/styleg-c.ads \ + ada/stylesw.ads ada/system.ads ada/s-carun8.ads ada/s-crc32.ads \ + ada/s-crc32.adb ada/s-exctab.ads ada/s-htable.ads ada/s-imgenu.ads \ + ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads \ + ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads \ + ada/s-stoele.ads ada/s-stoele.adb ada/s-strops.ads ada/s-sopco3.ads \ + ada/s-sopco4.ads ada/s-sopco5.ads ada/s-string.ads ada/s-traent.ads \ + ada/s-unstyp.ads ada/s-utf_32.ads ada/s-wchcon.ads ada/table.ads \ + ada/table.adb ada/targparm.ads ada/tbuild.ads ada/tbuild.adb \ + ada/tree_io.ads ada/ttypes.ads ada/types.ads ada/types.adb \ + ada/uintp.ads ada/uintp.adb ada/uname.ads ada/unchconv.ads \ + ada/unchdeal.ads ada/urealp.ads ada/urealp.adb ada/widechar.ads ada/sem_vfpt.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/a-uncdea.ads ada/alloc.ads ada/atree.ads ada/atree.adb \ @@ -4032,10 +4030,11 @@ ada/stringt.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/namet.ads ada/opt.ads ada/output.ads ada/stringt.ads \ ada/stringt.adb ada/system.ads ada/s-carun8.ads ada/s-exctab.ads \ ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-stalib.ads \ - ada/s-strops.ads ada/s-sopco3.ads ada/s-sopco4.ads ada/s-sopco5.ads \ - ada/s-string.ads ada/s-traent.ads ada/s-unstyp.ads ada/s-wchcon.ads \ - ada/table.ads ada/table.adb ada/tree_io.ads ada/types.ads ada/types.adb \ - ada/unchconv.ads ada/unchdeal.ads + ada/s-stoele.ads ada/s-stoele.adb ada/s-strops.ads ada/s-sopco3.ads \ + ada/s-sopco4.ads ada/s-sopco5.ads ada/s-string.ads ada/s-traent.ads \ + ada/s-unstyp.ads ada/s-wchcon.ads ada/table.ads ada/table.adb \ + ada/tree_io.ads ada/types.ads ada/types.adb ada/unchconv.ads \ + ada/unchdeal.ads ada/style.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/a-uncdea.ads ada/alloc.ads ada/atree.ads ada/atree.adb \ @@ -4087,37 +4086,39 @@ ada/stylesw.o : ada/ada.ads ada/a-unccon.ads ada/a-uncdea.ads \ ada/types.ads ada/unchdeal.ads ada/switch-b.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ - ada/a-uncdea.ads ada/alloc.ads ada/debug.ads ada/hostparm.ads \ - ada/namet.ads ada/opt.ads ada/osint.ads ada/output.ads ada/switch.ads \ - ada/switch-b.ads ada/switch-b.adb ada/system.ads ada/s-exctab.ads \ - ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-soflin.ads \ - ada/s-stache.ads ada/s-stalib.ads ada/s-stoele.ads ada/s-stoele.adb \ - ada/s-strops.ads ada/s-sopco3.ads ada/s-sopco4.ads ada/s-sopco5.ads \ - ada/s-string.ads ada/s-traent.ads ada/s-unstyp.ads ada/s-wchcon.ads \ - ada/table.ads ada/table.adb ada/tree_io.ads ada/types.ads \ - ada/unchconv.ads ada/unchdeal.ads + ada/a-uncdea.ads ada/alloc.ads ada/debug.ads ada/gnatvsn.ads \ + ada/hostparm.ads ada/namet.ads ada/opt.ads ada/osint.ads ada/output.ads \ + ada/switch.ads ada/switch-b.ads ada/switch-b.adb ada/system.ads \ + ada/s-exctab.ads ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads \ + ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads ada/s-stoele.ads \ + ada/s-stoele.adb ada/s-strops.ads ada/s-sopco3.ads ada/s-sopco4.ads \ + ada/s-sopco5.ads ada/s-string.ads ada/s-traent.ads ada/s-unstyp.ads \ + ada/s-wchcon.ads ada/table.ads ada/table.adb ada/tree_io.ads \ + ada/types.ads ada/unchconv.ads ada/unchdeal.ads ada/switch-c.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ - ada/a-uncdea.ads ada/alloc.ads ada/debug.ads ada/hostparm.ads \ - ada/lib.ads ada/namet.ads ada/opt.ads ada/osint.ads ada/output.ads \ - ada/prepcomp.ads ada/sem_warn.ads ada/stylesw.ads ada/switch.ads \ - ada/switch-c.ads ada/switch-c.adb ada/system.ads ada/s-exctab.ads \ + ada/a-uncdea.ads ada/alloc.ads ada/debug.ads ada/gnatvsn.ads \ + ada/hostparm.ads ada/lib.ads ada/namet.ads ada/opt.ads ada/osint.ads \ + ada/output.ads ada/prepcomp.ads ada/sem_warn.ads ada/stylesw.ads \ + ada/switch.ads ada/switch-c.ads ada/switch-c.adb ada/system.ads \ + ada/s-exctab.ads ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads \ + ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads \ + ada/s-stoele.ads ada/s-stoele.adb ada/s-strops.ads ada/s-sopco3.ads \ + ada/s-sopco4.ads ada/s-sopco5.ads ada/s-string.ads ada/s-traent.ads \ + ada/s-unstyp.ads ada/s-wchcon.ads ada/table.ads ada/table.adb \ + ada/tree_io.ads ada/types.ads ada/unchconv.ads ada/unchdeal.ads \ + ada/validsw.ads + +ada/switch.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ + ada/a-uncdea.ads ada/alloc.ads ada/debug.ads ada/gnatvsn.ads \ + ada/hostparm.ads ada/namet.ads ada/opt.ads ada/osint.ads ada/output.ads \ + ada/switch.ads ada/switch.adb ada/system.ads ada/s-exctab.ads \ ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-secsta.ads \ ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads ada/s-stoele.ads \ ada/s-stoele.adb ada/s-strops.ads ada/s-sopco3.ads ada/s-sopco4.ads \ ada/s-sopco5.ads ada/s-string.ads ada/s-traent.ads ada/s-unstyp.ads \ ada/s-wchcon.ads ada/table.ads ada/table.adb ada/tree_io.ads \ - ada/types.ads ada/unchconv.ads ada/unchdeal.ads ada/validsw.ads - -ada/switch.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ - ada/a-uncdea.ads ada/alloc.ads ada/debug.ads ada/hostparm.ads \ - ada/namet.ads ada/opt.ads ada/osint.ads ada/output.ads ada/switch.ads \ - ada/switch.adb ada/system.ads ada/s-exctab.ads ada/s-memory.ads \ - ada/s-os_lib.ads ada/s-parame.ads ada/s-stalib.ads ada/s-strops.ads \ - ada/s-sopco3.ads ada/s-sopco4.ads ada/s-sopco5.ads ada/s-string.ads \ - ada/s-traent.ads ada/s-unstyp.ads ada/s-wchcon.ads ada/table.ads \ - ada/table.adb ada/tree_io.ads ada/types.ads ada/unchconv.ads \ - ada/unchdeal.ads + ada/types.ads ada/unchconv.ads ada/unchdeal.ads ada/system.o : ada/system.ads diff --git a/gcc/ada/fmap.ads b/gcc/ada/fmap.ads index 17528a57210..879b51f1ce2 100644 --- a/gcc/ada/fmap.ads +++ b/gcc/ada/fmap.ads @@ -66,12 +66,12 @@ package Fmap is procedure Add_Forbidden_File_Name (Name : File_Name_Type); -- Indicate that a source file name is forbidden. - -- This is used by gnatmake when there are Locally_Removed_Files in - -- extending projects. + -- This is used by gnatmake when there are excluded sources in projects + -- (attributes Excluded_Source_Files or Locally_Removed_Files). procedure Remove_Forbidden_File_Name (Name : File_Name_Type); -- Indicate that a source file name that was forbidden is no longer - -- forbidden. Used by gnatmake when a locally removed file is redefined + -- forbidden. Used by gnatmake when an excluded source is redefined -- in another extending project. end Fmap; diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi index b35707e9f81..42d3601f9f9 100644 --- a/gcc/ada/gnat_ugn.texi +++ b/gcc/ada/gnat_ugn.texi @@ -15433,6 +15433,15 @@ case if the specification occupies more then one line. Place the keyword @code{loop} in FOR and WHILE loop statements and the keywird @code{then} in IF statements on a separate line. +@cindex @option{^--use-on-new-line^/USE_ON_NEW_LINE^} (@command{gnatpp}) +@item ^--use-on-new-line^/USE_ON_NEW_LINE^ +Start each USE clause in a context clause from a separate line. + +@cindex @option{^--separate-stmt-name^/STMT_NAME_ON_NEW_LINE^} (@command{gnatpp}) +@item ^--separate-stmt-name^/STMT_NAME_ON_NEW_LINE^ +Use a separate line for a loop or block statement name, but do not use an extra +indentation level for the statement itself. + @end table @ifclear vms @@ -16016,6 +16025,13 @@ A further difference between GNAT style layout and compact layout is that GNAT style layout inserts empty lines as separation for compound statements, return statements and bodies. +Note that the layout specified by +@option{^--separate-stmt-name^/STMT_NAME_ON_NEW_LINE^} +for named block and loop statements overrides the layout defined by these +constructs by @option{^-l1^/CONSTRUCT_LAYOUT=GNAT^}, +@option{^-l2^/CONSTRUCT_LAYOUT=COMPACT^} or +@option{^-l3^/CONSTRUCT_LAYOUT=UNCOMPACT^} option. + @node Name Casing @subsection Name Casing diff --git a/gcc/ada/sinfo.ads b/gcc/ada/sinfo.ads index 65009c6796e..749dd801168 100644 --- a/gcc/ada/sinfo.ads +++ b/gcc/ada/sinfo.ads @@ -1818,8 +1818,8 @@ package Sinfo is -- -- Is_Folded_In_Parser is True if the parser created this literal by -- folding a sequence of "&" operators. For example, if the source code - -- says "aaa" & "bbb" & "ccc", and the produces "aaabbbccc", the flag is - -- set. This flag is needed because the parser doesn't know about + -- says "aaa" & "bbb" & "ccc", and this produces "aaabbbccc", the flag + -- is set. This flag is needed because the parser doesn't know about -- visibility, so the folded result might be wrong, and semantic -- analysis needs to check for that. diff --git a/gcc/ada/stand.ads b/gcc/ada/stand.ads index 1b18bafc23b..32b769fab38 100644 --- a/gcc/ada/stand.ads +++ b/gcc/ada/stand.ads @@ -346,7 +346,7 @@ package Stand is -- denote a thin pointer component. Standard_Debug_Renaming_Type : Entity_Id; - -- A null record type with zero size, used as the type of variables used + -- A zero-size subtype of Integer, used as the type of variables used -- to provide the debugger with name encodings for renaming declarations. -- The entities labeled Any_xxx are used in situations where the full diff --git a/gcc/ada/vms_data.ads b/gcc/ada/vms_data.ads index f6565b5f376..8b0a1e1ca5b 100644 --- a/gcc/ada/vms_data.ads +++ b/gcc/ada/vms_data.ads @@ -5089,6 +5089,21 @@ package VMS_Data is -- Place the THEN keyword in IF statement and the LOOP keyword in for- -- and while-loops on a separate line. + S_Pretty_Use_On_New_Line : aliased constant S := "/USE_ON_NEW_LINE " & + "--use-on-new-line"; + -- /USE_ON_NEW_LINE + -- + -- Start any USE clause that is a part of a context clause from a + -- separate line. + + S_Pretty_Stnm_On_Nw_Line : aliased constant S := "/STMT_NAME_ON_NEW_LINE " & + "--separate-stmt-name"; + -- /STMT_NAME_ON_NEW_LINE + -- + -- For named block and loop statements use a separate line for the + -- statement name, but do not use an extra indentation level for the + -- statement itself. + S_Pretty_Eol : aliased constant S := "/END_OF_LINE=" & "DOS " & "--eol=dos " & @@ -5396,44 +5411,46 @@ package VMS_Data is -- By default such warnings are not activated. Pretty_Switches : aliased constant Switches := - (S_Pretty_Add 'Access, - S_Pretty_Align 'Access, - S_Pretty_All_Prjs 'Access, - S_Pretty_Attrib 'Access, - S_Pretty_Comments 'Access, - S_Pretty_Compact_Is 'Access, - S_Pretty_Config 'Access, - S_Pretty_Constr 'Access, - S_Pretty_Comind 'Access, - S_Pretty_Current 'Access, - S_Pretty_Dico 'Access, - S_Pretty_Eol 'Access, - S_Pretty_Ext 'Access, - S_Pretty_Encoding 'Access, - S_Pretty_Files 'Access, - S_Pretty_Forced 'Access, - S_Pretty_Formfeed 'Access, - S_Pretty_Indent 'Access, - S_Pretty_Keyword 'Access, - S_Pretty_Maxlen 'Access, - S_Pretty_Maxind 'Access, - S_Pretty_Mess 'Access, - S_Pretty_Names 'Access, - S_Pretty_No_Backup 'Access, - S_Pretty_No_Labels 'Access, - S_Pretty_Notabs 'Access, - S_Pretty_Output 'Access, - S_Pretty_Override 'Access, - S_Pretty_Pragma 'Access, - S_Pretty_Replace 'Access, - S_Pretty_Project 'Access, - S_Pretty_RTS 'Access, - S_Pretty_Search 'Access, - S_Pretty_Sep_Loop_Then 'Access, - S_Pretty_Specific 'Access, - S_Pretty_Standard 'Access, - S_Pretty_Verbose 'Access, - S_Pretty_Warnings 'Access); + (S_Pretty_Add 'Access, + S_Pretty_Align 'Access, + S_Pretty_All_Prjs 'Access, + S_Pretty_Attrib 'Access, + S_Pretty_Comments 'Access, + S_Pretty_Compact_Is 'Access, + S_Pretty_Config 'Access, + S_Pretty_Constr 'Access, + S_Pretty_Comind 'Access, + S_Pretty_Current 'Access, + S_Pretty_Dico 'Access, + S_Pretty_Eol 'Access, + S_Pretty_Ext 'Access, + S_Pretty_Encoding 'Access, + S_Pretty_Files 'Access, + S_Pretty_Forced 'Access, + S_Pretty_Formfeed 'Access, + S_Pretty_Indent 'Access, + S_Pretty_Keyword 'Access, + S_Pretty_Maxlen 'Access, + S_Pretty_Maxind 'Access, + S_Pretty_Mess 'Access, + S_Pretty_Names 'Access, + S_Pretty_No_Backup 'Access, + S_Pretty_No_Labels 'Access, + S_Pretty_Notabs 'Access, + S_Pretty_Output 'Access, + S_Pretty_Override 'Access, + S_Pretty_Pragma 'Access, + S_Pretty_Replace 'Access, + S_Pretty_Project 'Access, + S_Pretty_RTS 'Access, + S_Pretty_Search 'Access, + S_Pretty_Sep_Loop_Then 'Access, + S_Pretty_Use_On_New_Line'Access, + S_Pretty_Stnm_On_Nw_Line'Access, + S_Pretty_Specific 'Access, + S_Pretty_Standard 'Access, + S_Pretty_Verbose 'Access, + S_Pretty_Warnings 'Access); ------------------------------ -- Switches for GNAT SHARED -- -- 2.11.0