-- --
-- B o d y --
-- --
--- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2007, 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- --
--- ware Foundation; either version 2, or (at your option) any later ver- --
+-- ware Foundation; either version 3, or (at your option) any later ver- --
-- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --
-- for more details. You should have received a copy of the GNU General --
--- Public License distributed with GNAT; see file COPYING. If not, write --
--- to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, --
--- MA 02111-1307, USA. --
+-- Public License distributed with GNAT; see file COPYING3. If not, go to --
+-- http://www.gnu.org/licenses for a complete copy of the license. --
-- --
-- GNAT was originally developed by the GNAT team at New York University. --
-- Extensive contributions were provided by Ada Core Technologies Inc. --
-- Local functions, used only in this chapter
- function P_Pragma_Argument_Association return Node_Id;
+ procedure Scan_Pragma_Argument_Association
+ (Identifier_Seen : in out Boolean;
+ Association : out Node_Id);
+ -- Scans out a pragma argument association. Identifier_Seen is true on
+ -- entry if a previous association had an identifier, and gets set True if
+ -- the scanned association has an identifier (this is used to check the
+ -- rule that no associations without identifiers can follow an association
+ -- which has an identifier). The result is returned in Association.
---------------------
-- 2.3 Identifier --
if Token = Tok_Identifier then
- -- Ada 2005 (AI-284): Compiling in Ada95 mode we notify
- -- that interface, overriding, and synchronized are
- -- new reserved words
+ -- Ada 2005 (AI-284): Compiling in Ada95 mode we warn that INTERFACE,
+ -- OVERRIDING, and SYNCHRONIZED are new reserved words.
- if Ada_Version = Ada_95 then
+ if Ada_Version = Ada_95
+ and then Warn_On_Ada_2005_Compatibility
+ then
if Token_Name = Name_Overriding
or else Token_Name = Name_Synchronized
or else (Token_Name = Name_Interface
-- CHARACTER_LITERAL ::= ' GRAPHIC_CHARACTER '
- -- Handled by the scanner and returned as Tok_Character_Literal
+ -- Handled by the scanner and returned as Tok_Char_Literal
-------------------------
-- 2.6 String Literal --
-- STRING LITERAL ::= "{STRING_ELEMENT}"
- -- Handled by the scanner and returned as Tok_Character_Literal
+ -- Handled by the scanner and returned as Tok_String_Literal
-- or if the string looks like an operator as Tok_Operator_Symbol.
-------------------------
Arg_Count : Int := 0;
-- Number of argument associations processed
+ Identifier_Seen : Boolean := False;
+ -- Set True if an identifier is encountered for a pragma argument. Used
+ -- to check that there are no more arguments without identifiers.
+
Pragma_Node : Node_Id;
Pragma_Name : Name_Id;
Semicolon_Loc : Source_Ptr;
loop
Arg_Count := Arg_Count + 1;
- Assoc_Node := P_Pragma_Argument_Association;
+ Scan_Pragma_Argument_Association (Identifier_Seen, Assoc_Node);
if Arg_Count = 2
and then (Interface_Check_Required or else Import_Check_Required)
-- Error recovery: cannot raise Error_Resync
- function P_Pragma_Argument_Association return Node_Id is
+ procedure Scan_Pragma_Argument_Association
+ (Identifier_Seen : in out Boolean;
+ Association : out Node_Id)
+ is
Scan_State : Saved_Scan_State;
- Pragma_Arg_Node : Node_Id;
Identifier_Node : Node_Id;
begin
- Pragma_Arg_Node := New_Node (N_Pragma_Argument_Association, Token_Ptr);
- Set_Chars (Pragma_Arg_Node, No_Name);
+ Association := New_Node (N_Pragma_Argument_Association, Token_Ptr);
+ Set_Chars (Association, No_Name);
if Token = Tok_Identifier then
Identifier_Node := Token_Node;
Scan; -- past Identifier
if Token = Tok_Arrow then
+ Identifier_Seen := True;
Scan; -- past arrow
- Set_Chars (Pragma_Arg_Node, Chars (Identifier_Node));
+ Set_Chars (Association, Chars (Identifier_Node));
Delete_Node (Identifier_Node);
+
+ -- Case of argument with no identifier
+
else
Restore_Scan_State (Scan_State); -- to Identifier
+
+ if Identifier_Seen then
+ Error_Msg_SC
+ ("|pragma argument identifier required here (RM 2.8(4))");
+ end if;
end if;
end if;
- Set_Expression (Pragma_Arg_Node, P_Expression);
- return Pragma_Arg_Node;
-
- end P_Pragma_Argument_Association;
+ Set_Expression (Association, P_Expression);
+ end Scan_Pragma_Argument_Association;
end Ch2;
OSDN Git Service
