From 83fa09c5beeee4a76ec6910e1ca38577d5373a60 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Tue, 2 Aug 2011 11:48:59 +0200 Subject: [PATCH] [multiple changes] 2011-08-02 Yannick Moy * a-cfdlli.ads, a-cfhase.ads, a-cforma.ads, a-cfhama.ads, a-cforse.ads: Update comments. 2011-08-02 Ed Schonberg * sem_attr.adb: add attribute name when 'Result has the wrong prefix. From-SVN: r177113 --- gcc/ada/ChangeLog | 9 +++++++++ gcc/ada/a-cfdlli.ads | 7 ++++++- gcc/ada/a-cfhama.ads | 9 ++++++++- gcc/ada/a-cfhase.ads | 7 ++++++- gcc/ada/a-cforma.ads | 9 ++++++++- gcc/ada/a-cforse.ads | 7 ++++++- gcc/ada/sem_attr.adb | 2 ++ 7 files changed, 45 insertions(+), 5 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 09245bf4bf8..35103c9d3b4 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,12 @@ +2011-08-02 Yannick Moy + + * a-cfdlli.ads, a-cfhase.ads, a-cforma.ads, a-cfhama.ads, + a-cforse.ads: Update comments. + +2011-08-02 Ed Schonberg + + * sem_attr.adb: add attribute name when 'Result has the wrong prefix. + 2011-08-02 Robert Dewar * a-cfdlli.ads, a-cfhase.ads, a-cforma.ads, a-cfhama.ads, diff --git a/gcc/ada/a-cfdlli.ads b/gcc/ada/a-cfdlli.ads index 96945ab29d7..3be6ea6dc78 100644 --- a/gcc/ada/a-cfdlli.ads +++ b/gcc/ada/a-cfdlli.ads @@ -43,11 +43,16 @@ -- which is not possible if cursors encapsulate an access to the underlying -- container. --- There are two new functions: +-- There are three new functions: +-- function Strict_Equal (Left, Right : List) return Boolean; -- function Left (Container : List; Position : Cursor) return List; -- function Right (Container : List; Position : Cursor) return List; +-- Strict_Equal returns True if the containers are physically equal, +-- meaning that they are structurally equal (function "=" returns True) +-- and that they have the same set of cursors. + -- Left returns a container containing all elements preceding Position -- (excluded) in Container. Right returns a container containing all -- elements following Position (included) in Container. These two new diff --git a/gcc/ada/a-cfhama.ads b/gcc/ada/a-cfhama.ads index 96f64708fbf..56a0a62ce1b 100644 --- a/gcc/ada/a-cfhama.ads +++ b/gcc/ada/a-cfhama.ads @@ -42,11 +42,18 @@ -- and its previous version C'Old) for expressing properties, which is not -- possible if cursors encapsulate an access to the underlying container. --- There are two new functions: +-- There are four new functions: +-- function Strict_Equal (Left, Right : Map) return Boolean; +-- function Overlap (Left, Right : Map) return Boolean; -- function Left (Container : Map; Position : Cursor) return Map; -- function Right (Container : Map; Position : Cursor) return Map; +-- Strict_Equal returns True if the containers are physically equal, +-- meaning that they are structurally equal (function "=" returns True) +-- and that they have the same set of cursors. Overlap returns True if +-- the containers have common keys. + -- Left returns a container containing all elements preceding Position -- (excluded) in Container. Right returns a container containing all -- elements following Position (included) in Container. These two new diff --git a/gcc/ada/a-cfhase.ads b/gcc/ada/a-cfhase.ads index a3e4179f5d1..b9da734e32a 100644 --- a/gcc/ada/a-cfhase.ads +++ b/gcc/ada/a-cfhase.ads @@ -43,11 +43,16 @@ -- which is not possible if cursors encapsulate an access to the underlying -- container. --- There are two new functions: +-- There are three new functions: +-- function Strict_Equal (Left, Right : Set) return Boolean; -- function Left (Container : Set; Position : Cursor) return Set; -- function Right (Container : Set; Position : Cursor) return Set; +-- Strict_Equal returns True if the containers are physically equal, +-- meaning that they are structurally equal (function "=" returns True) +-- and that they have the same set of cursors. + -- Left returns a container containing all elements preceding Position -- (excluded) in Container. Right returns a container containing all -- elements following Position (included) in Container. These two new diff --git a/gcc/ada/a-cforma.ads b/gcc/ada/a-cforma.ads index 2ddefebff71..261a29e68b3 100644 --- a/gcc/ada/a-cforma.ads +++ b/gcc/ada/a-cforma.ads @@ -44,11 +44,18 @@ -- container. The operators "<" and ">" that could not be modified that way -- have been removed. --- There are two new functions: +-- There are four new functions: +-- function Strict_Equal (Left, Right : Map) return Boolean; +-- function Overlap (Left, Right : Map) return Boolean; -- function Left (Container : Map; Position : Cursor) return Map; -- function Right (Container : Map; Position : Cursor) return Map; +-- Strict_Equal returns True if the containers are physically equal, +-- meaning that they are structurally equal (function "=" returns True) +-- and that they have the same set of cursors. Overlap returns True if +-- the containers have common keys. + -- Left returns a container containing all elements preceding Position -- (excluded) in Container. Right returns a container containing all -- elements following Position (included) in Container. These two new diff --git a/gcc/ada/a-cforse.ads b/gcc/ada/a-cforse.ads index 89caaba5ba4..c15f9c64333 100644 --- a/gcc/ada/a-cforse.ads +++ b/gcc/ada/a-cforse.ads @@ -44,11 +44,16 @@ -- container. The operators "<" and ">" that could not be modified that way -- have been removed. --- There are two new functions: +-- There are three new functions: +-- function Strict_Equal (Left, Right : Set) return Boolean; -- function Left (Container : Set; Position : Cursor) return Set; -- function Right (Container : Set; Position : Cursor) return Set; +-- Strict_Equal returns True if the containers are physically equal, +-- meaning that they are structurally equal (function "=" returns True) +-- and that they have the same set of cursors. + -- Left returns a container containing all elements preceding Position -- (excluded) in Container. Right returns a container containing all -- elements following Position (included) in Container. These two new diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb index c8412886233..9e9cd19e30f 100644 --- a/gcc/ada/sem_attr.adb +++ b/gcc/ada/sem_attr.adb @@ -4009,6 +4009,8 @@ package body Sem_Attr is -- Check OK prefix if Chars (CS) /= Chars (P) then + Error_Msg_Name_1 := Name_Result; + Error_Msg_NE ("incorrect prefix for % attribute, expected &", P, CS); Error_Attr; -- 2.30.2