Commit 2f448b29 authored by yoogx's avatar yoogx
Browse files

* Add minimal support for annex-specific property definition

parent 6874047f
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -132,7 +132,10 @@ package Ocarina.ME_AADL.AADL_Tree.Entities.Properties is ...@@ -132,7 +132,10 @@ package Ocarina.ME_AADL.AADL_Tree.Entities.Properties is
PO_Provides_Subprogram_Access, PO_Provides_Subprogram_Access,
PO_Prototype, PO_Prototype,
PO_Package); PO_Package,
PO_Alien_Meta_Model -- Not support alien meta-model elements, e.g. EMV2
);
type Referable_Element_Category is type Referable_Element_Category is
(REC_Component_Category, (REC_Component_Category,
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -981,10 +981,12 @@ package body Ocarina.FE_AADL.Lexer is ...@@ -981,10 +981,12 @@ package body Ocarina.FE_AADL.Lexer is
-- Skip_Tokens -- -- Skip_Tokens --
----------------- -----------------
procedure Skip_Tokens (Delimiters : Token_List_Type) is procedure Skip_Tokens (Delimiters : Token_List_Type;
Include_Delimiter : Boolean := True)
is
begin begin
for Index in Delimiters'Range loop for Index in Delimiters'Range loop
Skip_Tokens (Delimiters (Index)); Skip_Tokens (Delimiters (Index), Include_Delimiter);
end loop; end loop;
end Skip_Tokens; end Skip_Tokens;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -86,7 +86,8 @@ package Ocarina.FE_AADL.Lexer is ...@@ -86,7 +86,8 @@ package Ocarina.FE_AADL.Lexer is
-- Skip tokens until we find Delimiter -- Skip tokens until we find Delimiter
-- This procedure verifies that skipped tokens are well embraced -- This procedure verifies that skipped tokens are well embraced
procedure Skip_Tokens (Delimiters : Token_List_Type); procedure Skip_Tokens (Delimiters : Token_List_Type;
Include_Delimiter : Boolean := True);
-- Same as above, with each token T in given list, calls Skip_Tokens (T) -- Same as above, with each token T in given list, calls Skip_Tokens (T)
end Ocarina.FE_AADL.Lexer; end Ocarina.FE_AADL.Lexer;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -2918,6 +2918,14 @@ package body Ocarina.FE_AADL.Parser.Properties.Values is ...@@ -2918,6 +2918,14 @@ package body Ocarina.FE_AADL.Parser.Properties.Values is
Owner_Category := New_Node (K_Named_Element, Token_Location); Owner_Category := New_Node (K_Named_Element, Token_Location);
case Token is case Token is
when T_Left_Curly_Bracket =>
-- For now, we simply skip annex-dependent properties
Save_Lexer (Loc);
Skip_Tokens ((T_Comma, T_Right_Parenthesis), False);
Category := PO_Alien_Meta_Model;
Comp_Cat := CC_Unknown;
when T_Abstract | T_System when T_Abstract | T_System
| T_Processor | T_Thread | T_Processor | T_Thread
| T_Process | T_Virtual | T_Process | T_Virtual
......
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