Commit e792f502 authored by julien.delange's avatar julien.delange

* apply jerome's patch to ocarina in order to commit changes

   in buildsupport



git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/ocarina@1012 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent 4ce8e1dc
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2005-2009, GET-Telecom Paris. --
-- Copyright (C) 2005-2010, European Space Agency (ESA). --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -625,6 +625,11 @@ package body Ocarina.Instances.Properties is
Node : Node_Id;
begin
if No (Property_Value) then
-- If there is no property value defined, simply return
return Instantiated_Value;
end if;
case ATN.Kind (Property_Value) is
when K_Literal =>
Instantiated_Value := New_Node (Kind (Property_Value),
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2009-2010, GET-Telecom Paris. --
-- Copyright (C) 2009-2010, European Space Agency (ESA). --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -37,7 +37,7 @@ with Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Tree.Nodes;
with Ocarina.ME_AADL.AADL_Tree.Entities;
with Ocarina.ME_AADL.AADL_Tree.Entities.Properties;
with Locations;
with Ocarina.Annotations;
package body Ocarina.Analyzer.AADL.Queries is
......@@ -209,7 +209,8 @@ package body Ocarina.Analyzer.AADL.Queries is
end case;
when others =>
raise Program_Error;
raise Program_Error with "Invalid kind " & Kind (Entity)'Img
& " at " & Locations.Image (Loc (Entity));
end case;
end Get_Category_Of_Entity;
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2005-2010, GET-Telecom Paris. --
-- Copyright (C) 2005-2010, European Space Agency (ESA). --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -149,7 +149,9 @@ package body Ocarina.Processor.Properties is
First_Node (Declarations (List_Node));
while Declaration_Node /= No_Node loop
if Is_Private (Property_Node)
if Kind (Declaration_Node)
/= K_Name_Visibility_declaration
and then Is_Private (Property_Node)
= Is_Private (Declaration_Node)
and then Property_Can_Apply_To_Entity
(Property_Node, Declaration_Node)
......
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