* Adjust to AADLv2.1 syntax for record using square brackets '['

        Fixes #1

resources/AADLv2/communication_properties.aadl

@@ -35,10 +35,11 @@ property set Communication_Properties is
 	Transmission_Type: enumeration (push, pull)
 		applies to (data port, port connection, bus, virtual bus);
 
-	Input_Rate: Rate_Spec => (Value_Range => 1.0 .. 1.0; Rate_Unit => PerDispatch; Rate_Distribution => Fixed;)
+
+	Input_Rate: Rate_Spec => [ Value_Range => 1.0 .. 1.0; Rate_Unit => PerDispatch; Rate_Distribution => Fixed; ]
 		applies to (port);
 
-	Input_Time: list of IO_Time_Spec => ((Time => Dispatch; Offset => 0 ns .. 0 ns;))
+	Input_Time: list of IO_Time_Spec => ([ Time => Dispatch; Offset => 0 ns .. 0 ns; ])
 		applies to (port);
 
 	IO_Time_Spec: type record (
@@ -48,19 +49,20 @@ property set Communication_Properties is
 
 	IO_Reference_Time: type enumeration (Dispatch, Start, Completion, Deadline, NoIO);
 
-	Output_Rate: Rate_Spec => (Value_Range => 1.0 .. 1.0; Rate_Unit => PerDispatch; Rate_Distribution => Fixed;)
+	Output_Rate: Rate_Spec => [ Value_Range => 1.0 .. 1.0; Rate_Unit => PerDispatch; Rate_Distribution => Fixed; ]
 		applies to (port);
 
-	Output_Time: list of IO_Time_Spec => ((Time => Completion; Offset => 0 ns .. 0 ns;))
+	Output_Time: list of IO_Time_Spec => ([ Time => Completion; Offset => 0 ns .. 0 ns; ])
 		applies to (port);
 
+
 	Rate_Spec: type record (
 		Value_Range: range of aadlreal;
 		Rate_Unit: enumeration (PerSecond, PerDispatch);
 		Rate_Distribution: Supported_Distributions;
 	);
 
-	Subprogram_Call_Rate: Rate_Spec => (Value_Range => 1.0 .. 1.0; Rate_Unit => PerDispatch; Rate_Distribution => Fixed;)
+	Subprogram_Call_Rate: Rate_Spec => [ Value_Range => 1.0 .. 1.0; Rate_Unit => PerDispatch; Rate_Distribution => Fixed; ]
 		applies to (subprogram access);
 
 	Transmission_Time: record (

resources/AADLv2/memory_properties.aadl

@@ -5,61 +5,61 @@
 
 property set Memory_Properties is
 	Size: type aadlinteger 0 Bytes .. Max_Memory_Size units Size_Units;
-	
+
 	Size_Range: type range of Size;
-	
+
 	Access_Right: Access_Rights => read_write
 		applies to (data, bus, data access, bus access);
-	
+
 	Access_Rights: type enumeration (read_only, write_only, read_write, by_method);
-	
+
 	Access_Time: record (
 		First: IO_Time_Spec;
 		Last: IO_Time_Spec;)
-		=> (First => (Time => Start; Offset => 0 ns .. 0 ns;);
-			Last => (Time => Completion; Offset => 0 ns .. 0 ns;);)
-		applies to (data access);
-	
+		=> [ First => [ Time => Start; Offset => 0 ns .. 0 ns; ];
+			Last => [ Time => Completion; Offset => 0 ns .. 0 ns; ]; ]
+                        applies to (data access);
+
 	Allowed_Message_Size: Size_Range
 		applies to (bus);
-	
+
 	Assign_Time: record (
 		Fixed: Time_Range;
 		PerByte: Time_Range;)
 		applies to (processor);
-	
+
 	Base_Address: aadlinteger 0 .. Max_Base_Address
 		applies to (memory, data, data access, port);
-	
+
 	Device_Register_Address: aadlinteger
 		applies to (port, feature group);
-	
+
 	Read_Time: record (
 		Fixed: Time_Range;
 		PerByte: Time_Range;)
 		applies to (memory);
-	
+
 	Source_Code_Size: Size
 		applies to (data, thread, thread group, process, system, subprogram, processor, device);
-	
+
 	Source_Data_Size: Size
 		applies to (data, subprogram, thread, thread group, process, system, processor, device);
-	
+
 	Source_Heap_Size: Size
 		applies to (thread, subprogram);
-	
+
 	Source_Stack_Size: Size
 		applies to (thread, subprogram, processor, device);
-	
+
 	Byte_Count: aadlinteger 0 .. Max_Byte_Count
 		applies to (memory);
-	
+
 	Word_Size: Size => 8 bits
 		applies to (memory);
-	
+
 	Word_Space: aadlinteger 1 .. Max_Word_Space => 1
 		applies to (memory);
-	
+
 	Write_Time: record (
 		Fixed: Time_Range;
 		PerByte: Time_Range;)

src/backends/ocarina-be_aadl-properties-values.adb

@@ -311,7 +311,7 @@ package body Ocarina.BE_AADL.Properties.Values is
 
       List_Node : Node_Id;
    begin
-      Print_Token (T_Left_Parenthesis);
+      Print_Token (T_Left_Square_Bracket);
       Write_Space;
 
       List_Node := First_Node
@@ -331,7 +331,7 @@ package body Ocarina.BE_AADL.Properties.Values is
       end loop;
 
       Write_Space;
-      Print_Token (T_Right_Parenthesis);
+      Print_Token (T_Right_Square_Bracket);
    end Print_Record_Term;
 
    -------------------------------

src/frontends/aadl/ocarina-fe_aadl-parser-properties-values.adb

@@ -2365,6 +2365,16 @@ package body Ocarina.FE_AADL.Parser.Properties.Values is
          when T_Left_Parenthesis =>
             return P_Boolean_Or_Record_Term;
 
+         when T_Left_Square_Bracket =>
+            if AADL_Version = AADL_V2 then
+               return P_Record_Term;
+            else
+               DPE (PC_Property_Expression,
+                    EMC_Not_Allowed_In_AADL_V1);
+               Skip_Tokens (T_Semicolon);
+               return No_Node;
+            end if;
+
          when T_Compute =>
             if AADL_Version = AADL_V2 then
                return P_Computed_Term;
@@ -2539,8 +2549,8 @@ package body Ocarina.FE_AADL.Parser.Properties.Values is
 
    --  AADL_V2
    --  record_term ::=
-   --     ( record_field_identifier => property_expression ;
-   --        ( record_field_identifier => property_expression ; )* )
+   --     [ record_field_identifier => property_expression ;
+   --        ( record_field_identifier => property_expression ; )* ]
 
    function P_Record_Term return Node_Id is
       use Ocarina.ME_AADL.AADL_Tree.Nodes;
@@ -2567,7 +2577,7 @@ package body Ocarina.FE_AADL.Parser.Properties.Values is
       Items := P_Items_List (P_Record_Term_Element'Access,
                              No_Node,
                              T_Semicolon,
-                             T_Right_Parenthesis,
+                             T_Right_Square_Bracket,
                              PC_Record_Term,
                              True);
 

tests/MANIFEST

@@ -280,3 +280,4 @@ tests/test_identifier/t.aadl
 tests/example_04_03/t.aadl
 tests/example_04_05_1/t.aadl
 
+tests/github/issue_1/test.aadl

tests/github/issue_1/MANIFEST

+AADL_VERSION=-aadlv2

tests/github/issue_1/test.aadl

+package PropValue
+public
+
+bus Ethernet_Cable
+end Ethernet_Cable;
+
+bus implementation Ethernet_Cable.ARINC_664
+properties
+    -- The following is legal AADL 2 and accepted by OSATE
+    -- but not by Ocarina.  Ocarina only accepts () and OSATE
+    -- only accepts [] for records.
+    Transmission_Time => [ Fixed => 3360 ns .. 3360 ns; PerByte => 80 ns .. 80 ns; ];
+end Ethernet_Cable.ARINC_664;
+
+system Test
+end Test;
+
+system implementation Test.Imp
+subcomponents
+    aBus : bus Ethernet_Cable.ARINC_664;
+end Test.Imp;
+end PropValue;
\ No newline at end of file

tests/test_tree_p2/test.aadl.out

@@ -5841,9 +5841,9 @@ Declarations List_Id 7
     Category Byte 11
     Component_Cat Byte 11
     Classifier_Ref Node_Id 0
- 1205 property definition declaration communication_properties.aadl:38:02
+ 1205 property definition declaration communication_properties.aadl:39:02
   Identifier Node_Id 1182
-  1182 identifier communication_properties.aadl:38:02
+  1182 identifier communication_properties.aadl:39:02
    Corresponding_Entity Node_Id 1205
    Display_Name Name_Id "Input_Rate"
    Scope_Entity Node_Id 1049
@@ -5851,13 +5851,13 @@ Declarations List_Id 7
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
   Property_Name_Type Node_Id 1207
-  1207 property type communication_properties.aadl:38:02
+  1207 property type communication_properties.aadl:39:02
    Is_List Boolean FALSE
    Multiplicity Int 0
    Property_Type_Designator Node_Id 1184
-   1184 unique property type identifier communication_properties.aadl:38:12
+   1184 unique property type identifier communication_properties.aadl:39:12
     Identifier Node_Id 1183
-    1183 identifier communication_properties.aadl:38:14
+    1183 identifier communication_properties.aadl:39:14
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "Rate_Spec"
      Scope_Entity Node_Id 0
@@ -5865,56 +5865,56 @@ Declarations List_Id 7
     Entity Node_Id 1326
     Property_Set_Identifier Node_Id 0
    Expanded_Type_Designator Node_Id 1325
-   1325 record type communication_properties.aadl:57:25
+   1325 record type communication_properties.aadl:59:25
     List_Items List_Id 1310
-    1311 record type element communication_properties.aadl:58:03
+    1311 record type element communication_properties.aadl:60:03
      Identifier Node_Id 1312
-     1312 identifier communication_properties.aadl:58:03
+     1312 identifier communication_properties.aadl:60:03
       Corresponding_Entity Node_Id 1311
       Display_Name Name_Id "Value_Range"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
      Property_Type_Designator Node_Id 1313
-     1313 range type communication_properties.aadl:58:16
+     1313 range type communication_properties.aadl:60:16
       Number_Type Node_Id 1314
-      1314 real type communication_properties.aadl:58:25
+      1314 real type communication_properties.aadl:60:25
        Type_Range Node_Id 0
        Unit_Designator Node_Id 0
-    1315 record type element communication_properties.aadl:59:03
+    1315 record type element communication_properties.aadl:61:03
      Identifier Node_Id 1316
-     1316 identifier communication_properties.aadl:59:03
+     1316 identifier communication_properties.aadl:61:03
       Corresponding_Entity Node_Id 1315
       Display_Name Name_Id "Rate_Unit"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
      Property_Type_Designator Node_Id 1317
-     1317 enumeration type communication_properties.aadl:59:14
+     1317 enumeration type communication_properties.aadl:61:14
       Identifiers List_Id 1318
-      1319 identifier communication_properties.aadl:59:27
+      1319 identifier communication_properties.aadl:61:27
        Corresponding_Entity Node_Id 1317
        Display_Name Name_Id "PerSecond"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
-      1320 identifier communication_properties.aadl:59:38
+      1320 identifier communication_properties.aadl:61:38
        Corresponding_Entity Node_Id 1317
        Display_Name Name_Id "PerDispatch"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
       Enumeration_Context Node_Id 0
-    1321 record type element communication_properties.aadl:60:03
+    1321 record type element communication_properties.aadl:62:03
      Identifier Node_Id 1322
-     1322 identifier communication_properties.aadl:60:03
+     1322 identifier communication_properties.aadl:62:03
       Corresponding_Entity Node_Id 1321
       Display_Name Name_Id "Rate_Distribution"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
      Property_Type_Designator Node_Id 1324
-     1324 unique property type identifier communication_properties.aadl:60:20
+     1324 unique property type identifier communication_properties.aadl:62:20
       Identifier Node_Id 1323
-      1323 identifier communication_properties.aadl:60:22
+      1323 identifier communication_properties.aadl:62:22
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Supported_Distributions"
        Scope_Entity Node_Id 0
@@ -5922,61 +5922,61 @@ Declarations List_Id 7
       Entity Node_Id 0
       Property_Set_Identifier Node_Id 0
   Default_Value Node_Id 1208
-  1208 property value communication_properties.aadl:38:02
+  1208 property value communication_properties.aadl:39:02
    Value_Container Node_Id 1048
    Single_Value Node_Id 1185
-   1185 record term communication_properties.aadl:38:27
+   1185 record term communication_properties.aadl:39:27
     List_Items List_Id 1186
-    1187 record term element communication_properties.aadl:38:28
+    1187 record term element communication_properties.aadl:39:29
      Identifier Node_Id 1188
-     1188 identifier communication_properties.aadl:38:28
+     1188 identifier communication_properties.aadl:39:29
       Corresponding_Entity Node_Id 1187
       Display_Name Name_Id "Value_Range"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Property_Expression Node_Id 1193
-     1193 number range term communication_properties.aadl:38:43
+     1193 number range term communication_properties.aadl:39:44
       Lower_Bound Node_Id 1189
-      1189 signed aadlnumber communication_properties.aadl:38:43
+      1189 signed aadlnumber communication_properties.aadl:39:44
        Number_Value Node_Id 1190
-       1190 literal communication_properties.aadl:38:43
+       1190 literal communication_properties.aadl:39:44
         Value Value_Id 36
        Unit_Identifier Node_Id 0
       Upper_Bound Node_Id 1191
-      1191 signed aadlnumber communication_properties.aadl:38:50
+      1191 signed aadlnumber communication_properties.aadl:39:51
        Number_Value Node_Id 1192
-       1192 literal communication_properties.aadl:38:50
+       1192 literal communication_properties.aadl:39:51
         Value Value_Id 37
        Unit_Identifier Node_Id 0
       Delta_Term Node_Id 0
-    1194 record term element communication_properties.aadl:38:55
+    1194 record term element communication_properties.aadl:39:56
      Identifier Node_Id 1195
-     1195 identifier communication_properties.aadl:38:55
+     1195 identifier communication_properties.aadl:39:56
       Corresponding_Entity Node_Id 1194
       Display_Name Name_Id "Rate_Unit"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Property_Expression Node_Id 1197
-     1197 property term communication_properties.aadl:38:65
+     1197 property term communication_properties.aadl:39:66
       Identifier Node_Id 1196
-      1196 identifier communication_properties.aadl:38:68
+      1196 identifier communication_properties.aadl:39:69
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "PerDispatch"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
       Entity Node_Id 0
       Property_Set_Identifier Node_Id 0
-    1198 record term element communication_properties.aadl:38:81
+    1198 record term element communication_properties.aadl:39:82
      Identifier Node_Id 1199
-     1199 identifier communication_properties.aadl:38:81
+     1199 identifier communication_properties.aadl:39:82
       Corresponding_Entity Node_Id 1198
       Display_Name Name_Id "Rate_Distribution"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Property_Expression Node_Id 1201
-     1201 property term communication_properties.aadl:38:99
+     1201 property term communication_properties.aadl:39:100
       Identifier Node_Id 1200
-      1200 identifier communication_properties.aadl:38:102
+      1200 identifier communication_properties.aadl:39:103
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Fixed"
        Scope_Entity Node_Id 0
@@ -5987,17 +5987,17 @@ Declarations List_Id 7
    Expanded_Single_Value Node_Id 0
    Expanded_Multi_Value List_Id 0
   Applies_To Node_Id 1206
-  1206 applies to communication_properties.aadl:38:02
+  1206 applies to communication_properties.aadl:39:02
    Is_All Boolean FALSE
    Owner_Categories List_Id 1203
-   1204 named element communication_properties.aadl:39:15
+   1204 named element communication_properties.aadl:40:15
     Identifier Node_Id 0
     Category Byte 14
     Component_Cat Byte 14
     Classifier_Ref Node_Id 0
- 1231 property definition declaration communication_properties.aadl:41:02
+ 1231 property definition declaration communication_properties.aadl:42:02
   Identifier Node_Id 1209
-  1209 identifier communication_properties.aadl:41:02
+  1209 identifier communication_properties.aadl:42:02
    Corresponding_Entity Node_Id 1231
    Display_Name Name_Id "Input_Time"
    Scope_Entity Node_Id 1049
@@ -6005,13 +6005,13 @@ Declarations List_Id 7
   Is_Access Boolean FALSE
   Is_Inherit Boolean FALSE
   Property_Name_Type Node_Id 1233
-  1233 property type communication_properties.aadl:41:02
+  1233 property type communication_properties.aadl:42:02
    Is_List Boolean TRUE
    Multiplicity Int 1
    Property_Type_Designator Node_Id 1212
-   1212 unique property type identifier communication_properties.aadl:41:19
+   1212 unique property type identifier communication_properties.aadl:42:19
     Identifier Node_Id 1211
-    1211 identifier communication_properties.aadl:41:22
+    1211 identifier communication_properties.aadl:42:22
      Corresponding_Entity Node_Id 0
      Display_Name Name_Id "IO_Time_Spec"
      Scope_Entity Node_Id 0
@@ -6019,38 +6019,38 @@ Declarations List_Id 7
     Entity Node_Id 1246
     Property_Set_Identifier Node_Id 0
    Expanded_Type_Designator Node_Id 1245
-   1245 record type communication_properties.aadl:44:28
+   1245 record type communication_properties.aadl:45:28
     List_Items List_Id 1236
-    1237 record type element communication_properties.aadl:45:03
+    1237 record type element communication_properties.aadl:46:03
      Identifier Node_Id 1238
-     1238 identifier communication_properties.aadl:45:03
+     1238 identifier communication_properties.aadl:46:03
       Corresponding_Entity Node_Id 1237
       Display_Name Name_Id "Offset"
       Scope_Entity Node_Id 0
       Backend_Node Node_Id 0
      Is_List Boolean FALSE
      Property_Type_Designator Node_Id 1240
-     1240 unique property type identifier communication_properties.aadl:45:09
+     1240 unique property type identifier communication_properties.aadl:46:09
       Identifier Node_Id 1239
-      1239 identifier communication_properties.aadl:45:11
+      1239 identifier communication_properties.aadl:46:11
        Corresponding_Entity Node_Id 0
        Display_Name Name_Id "Time_Range"
        Scope_Entity Node_Id 0
        Backend_Node Node_Id 0
       Entity Node_Id 0