* Correct reference output

tests/real-annexes-execution/test_real_exec_02.aadl.out

@@ -151,22 +151,22 @@ Evaluating theorem set_declaration_is_passing_through
 
  * Iterate for variable: rma.erc32_node_a_task_1
 Content of set accessor_flows (test_real_exec_02.aadl:251:21) is 
-anonymous end to end flow :4024 end to end flow spec 
+anonymous end to end flow :4014 end to end flow spec 
  => Result: TRUE
 
  * Iterate for variable: rma.erc32_node_a_task_2
 Content of set accessor_flows (test_real_exec_02.aadl:251:21) is 
-anonymous end to end flow :4024 end to end flow spec 
+anonymous end to end flow :4014 end to end flow spec 
  => Result: TRUE
 
  * Iterate for variable: rma.erc32_node_a_task_12
 Content of set accessor_flows (test_real_exec_02.aadl:251:21) is 
-anonymous end to end flow :4025 end to end flow spec 
+anonymous end to end flow :4015 end to end flow spec 
  => Result: TRUE
 
  * Iterate for variable: rma.erc32_node_a_task_22
 Content of set accessor_flows (test_real_exec_02.aadl:251:21) is 
-anonymous end to end flow :4025 end to end flow spec 
+anonymous end to end flow :4015 end to end flow spec 
  => Result: TRUE
 
 theorem set_declaration_is_passing_through is: TRUE

tests/real-annexes-parsing/test_real_parse_01.aadl.out

@@ -78,7 +78,7 @@ property set Deployment is
   Protocol : Deployment::Protocol_Type
     applies to (system);
 
-  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_ORK, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, ARM_CORTEX, ARM_DSLINUX, ARM_N770, GUMSTIX_RTEMS, NDS_RTEMS, X86_RTEMS, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
+  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
 
   Execution_Platform : Deployment::Allowed_Execution_Platform
     applies to ( all);
@@ -685,10 +685,10 @@ system)
     applies to (system);
 
   dataview : list of aadlstring
-    applies to (package, system);
+    applies to (package);
 
   dataviewpath : list of aadlstring
-    applies to (package, system);
+    applies to (package);
 
   Encoding_type : type enumeration (native, uper, acn);
 

tests/real-annexes-parsing/test_real_parse_02.aadl.out

@@ -78,7 +78,7 @@ property set Deployment is
   Protocol : Deployment::Protocol_Type
     applies to (system);
 
-  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_ORK, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, ARM_CORTEX, ARM_DSLINUX, ARM_N770, GUMSTIX_RTEMS, NDS_RTEMS, X86_RTEMS, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
+  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
 
   Execution_Platform : Deployment::Allowed_Execution_Platform
     applies to ( all);
@@ -685,10 +685,10 @@ system)
     applies to (system);
 
   dataview : list of aadlstring
-    applies to (package, system);
+    applies to (package);
 
   dataviewpath : list of aadlstring
-    applies to (package, system);
+    applies to (package);
 
   Encoding_type : type enumeration (native, uper, acn);
 

tests/real-annexes-parsing/test_real_parse_03.aadl.out

@@ -78,7 +78,7 @@ property set Deployment is
   Protocol : Deployment::Protocol_Type
     applies to (system);
 
-  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_ORK, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, ARM_CORTEX, ARM_DSLINUX, ARM_N770, GUMSTIX_RTEMS, NDS_RTEMS, X86_RTEMS, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
+  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
 
   Execution_Platform : Deployment::Allowed_Execution_Platform
     applies to ( all);
@@ -685,10 +685,10 @@ system)
     applies to (system);
 
   dataview : list of aadlstring
-    applies to (package, system);
+    applies to (package);
 
   dataviewpath : list of aadlstring
-    applies to (package, system);
+    applies to (package);
 
   Encoding_type : type enumeration (native, uper, acn);
 

tests/real-annexes-parsing/test_real_parse_04.aadl.out

@@ -78,7 +78,7 @@ property set Deployment is
   Protocol : Deployment::Protocol_Type
     applies to (system);
 
-  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_ORK, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, ARM_CORTEX, ARM_DSLINUX, ARM_N770, GUMSTIX_RTEMS, NDS_RTEMS, X86_RTEMS, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
+  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
 
   Execution_Platform : Deployment::Allowed_Execution_Platform
     applies to ( all);
@@ -685,10 +685,10 @@ system)
     applies to (system);
 
   dataview : list of aadlstring
-    applies to (package, system);
+    applies to (package);
 
   dataviewpath : list of aadlstring
-    applies to (package, system);
+    applies to (package);
 
   Encoding_type : type enumeration (native, uper, acn);
 

tests/real-annexes-parsing/test_real_parse_05.aadl.out

@@ -78,7 +78,7 @@ property set Deployment is
   Protocol : Deployment::Protocol_Type
     applies to (system);
 
-  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_ORK, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, ARM_CORTEX, ARM_DSLINUX, ARM_N770, GUMSTIX_RTEMS, NDS_RTEMS, X86_RTEMS, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
+  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
 
   Execution_Platform : Deployment::Allowed_Execution_Platform
     applies to ( all);
@@ -685,10 +685,10 @@ system)
     applies to (system);
 
   dataview : list of aadlstring
-    applies to (package, system);
+    applies to (package);
 
   dataviewpath : list of aadlstring
-    applies to (package, system);
+    applies to (package);
 
   Encoding_type : type enumeration (native, uper, acn);
 

tests/test042/test.aadl.out

@@ -74,7 +74,7 @@ property set Deployment is
   Protocol : Deployment::Protocol_Type
     applies to (system);
 
-  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_ORK, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, ARM_CORTEX, ARM_DSLINUX, ARM_N770, GUMSTIX_RTEMS, NDS_RTEMS, X86_RTEMS, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
+  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
 
   Execution_Platform : Deployment::Allowed_Execution_Platform
     applies to ( all);
@@ -681,10 +681,10 @@ system)
     applies to (system);
 
   dataview : list of aadlstring
-    applies to (package, system);
+    applies to (package);
 
   dataviewpath : list of aadlstring
-    applies to (package, system);
+    applies to (package);
 
   Encoding_type : type enumeration (native, uper, acn);