Skip to content

Commit

Permalink
Change version of language parser
Browse files Browse the repository at this point in the history 
Ref. #609
  • Loading branch information
@treiher
treiher committed Sep 7, 2021
1 parent 870744f commit f9b4467
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 1 deletion.
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"pydotplus >=2, <3",
"z3-solver >=4, <5",
"RecordFlux-language@git+https://github.com/Componolit/RecordFlux-language.git"
"@v0.6.0#egg=RecordFlux-language",
"@v0.7.0#egg=RecordFlux-language",
],
extras_require={
"devel": [
Expand Down
48 changes: 48 additions & 0 deletions tests/unit/specification/parser_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ def test_parse_integer_type_spec() -> None:
"last": {"_kind": "NumericLiteral", "_value": "2_000"},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Page_Num"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand All @@ -242,6 +243,7 @@ def test_parse_integer_type_spec() -> None:
"last": {"_kind": "NumericLiteral", "_value": "255"},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Line_Size"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand All @@ -250,6 +252,7 @@ def test_parse_integer_type_spec() -> None:
"mod": {"_kind": "NumericLiteral", "_value": "256"},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Byte"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand All @@ -258,6 +261,7 @@ def test_parse_integer_type_spec() -> None:
"mod": {"_kind": "NumericLiteral", "_value": "64"},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Hash_Index"},
"parameters": None,
},
],
"end_identifier": {"_kind": "UnqualifiedID", "_value": "Integer_Type"},
Expand Down Expand Up @@ -351,6 +355,7 @@ def test_parse_enumeration_type_spec() -> None:
},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Day"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand Down Expand Up @@ -395,6 +400,7 @@ def test_parse_enumeration_type_spec() -> None:
},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Protocol"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand Down Expand Up @@ -434,6 +440,7 @@ def test_parse_enumeration_type_spec() -> None:
},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Gender"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand Down Expand Up @@ -485,6 +492,7 @@ def test_parse_enumeration_type_spec() -> None:
},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Priority"},
"parameters": None,
},
],
"end_identifier": {"_kind": "UnqualifiedID", "_value": "Enumeration_Type"},
Expand All @@ -510,6 +518,7 @@ def test_parse_sequence_type_spec() -> None:
"mod": {"_kind": "NumericLiteral", "_value": "256"},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Byte"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand All @@ -522,6 +531,7 @@ def test_parse_sequence_type_spec() -> None:
},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Bytes"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand Down Expand Up @@ -585,6 +595,7 @@ def test_parse_sequence_type_spec() -> None:
"name": {"_kind": "UnqualifiedID", "_value": "Byte"},
"package": None,
},
"type_arguments": [],
},
{
"_kind": "Component",
Expand All @@ -603,12 +614,14 @@ def test_parse_sequence_type_spec() -> None:
},
"package": None,
},
"type_arguments": [],
},
],
"initial_component": None,
},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Foo"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand All @@ -621,6 +634,7 @@ def test_parse_sequence_type_spec() -> None:
},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Bar"},
"parameters": None,
},
],
"end_identifier": {"_kind": "UnqualifiedID", "_value": "Sequence_Type"},
Expand All @@ -646,6 +660,7 @@ def test_parse_message_type_spec() -> None:
"mod": {"_kind": "NumericLiteral", "_value": "256"},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "T"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand Down Expand Up @@ -724,6 +739,7 @@ def test_parse_message_type_spec() -> None:
"name": {"_kind": "UnqualifiedID", "_value": "T"},
"package": None,
},
"type_arguments": [],
},
{
"_kind": "Component",
Expand All @@ -739,6 +755,7 @@ def test_parse_message_type_spec() -> None:
"name": {"_kind": "UnqualifiedID", "_value": "T"},
"package": None,
},
"type_arguments": [],
},
{
"_kind": "Component",
Expand All @@ -754,12 +771,14 @@ def test_parse_message_type_spec() -> None:
"name": {"_kind": "UnqualifiedID", "_value": "T"},
"package": None,
},
"type_arguments": [],
},
],
"initial_component": None,
},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "PDU"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand All @@ -783,6 +802,7 @@ def test_parse_message_type_spec() -> None:
"name": {"_kind": "UnqualifiedID", "_value": "T"},
"package": None,
},
"type_arguments": [],
},
{
"_kind": "Component",
Expand All @@ -798,12 +818,14 @@ def test_parse_message_type_spec() -> None:
"name": {"_kind": "UnqualifiedID", "_value": "T"},
"package": None,
},
"type_arguments": [],
},
],
"initial_component": None,
},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Simple_PDU"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand All @@ -812,6 +834,7 @@ def test_parse_message_type_spec() -> None:
"_value": "null " "message",
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Empty_PDU"},
"parameters": None,
},
],
"end_identifier": {"_kind": "UnqualifiedID", "_value": "Message_Type"},
Expand All @@ -837,6 +860,7 @@ def test_parse_type_refinement_spec() -> None:
"mod": {"_kind": "NumericLiteral", "_value": "256"},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "T"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand Down Expand Up @@ -915,6 +939,7 @@ def test_parse_type_refinement_spec() -> None:
"name": {"_kind": "UnqualifiedID", "_value": "T"},
"package": None,
},
"type_arguments": [],
},
{
"_kind": "Component",
Expand All @@ -930,6 +955,7 @@ def test_parse_type_refinement_spec() -> None:
"name": {"_kind": "UnqualifiedID", "_value": "T"},
"package": None,
},
"type_arguments": [],
},
{
"_kind": "Component",
Expand All @@ -945,12 +971,14 @@ def test_parse_type_refinement_spec() -> None:
"name": {"_kind": "UnqualifiedID", "_value": "T"},
"package": None,
},
"type_arguments": [],
},
],
"initial_component": None,
},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "PDU"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand All @@ -974,6 +1002,7 @@ def test_parse_type_refinement_spec() -> None:
"name": {"_kind": "UnqualifiedID", "_value": "T"},
"package": None,
},
"type_arguments": [],
},
{
"_kind": "Component",
Expand All @@ -989,17 +1018,20 @@ def test_parse_type_refinement_spec() -> None:
"name": {"_kind": "UnqualifiedID", "_value": "T"},
"package": None,
},
"type_arguments": [],
},
],
"initial_component": None,
},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Simple_PDU"},
"parameters": None,
},
{
"_kind": "TypeDecl",
"definition": {"_kind": "NullMessageTypeDef", "_value": "null message"},
"identifier": {"_kind": "UnqualifiedID", "_value": "Empty_PDU"},
"parameters": None,
},
],
"end_identifier": {"_kind": "UnqualifiedID", "_value": "Message_Type"},
Expand Down Expand Up @@ -1093,6 +1125,7 @@ def test_parse_type_derivation_spec() -> None:
"mod": {"_kind": "NumericLiteral", "_value": "256"},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "T"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand All @@ -1113,12 +1146,14 @@ def test_parse_type_derivation_spec() -> None:
"name": {"_kind": "UnqualifiedID", "_value": "T"},
"package": None,
},
"type_arguments": [],
}
],
"initial_component": None,
},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Foo"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand All @@ -1131,6 +1166,7 @@ def test_parse_type_derivation_spec() -> None:
},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Bar"},
"parameters": None,
},
],
"end_identifier": {"_kind": "UnqualifiedID", "_value": "Test"},
Expand Down Expand Up @@ -1162,6 +1198,7 @@ def test_parse_ethernet_spec() -> None:
},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Address"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand All @@ -1186,6 +1223,7 @@ def test_parse_ethernet_spec() -> None:
},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Type_Length"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand All @@ -1200,6 +1238,7 @@ def test_parse_ethernet_spec() -> None:
"last": {"_kind": "NumericLiteral", "_value": "16#8100#"},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "TPID"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand All @@ -1213,6 +1252,7 @@ def test_parse_ethernet_spec() -> None:
},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "TCI"},
"parameters": None,
},
{
"_kind": "TypeDecl",
Expand All @@ -1239,6 +1279,7 @@ def test_parse_ethernet_spec() -> None:
},
"package": None,
},
"type_arguments": [],
},
{
"_kind": "Component",
Expand All @@ -1257,6 +1298,7 @@ def test_parse_ethernet_spec() -> None:
},
"package": None,
},
"type_arguments": [],
},
{
"_kind": "Component",
Expand Down Expand Up @@ -1382,6 +1424,7 @@ def test_parse_ethernet_spec() -> None:
},
"package": None,
},
"type_arguments": [],
},
{
"_kind": "Component",
Expand All @@ -1397,6 +1440,7 @@ def test_parse_ethernet_spec() -> None:
"name": {"_kind": "UnqualifiedID", "_value": "TPID"},
"package": None,
},
"type_arguments": [],
},
{
"_kind": "Component",
Expand All @@ -1412,6 +1456,7 @@ def test_parse_ethernet_spec() -> None:
"name": {"_kind": "UnqualifiedID", "_value": "TCI"},
"package": None,
},
"type_arguments": [],
},
{
"_kind": "Component",
Expand Down Expand Up @@ -1566,6 +1611,7 @@ def test_parse_ethernet_spec() -> None:
},
"package": None,
},
"type_arguments": [],
},
{
"_kind": "Component",
Expand Down Expand Up @@ -1668,12 +1714,14 @@ def test_parse_ethernet_spec() -> None:
},
"package": None,
},
"type_arguments": [],
},
],
"initial_component": None,
},
},
"identifier": {"_kind": "UnqualifiedID", "_value": "Frame"},
"parameters": None,
},
],
"end_identifier": {"_kind": "UnqualifiedID", "_value": "Ethernet"},
Expand Down

0 comments on commit f9b4467

Please sign in to comment.