diff options
| author | Vincent Celier <celier@adacore.com> | 2005-06-16 10:44:38 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2005-06-16 10:44:38 +0200 |
| commit | a493557f3ac51eb4c8967a5816f980ca547c2365 (patch) | |
| tree | 3390ad3df2d970f1a21ad81883e24f66f98535e1 /gcc/ada/prj-part.adb | |
| parent | 88664966ce2f31c5200f94b0a45c6abe2d41de1f (diff) | |
| download | gcc-a493557f3ac51eb4c8967a5816f980ca547c2365.zip gcc-a493557f3ac51eb4c8967a5816f980ca547c2365.tar.gz gcc-a493557f3ac51eb4c8967a5816f980ca547c2365.tar.bz2 | |
prj-part.adb (Pre_Parse_Context_Clause): Call Set_Is_Not_Last_In_List when the project file in a with clause is not the...
2005-06-14 Vincent Celier <celier@adacore.com>
* prj-part.adb (Pre_Parse_Context_Clause): Call Set_Is_Not_Last_In_List
when the project file in a with clause is not the last one, that is the
project file name is followed by a comma.
* prj-pp.adb: (First_With_In_List): New Boolean global variable
(Print): Issue list of project files separated by commas in with clauses
according to the values returned by Is_Not_Last_In_List.
* prj-tree.ads, prj-tree.adb: (Is_Not_Last_In_List): New function
(Set_Is_Not_Last_In_List): New procedure
From-SVN: r101054
Diffstat (limited to 'gcc/ada/prj-part.adb')
| -rw-r--r-- | gcc/ada/prj-part.adb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gcc/ada/prj-part.adb b/gcc/ada/prj-part.adb index 1b10084..fe2830a 100644 --- a/gcc/ada/prj-part.adb +++ b/gcc/ada/prj-part.adb @@ -667,7 +667,10 @@ package body Prj.Part is Scan (In_Tree); -- scan past the semicolon. exit Comma_Loop; - elsif Token /= Tok_Comma then + elsif Token = Tok_Comma then + Set_Is_Not_Last_In_List (Current_With_Node, In_Tree); + + else Error_Msg ("expected comma or semi colon", Token_Ptr); exit Comma_Loop; end if; @@ -679,7 +682,6 @@ package body Prj.Part is end loop With_Loop; end Pre_Parse_Context_Clause; - ------------------------------- -- Post_Parse_Context_Clause -- ------------------------------- @@ -1472,7 +1474,7 @@ package body Prj.Part is then -- Invalid name: report an error - Error_Msg ("Expected """ & + Error_Msg ("expected """ & Get_Name_String (Name_Of (Project, In_Tree)) & """", Token_Ptr); end if; @@ -1489,7 +1491,7 @@ package body Prj.Part is if Token /= Tok_EOF then Error_Msg - ("Unexpected text following end of project", Token_Ptr); + ("unexpected text following end of project", Token_Ptr); end if; end if; |