* Add RTDS, VHDL, System_C as languages for Source_Language

	  property



git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/ocarina@727 129961e7-ef38-4bb5-a8f7-c9a525a55882

resources/AADLv1/aadl_project.aadl

@@ -90,13 +90,14 @@ property set AADL_Project is
      Lustre,
      Lustre5, -- alias for Lustre
      Lustre6, -- alias for Lustre
+     RTDS,    -- SDL
      RTSJ,    -- Real Time Specification for Java
      SCADE6,  -- alias for Lustre
      SDL,
      Simulink,
-     Simulink_6_5);
-  -- The following are example software source languages.
-  -- ( Ada95, C, Simulink_6_5 )
+     Simulink_6_5,
+     System_C,
+     VHDL);
 
   Max_Aadlinteger: constant aadlinteger => 2#1#e32;
 

resources/AADLv2/aadl_project.aadl

@@ -96,14 +96,15 @@ property set AADL_Project is
      Lustre,
      Lustre5, -- alias for Lustre
      Lustre6, -- alias for Lustre
+     RTDS,    -- SDL
      RTSJ,    -- Real Time Specification for Java
      SCADE6,  -- alias for Lustre
      SDL,
      Scade,
      Simulink,
-     Simulink_6_5);
-  -- The following are example software source languages:
-  -- ( Ada95, Ada2005, C, Simulink_6_5 )
+     Simulink_6_5,
+     System_C,
+     VHDL);
 
   Supported_Distributions: type enumeration (Fixed);
   -- The following are example distributions:

src/backends/ocarina-backends-properties.adb

@@ -241,22 +241,25 @@ package body Ocarina.Backends.Properties is
    Concurrency_Priority_Ceiling_Name            : Name_Id;
    Concurrency_Priority_Ceiling_Protocol_Name   : Name_Id;
 
-   Language_Ada_95_Name   : Name_Id;
    Language_Ada_Name      : Name_Id;
+   Language_Ada_95_Name   : Name_Id;
    Language_Ada_05_Name   : Name_Id;
-   Language_C_Name        : Name_Id;
-   Language_RTSJ_Name     : Name_Id;
-   Language_Simulink_Name : Name_Id;
-   Language_Scade_Name    : Name_Id;
    Language_ASN1_Name     : Name_Id;
-   Language_Lustre_Name   : Name_Id;
+   Language_C_Name        : Name_Id;
    Language_Esterel_Name  : Name_Id;
+   Language_GUI_Name      : Name_Id;
+   Language_Lustre_Name   : Name_Id;
    Language_Lustre5_Name  : Name_Id;
    Language_Lustre6_Name  : Name_Id;
-   Language_GUI_Name      : Name_Id;
    Language_Rhapsody_Name : Name_Id;
+   Language_RTDS_Name     : Name_Id;
+   Language_RTSJ_Name     : Name_Id;
+   Language_Scade_Name    : Name_Id;
    Language_SCADE6_Name   : Name_Id;
    Language_SDL_Name      : Name_Id;
+   Language_Simulink_Name : Name_Id;
+   Language_System_C_Name : Name_Id;
+   Language_VHDL_Name     : Name_Id;
 
    Thread_Periodic_Name   : Name_Id;
    Thread_Aperiodic_Name  : Name_Id;
@@ -1309,6 +1312,9 @@ package body Ocarina.Backends.Properties is
          elsif Source_L = Language_SDL_Name then
             return Language_SDL;
 
+         elsif Source_L = Language_RTDS_Name then
+            return Language_RTDS;
+
          elsif Source_L = Language_C_Name then
             return Language_C;
 
@@ -1324,6 +1330,12 @@ package body Ocarina.Backends.Properties is
          elsif Source_L = Language_Rhapsody_Name then
             return Language_Rhapsody;
 
+         elsif Source_L = Language_System_C_Name then
+            return Language_System_C;
+
+         elsif Source_L = Language_VHDL_Name then
+            return Language_VHDL;
+
          elsif Source_L = Language_GUI_Name then
             return Language_GUI;
 
@@ -1417,8 +1429,11 @@ package body Ocarina.Backends.Properties is
 
             return Subprogram_Unknown;
 
-         when Language_SDL =>
-            --  A subprogram having SDL as implementation
+         when Language_SDL
+           | Language_RTDS
+           | Language_System_C
+           | Language_VHDL =>
+            --  A subprogram having this language as implementation
             --  language is not supported.
 
             return Subprogram_Unknown;
@@ -2848,6 +2863,9 @@ package body Ocarina.Backends.Properties is
       Language_Rhapsody_Name := Get_String_Name ("rhapsody");
       Language_SCADE6_Name   := Get_String_Name ("scade6");
       Language_SDL_Name      := Get_String_Name ("sdl");
+      Language_RTDS_Name     := Get_String_Name ("rtds");
+      Language_VHDL_Name     := Get_String_Name ("vhdl");
+      Language_System_C_Name := Get_String_Name ("system_c");
 
       Thread_Periodic_Name   := Get_String_Name ("periodic");
       Thread_Aperiodic_Name  := Get_String_Name ("aperiodic");

src/backends/ocarina-backends-properties.ads

@@ -63,14 +63,17 @@ package Ocarina.Backends.Properties is
      (Language_Ada_95,
       Language_ASN1,
       Language_C,
-      Language_Lustre,
       Language_Esterel,
       Language_Gui,
+      Language_Lustre,
       Language_Rhapsody,
+      Language_RTDS,
+      Language_RTSJ,
       Language_Scade,
       Language_SDL,
       Language_Simulink,
-      Language_RTSJ,
+      Language_System_C,
+      Language_VHDL,
       Language_None);
 
    type Supported_Scheduling_Protocol is

tests/test_tree_i/test.aadl.out

@@ -7,7 +7,7 @@ Root_System Node_Id 6
   Corresponding_Entity Node_Id 6
   Scope_Entity Node_Id 0
   Backend_Node Node_Id 0
- Corresponding_Declaration Node_Id 1474
+ Corresponding_Declaration Node_Id 1477
  Properties List_Id 0
  Is_Private Boolean FALSE
  Features List_Id 0