Commit 9a77bee7 authored by yoogx's avatar yoogx
Browse files

* Code clean-up

parent d34317cd
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2013-2014 ESA & ISAE. -- -- Copyright (C) 2013-2015 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 --
...@@ -31,8 +31,6 @@ ...@@ -31,8 +31,6 @@
-- -- -- --
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
pragma Warnings (Off);
with Ada.Command_Line; use Ada.Command_Line; with Ada.Command_Line; use Ada.Command_Line;
with GNAT.Directory_Operations; use GNAT.Directory_Operations; with GNAT.Directory_Operations; use GNAT.Directory_Operations;
with GNAT.OS_Lib; use GNAT.OS_Lib; with GNAT.OS_Lib; use GNAT.OS_Lib;
...@@ -54,33 +52,12 @@ with Ocarina.Parser; use Ocarina.Parser; ...@@ -54,33 +52,12 @@ with Ocarina.Parser; use Ocarina.Parser;
with Ocarina.Options; use Ocarina.Options; with Ocarina.Options; use Ocarina.Options;
with Ocarina.Files; use Ocarina.Files; with Ocarina.Files; use Ocarina.Files;
with Ocarina.Analyzer.AADL.Finder; use Ocarina.Analyzer.AADL.Finder;
with Ocarina.ME_AADL.AADL_Tree.Entities;
with Ocarina.ME_AADL.AADL_Tree.Nutils;
with Ocarina.ME_AADL.AADL_Instances.Nodes;
with Ocarina.ME_AADL.AADL_Instances.Entities;
with Ocarina.ME_AADL.AADL_Instances.Nutils;
with Namet;
with Ocarina.Instances.Finder;
with Ada.Strings.Equal_Case_Insensitive;
with Ada.Text_IO;
package body Ocarina.Utils is package body Ocarina.Utils is
package ATN renames Ocarina.ME_AADL.AADL_Tree.Nodes;
package ATE renames Ocarina.ME_AADL.AADL_Tree.Entities;
package ATNU renames Ocarina.ME_AADL.AADL_Tree.Nutils;
package AIN renames Ocarina.ME_AADL.AADL_Instances.Nodes;
package AIE renames Ocarina.ME_AADL.AADL_Instances.Entities;
package AINU renames Ocarina.ME_AADL.AADL_Instances.Nutils;
AADL_Root : Node_Id := No_Node; AADL_Root : Node_Id := No_Node;
File_Name : Name_Id := No_Name; File_Name : Name_Id := No_Name;
Buffer : Location; Buffer : Location;
Language : Name_Id := No_Name; Language : Name_Id := No_Name;
Components : Node_List;
----------- -----------
-- Reset -- -- Reset --
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2005-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. -- -- Copyright (C) 2005-2009 Telecom ParisTech, 2010-2015 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 --
...@@ -45,8 +45,6 @@ use type Types.Byte, Types.Name_Id, Types.Node_Id, Types.Int; ...@@ -45,8 +45,6 @@ use type Types.Byte, Types.Name_Id, Types.Node_Id, Types.Int;
with Utils; with Utils;
with Ada.Directories; with Ada.Directories;
with Ada.Strings.Fixed;
with Ada.Strings.Maps;
package body Parser is package body Parser is
...@@ -2054,9 +2052,11 @@ package body Parser is ...@@ -2054,9 +2052,11 @@ package body Parser is
Output.Set_Output (Output_File); Output.Set_Output (Output_File);
end if; end if;
W_Package_Body_Python (Ada.Directories.Base_Name ( W_Package_Body_Python
Namet.Get_Name_String ( (Ada.Directories.Base_Name
Utils.Replace_Char(Output_Name, '-', '_')))); (Namet.Get_Name_String
(Utils.Replace_Char (Output_Name, '-', '_'))));
-- If the output is not the standard output, compute the body -- If the output is not the standard output, compute the body
-- filename and redirect output. -- filename and redirect output.
...@@ -2076,7 +2076,7 @@ package body Parser is ...@@ -2076,7 +2076,7 @@ package body Parser is
if Output_Name /= Types.No_Name then if Output_Name /= Types.No_Name then
Output_Name := Utils.Remove_Suffix_From_Name Output_Name := Utils.Remove_Suffix_From_Name
("-python.idl", Output_Name); ("-python.idl", Output_Name);
Output_Name := Utils.Replace_Char(Output_Name, '-', '_'); Output_Name := Utils.Replace_Char (Output_Name, '-', '_');
Output_Name := Utils.Add_Suffix_To_Name (".py", Output_Name); Output_Name := Utils.Add_Suffix_To_Name (".py", Output_Name);
Output_File := Output_File :=
GNAT.OS_Lib.Create_File GNAT.OS_Lib.Create_File
...@@ -2154,7 +2154,8 @@ package body Parser is ...@@ -2154,7 +2154,8 @@ package body Parser is
Output.Write_Str ("procedure return_List"); Output.Write_Str ("procedure return_List");
Output.Write_Eol; Output.Write_Eol;
W_Indentation (2); W_Indentation (2);
Output.Write_Str ("(Data : in out Callback_Data'Class; List : List_Id) is"); Output.Write_Str
("(Data : in out Callback_Data'Class; List : List_Id) is");
Output.Write_Eol; Output.Write_Eol;
W_Indentation (2); W_Indentation (2);
Output.Write_Str ("List_Node : Node_Id;"); Output.Write_Str ("List_Node : Node_Id;");
...@@ -2175,7 +2176,8 @@ package body Parser is ...@@ -2175,7 +2176,8 @@ package body Parser is
Output.Write_Str ("while Present (List_Node) loop"); Output.Write_Str ("while Present (List_Node) loop");
Output.Write_Eol; Output.Write_Eol;
W_Indentation (4); W_Indentation (4);
Output.Write_Str ("Set_Return_Value (Data, Integer'Image (Integer (List_Node)));"); Output.Write_Str
("Set_Return_Value (Data, Integer'Image (Integer (List_Node)));");
Output.Write_Eol; Output.Write_Eol;
W_Indentation (4); W_Indentation (4);
Output.Write_Str ("List_Node := Next_Node (List_Node);"); Output.Write_Str ("List_Node := Next_Node (List_Node);");
...@@ -2369,8 +2371,8 @@ package body Parser is ...@@ -2369,8 +2371,8 @@ package body Parser is
NS := Type_Spec (NS); NS := Type_Spec (NS);
end loop; end loop;
-- output setter -- Output setter
W_Indentation (1); W_Indentation (1);
Output.Write_Str ("procedure On_"); Output.Write_Str ("procedure On_");
Output.Write_Str (WS (GNS (Identifier (A)))); Output.Write_Str (WS (GNS (Identifier (A))));
...@@ -2411,7 +2413,7 @@ package body Parser is ...@@ -2411,7 +2413,7 @@ package body Parser is
Output.Write_Str ("dummy;"); Output.Write_Str ("dummy;");
isDummy := True; isDummy := True;
end if; end if;
if isDummy = False then if isDummy = False then
Output.Write_Eol; Output.Write_Eol;
W_Indentation (3); W_Indentation (3);
if GNS (Identifier (Type_Spec (A))) = "Node_Id" then if GNS (Identifier (Type_Spec (A))) = "Node_Id" then
...@@ -2475,7 +2477,7 @@ package body Parser is ...@@ -2475,7 +2477,7 @@ package body Parser is
Output.Write_Str ("begin"); Output.Write_Str ("begin");
Output.Write_Eol; Output.Write_Eol;
W_Indentation (2); W_Indentation (2);
if isDummy = False then if isDummy = False then
if GNS (Identifier (Type_Spec (A))) = "Node_Id" then if GNS (Identifier (Type_Spec (A))) = "Node_Id" then
Output.Write_Str ("Set_Return_Value (Data, Integer ("); Output.Write_Str ("Set_Return_Value (Data, Integer (");
elsif GNS (Identifier (Type_Spec (A))) = "List_Id" then elsif GNS (Identifier (Type_Spec (A))) = "List_Id" then
...@@ -2568,7 +2570,9 @@ package body Parser is ...@@ -2568,7 +2570,9 @@ package body Parser is
-- W_Attribute_Register_python -- -- W_Attribute_Register_python --
--------------------------------- ---------------------------------
procedure W_Attribute_Register_python (A : Types.Node_Id; prefix : String) is procedure W_Attribute_Register_python
(A : Types.Node_Id; prefix : String)
is
begin begin
W_Indentation (2); W_Indentation (2);
Output.Write_Str ("Register_Command "); Output.Write_Str ("Register_Command ");
...@@ -2622,7 +2626,7 @@ package body Parser is ...@@ -2622,7 +2626,7 @@ package body Parser is
Namet.Write_Name (Module_Name); Namet.Write_Name (Module_Name);
Output.Write_Str (".Python is"); Output.Write_Str (".Python is");
Output.Write_Eol; Output.Write_Eol;
W_Indentation (1); W_Indentation (1);
Output.Write_Str ("procedure return_List"); Output.Write_Str ("procedure return_List");
Output.Write_Eol; Output.Write_Eol;
...@@ -2636,7 +2640,8 @@ package body Parser is ...@@ -2636,7 +2640,8 @@ package body Parser is
Output.Write_Str ("procedure return_List"); Output.Write_Str ("procedure return_List");
Output.Write_Eol; Output.Write_Eol;
W_Indentation (2); W_Indentation (2);
Output.Write_Str ("(Data : in out Callback_Data'Class; List : List_Id);"); Output.Write_Str
("(Data : in out Callback_Data'Class; List : List_Id);");
Output.Write_Eol; Output.Write_Eol;
Output.Write_Eol; Output.Write_Eol;
...@@ -2666,7 +2671,7 @@ package body Parser is ...@@ -2666,7 +2671,7 @@ package body Parser is
Output.Write_Str ("#! /usr/bin/python"); Output.Write_Str ("#! /usr/bin/python");
Output.Write_Eol; Output.Write_Eol;
Output.Write_Eol; Output.Write_Eol;
Output.Write_Str ("import libocarina_python; # Ocarina bindings"); Output.Write_Str ("import libocarina_python; # Ocarina bindings");
Output.Write_Eol; Output.Write_Eol;
Output.Write_Eol; Output.Write_Eol;
...@@ -2718,8 +2723,8 @@ package body Parser is ...@@ -2718,8 +2723,8 @@ package body Parser is
Output.Write_Eol; Output.Write_Eol;
W_Indentation (1); W_Indentation (1);
Output.Write_Str ("return libocarina_python."); Output.Write_Str ("return libocarina_python.");
Output.Write_Str (Ada.Directories.Base_Name ( Output.Write_Str (Ada.Directories.Base_Name
Namet.get_Name_String (Output_Name))); (Namet.Get_Name_String (Output_Name)));
Output.Write_Str ("_"); Output.Write_Str ("_");
Output.Write_Str (A); Output.Write_Str (A);
Output.Write_Str (" (N);"); Output.Write_Str (" (N);");
...@@ -2735,8 +2740,8 @@ package body Parser is ...@@ -2735,8 +2740,8 @@ package body Parser is
Output.Write_Eol; Output.Write_Eol;
W_Indentation (1); W_Indentation (1);
Output.Write_Str ("libocarina_python."); Output.Write_Str ("libocarina_python.");
Output.Write_Str (Ada.Directories.Base_Name ( Output.Write_Str (Ada.Directories.Base_Name
Namet.get_Name_String (Output_Name))); (Namet.Get_Name_String (Output_Name)));
Output.Write_Str ("_"); Output.Write_Str ("_");
Output.Write_Str (WS (A)); Output.Write_Str (WS (A));
Output.Write_Str (" (N, V);"); Output.Write_Str (" (N, V);");
...@@ -2767,7 +2772,7 @@ package body Parser is ...@@ -2767,7 +2772,7 @@ package body Parser is
W_Indentation (1); W_Indentation (1);
Output.Write_Str ("return libocarina_python."); Output.Write_Str ("return libocarina_python.");
Output.Write_Str (Ada.Directories.Base_Name ( Output.Write_Str (Ada.Directories.Base_Name (
Namet.get_Name_String (Output_Name)) & "_python"); Namet.Get_Name_String (Output_Name)) & "_python");
Output.Write_Str ("_"); Output.Write_Str ("_");
Output.Write_Str (GNS (Identifier (A))); Output.Write_Str (GNS (Identifier (A)));
Output.Write_Str (" (N);"); Output.Write_Str (" (N);");
...@@ -2783,8 +2788,8 @@ package body Parser is ...@@ -2783,8 +2788,8 @@ package body Parser is
Output.Write_Eol; Output.Write_Eol;
W_Indentation (1); W_Indentation (1);
Output.Write_Str ("libocarina_python."); Output.Write_Str ("libocarina_python.");
Output.Write_Str (Ada.Directories.Base_Name ( Output.Write_Str (Ada.Directories.Base_Name
Namet.get_Name_String (Output_Name)) & "_python"); (Namet.Get_Name_String (Output_Name)) & "_python");
Output.Write_Str ("_"); Output.Write_Str ("_");
Output.Write_Str (WS (GNS (Identifier (A)))); Output.Write_Str (WS (GNS (Identifier (A))));
Output.Write_Str (" (N, V);"); Output.Write_Str (" (N, V);");
......
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