Support both import and export in same file

diff --git a/asn1ate/parser.py b/asn1ate/parser.py
index 3bab623..c4e65e0 100644 (file)
--- a/asn1ate/parser.py
+++ b/asn1ate/parser.py
@@ -300,7 +300,8 @@ def _build_asn1_grammar():
     symbols_from_module = symbol_list + Suppress(FROM) + global_module_reference
     symbols_from_module_list = OneOrMore(symbols_from_module)
     symbols_imported = Optional(symbols_from_module_list)
-    imports = Optional( (IMPORTS ^ EXPORTS) + (symbol_list ^ symbols_imported) + Suppress(';'))
+    imports = Optional(EXPORTS + symbol_list + Suppress(Optional(';'))) + Optional(IMPORTS + symbols_imported + Suppress(Optional(';'))) 
+
 
     module_body = (imports + assignment_list) | empty
     module_defaults = Suppress(tag_default + extension_default)  # we don't want these in the AST

diff --git a/testdata/import_export.asn b/testdata/import_export.asn
new file mode 100644 (file)
index 0000000..ec9f81a
--- /dev/null
+++ b/testdata/import_export.asn
@@ -0,0 +1,14 @@
+MyASN1Module DEFINITIONS ::=
+
+BEGIN
+
+EXPORTS EVERYTHING
+
+IMPORTS DataType FROM OtherASN1Module
+
+MyType ::= INTEGER
+
+MySet ::= SET {MyType, BOOLEAN}
+
+END --MyASN1Module
+