Skip to content

R
riscv-gcc-1
Commit 8b404dac by Arnaud Charlet
Options

[multiple changes] 

2013-04-25  Hristian Kirtchev  <kirtchev@adacore.com>

	* exp_ch6.adb: Add with and use clause for Stringt.
	(Expand_Contract_Cases): Moved from sem_ch6. Add formal parameters
	Decls and Stmts along with comments on their usage.
	* exp_ch6.ads (Expand_Contract_Cases): Moved from sem_ch6.
	* sem_ch6.adb (Expand_Contract_Cases): Moved to exp_ch6.
	(Process_Contract_Cases): Update the call to Expand_Contract_Cases.

2013-04-25  Ed Schonberg  <schonberg@adacore.com>

	* gnat_rm.texi: Minor editing, to clarify use of dimension aspects.
	* sem_util.adb (Is_OK_Variable_For_Out_Formal): Reject an
	aggregate for a packed type, which may be converted into an
	unchecked conversion of an object.

From-SVN: r198292
parent 7be8338d
Showing with 75 additions and 18 deletions
gcc/ada/ChangeLog
2013-04-25 Hristian Kirtchev <kirtchev@adacore.com>
* exp_ch6.adb: Add with and use clause for Stringt.
(Expand_Contract_Cases): Moved from sem_ch6. Add formal parameters
Decls and Stmts along with comments on their usage.
* exp_ch6.ads (Expand_Contract_Cases): Moved from sem_ch6.
* sem_ch6.adb (Expand_Contract_Cases): Moved to exp_ch6.
(Process_Contract_Cases): Update the call to Expand_Contract_Cases.
2013-04-25 Ed Schonberg <schonberg@adacore.com>
* gnat_rm.texi: Minor editing, to clarify use of dimension aspects.
* sem_util.adb (Is_OK_Variable_For_Out_Formal): Reject an
aggregate for a packed type, which may be converted into an
unchecked conversion of an object.
2013-04-25 Robert Dewar <dewar@adacore.com>
* sem_prag.adb: Minor code reorganization (correct misspelling
......
gcc/ada/exp_ch6.ads
......@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- Copyright (C) 1992-2012, Free Software Foundation, Inc. --
-- Copyright (C) 1992-2013, Free Software Foundation, Inc. --
-- --
-- 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- --
......@@ -71,6 +71,17 @@ package Exp_Ch6 is
-- This procedure contains common processing for Expand_N_Function_Call,
-- Expand_N_Procedure_Statement, and Expand_N_Entry_Call.
procedure Expand_Contract_Cases
(CCs : Node_Id;
Subp_Id : Entity_Id;
Decls : List_Id;
Stmts : in out List_Id);
-- Given pragma Contract_Cases CCs, create the circuitry needed to evaluate
-- case guards and trigger consequence expressions. Subp_Id is the related
-- subprogram for which the pragma applies. Decls are the declarations of
-- Subp_Id's body. All generated code is added to list Stmts. If Stmts is
-- empty, a new list is created.
procedure Freeze_Subprogram (N : Node_Id);
-- generate the appropriate expansions related to Subprogram freeze
-- nodes (e.g. the filling of the corresponding Dispatch Table for
......
gcc/ada/gnat_rm.texi
......@@ -992,6 +992,7 @@ consideration, the use of these pragmas should be minimized.
* Pragma Optimize_Alignment::
* Pragma Ordered::
* Pragma Overflow_Mode::
* Pragma Overriding_Renamings::
* Pragma Partition_Elaboration_Policy::
* Pragma Passive::
* Pragma Persistent_BSS::
......@@ -4698,6 +4699,25 @@ overflow checking, but does not affect the overflow mode.
The pragma @code{Unsuppress (Overflow_Check)} unsuppresses (enables)
overflow checking, but does not affect the overflow mode.
@node Pragma Overriding_Renamings
@unnumberedsec Pragma Overriding_Renamings
@findex Overriding_Renamings
@cindex Rational profile
@noindent
Syntax:
@smallexample @c ada
pragma Overriding_Renamings;
@end smallexample
@noindent
This is a GNAT pragma to simplify porting legacy code accepted by the Rational
Ada compiler. In the presence of this pragma, a renaming declaration that
renames an inherited operation declared in the same scope is legal, even though
RM 8.3 (15) stipulates that an overridden operation is not visible within the
declaration of the overriding operation.
@node Pragma Partition_Elaboration_Policy
@unnumberedsec Pragma Partition_Elaboration_Policy
@findex Partition_Elaboration_Policy
......@@ -5205,6 +5225,7 @@ The Rational profile is intended to facilitate porting legacy code that
compiles with the Rational APEX compiler, even when the code includes non-
conforming Ada constructs. The profile enables the following three pragmas:
@itemize @bullet
@item pragma Implicit_Packing
@item pragma Overriding_Renamings
......@@ -6814,9 +6835,9 @@ This aspect is equivalent to pragma @code{Depends}.
@unnumberedsec Aspect Dimension
@findex Dimension
@noindent
The @code{Dimension} aspect is used to define a system of
dimensions that will be used in subsequent subtype declarations with
@code{Dimension} aspects that reference this system. The syntax is:
The @code{Dimension} aspect is used to specify the dimensions of a given
subtype of a dimensioned numeric type. The aspect also specifies a symbol
used when doing formatted output of dimensioned quantities. The syntax is:
@smallexample @c ada
with Dimension =>
......@@ -6833,9 +6854,13 @@ RATIONAL ::= [-] NUMERIC_LITERAL [/ NUMERIC_LITERAL]
@end smallexample
@noindent
This aspect can only be applied to a subtype where the parent type has
a @code{Dimension_Systen} aspect. It specifies which units apply to
the subtype, and the corresponding powers. For examples of the usage
This aspect can only be applied to a subtype whose parent type has
a @code{Dimension_Systen} aspect. The aspect must specify values for
all dimensions of the system. The rational values are the powers of the
corresponding dimensions that are used by the compiler to verify that
physical (numeric) computations are dimensionally consistent. For example,
the computation of a force must result in dimensions (L => 1, M => 1, T => -2).
For further examples of the usage
of this aspect, see package @code{System.Dim.Mks}.
Note that when the dimensioned type is an integer type, then any
dimension value must be an integer literal.
......@@ -6864,15 +6889,19 @@ This aspect is applied to a type, which must be a numeric derived type
will represent values within the dimension system. Each @code{DIMENSION}
corresponds to one particular dimension. A maximum of 7 dimensions may
be specified. @code{Unit_Name} is the name of the dimension (for example
@code{Meter}). @code{Unit_Symbol} is the short hand used for quantities
@code{Meter}). @code{Unit_Symbol} is the shorthand used for quantities
of this dimension (for example 'm' for Meter). @code{Dim_Symbol} gives
the identification within the dimension system (typically this is a
single letter, e.g. 'L' standing for length for unit name Meter).
single letter, e.g. 'L' standing for length for unit name Meter). The
Unit_Smbol is used in formatted output of dimensioned quantities. The
Dim_Symbol is used in error messages when numeric operations have
inconsistent dimensions.
Although the implementation allows multiple different dimension systems
to be defined using this aspect, in practice, nearly all usage of the
dimension system will use the standard definition in the run-time
package @code{System.Dim.Mks}:
GNAT provides the standard definition of the International MKS system in
the run-time package @code{System.Dim.Mks}. You can easily define
similar packages for cgs units or British units, and define conversion factors
between values in different systems. The MKS system is characterized by the
following aspect:
@smallexample @c ada
type Mks_Type is new Long_Long_Float
......@@ -6888,9 +6917,7 @@ package @code{System.Dim.Mks}:
@end smallexample
@noindent
which correspond to the standard 7-unit dimension system typically
used in physical calculations. See section
"Performing Dimensionality Analysis in GNAT" in the GNAT Users
See section "Performing Dimensionality Analysis in GNAT" in the GNAT Users
Guide for detailed examples of use of the dimension system.
@node Aspect Favor_Top_Level
......
gcc/ada/sem_util.adb
......@@ -8909,10 +8909,13 @@ package body Sem_Util is
-- parameters in cases where code generation is unaffected. We tell
-- source unchecked conversions by seeing if they are rewrites of an
-- original Unchecked_Conversion function call, or of an explicit
-- conversion of a function call.
-- conversion of a function call or an aggregate (as may happen in the
-- expansion of a packed array aggregate).
elsif Nkind (AV) = N_Unchecked_Type_Conversion then
if Nkind (Original_Node (AV)) = N_Function_Call then
if Nkind_In (Original_Node (AV),
N_Function_Call, N_Aggregate)
then
return False;
elsif Comes_From_Source (AV)
......
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