diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-10-08 10:22:31 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-10-08 10:22:31 +0000 |
| commit | 4c3c04756a8649638033e53f6c6395acf7156cde (patch) | |
| tree | ec2b5e80bfd4ae021a7fb9457b85dbe2ab34c666 /gcc/ada/prj-tree.adb | |
| parent | dc43851bf1f4c7852cf393f540ab79780c14b01d (diff) | |
| download | ppe42-gcc-4c3c04756a8649638033e53f6c6395acf7156cde.tar.gz ppe42-gcc-4c3c04756a8649638033e53f6c6395acf7156cde.zip | |
2010-10-08 Robert Dewar <dewar@adacore.com>
* sem_ch3.adb: Minor reformatting.
2010-10-08 Vincent Celier <celier@adacore.com>
* ali-util.adb (Get_File_Checksum): Make sure that external_as_list is
not a reserved word.
* prj-proc.adb (Expression): Process string list external references.
* prj-strt.adb (External_Reference): Parse external_as_list external
references.
* prj-tree.ads (Expression_Kind_Of): Allowed for N_External_Value nodes
(Set_Expression_Kind_Of): Ditto
* prj.adb (Initialize): Set external_as_list as a reserved word
* projects.texi: Document new string external reference external_as_list
* scans.ads (Token_Type): New token Tok_External_As_List
* snames.ads-tmpl: New standard name Name_External_As_List
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@165157 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-tree.adb')
| -rw-r--r-- | gcc/ada/prj-tree.adb | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/gcc/ada/prj-tree.adb b/gcc/ada/prj-tree.adb index 55f21950b1a..f1b700bd962 100644 --- a/gcc/ada/prj-tree.adb +++ b/gcc/ada/prj-tree.adb @@ -559,11 +559,12 @@ package body Prj.Tree is function Expression_Kind_Of (Node : Project_Node_Id; - In_Tree : Project_Node_Tree_Ref) return Variable_Kind is + In_Tree : Project_Node_Tree_Ref) return Variable_Kind + is begin pragma Assert (Present (Node) - and then + and then -- should use Nkind_In here ??? why not??? (In_Tree.Project_Nodes.Table (Node).Kind = N_Literal_String or else In_Tree.Project_Nodes.Table (Node).Kind = N_Attribute_Declaration @@ -571,7 +572,7 @@ package body Prj.Tree is In_Tree.Project_Nodes.Table (Node).Kind = N_Variable_Declaration or else In_Tree.Project_Nodes.Table (Node).Kind = - N_Typed_Variable_Declaration + N_Typed_Variable_Declaration or else In_Tree.Project_Nodes.Table (Node).Kind = N_Package_Declaration or else @@ -581,9 +582,9 @@ package body Prj.Tree is or else In_Tree.Project_Nodes.Table (Node).Kind = N_Variable_Reference or else - In_Tree.Project_Nodes.Table (Node).Kind = - N_Attribute_Reference)); - + In_Tree.Project_Nodes.Table (Node).Kind = N_Attribute_Reference + or else + In_Tree.Project_Nodes.Table (Node).Kind = N_External_Value)); return In_Tree.Project_Nodes.Table (Node).Expr_Kind; end Expression_Kind_Of; @@ -1837,7 +1838,7 @@ package body Prj.Tree is begin pragma Assert (Present (Node) - and then + and then -- should use Nkind_In here ??? why not??? (In_Tree.Project_Nodes.Table (Node).Kind = N_Literal_String or else In_Tree.Project_Nodes.Table (Node).Kind = N_Attribute_Declaration @@ -1845,7 +1846,7 @@ package body Prj.Tree is In_Tree.Project_Nodes.Table (Node).Kind = N_Variable_Declaration or else In_Tree.Project_Nodes.Table (Node).Kind = - N_Typed_Variable_Declaration + N_Typed_Variable_Declaration or else In_Tree.Project_Nodes.Table (Node).Kind = N_Package_Declaration or else @@ -1855,8 +1856,9 @@ package body Prj.Tree is or else In_Tree.Project_Nodes.Table (Node).Kind = N_Variable_Reference or else - In_Tree.Project_Nodes.Table (Node).Kind = - N_Attribute_Reference)); + In_Tree.Project_Nodes.Table (Node).Kind = N_Attribute_Reference + or else + In_Tree.Project_Nodes.Table (Node).Kind = N_External_Value)); In_Tree.Project_Nodes.Table (Node).Expr_Kind := To; end Set_Expression_Kind_Of; |
