Fixes #95. Bug in parsing of the used_packages input to generate_codecs function.

Author: Lars Asplund

vunit/com/codec_generator.py

@@ -38,9 +38,9 @@ def generate_codecs(input_package_design_unit, codec_package_name,  # pylint: di
         if '.' in used_package:
             if used_package.split('.')[0] not in libraries:
                 libraries.append(used_package.split('.')[0])
-                use_clauses += 'use %s.all;\n' % used_package
-            else:
-                use_clauses += 'use work.%s.all;\n' % used_package
+            use_clauses += 'use %s.all;\n' % used_package
+        else:
+            use_clauses += 'use work.%s.all;\n' % used_package
     if len(libraries) != 0:
         use_clauses = 'library ' + ';\nlibrary '.join(libraries) + ';\n' + use_clauses
 

vunit/vhdl/com/run.py

@@ -14,5 +14,5 @@
 tb_com_lib = ui.add_library("tb_com_lib")
 tb_com_lib.add_source_files(join(root, 'test', '*.vhd'))
 pkg = tb_com_lib.package('custom_types_pkg')
-pkg.generate_codecs(codec_package_name='custom_codec_pkg', used_packages=['ieee.std_logic_1164'])
+pkg.generate_codecs(codec_package_name='custom_codec_pkg', used_packages=['ieee.std_logic_1164', 'constants_pkg', 'tb_com_lib.more_constants_pkg'])
 ui.main()

vunit/vhdl/com/test/constants.vhd

@@ -0,0 +1,11 @@
+-- Test suite for com codec package
+--
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this file,
+-- You can obtain one at http://mozilla.org/MPL/2.0/.
+--
+-- Copyright (c) 2015, Lars Asplund lars.anders.asplund@gmail.com
+
+package constants_pkg is
+  constant byte_msb_c : natural := 7;
+end package constants_pkg;

vunit/vhdl/com/test/custom_types.vhd

@@ -20,6 +20,9 @@ use ieee.float_pkg.all;
 
 use std.textio.all;
 
+use work.constants_pkg.all;
+use work.more_constants_pkg.all;
+
 package custom_types_pkg is
   type enum1_t is (red, green, blue);
 
@@ -86,7 +89,7 @@ package custom_types_pkg is
   type record9_msg_type_t is (foo, bar);
   type record9_t is record
     msg_type : record9_msg_type_t;
-    slv   : std_logic_vector(7 downto 0);
+    slv   : std_logic_vector(byte_msb_c downto byte_lsb_c);
     str   : string(1 to 3);
     int_2d : int_2d_t(1 to 2, 4 downto -1);
   end record record9_t;

vunit/vhdl/com/test/more_constants.vhd

@@ -0,0 +1,11 @@
+-- Test suite for com codec package
+--
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this file,
+-- You can obtain one at http://mozilla.org/MPL/2.0/.
+--
+-- Copyright (c) 2015, Lars Asplund lars.anders.asplund@gmail.com
+
+package more_constants_pkg is
+  constant byte_lsb_c : natural := 0;
+end package more_constants_pkg;