Support for EXPORT in ASN.1 files

asn1ate/parser.py

@@ -118,6 +118,7 @@ def annotation(t):
     SIZE = Keyword('SIZE')
     OF = Keyword('OF')
     IMPORTS = Keyword('IMPORTS')
+    EXPORTS = Keyword('EXPORTS')
     FROM = Keyword('FROM')
 
     # Built-in types
@@ -296,11 +297,11 @@ def annotation(t):
 
     symbol = Unique(reference)  # TODO: parameterized reference?
     symbol_list = Group(delimitedList(symbol))
-
     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(Suppress(IMPORTS) + 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

basic_test.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# For every *.asn file, run it through test.py and pipe
+# the result back to Python.
+# This checks two things:
+# 1) All steps of parsing and codegen run without exceptions
+# 2) The end result is valid Python
+# Note that it does not say anything about correctness or
+# completeness of the generated code.
+
+export PYTHONPATH=`pwd`
+for f in testdata/*.asn; 
+do 
+	echo "Checking $f"; 
+	python asn1ate/test.py $f | python
+done
+

testdata/exports.asn

@@ -0,0 +1,15 @@
+TEST 
+DEFINITIONS ::=
+BEGIN
+
+EXPORTS
+	Bool, 
+	Int,
+	Null;
+
+  -- Simple scalar types
+  Bool ::= BOOLEAN
+  Null ::= NULL
+  Int ::= INTEGER
+
+END

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
+