From d408dbfeabe3b4a65f6e955e97c0bef92056a845 Mon Sep 17 00:00:00 2001 From: Anthony Leonardo Gracio Date: Thu, 10 Oct 2019 15:23:19 +0000 Subject: [PATCH] [Ada] Mention GNAT Studio instead of GPS 2019-10-10 Anthony Leonardo Gracio gcc/ada/ * doc/gnat_ugn/about_this_guide.rst, doc/gnat_ugn/building_executable_programs_with_gnat.rst, doc/gnat_ugn/getting_started_with_gnat.rst, doc/gnat_ugn/gnat_and_program_execution.rst, errout.ads, exp_ch3.adb, gnatls.adb, impunit.adb, lib-writ.ads, opt.ads, sem_ch7.adb, sem_prag.adb, sem_res.adb, sem_warn.adb, terminals.c: Replace GPS by GNAT Studio. * gnat_ugn.texi: Regenerate. From-SVN: r276815 --- gcc/ada/ChangeLog | 14 +++++++++----- gcc/ada/doc/gnat_ugn/about_this_guide.rst | 6 +++--- .../building_executable_programs_with_gnat.rst | 4 ++-- gcc/ada/doc/gnat_ugn/getting_started_with_gnat.rst | 6 +++--- .../doc/gnat_ugn/gnat_and_program_execution.rst | 4 ++-- gcc/ada/errout.ads | 4 ++-- gcc/ada/exp_ch3.adb | 3 ++- gcc/ada/gnat_ugn.texi | 22 +++++++++++----------- gcc/ada/gnatls.adb | 5 +++-- gcc/ada/impunit.adb | 4 ++-- gcc/ada/lib-writ.ads | 3 ++- gcc/ada/opt.ads | 3 ++- gcc/ada/sem_ch7.adb | 2 +- gcc/ada/sem_prag.adb | 7 ++++--- gcc/ada/sem_res.adb | 2 +- gcc/ada/sem_warn.adb | 8 ++++---- gcc/ada/terminals.c | 2 +- 17 files changed, 54 insertions(+), 45 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 7579bb3..029925a 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,6 +1,10 @@ -2019-10-10 Ed Schonberg +2019-10-10 Anthony Leonardo Gracio - * exp_ch6.adb (Expand_Simple_Function_Return_Statement): If the - function to which the return statement applies is an - Ignored_Ghost_Function, do not indicate that it uses the - secondary stack when the return type is unconstrained. \ No newline at end of file + * doc/gnat_ugn/about_this_guide.rst, + doc/gnat_ugn/building_executable_programs_with_gnat.rst, + doc/gnat_ugn/getting_started_with_gnat.rst, + doc/gnat_ugn/gnat_and_program_execution.rst, errout.ads, + exp_ch3.adb, gnatls.adb, impunit.adb, lib-writ.ads, opt.ads, + sem_ch7.adb, sem_prag.adb, sem_res.adb, sem_warn.adb, + terminals.c: Replace GPS by GNAT Studio. + * gnat_ugn.texi: Regenerate. \ No newline at end of file diff --git a/gcc/ada/doc/gnat_ugn/about_this_guide.rst b/gcc/ada/doc/gnat_ugn/about_this_guide.rst index d322b9d..1ab2f4c 100644 --- a/gcc/ada/doc/gnat_ugn/about_this_guide.rst +++ b/gcc/ada/doc/gnat_ugn/about_this_guide.rst @@ -90,11 +90,11 @@ following documents: * :title:`GNAT Reference_Manual`, which contains all reference material for the GNAT implementation of Ada. -* :title:`Using the GNAT Programming Studio`, which describes the GPS +* :title:`Using GNAT Studio`, which describes the GNAT Studio Integrated Development Environment. -* :title:`GNAT Programming Studio Tutorial`, which introduces the - main GPS features through examples. +* :title:`GNAT Studio Tutorial`, which introduces the + main GNAT Studio features through examples. * :title:`Debugging with GDB`, for all details on the use of the GNU source-level debugger. diff --git a/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst b/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst index 6f13452..457646a 100644 --- a/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst +++ b/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst @@ -2377,7 +2377,7 @@ file) and have the following form: The first integer after the file name is the line number in the file, and the second integer is the column number within the line. -``GPS`` can parse the error messages +``GNAT Studio`` can parse the error messages and point to the referenced character. The following switches provide control over the error message format: @@ -5139,7 +5139,7 @@ checks to be performed. The following checks are defined: .. end of switch description (leave this comment to ease automatic parsing for -.. GPS +.. GNAT Studio In the above rules, appearing in column one is always permitted, that is, counts as meeting either a requirement for a required preceding space, diff --git a/gcc/ada/doc/gnat_ugn/getting_started_with_gnat.rst b/gcc/ada/doc/gnat_ugn/getting_started_with_gnat.rst index 756e301..34dc355 100644 --- a/gcc/ada/doc/gnat_ugn/getting_started_with_gnat.rst +++ b/gcc/ada/doc/gnat_ugn/getting_started_with_gnat.rst @@ -9,11 +9,11 @@ Getting Started with GNAT This chapter describes how to use GNAT's command line interface to build executable Ada programs. On most platforms a visually oriented Integrated Development Environment -is also available, the GNAT Programming Studio (GPS). -GPS offers a graphical "look and feel", support for development in +is also available, the GNAT Programming Studio (GNAT Studio). +GNAT Studio offers a graphical "look and feel", support for development in other programming languages, comprehensive browsing features, and many other capabilities. -For information on GPS please refer to +For information on GNAT Studio please refer to :title:`Using the GNAT Programming Studio`. diff --git a/gcc/ada/doc/gnat_ugn/gnat_and_program_execution.rst b/gcc/ada/doc/gnat_ugn/gnat_and_program_execution.rst index 56ee103..cae61e9 100644 --- a/gcc/ada/doc/gnat_ugn/gnat_and_program_execution.rst +++ b/gcc/ada/doc/gnat_ugn/gnat_and_program_execution.rst @@ -116,9 +116,9 @@ Running GDB This section describes how to initiate the debugger. -The debugger can be launched from a ``GPS`` menu or +The debugger can be launched from a ``GNAT Studio`` menu or directly from the command line. The description below covers the latter use. -All the commands shown can be used in the ``GPS`` debug console window, +All the commands shown can be used in the ``GNAT Studio`` debug console window, but there are usually more GUI-based ways to achieve the same effect. The command to run ``GDB`` is diff --git a/gcc/ada/errout.ads b/gcc/ada/errout.ads index 9a54c7c..37db3e5 100644 --- a/gcc/ada/errout.ads +++ b/gcc/ada/errout.ads @@ -647,8 +647,8 @@ package Errout is -- CODEFIX Facility -- ----------------------- - -- The GPS and GNATBench IDE's have a codefix facility that allows for - -- automatic correction of a subset of the errors and warnings issued + -- The GNAT Studio and GNATBench IDE's have a codefix facility that allows + -- for automatic correction of a subset of the errors and warnings issued -- by the compiler. This is done by recognizing the text of specific -- messages using appropriate matching patterns. diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb index 18c6aaf..82a58b7 100644 --- a/gcc/ada/exp_ch3.adb +++ b/gcc/ada/exp_ch3.adb @@ -6335,7 +6335,8 @@ package body Exp_Ch3 is -- would otherwise make two copies. The RM allows removing redunant -- Adjust/Finalize calls, but does not allow insertion of extra ones. - -- This part is disabled for now, because it breaks GPS builds + -- This part is disabled for now, because it breaks GNAT Studio + -- builds (False -- ??? and then Nkind (Expr_Q) = N_Explicit_Dereference diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi index 5db9c76..a1ef122 100644 --- a/gcc/ada/gnat_ugn.texi +++ b/gcc/ada/gnat_ugn.texi @@ -21,7 +21,7 @@ @copying @quotation -GNAT User's Guide for Native Platforms , Sep 14, 2019 +GNAT User's Guide for Native Platforms , Oct 09, 2019 AdaCore @@ -682,12 +682,12 @@ material for the several revisions of the Ada language standard. implementation of Ada. @item -@cite{Using the GNAT Programming Studio}, which describes the GPS +@cite{Using GNAT Studio}, which describes the GNAT Studio Integrated Development Environment. @item -@cite{GNAT Programming Studio Tutorial}, which introduces the -main GPS features through examples. +@cite{GNAT Studio Tutorial}, which introduces the +main GNAT Studio features through examples. @item @cite{Debugging with GDB}, @@ -897,11 +897,11 @@ the '\' character should be used instead. This chapter describes how to use GNAT's command line interface to build executable Ada programs. On most platforms a visually oriented Integrated Development Environment -is also available, the GNAT Programming Studio (GPS). -GPS offers a graphical "look and feel", support for development in +is also available, the GNAT Programming Studio (GNAT Studio). +GNAT Studio offers a graphical "look and feel", support for development in other programming languages, comprehensive browsing features, and many other capabilities. -For information on GPS please refer to +For information on GNAT Studio please refer to @cite{Using the GNAT Programming Studio}. @menu @@ -10446,7 +10446,7 @@ e.adb:4:20: ";" should be "is" The first integer after the file name is the line number in the file, and the second integer is the column number within the line. -@code{GPS} can parse the error messages +@code{GNAT Studio} can parse the error messages and point to the referenced character. The following switches provide control over the error message format: @@ -14110,7 +14110,7 @@ if any. @c end of switch description (leave this comment to ease automatic parsing for -@c GPS +@c GNAT Studio In the above rules, appearing in column one is always permitted, that is, counts as meeting either a requirement for a required preceding space, @@ -19394,9 +19394,9 @@ variables, and more generally to report on the state of execution. This section describes how to initiate the debugger. -The debugger can be launched from a @code{GPS} menu or +The debugger can be launched from a @code{GNAT Studio} menu or directly from the command line. The description below covers the latter use. -All the commands shown can be used in the @code{GPS} debug console window, +All the commands shown can be used in the @code{GNAT Studio} debug console window, but there are usually more GUI-based ways to achieve the same effect. The command to run @code{GDB} is diff --git a/gcc/ada/gnatls.adb b/gcc/ada/gnatls.adb index 4c4a019..b5782aa 100644 --- a/gcc/ada/gnatls.adb +++ b/gcc/ada/gnatls.adb @@ -53,8 +53,9 @@ with GNAT.OS_Lib; use GNAT.OS_Lib; procedure Gnatls is pragma Ident (Gnat_Static_Version_String); - -- NOTE : The following string may be used by other tools, such as GPS. So - -- it can only be modified if these other uses are checked and coordinated. + -- NOTE : The following string may be used by other tools, such as + -- GNAT Studio. So it can only be modified if these other uses are checked + -- and coordinated. Project_Search_Path : constant String := "Project Search Path:"; -- Label displayed in verbose mode before the directories in the project diff --git a/gcc/ada/impunit.adb b/gcc/ada/impunit.adb index 7e67569..7048ab4 100644 --- a/gcc/ada/impunit.adb +++ b/gcc/ada/impunit.adb @@ -32,8 +32,8 @@ with Namet; use Namet; with Opt; use Opt; with Uname; use Uname; --- Note: this package body is used by GPS and GNATBench to supply a list of --- entries for help on available library routines. +-- Note: this package body is used by GNAT Studio and GNATBench to supply a +-- list of entries for help on available library routines. package body Impunit is diff --git a/gcc/ada/lib-writ.ads b/gcc/ada/lib-writ.ads index 7248a61..5045b91 100644 --- a/gcc/ada/lib-writ.ads +++ b/gcc/ada/lib-writ.ads @@ -56,7 +56,8 @@ package Lib.Writ is -- incompatible with new versions of the compiler. Any changes to ali file -- formats must be carefully evaluated to understand any such possible -- conflicts, and in particular, it is very undesirable to create conflicts - -- between older versions of GPS and newer versions of the compiler. + -- between older versions of GNAT Studio and newer versions of the + -- compiler. -- If the following guidelines are respected, downward compatibility -- problems (old tools reading new ali files) should be minimized: diff --git a/gcc/ada/opt.ads b/gcc/ada/opt.ads index a07db75..1f068dc 100644 --- a/gcc/ada/opt.ads +++ b/gcc/ada/opt.ads @@ -501,7 +501,8 @@ package Opt is Display_Compilation_Progress : Boolean := False; -- GNATMAKE, GPRBUILD -- Set True (-d switch) to display information on progress while compiling - -- files. Internal flag to be used in conjunction with an IDE (e.g GPS). + -- files. Internal flag to be used in conjunction with an IDE + -- (e.g GNAT Studio). type Distribution_Stub_Mode_Type is -- GNAT diff --git a/gcc/ada/sem_ch7.adb b/gcc/ada/sem_ch7.adb index db6bffd..313cb4e 100644 --- a/gcc/ada/sem_ch7.adb +++ b/gcc/ada/sem_ch7.adb @@ -1271,7 +1271,7 @@ package body Sem_Ch7 is procedure Generate_Parent_References; -- For a child unit, generate references to parent units, for - -- GPS navigation purposes. + -- GNAT Studio navigation purposes. function Is_Public_Child (Child, Unit : Entity_Id) return Boolean; -- Child and Unit are entities of compilation units. True if Child diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index c7c267a..76dd711 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -8194,15 +8194,16 @@ package body Sem_Prag is Set_Convention_From_Pragma (E); -- Treat a pragma Import as an implicit body, and pragma import - -- as implicit reference (for navigation in GPS). + -- as implicit reference (for navigation in GNAT Studio). if Prag_Id = Pragma_Import then Generate_Reference (E, Id, 'b'); -- For exported entities we restrict the generation of references -- to entities exported to foreign languages since entities - -- exported to Ada do not provide further information to GPS and - -- add undesired references to the output of the gnatxref tool. + -- exported to Ada do not provide further information to + -- GNAT Studio and add undesired references to the output of the + -- gnatxref tool. elsif Prag_Id = Pragma_Export and then Convention (E) /= Convention_Ada diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index 28d1352..4a50b09 100644 --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -6845,7 +6845,7 @@ package body Sem_Res is end if; -- If this is a dispatching call, generate the appropriate reference, - -- for better source navigation in GPS. + -- for better source navigation in GNAT Studio. if Is_Overloadable (Nam) and then Present (Controlling_Argument (N)) diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb index 8f85057..f9a6062 100644 --- a/gcc/ada/sem_warn.adb +++ b/gcc/ada/sem_warn.adb @@ -821,10 +821,10 @@ package body Sem_Warn is function Generic_Body_Formal (E : Entity_Id) return Entity_Id; -- Warnings on unused formals of subprograms are placed on the entity -- in the subprogram body, which seems preferable because it suggests - -- a better codefix for GPS. The analysis of generic subprogram bodies - -- uses a different circuitry, so the choice for the proper placement - -- of the warning in the generic case takes place here, by finding the - -- body entity that corresponds to a formal in a spec. + -- a better codefix for GNAT Studio. The analysis of generic subprogram + -- bodies uses a different circuitry, so the choice for the proper + -- placement of the warning in the generic case takes place here, by + -- finding the body entity that corresponds to a formal in a spec. procedure May_Need_Initialized_Actual (Ent : Entity_Id); -- If an entity of a generic type has default initialization, then the diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c index 0ce3fb7..af4417f 100644 --- a/gcc/ada/terminals.c +++ b/gcc/ada/terminals.c @@ -170,7 +170,7 @@ struct TTY_Process { BOOL usePipe; }; -/* Control whether create_child cause the process to inherit GPS' +/* Control whether create_child cause the process to inherit GNAT Studio' error mode setting. The default is 1, to minimize the possibility of subprocesses blocking when accessing unmounted drives. */ static int Vw32_start_process_inherit_error_mode = 1; -- 2.7.4