Change message syntax

Ref. #380
AdaCore · Aug 6, 2020 · 9dd8e6f · 9dd8e6f
1 parent f483948
commit 9dd8e6f
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ package TLV is
       message
          Tag    : Tag
             then Length
-               if Tag = Msg_Data,
+               if Tag = Msg_Data
             then null
                if Tag = Msg_Error;
          Length : Length

diff --git a/doc/Language-Reference.md b/doc/Language-Reference.md
@@ -83,7 +83,7 @@ A message type is a collection components. Additional then clauses allow to defi
 *message_definition* ::= __message__ [ *null_component* ] *component* { *component* } __end message__ | __null message__
 
 *component* ::= *component_name* __:__ *component_type*
-                 [ *then_clause* ] { __,__ *then_clause* } __;__
+                   { *then_clause* } __;__
 
 *null_component* ::= __null__
                          *then_clause* __;__
@@ -120,7 +120,7 @@ type Frame is
       EtherType : U16
          then Payload
             with Length => EtherType * 8
-            if EtherType <= 1500,
+            if EtherType <= 1500
          then Payload
             with Length => Message'Last - EtherType'Last
             if EtherType >= 1536;
@@ -230,7 +230,7 @@ package Ethernet is
          EtherType : U16
             then Payload
                with Length => EtherType * 8
-               if EtherType <= 1500,
+               if EtherType <= 1500
             then Payload
                with Length => Message'Last - EtherType'Last
                if EtherType >= 1536;

diff --git a/examples/ping/specs/icmp.rflx b/examples/ping/specs/icmp.rflx
@@ -49,11 +49,11 @@ package ICMP is
       message
          Tag : Tag
             then Code_Destination_Unreachable
-               if Tag = Destination_Unreachable,
+               if Tag = Destination_Unreachable
             then Code_Time_Exceeded
-               if Tag = Time_Exceeded,
+               if Tag = Time_Exceeded
             then Code_Redirect
-               if Tag = Redirect,
+               if Tag = Redirect
             then Code_Zero
                if (Tag = Echo_Reply
                    or Tag = Echo_Request
@@ -74,16 +74,16 @@ package ICMP is
             then Unused_32
                if (Tag = Destination_Unreachable
                    or Tag = Source_Quench
-                   or Tag = Time_Exceeded),
+                   or Tag = Time_Exceeded)
             then Identifier
                if (Tag = Echo_Request
                    or Tag = Echo_Reply
                    or Tag = Timestamp_Msg
                    or Tag = Timestamp_Reply
                    or Tag = Information_Request
-                   or Tag = Information_Reply),
+                   or Tag = Information_Reply)
             then Pointer
-               if Tag = Parameter_Problem,
+               if Tag = Parameter_Problem
             then Gateway_Internet_Address
                if Tag = Redirect;
          Gateway_Internet_Address : Gateway_Internet_Address
@@ -99,9 +99,9 @@ package ICMP is
          Identifier : Identifier;
          Sequence_Number : Sequence_Number
             then Originate_Timestamp
-               if Tag = Timestamp_Msg or Tag = Timestamp_Reply,
+               if Tag = Timestamp_Msg or Tag = Timestamp_Reply
             then null
-               if Tag = Information_Request or Tag = Information_Reply,
+               if Tag = Information_Request or Tag = Information_Reply
             then Data
                with Length => Message'Last - Sequence_Number'Last
                if Tag = Echo_Reply or Tag = Echo_Request;

diff --git a/examples/ping/specs/ipv4_option.rflx b/examples/ping/specs/ipv4_option.rflx
@@ -10,7 +10,7 @@ package IPv4_Option is
          Option_Class : Option_Class;
          Option_Number : Option_Number
             then null
-               if Option_Class = Control and Option_Number = 1,
+               if Option_Class = Control and Option_Number = 1
             then Option_Length
                if Option_Number > 1;
          Option_Length : Option_Length

diff --git a/rflx/model.py b/rflx/model.py
@@ -700,7 +700,7 @@ def __str__(self) -> str:
             ):
                 if f == INITIAL:
                     fields += "null"
-                fields += "\n" + indent(",\n".join(str(o) for o in outgoing), 3)
+                fields += "\n" + indent("\n".join(str(o) for o in outgoing), 3)
             if fields:
                 fields += ";"
         return f"type {self.name} is\n   message\n{indent(fields, 6)}\n   end message"

diff --git a/rflx/parser/grammar.py b/rflx/parser/grammar.py
@@ -307,15 +307,16 @@ def message_type_definition() -> Token:
         - Group(Optional(value_constraint()))
     )
     then.setParseAction(parse_then)
-    then_list = then + ZeroOrMore(comma() - then)
+    then_list = ZeroOrMore(then)
     then_list.setParseAction(lambda t: [t.asList()])
+
     component_item = (
         ~Keyword("end")
         + ~CaselessKeyword("Message")
         - unqualified_identifier()
         + Literal(":")
         - qualified_identifier()
-        - Optional(then_list)
+        - then_list
         - semicolon()
     )
     component_item.setParseAction(

diff --git a/specs/ethernet.rflx b/specs/ethernet.rflx
@@ -12,7 +12,7 @@ package Ethernet is
          Type_Length_TPID : Type_Length
             then TPID
                with First => Type_Length_TPID'First
-               if Type_Length_TPID = 16#8100#,
+               if Type_Length_TPID = 16#8100#
             then Type_Length
                with First => Type_Length_TPID'First
                if Type_Length_TPID /= 16#8100#;
@@ -21,7 +21,7 @@ package Ethernet is
          Type_Length : Type_Length
             then Payload
                with Length => Type_Length * 8
-               if Type_Length <= 1500,
+               if Type_Length <= 1500
             then Payload
                with Length => Message'Last - Type_Length'Last
                if Type_Length >= 1536;

diff --git a/specs/icmp.rflx b/specs/icmp.rflx
@@ -49,11 +49,11 @@ package ICMP is
       message
          Tag : Tag
             then Code_Destination_Unreachable
-               if Tag = Destination_Unreachable,
+               if Tag = Destination_Unreachable
             then Code_Time_Exceeded
-               if Tag = Time_Exceeded,
+               if Tag = Time_Exceeded
             then Code_Redirect
-               if Tag = Redirect,
+               if Tag = Redirect
             then Code_Zero
                if (Tag = Echo_Reply
                    or Tag = Echo_Request
@@ -74,16 +74,16 @@ package ICMP is
             then Unused_32
                if (Tag = Destination_Unreachable
                    or Tag = Source_Quench
-                   or Tag = Time_Exceeded),
+                   or Tag = Time_Exceeded)
             then Identifier
                if (Tag = Echo_Request
                    or Tag = Echo_Reply
                    or Tag = Timestamp_Msg
                    or Tag = Timestamp_Reply
                    or Tag = Information_Request
-                   or Tag = Information_Reply),
+                   or Tag = Information_Reply)
             then Pointer
-               if Tag = Parameter_Problem,
+               if Tag = Parameter_Problem
             then Gateway_Internet_Address
                if Tag = Redirect;
          Gateway_Internet_Address : Gateway_Internet_Address
@@ -99,9 +99,9 @@ package ICMP is
          Identifier : Identifier;
          Sequence_Number : Sequence_Number
             then Originate_Timestamp
-               if Tag = Timestamp_Msg or Tag = Timestamp_Reply,
+               if Tag = Timestamp_Msg or Tag = Timestamp_Reply
             then null
-               if Tag = Information_Request or Tag = Information_Reply,
+               if Tag = Information_Request or Tag = Information_Reply
             then Data
                with Length => Message'Last - Sequence_Number'Last
                if Tag = Echo_Reply or Tag = Echo_Request;
@@ -112,4 +112,4 @@ package ICMP is
          Data : Opaque;
       end message;
 
-end ICMP;
+end ICMP;
diff --git a/specs/ipv4.rflx b/specs/ipv4.rflx
@@ -22,7 +22,7 @@ package IPv4 is
          Option_Class : Option_Class;
          Option_Number : Option_Number
             then null
-               if Option_Class = Control and Option_Number = 1,
+               if Option_Class = Control and Option_Number = 1
             then Option_Length
                if Option_Number > 1;
          Option_Length : Option_Length

diff --git a/specs/tls_handshake.rflx b/specs/tls_handshake.rflx
@@ -134,7 +134,7 @@ package TLS_Handshake is
                with Length => Legacy_Compression_Methods_Length * 8;
          Legacy_Compression_Methods : Opaque
             then null
-               if Message'Last / 8 = Legacy_Compression_Methods'Last / 8,
+               if Message'Last / 8 = Legacy_Compression_Methods'Last / 8
             then Extensions_Length
                if Message'Last / 8 /= Legacy_Compression_Methods'Last / 8;
          Extensions_Length : Client_Hello_Extensions_Length
@@ -165,7 +165,7 @@ package TLS_Handshake is
          Extensions_Length : Server_Hello_Extensions_Length
             then Extensions
                with Length => Extensions_Length * 8
-               if Random /= (16#CF#, 16#21#, 16#AD#, 16#74#, 16#E5#, 16#9A#, 16#61#, 16#11#, 16#BE#, 16#1D#, 16#8C#, 16#02#, 16#1E#, 16#65#, 16#B8#, 16#91#, 16#C2#, 16#A2#, 16#11#, 16#16#, 16#7A#, 16#BB#, 16#8C#, 16#5E#, 16#07#, 16#9E#, 16#09#, 16#E2#, 16#C8#, 16#A8#, 16#33#, 16#9C#),
+               if Random /= (16#CF#, 16#21#, 16#AD#, 16#74#, 16#E5#, 16#9A#, 16#61#, 16#11#, 16#BE#, 16#1D#, 16#8C#, 16#02#, 16#1E#, 16#65#, 16#B8#, 16#91#, 16#C2#, 16#A2#, 16#11#, 16#16#, 16#7A#, 16#BB#, 16#8C#, 16#5E#, 16#07#, 16#9E#, 16#09#, 16#E2#, 16#C8#, 16#A8#, 16#33#, 16#9C#)
             then HRR_Extensions
                with Length => Extensions_Length * 8
                if Random = (16#CF#, 16#21#, 16#AD#, 16#74#, 16#E5#, 16#9A#, 16#61#, 16#11#, 16#BE#, 16#1D#, 16#8C#, 16#02#, 16#1E#, 16#65#, 16#B8#, 16#91#, 16#C2#, 16#A2#, 16#11#, 16#16#, 16#7A#, 16#BB#, 16#8C#, 16#5E#, 16#07#, 16#9E#, 16#09#, 16#E2#, 16#C8#, 16#A8#, 16#33#, 16#9C#);

diff --git a/specs/tls_record.rflx b/specs/tls_record.rflx
@@ -11,7 +11,7 @@ package TLS_Record is
          Length : Length
             then Fragment
                with Length => Length * 8
-               if Tag /= APPLICATION_DATA and Length <= 2**14,
+               if Tag /= APPLICATION_DATA and Length <= 2**14
             then Encrypted_Record
                with Length => Length * 8
                if Tag = APPLICATION_DATA and Legacy_Record_Version = TLS_1_2;

diff --git a/specs/tlv.rflx b/specs/tlv.rflx
@@ -7,7 +7,7 @@ package TLV is
       message
          Tag    : Tag
             then Length
-               if Tag = Msg_Data,
+               if Tag = Msg_Data
             then null
                if Tag = Msg_Error;
          Length : Length

diff --git a/tests/message_type.rflx b/tests/message_type.rflx
@@ -6,7 +6,7 @@ package Message_Type is
       message
          Foo : T
             then Bar
-               if Foo <= 16#1E#,
+               if Foo <= 16#1E#
             then Baz
                if Foo > 16#1E#;
          Bar : T;

diff --git a/tests/test_integration.py b/tests/test_integration.py
@@ -150,7 +150,7 @@ def test_potential_name_conflicts_fields_literals() -> None:
                  message
                     A : E
                        then null
-                          if A = F_A,
+                          if A = F_A
                        then B
                           if A = F_B;
                     B : E;

diff --git a/tests/tlv_with_checksum.rflx b/tests/tlv_with_checksum.rflx
@@ -8,7 +8,7 @@ package TLV_With_Checksum is
       message
          Tag      : Tag
             then Length
-               if Tag = Msg_Data,
+               if Tag = Msg_Data
             then null
                if Tag = Msg_Error;
          Length   : Length