Add dynamic array tracing tests

[deliverable/barectf.git] / barectf / __init__.py

diff --git a/barectf/__init__.py b/barectf/__init__.py
index bb0207c4d4984ebfc087f08cdf6ed906539c88d4..b47d71c779a71a3c341c4531fb25c6f841b286c1 100644 (file)
--- a/barectf/__init__.py
+++ b/barectf/__init__.py
@@ -24,7 +24,9 @@
 import barectf.config_parse_common as barectf_config_parse_common
 import barectf.version as barectf_version
 import barectf.config as barectf_config
-import barectf.gen as barectf_gen
+import barectf.config_file as barectf_config_file
+import barectf.codegen as barectf_codegen
+import barectf.typing as barectf_typing
 
 
 # version API
@@ -34,6 +36,14 @@ __patch_version__ = barectf_version.__patch_version__
 __version__ = barectf_version.__version__
 
 
+# common typing API
+Index = barectf_typing.Index
+Count = barectf_typing.Count
+Id = barectf_typing.Id
+Alignment = barectf_typing.Alignment
+VersionNumber = barectf_typing.VersionNumber
+
+
 # configuration API
 _ArrayFieldType = barectf_config._ArrayFieldType
 _BitArrayFieldType = barectf_config._BitArrayFieldType
@@ -46,18 +56,17 @@ ClockType = barectf_config.ClockType
 ClockTypeCTypes = barectf_config.ClockTypeCTypes
 ClockTypeOffset = barectf_config.ClockTypeOffset
 Configuration = barectf_config.Configuration
-configuration_file_major_version = barectf_config.configuration_file_major_version
-configuration_from_file = barectf_config.configuration_from_file
 ConfigurationCodeGenerationHeaderOptions = barectf_config.ConfigurationCodeGenerationHeaderOptions
 ConfigurationCodeGenerationOptions = barectf_config.ConfigurationCodeGenerationOptions
 ConfigurationOptions = barectf_config.ConfigurationOptions
 DEFAULT_FIELD_TYPE = barectf_config.DEFAULT_FIELD_TYPE
 DisplayBase = barectf_config.DisplayBase
-effective_configuration_file = barectf_config.effective_configuration_file
+DynamicArrayFieldType = barectf_config.DynamicArrayFieldType
 EnumerationFieldTypeMapping = barectf_config.EnumerationFieldTypeMapping
 EnumerationFieldTypeMappingRange = barectf_config.EnumerationFieldTypeMappingRange
 EnumerationFieldTypeMappings = barectf_config.EnumerationFieldTypeMappings
 EventType = barectf_config.EventType
+LogLevel = barectf_config.LogLevel
 RealFieldType = barectf_config.RealFieldType
 SignedEnumerationFieldType = barectf_config.SignedEnumerationFieldType
 SignedIntegerFieldType = barectf_config.SignedIntegerFieldType
@@ -78,11 +87,20 @@ UnsignedEnumerationFieldType = barectf_config.UnsignedEnumerationFieldType
 UnsignedIntegerFieldType = barectf_config.UnsignedIntegerFieldType
 
 
+# configuration file API
+configuration_file_major_version = barectf_config_file.configuration_file_major_version
+configuration_from_file = barectf_config_file.configuration_from_file
+effective_configuration_file = barectf_config_file.effective_configuration_file
+
+
 # code generation API
-CodeGenerator = barectf_gen.CodeGenerator
+CodeGenerator = barectf_codegen.CodeGenerator
 
 
+# remove local names
 del barectf_config_parse_common
 del barectf_version
 del barectf_config
-del barectf_gen
+del barectf_config_file
+del barectf_codegen
+del barectf_typing