Commit 832ce96b authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Don't need interface view to parse data view

parent c8dc31e7
...@@ -14,6 +14,7 @@ with System.Assertions, ...@@ -14,6 +14,7 @@ with System.Assertions,
Ocarina.Configuration, Ocarina.Configuration,
Ocarina.Files, Ocarina.Files,
Ocarina.Parser, Ocarina.Parser,
Ocarina.FE_AADL.Parser,
TASTE.Backend.Build_Script, TASTE.Backend.Build_Script,
TASTE.Backend.Skeletons; TASTE.Backend.Skeletons;
...@@ -145,6 +146,7 @@ package body TASTE.AADL_Parser is ...@@ -145,6 +146,7 @@ package body TASTE.AADL_Parser is
(AADL_Language, Deployment_Root, File_Descr); (AADL_Language, Deployment_Root, File_Descr);
end if; end if;
-- Also parse the data view as a root component -- Also parse the data view as a root component
Ocarina.FE_AADL.Parser.Add_Pre_Prop_Sets := False;
Dataview_root := Ocarina.Parser.Parse Dataview_root := Ocarina.Parser.Parse
(AADL_Language, Dataview_root, File_Descr); (AADL_Language, Dataview_root, File_Descr);
end if; end if;
......
...@@ -241,6 +241,7 @@ package body TASTE.Parser_Utils is ...@@ -241,6 +241,7 @@ package body TASTE.Parser_Utils is
Ocarina.Initialize; Ocarina.Initialize;
Ocarina.AADL_Version := Ocarina.AADL_V2; Ocarina.AADL_Version := Ocarina.AADL_V2;
Ocarina.Configuration.Init_Modules; Ocarina.Configuration.Init_Modules;
-- Following is needed to parse the interface view
Ocarina.FE_AADL.Parser.Add_Pre_Prop_Sets := True; Ocarina.FE_AADL.Parser.Add_Pre_Prop_Sets := True;
end Initialize_Ocarina; end Initialize_Ocarina;
end TASTE.Parser_Utils; end TASTE.Parser_Utils;
package TASTE.Parser_Version is package TASTE.Parser_Version is
Parser_Release : constant String := Parser_Release : constant String :=
"4f0d719 ; Commit Date: Wed Mar 14 16:20:56 2018 "; "c8dc31e ; Commit Date: Wed Mar 14 17:18:22 2018 ";
Ocarina_Version : constant String := Ocarina_Version : constant String :=
"Ocarina 2017.x (Working Copy from r2a52334)"; "Ocarina 2017.x (Working Copy from r2a52334)";
end TASTE.Parser_Version; end TASTE.Parser_Version;
\ No newline at end of file
---------------------------------------------------
-- AADL2.0
-- TASTE
--
--
---------------------------------------------------
PACKAGE interfaceview::FV::Simple_C_Function
PUBLIC
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
SUBPROGRAM PI_cyclic_operation
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_cyclic_operation;
SUBPROGRAM IMPLEMENTATION PI_cyclic_operation.others
END PI_cyclic_operation.others;
END interfaceview::FV::Simple_C_Function;
PACKAGE interfaceview::IV
PUBLIC
WITH interfaceview::FV::Simple_C_Function;
WITH interfaceview::FV;
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
SYSTEM Simple_C_Function
FEATURES
PI_cyclic_operation : PROVIDES SUBPROGRAM ACCESS interfaceview::FV::Simple_C_Function::PI_cyclic_operation.others {
Taste::coordinates => "1042 584";
Taste::RCMoperationKind => cyclic;
Taste::RCMperiod => 2000 ms;
Taste::Deadline => 2000 ms;
Taste::InterfaceName => "cyclic_operation";
};
PROPERTIES
Source_Language => (C);
END Simple_C_Function;
SYSTEM IMPLEMENTATION Simple_C_Function.others
SUBCOMPONENTS
cyclic_operation_impl : SUBPROGRAM interfaceview::FV::Simple_C_Function::PI_cyclic_operation.others {
Compute_Execution_Time => 0 ms .. 2000 ms;
};
CONNECTIONS
OpToPICnx_cyclic_operation_impl : SUBPROGRAM ACCESS cyclic_operation_impl -> PI_cyclic_operation;
END Simple_C_Function.others;
SYSTEM interfaceview
END interfaceview;
SYSTEM IMPLEMENTATION interfaceview.others
SUBCOMPONENTS
Simple_C_Function : SYSTEM interfaceview::IV::Simple_C_Function.others {
Taste::coordinates => "1042 432 1706 1121";
};
END interfaceview.others;
PROPERTIES
Taste::dataView => ("DataView");
Taste::dataViewPath => ("DataView.aadl");
Taste::coordinates => "0 0 2970 2100";
Taste::version => "1.3.18";
END interfaceview::IV;
PACKAGE interfaceview::FV
PUBLIC
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
END interfaceview::FV;
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