issue #7411: "warning: return type of member is not documented" for static void and virtual void functions

1 files changed, 188 insertions, 188 deletions

diff --git a/vhdlparser/VhdlParser.cc b/vhdlparser/VhdlParser.cc
index c92c852..ab38310 100644
--- a/vhdlparser/VhdlParser.cc
+++ b/vhdlparser/VhdlParser.cc
@@ -4,17 +4,17 @@
 namespace vhdl {
 namespace parser {
   unsigned int jj_la1_0[] = {
-0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x90404000,0x20080000,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90004000,0x400000,0x0,0x90404000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20080000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0x40000000,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x40020000,0x40020001,0x0,0x0,0x0,0x40000000,0xd0020000,0x0,0x0,0x800000,0x0,0x0,0x80004000,0x400000,0x0,0x0,0x80404000,0x0,0x0,0x0,0x0,0x8000,0x0,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x10000,0x0,0x10800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10800,0x10000000,0x0,0x50000000,0x8000,0x80000000,0x0,0x80000000,0x80000000,0x4000000,0x8000000,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x800,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x80004000,0x0,0x80004000,0x0,0x0,0x0,0x0,0x0,0x0,0x90004000,0x400000,0x0,0x0,0x90404000,0x0,0x0,0x0,0x40000000,0x0,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x20080000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10800,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x8000000,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x0,0x0,0x0,0x0,0x0,0x20080000,0x0,0x8000,0x0,0x0,0x41000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10800,0x2000,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90c04000,0x20080000,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x90404000,0x20080000,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90004000,0x400000,0x0,0x90404000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20080000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0x40000000,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x40020000,0x40020001,0x0,0x0,0x0,0x40000000,0xd0020000,0x0,0x0,0x800000,0x0,0x0,0x80004000,0x400000,0x0,0x0,0x80404000,0x0,0x0,0x0,0x0,0x8000,0x0,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x10000,0x0,0x10800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10800,0x10000000,0x0,0x50000000,0x8000,0x80000000,0x0,0x80000000,0x80000000,0x4000000,0x8000000,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x800,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x80004000,0x0,0x80004000,0x0,0x0,0x0,0x0,0x0,0x0,0x90004000,0x400000,0x0,0x0,0x90404000,0x0,0x0,0x0,0x40000000,0x0,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x20080000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10800,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x8000000,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x0,0x0,0x0,0x0,0x0,0x20080000,0x0,0x8000,0x0,0x0,0x41000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10800,0x2000,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90c04000,0x20080000,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
   unsigned int jj_la1_1[] = {
-0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x125808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x0,0x0,0x1000,0x104800,0x1008,0x20000,0x125808,0x10000,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x1000,0x1000000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x20000,0x1000,0x0,0x4000001,0x0,0x400000,0x4000101,0x4000101,0x0,0x10,0x0,0x100,0x12024900,0x0,0x0,0x0,0x100,0x0,0x104800,0x8,0x20000,0x0,0x124808,0x0,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x200000,0x0,0x0,0x0,0x81000,0x0,0x0,0x0,0x0,0x0,0x40,0x20,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x800,0x0,0x0,0x0,0x8a00000,0x0,0x0,0x1000,0x0,0x0,0x0,0x1000,0x0,0x0,0x8a00000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x40000,0x400000,0x0,0x0,0x104800,0x20000,0x124800,0x10000,0x10000,0x0,0x0,0x10000,0x10000,0x104800,0x8,0x20000,0x0,0x124808,0x0,0x0,0x0,0x100,0x1,0x0,0x104800,0x0,0x20000,0x124800,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x20081200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x104000,0x1000000,0x1104800,0x0,0x20000,0x1124800,0x4000,0x0,0x100000,0x100000,0x0,0x104000,0x20081200,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x1104800,0x0,0x20000,0x1124800,0x0,0x104000,0x104000,0x4000001,0x1,0x0,0x4000001,0x10000,0x10000,0x10000,0x0,0x0,0x125808,0x0,0x20,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x20,0x0,0x200000,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x200000,0x0,0x0,0x0,0x200000,0x0,0x20,0x104000,0x100000,0x100000,0x0,0x1000000,0x0,0x0,0x104000,};
+0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x125808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x0,0x0,0x1000,0x104800,0x1008,0x20000,0x125808,0x10000,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x1000,0x1000000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x20000,0x1000,0x0,0x4000001,0x0,0x400000,0x4000101,0x4000101,0x0,0x10,0x0,0x100,0x12024900,0x0,0x0,0x0,0x100,0x0,0x104800,0x8,0x20000,0x0,0x124808,0x0,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x200000,0x0,0x0,0x0,0x81000,0x0,0x0,0x0,0x0,0x0,0x40,0x20,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x800,0x0,0x0,0x0,0x8a00000,0x0,0x0,0x1000,0x0,0x0,0x0,0x1000,0x0,0x0,0x8a00000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x40000,0x400000,0x0,0x0,0x104800,0x20000,0x124800,0x10000,0x10000,0x0,0x0,0x10000,0x10000,0x104800,0x8,0x20000,0x0,0x124808,0x0,0x0,0x0,0x100,0x1,0x0,0x104800,0x0,0x20000,0x124800,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x20081200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x104000,0x1000000,0x1104800,0x0,0x20000,0x1124800,0x4000,0x0,0x100000,0x100000,0x0,0x104000,0x20081200,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x1104800,0x0,0x20000,0x1124800,0x0,0x104000,0x104000,0x4000001,0x1,0x0,0x4000001,0x10000,0x10000,0x10000,0x0,0x0,0x125808,0x0,0x20,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x20,0x0,0x200000,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x200000,0x0,0x0,0x0,0x200000,0x0,0x20,0x104000,0x100000,0x100000,0x0,0x1000000,0x0,0x0,0x104000,};
   unsigned int jj_la1_2[] = {
-0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x110000,0x28000,0x0,0x20000000,0x0,0x0,0x0,0x200000,0x200000,0x0,0x0,0x0,0x4000,0x0,0x0,0x110000,0x0,0x0,0x110000,0x0,0x4000,0x4000,0x0,0x0,0x0,0x0,0x28000,0x0,0x0,0x0,0x0,0x400,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x4000,0x400000,0x8000,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000000,0x1000,0x1000,0x0,0x0,0x0,0x100,0x11000,0x0,0x0,0x0,0x0,0x0,0x110000,0x0,0x0,0x1000,0x111000,0x0,0x0,0x4000,0x0,0x400,0x8000,0x28000,0x0,0x0,0x0,0x0,0x0,0x0,0x209,0x209,0x0,0x23b,0x100,0x100,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x23b,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x1000,0x20,0x0,0x0,0x0,0x10,0x800,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000,0x0,0x110000,0x0,0x110000,0x0,0x0,0x1000,0x0,0x0,0x0,0x110000,0x0,0x0,0x1000,0x111000,0x0,0x0,0x0,0x0,0x1000,0x0,0x110000,0x0,0x0,0x110000,0x0,0x8000,0x0,0x0,0x0,0x8000,0x0,0x20000024,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x23b,0x200000,0x1000,0x0,0x0,0x20,0xc0000000,0xc0000000,0x0,0x1000000,0x0,0x800000,0x0,0x800000,0x0,0x400,0x0,0x0,0x0,0x0,0x10000,0x0,0x110000,0x0,0x110000,0x0,0x0,0x110000,0x10000,0x0,0x100000,0x100000,0x0,0x110000,0x20000024,0x0,0x0,0x0,0x0,0x600000,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x23b,0x0,0x0,0x110000,0x0,0x0,0x110000,0x0,0x110000,0x110000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x110000,0x28000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x800,0x23b,0x0,0x0,0x0,0x0,0x1000000,0x0,0x800,0x0,0x0,0x0,0x800,0x0,0x0,0x110000,0x100000,0x100000,0x0,0x0,0x2000,0x0,0x138000,};
+0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x110000,0x28000,0x0,0x20000000,0x0,0x0,0x0,0x200000,0x200000,0x0,0x0,0x0,0x4000,0x0,0x0,0x110000,0x0,0x0,0x110000,0x0,0x4000,0x4000,0x0,0x0,0x0,0x0,0x28000,0x0,0x0,0x0,0x0,0x400,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x4000,0x400000,0x8000,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000000,0x1000,0x1000,0x0,0x0,0x0,0x100,0x11000,0x0,0x0,0x0,0x0,0x0,0x110000,0x0,0x0,0x1000,0x111000,0x0,0x0,0x4000,0x0,0x400,0x8000,0x28000,0x0,0x0,0x0,0x0,0x0,0x0,0x209,0x209,0x0,0x23b,0x100,0x100,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x23b,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x1000,0x20,0x0,0x0,0x0,0x10,0x800,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000,0x0,0x110000,0x0,0x110000,0x0,0x0,0x1000,0x0,0x0,0x0,0x110000,0x0,0x0,0x1000,0x111000,0x0,0x0,0x0,0x0,0x1000,0x0,0x110000,0x0,0x0,0x110000,0x0,0x8000,0x0,0x0,0x0,0x8000,0x0,0x20000024,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x23b,0x0,0x200000,0x1000,0x0,0x0,0x20,0xc0000000,0xc0000000,0x0,0x1000000,0x0,0x800000,0x0,0x800000,0x0,0x400,0x0,0x0,0x0,0x0,0x10000,0x0,0x110000,0x0,0x110000,0x0,0x0,0x110000,0x10000,0x0,0x100000,0x100000,0x0,0x110000,0x20000024,0x0,0x0,0x0,0x0,0x600000,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x23b,0x0,0x0,0x110000,0x0,0x0,0x110000,0x0,0x110000,0x110000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x110000,0x28000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x800,0x23b,0x0,0x0,0x0,0x0,0x1000000,0x0,0x800,0x0,0x0,0x0,0x800,0x0,0x0,0x110000,0x100000,0x100000,0x0,0x0,0x2000,0x0,0x138000,};
   unsigned int jj_la1_3[] = {
-0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x188830,0x8000000,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x80000,0x0,0x0,0x80000,0x0,0x108830,0x80000,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x2000000,0x0,0x0,0x0,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x2000000,0x0,0x0,0x80000,0x80000,0x0,0x0,0x80000,0x0,0x4000,0x80000,0x80000,0x0,0x2000,0x0,0x0,0x128810,0x0,0x0,0x0,0x0,0x0,0x108830,0x80000,0x0,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x30000000,0x30000000,0x0,0x30000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30000000,0x0,0x0,0x0,0x0,0x108030,0x0,0x100030,0x100030,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x108030,0x0,0x4000,0x0,0x0,0x188820,0x0,0x188820,0x0,0x0,0x0,0x0,0x0,0x0,0x108830,0x80000,0x0,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xd000001,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x30000000,0x0,0x0,0x0,0x0,0x0,0x3c0,0x3c0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x0,0x0,0x0,0x0,0x0,0xd000001,0x0,0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x8000000,0x20,0x0,0x0,0x0,0x40000,0x0,0x0,0x30010000,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x80000,0x80000,0x80000,0x0,0x0,0x80000,0x0,0x0,0x0,0x2000000,0x0,0x188830,0x8000000,0x0,0x0,0x100010,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x2000000,0x0,0x30000000,0x8000000,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x188830,0x8000000,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x80000,0x0,0x0,0x80000,0x0,0x108830,0x80000,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x2000000,0x0,0x0,0x0,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x2000000,0x0,0x0,0x80000,0x80000,0x0,0x0,0x80000,0x0,0x4000,0x80000,0x80000,0x0,0x2000,0x0,0x0,0x128810,0x0,0x0,0x0,0x0,0x0,0x108830,0x80000,0x0,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x30000000,0x30000000,0x0,0x30000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30000000,0x0,0x0,0x0,0x0,0x108030,0x0,0x100030,0x100030,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x108030,0x0,0x4000,0x0,0x0,0x188820,0x0,0x188820,0x0,0x0,0x0,0x0,0x0,0x0,0x108830,0x80000,0x0,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xd000001,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x30000000,0x20000,0x0,0x0,0x0,0x0,0x0,0x3c0,0x3c0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x0,0x0,0x0,0x0,0x0,0xd000001,0x0,0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x8000000,0x20,0x0,0x0,0x0,0x40000,0x0,0x0,0x30010000,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x80000,0x80000,0x80000,0x0,0x0,0x80000,0x0,0x0,0x0,0x2000000,0x0,0x188830,0x8000000,0x0,0x0,0x100010,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x2000000,0x0,0x30000000,0x8000000,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
   unsigned int jj_la1_4[] = {
-0x0,0x0,0x0,0x20000,0x30,0x40,0x100,0x0,0x0,0x0,0x0,0x40000,0x0,0x40001,0x0,0x0,0x0,0x0,0x40,0x0,0x40000,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x40001,0x8000000,0x0,0x0,0x0,0x0,0x10000000,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x20000,0x40,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x40000,0x40000,0x40000,0x40000,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x4,0x140001,0x0,0x0,0x0,0x40000,0x1,0x0,0x0,0x40000,0x40,0x0,0x40,0x0,0x0,0x0,0x0,0x40,0x140031,0x0,0x1,0x0,0x40000,0x0,0x200,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x40000008,0x40000,0x40,0x1,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x1,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x1,0x0,0x0,0x0,0x40001,0x1,0x40000,0x40000,0x7e0fc00,0x7e0fc00,0x0,0x0,0x0,0x140031,0x0,0x0,0x40,0x40,0x0,0x0,0x0,0x30,0x0,0x40001,0x0,0x80,0x0,0x40,0x40000,0x40,0x40000,0x0,0x30,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x40001,0x40000,0x0,0x40001,0x0,0x1,0x0,0x40,0x40,0x40001,0x0,0x80,0x0,0x0,0x0,0x0,0x40,0x140031,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40001,0x0,0x0,0x0,0xa0000000,0x20000000,0x0,0x1,0x40001,0x0,0x0,0x0,0x0,0x140031,0x0,0x8000000,0x40000,0x8000000,0x0,0x8000000,0x0,0x240,0x240,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x1,0x0,};
+0x0,0x0,0x0,0x20000,0x30,0x40,0x100,0x0,0x0,0x0,0x0,0x40000,0x0,0x40001,0x0,0x0,0x0,0x0,0x40,0x0,0x40000,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x40001,0x8000000,0x0,0x0,0x0,0x0,0x10000000,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x20000,0x40,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x40000,0x40000,0x40000,0x40000,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x4,0x140001,0x0,0x0,0x0,0x40000,0x1,0x0,0x0,0x40000,0x40,0x0,0x40,0x0,0x0,0x0,0x0,0x40,0x140031,0x0,0x1,0x0,0x40000,0x0,0x200,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x40000008,0x40000,0x40,0x1,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x1,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x1,0x0,0x0,0x0,0x40001,0x1,0x40000,0x40000,0x7e0fc00,0x7e0fc00,0x0,0x0,0x0,0x140031,0x0,0x0,0x0,0x40,0x40,0x0,0x0,0x0,0x30,0x0,0x40001,0x0,0x80,0x0,0x40,0x40000,0x40,0x40000,0x0,0x30,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x40001,0x40000,0x0,0x40001,0x0,0x1,0x0,0x40,0x40,0x40001,0x0,0x80,0x0,0x0,0x0,0x0,0x40,0x140031,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40001,0x0,0x0,0x0,0xa0000000,0x20000000,0x0,0x1,0x40001,0x0,0x0,0x0,0x0,0x140031,0x0,0x8000000,0x40000,0x8000000,0x0,0x8000000,0x0,0x240,0x240,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x1,0x0,};
   unsigned int jj_la1_5[] = {
-0x1420,0x0,0x180,0x0,0x0,0x0,0x0,0x2,0x3c0,0x0,0x0,0x1c0,0x0,0x200001c0,0x0,0x0,0x0,0x180,0x0,0x180,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x200001c0,0x0,0x180,0x0,0x180,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x20000000,0x20000000,0x2,0x0,0x0,0x0,0x3c0,0x1c0,0x1c0,0x3c0,0x380,0x0,0x180,0x180,0x0,0x0,0x0,0x0,0x1017e0,0x0,0x0,0x0,0x1e0,0x0,0x180,0x0,0x3c0,0x0,0x180,0x0,0x180,0x0,0x0,0x180,0x0,0x1017e0,0x0,0x0,0x180,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x180,0x0,0x180,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x180,0x180,0x0,0x180,0x1420,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x1c0,0x0,0x0,0x0,0x180,0x1c0,0x0,0x1c0,0x1c0,0x0,0x0,0x180,0x0,0x180,0x1017e0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x1c0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x1c0,0x240,0x1c0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x1017e0,0x0,0x180,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x200001c0,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x1c0,0x0,0x0,0x0,0x0,0x1017e0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x180,};
+0x1420,0x0,0x180,0x0,0x0,0x0,0x0,0x2,0x3c0,0x0,0x0,0x1c0,0x0,0x200001c0,0x0,0x0,0x0,0x180,0x0,0x180,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x200001c0,0x0,0x180,0x0,0x180,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x20000000,0x20000000,0x2,0x0,0x0,0x0,0x3c0,0x1c0,0x1c0,0x3c0,0x380,0x0,0x180,0x180,0x0,0x0,0x0,0x0,0x1017e0,0x0,0x0,0x0,0x1e0,0x0,0x180,0x0,0x3c0,0x0,0x180,0x0,0x180,0x0,0x0,0x180,0x0,0x1017e0,0x0,0x0,0x180,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x180,0x0,0x180,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x180,0x180,0x0,0x180,0x1420,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x1c0,0x0,0x0,0x0,0x180,0x1c0,0x0,0x1c0,0x1c0,0x0,0x0,0x180,0x0,0x180,0x1017e0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x1c0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x1c0,0x240,0x1c0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x1017e0,0x0,0x180,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x200001c0,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x1c0,0x0,0x0,0x0,0x0,0x1017e0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x180,};
 
   /** Constructor with user supplied TokenManager. */
 
@@ -2579,9 +2579,9 @@ assert(false);
 }
 
 
-QCString VhdlParser::element_declaration() {QCString s,s1;
+QCString VhdlParser::element_declaration() {QCString rec_name,s1,s2;
     if (!hasError) {
-    s = identifier_list();
+    rec_name = identifier_list();
     }
     if (!hasError) {
     jj_consume_token(COLON_T);
@@ -2592,9 +2592,16 @@ QCString VhdlParser::element_declaration() {QCString s,s1;
     if (!hasError) {
     jj_consume_token(SEMI_T);
     }
-outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,s1.data(),Public);
-  //outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,s1.data(),Public);
-  return s+":"+s1;
+QCString name;
+   QCStringList ql=QCStringList::split(",",rec_name);
+   for (uint j=0;j<ql.count();j++)
+   {
+    name=ql[j]+"~";
+    name+=outlineParser()->getNameID().data();;
+    outlineParser()->addVhdlType(name.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,s1.data(),Public);
+   }
+   s2=rec_name+":"+s1;
+   return s2;
 assert(false);
 }
 
@@ -3907,13 +3914,7 @@ tmpEntry=m_sharedState->current;
     outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,0,Public);
     }
     if (!hasError) {
-    try {
-      if (!hasError) {
-      s2 = type_definition();
-      }
-    } catch ( ...) {
-outlineParser()->error_skipto(SEMI_T);
-    }
+    s2 = type_definition();
     }
     if (!hasError) {
     jj_consume_token(SEMI_T);
@@ -3922,19 +3923,17 @@ if (s2.contains("#")) {
       VhdlDocGen::deleteAllChars(s2,'#');
       tmpEntry->spec=VhdlDocGen::RECORD;
       tmpEntry->type=s2.data();
-      //outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(TYPE_T),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,s2.data(),Public);
     }
     else if (s2.contains("%")) {
       VhdlDocGen::deleteAllChars(s2,'%');
       tmpEntry->spec=VhdlDocGen::UNITS;
       tmpEntry->type=s2.data();
-      //outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(TYPE_T),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,s2.data(),s2.data(),Public);
-    }
+     }
     else {
       tmpEntry->spec=VhdlDocGen::TYPE;
       tmpEntry->type=s2.data();
-      //outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(TYPE_T),Entry::VARIABLE_SEC,VhdlDocGen::TYPE,0,s2.data(),Public);
     }
+
     tmpEntry.reset();
     return "type "+s+" is "+s2+";";
 assert(false);
@@ -6356,9 +6355,9 @@ assert(false);
 }
 
 
-QCString VhdlParser::physical_type_definition() {QCString s,s1,s2;
+QCString VhdlParser::physical_type_definition() {QCString s,s1,s2;Token *t=0;
     if (!hasError) {
-    jj_consume_token(UNITS_T);
+    t = jj_consume_token(UNITS_T);
     }
     if (!hasError) {
     s = identifier();
@@ -6367,7 +6366,7 @@ QCString VhdlParser::physical_type_definition() {QCString s,s1,s2;
     jj_consume_token(SEMI_T);
     }
     if (!hasError) {
-outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,0,Public);
+outlineParser()->addVhdlType(s.data(),t->beginLine,Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,0,Public);
     }
     if (!hasError) {
     while (!hasError) {
@@ -6409,7 +6408,7 @@ outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE
       ;
     }
     }
-return s+"%";
+return s;
 assert(false);
 }
 
@@ -7423,7 +7422,7 @@ assert(false);
 
 
 QCString VhdlParser::scalar_type_definition() {QCString s,s1;
-    if (jj_2_82(2147483647)) {
+    if (jj_2_81(2147483647)) {
       if (!hasError) {
       s = enumeration_type_definition();
       }
@@ -7437,21 +7436,25 @@ return s;
         s = range_constraint();
         }
         if (!hasError) {
-        if (jj_2_81(2147483647)) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case UNITS_T:{
           if (!hasError) {
           s1 = physical_type_definition();
           }
-        } else {
+          break;
+          }
+        default:
+          jj_la1[195] = jj_gen;
           ;
         }
         }
         if (!hasError) {
-return s+" "+s1+"%";
+return s+" "+s1;
         }
         break;
         }
       default:
-        jj_la1[195] = jj_gen;
+        jj_la1[196] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -7475,19 +7478,19 @@ void VhdlParser::secondary_unit() {
       break;
       }
     default:
-      jj_la1[196] = jj_gen;
+      jj_la1[197] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 }
 
 
-QCString VhdlParser::secondary_unit_declaration() {QCString s,s1;
+QCString VhdlParser::secondary_unit_declaration() {QCString s,s1;Token *t1=0;
     if (!hasError) {
     s = identifier();
     }
     if (!hasError) {
-    jj_consume_token(EQU_T);
+    t1 = jj_consume_token(EQU_T);
     }
     if (!hasError) {
     s1 = physical_literal();
@@ -7495,10 +7498,8 @@ QCString VhdlParser::secondary_unit_declaration() {QCString s,s1;
     if (!hasError) {
     jj_consume_token(SEMI_T);
     }
-//printf("\n %s %s [%d]",s.data(),s1.data(),outlineParser()->getLine());
-  outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,s1.data(),Public);
-
-  return s+"="+s1;
+outlineParser()->addVhdlType(s.data(),t1->beginLine,Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,s1.data(),Public);
+   return s+"="+s1;
 assert(false);
 }
 
@@ -7564,7 +7565,7 @@ void VhdlParser::selected_waveforms() {
         break;
         }
       default:
-        jj_la1[197] = jj_gen;
+        jj_la1[198] = jj_gen;
         goto end_label_35;
       }
       if (!hasError) {
@@ -7610,7 +7611,7 @@ QCString VhdlParser::sensitivity_list() {QCString s,s1;
         break;
         }
       default:
-        jj_la1[198] = jj_gen;
+        jj_la1[199] = jj_gen;
         goto end_label_36;
       }
       if (!hasError) {
@@ -7633,7 +7634,7 @@ assert(false);
 QCString VhdlParser::sequence_of_statement() {QCString s,s1;
     if (!hasError) {
     while (!hasError) {
-      if (jj_2_83(3)) {
+      if (jj_2_82(3)) {
         ;
       } else {
         goto end_label_37;
@@ -7653,84 +7654,84 @@ assert(false);
 
 
 QCString VhdlParser::sequential_statement() {QCString s;
-    if (jj_2_84(2147483647)) {
+    if (jj_2_83(2147483647)) {
       if (!hasError) {
       s = signal_assignment_statement();
       }
       if (!hasError) {
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
-    } else if (jj_2_85(3)) {
+    } else if (jj_2_84(3)) {
       if (!hasError) {
       s = assertion_statement();
       }
       if (!hasError) {
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
-    } else if (jj_2_86(3)) {
+    } else if (jj_2_85(3)) {
       if (!hasError) {
       s = report_statement();
       }
       if (!hasError) {
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
-    } else if (jj_2_87(3)) {
+    } else if (jj_2_86(3)) {
       if (!hasError) {
       s = wait_statement();
       }
       if (!hasError) {
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
-    } else if (jj_2_88(2147483647)) {
+    } else if (jj_2_87(2147483647)) {
       if (!hasError) {
       s = variable_assignment_statement();
       }
       if (!hasError) {
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
-    } else if (jj_2_89(3)) {
+    } else if (jj_2_88(3)) {
       if (!hasError) {
       s = procedure_call_statement();
       }
       if (!hasError) {
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
-    } else if (jj_2_90(3)) {
+    } else if (jj_2_89(3)) {
       if (!hasError) {
       if_statement();
       }
       if (!hasError) {
 return s;
       }
-    } else if (jj_2_91(3)) {
+    } else if (jj_2_90(3)) {
       if (!hasError) {
       case_statement();
       }
       if (!hasError) {
 return s;
       }
-    } else if (jj_2_92(3)) {
+    } else if (jj_2_91(3)) {
       if (!hasError) {
       loop_statement();
       }
       if (!hasError) {
 return s;
       }
-    } else if (jj_2_93(3)) {
+    } else if (jj_2_92(3)) {
       if (!hasError) {
       s = next_statement();
       }
       if (!hasError) {
 return s;
       }
-    } else if (jj_2_94(3)) {
+    } else if (jj_2_93(3)) {
       if (!hasError) {
       s = exit_statement();
       }
       if (!hasError) {
 return s;
       }
-    } else if (jj_2_95(3)) {
+    } else if (jj_2_94(3)) {
       if (!hasError) {
       s = return_statement();
       }
@@ -7751,7 +7752,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
         break;
         }
       default:
-        jj_la1[199] = jj_gen;
+        jj_la1[200] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -7781,7 +7782,7 @@ QCString VhdlParser::shift_expression() {QCString s,s1,s2;
       break;
       }
     default:
-      jj_la1[200] = jj_gen;
+      jj_la1[201] = jj_gen;
       ;
     }
     }
@@ -7847,7 +7848,7 @@ return "ror";
       break;
       }
     default:
-      jj_la1[201] = jj_gen;
+      jj_la1[202] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -7876,7 +7877,7 @@ return "-";
       break;
       }
     default:
-      jj_la1[202] = jj_gen;
+      jj_la1[203] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -7885,14 +7886,14 @@ assert(false);
 
 
 QCString VhdlParser::signal_assignment_statement() {QCString s,s1,s2,s3;
-    if (jj_2_97(2147483647)) {
+    if (jj_2_96(2147483647)) {
       if (!hasError) {
       conditional_signal_assignment_wave();
       }
       if (!hasError) {
 return "";
       }
-    } else if (jj_2_98(2147483647)) {
+    } else if (jj_2_97(2147483647)) {
       if (!hasError) {
       selected_signal_assignment_wave();
       }
@@ -7907,7 +7908,7 @@ return "";
       case BASIC_IDENTIFIER:
       case EXTENDED_CHARACTER:{
         if (!hasError) {
-        if (jj_2_96(2)) {
+        if (jj_2_95(2)) {
           if (!hasError) {
           s = identifier();
           }
@@ -7938,7 +7939,7 @@ s+=":";
           break;
           }
         default:
-          jj_la1[203] = jj_gen;
+          jj_la1[204] = jj_gen;
           ;
         }
         }
@@ -7954,7 +7955,7 @@ return s+s1+"<="+s2+s3+";";
         break;
         }
       default:
-        jj_la1[204] = jj_gen;
+        jj_la1[205] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -7993,7 +7994,7 @@ void VhdlParser::signal_declaration() {Token* tok=0;QCString s,s1,s2,s3,s4;
       break;
       }
     default:
-      jj_la1[205] = jj_gen;
+      jj_la1[206] = jj_gen;
       ;
     }
     }
@@ -8009,7 +8010,7 @@ void VhdlParser::signal_declaration() {Token* tok=0;QCString s,s1,s2,s3,s4;
       break;
       }
     default:
-      jj_la1[206] = jj_gen;
+      jj_la1[207] = jj_gen;
       ;
     }
     }
@@ -8044,7 +8045,7 @@ return "bus";
       break;
       }
     default:
-      jj_la1[207] = jj_gen;
+      jj_la1[208] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -8069,7 +8070,7 @@ QCString VhdlParser::signal_list() {QCString s,s1;
           break;
           }
         default:
-          jj_la1[208] = jj_gen;
+          jj_la1[209] = jj_gen;
           goto end_label_38;
         }
         if (!hasError) {
@@ -8105,7 +8106,7 @@ return "all";
       break;
       }
     default:
-      jj_la1[209] = jj_gen;
+      jj_la1[210] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -8134,7 +8135,7 @@ QCString VhdlParser::signature() {QCString s,s1,s2;
           break;
           }
         default:
-          jj_la1[210] = jj_gen;
+          jj_la1[211] = jj_gen;
           goto end_label_39;
         }
         if (!hasError) {
@@ -8152,7 +8153,7 @@ s+=",";s+=s1;
       break;
       }
     default:
-      jj_la1[211] = jj_gen;
+      jj_la1[212] = jj_gen;
       ;
     }
     }
@@ -8171,7 +8172,7 @@ s+="return ";s+=s1;
       break;
       }
     default:
-      jj_la1[212] = jj_gen;
+      jj_la1[213] = jj_gen;
       ;
     }
     }
@@ -8194,7 +8195,7 @@ QCString VhdlParser::simple_expression() {QCString s,s1,s2;
       break;
       }
     default:
-      jj_la1[213] = jj_gen;
+      jj_la1[214] = jj_gen;
       ;
     }
     }
@@ -8206,7 +8207,7 @@ s+=s1;
     }
     if (!hasError) {
     while (!hasError) {
-      if (jj_2_99(2147483647)) {
+      if (jj_2_98(2147483647)) {
         ;
       } else {
         goto end_label_40;
@@ -8296,7 +8297,7 @@ if (s.data())
       break;
       }
     default:
-      jj_la1[214] = jj_gen;
+      jj_la1[215] = jj_gen;
       ;
     }
     }
@@ -8311,7 +8312,7 @@ if (s.data())
       break;
       }
     default:
-      jj_la1[215] = jj_gen;
+      jj_la1[216] = jj_gen;
       ;
     }
     }
@@ -8325,7 +8326,7 @@ m_sharedState->tempEntry->endBodyLine=outlineParser()->getLine(END_T);
 
 
 void VhdlParser::subprogram_declaration() {
-    if (jj_2_100(2147483647)) {
+    if (jj_2_99(2147483647)) {
       if (!hasError) {
       subprogram_instantiation_declaration();
       }
@@ -8347,7 +8348,7 @@ m_sharedState->currP=0;
         break;
         }
       default:
-        jj_la1[216] = jj_gen;
+        jj_la1[217] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -8370,7 +8371,7 @@ void VhdlParser::subprogram_1() {
       break;
       }
     default:
-      jj_la1[217] = jj_gen;
+      jj_la1[218] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -8456,8 +8457,8 @@ return s;
       break;
       }
     default:
-      jj_la1[218] = jj_gen;
-      if (jj_2_101(2147483647)) {
+      jj_la1[219] = jj_gen;
+      if (jj_2_100(2147483647)) {
         if (!hasError) {
         s = attribute_declaration();
         }
@@ -8485,8 +8486,8 @@ return s;
           break;
           }
         default:
-          jj_la1[219] = jj_gen;
-          if (jj_2_102(3)) {
+          jj_la1[220] = jj_gen;
+          if (jj_2_101(3)) {
             if (!hasError) {
             s = group_template_declaration();
             }
@@ -8505,7 +8506,7 @@ return s;
               break;
               }
             default:
-              jj_la1[220] = jj_gen;
+              jj_la1[221] = jj_gen;
               jj_consume_token(-1);
               errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
             }
@@ -8540,7 +8541,7 @@ QCString VhdlParser::subprogram_declarative_part() {QCString s,s1;
         break;
         }
       default:
-        jj_la1[221] = jj_gen;
+        jj_la1[222] = jj_gen;
         goto end_label_41;
       }
       if (!hasError) {
@@ -8572,7 +8573,7 @@ void VhdlParser::subprogram_kind() {
       break;
       }
     default:
-      jj_la1[222] = jj_gen;
+      jj_la1[223] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -8616,12 +8617,12 @@ m_sharedState->param_sec=0;
         break;
         }
       default:
-        jj_la1[223] = jj_gen;
+        jj_la1[224] = jj_gen;
         ;
       }
       }
       if (!hasError) {
-      if (jj_2_103(2)) {
+      if (jj_2_102(2)) {
         if (!hasError) {
         gen_interface_list();
         }
@@ -8630,7 +8631,7 @@ m_sharedState->param_sec=0;
       }
       }
       if (!hasError) {
-      if (jj_2_104(2)) {
+      if (jj_2_103(2)) {
         if (!hasError) {
         gen_assoc_list();
         }
@@ -8668,7 +8669,7 @@ outlineParser()->newEntry();
           break;
           }
         default:
-          jj_la1[224] = jj_gen;
+          jj_la1[225] = jj_gen;
           jj_consume_token(-1);
           errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
         }
@@ -8676,7 +8677,7 @@ outlineParser()->newEntry();
         break;
         }
       default:
-        jj_la1[225] = jj_gen;
+        jj_la1[226] = jj_gen;
         ;
       }
       }
@@ -8717,7 +8718,7 @@ m_sharedState->param_sec=0;
         break;
         }
       default:
-        jj_la1[226] = jj_gen;
+        jj_la1[227] = jj_gen;
         ;
       }
       }
@@ -8735,7 +8736,7 @@ m_sharedState->tempEntry=m_sharedState->current;
       break;
       }
     default:
-      jj_la1[227] = jj_gen;
+      jj_la1[228] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -8768,7 +8769,7 @@ void VhdlParser::subprogram_statement_part() {
         break;
         }
       default:
-        jj_la1[228] = jj_gen;
+        jj_la1[229] = jj_gen;
         goto end_label_42;
       }
       if (!hasError) {
@@ -8819,7 +8820,7 @@ assert(false);
 
 QCString VhdlParser::subtype_indication() {QCString s,s1,s2;
     if (!hasError) {
-    if (jj_2_105(5)) {
+    if (jj_2_104(5)) {
       if (!hasError) {
       s = reslution_indication();
       }
@@ -8841,14 +8842,14 @@ QCString VhdlParser::subtype_indication() {QCString s,s1,s2;
         break;
         }
       default:
-        jj_la1[229] = jj_gen;
+        jj_la1[230] = jj_gen;
         goto end_label_43;
       }
     }
     end_label_43: ;
     }
     if (!hasError) {
-    if (jj_2_106(2147483647)) {
+    if (jj_2_105(2147483647)) {
       if (!hasError) {
       s2 = constraint();
       }
@@ -8862,7 +8863,7 @@ assert(false);
 
 
 QCString VhdlParser::suffix() {QCString s;
-    if (jj_2_107(2147483647)) {
+    if (jj_2_106(2147483647)) {
       if (!hasError) {
       s = name();
       }
@@ -8899,7 +8900,7 @@ return " all ";
         break;
         }
       default:
-        jj_la1[230] = jj_gen;
+        jj_la1[231] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -8932,7 +8933,7 @@ return s;
       break;
       }
     default:
-      jj_la1[231] = jj_gen;
+      jj_la1[232] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -8946,7 +8947,7 @@ QCString VhdlParser::term() {QCString s,s1,s2;
     }
     if (!hasError) {
     while (!hasError) {
-      if (jj_2_108(2)) {
+      if (jj_2_107(2)) {
         ;
       } else {
         goto end_label_44;
@@ -8999,7 +9000,7 @@ assert(false);
 
 
 QCString VhdlParser::type_declaration() {QCString s;
-    if (jj_2_109(3)) {
+    if (jj_2_108(3)) {
       if (!hasError) {
       s = full_type_declaration();
       }
@@ -9018,7 +9019,7 @@ return s;
         break;
         }
       default:
-        jj_la1[232] = jj_gen;
+        jj_la1[233] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -9069,8 +9070,8 @@ return s;
       break;
       }
     default:
-      jj_la1[233] = jj_gen;
-      if (jj_2_110(2)) {
+      jj_la1[234] = jj_gen;
+      if (jj_2_109(2)) {
         if (!hasError) {
         protected_type_body();
         }
@@ -9089,7 +9090,7 @@ return "";
           break;
           }
         default:
-          jj_la1[234] = jj_gen;
+          jj_la1[235] = jj_gen;
           jj_consume_token(-1);
           errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
         }
@@ -9126,7 +9127,7 @@ QCString VhdlParser::unconstraint_array_definition() {QCString s,s1,s2,s3;
         break;
         }
       default:
-        jj_la1[235] = jj_gen;
+        jj_la1[236] = jj_gen;
         goto end_label_45;
       }
       if (!hasError) {
@@ -9170,7 +9171,7 @@ QCString VhdlParser::use_clause() {QCString s,s1;
         break;
         }
       default:
-        jj_la1[236] = jj_gen;
+        jj_la1[237] = jj_gen;
         goto end_label_46;
       }
       if (!hasError) {
@@ -9212,7 +9213,7 @@ QCString VhdlParser::variable_assignment_statement() {QCString s,s1,s2;
     case BASIC_IDENTIFIER:
     case EXTENDED_CHARACTER:{
       if (!hasError) {
-      if (jj_2_111(2)) {
+      if (jj_2_110(2)) {
         if (!hasError) {
         s = identifier();
         }
@@ -9253,7 +9254,7 @@ return "";
       break;
       }
     default:
-      jj_la1[237] = jj_gen;
+      jj_la1[238] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -9271,7 +9272,7 @@ QCString VhdlParser::variable_declaration() {Token *tok=0;Token *t1=0;QCString s
       break;
       }
     default:
-      jj_la1[238] = jj_gen;
+      jj_la1[239] = jj_gen;
       ;
     }
     }
@@ -9299,7 +9300,7 @@ QCString VhdlParser::variable_declaration() {Token *tok=0;Token *t1=0;QCString s
       break;
       }
     default:
-      jj_la1[239] = jj_gen;
+      jj_la1[240] = jj_gen;
       ;
     }
     }
@@ -9345,7 +9346,7 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;
       break;
       }
     default:
-      jj_la1[240] = jj_gen;
+      jj_la1[241] = jj_gen;
       ;
     }
     }
@@ -9361,7 +9362,7 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;
       break;
       }
     default:
-      jj_la1[241] = jj_gen;
+      jj_la1[242] = jj_gen;
       ;
     }
     }
@@ -9374,7 +9375,7 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;
       break;
       }
     default:
-      jj_la1[242] = jj_gen;
+      jj_la1[243] = jj_gen;
       ;
     }
     }
@@ -9387,7 +9388,7 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;
       break;
       }
     default:
-      jj_la1[243] = jj_gen;
+      jj_la1[244] = jj_gen;
       ;
     }
     }
@@ -9436,7 +9437,7 @@ QCString VhdlParser::waveform() {QCString s,s1;
           break;
           }
         default:
-          jj_la1[244] = jj_gen;
+          jj_la1[245] = jj_gen;
           goto end_label_47;
         }
         if (!hasError) {
@@ -9466,7 +9467,7 @@ return " unaffected ";
       break;
       }
     default:
-      jj_la1[245] = jj_gen;
+      jj_la1[246] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -9493,7 +9494,7 @@ s1.prepend(" after ");
       break;
       }
     default:
-      jj_la1[246] = jj_gen;
+      jj_la1[247] = jj_gen;
       ;
     }
     }
@@ -9531,7 +9532,7 @@ QCString VhdlParser::protected_type_body() {
       break;
       }
     default:
-      jj_la1[247] = jj_gen;
+      jj_la1[248] = jj_gen;
       ;
     }
     }
@@ -9595,8 +9596,8 @@ void VhdlParser::protected_type_body_declarative_item() {
       break;
       }
     default:
-      jj_la1[248] = jj_gen;
-      if (jj_2_112(2147483647)) {
+      jj_la1[249] = jj_gen;
+      if (jj_2_111(2147483647)) {
         if (!hasError) {
         attribute_declaration();
         }
@@ -9615,8 +9616,8 @@ void VhdlParser::protected_type_body_declarative_item() {
           break;
           }
         default:
-          jj_la1[249] = jj_gen;
-          if (jj_2_113(3)) {
+          jj_la1[250] = jj_gen;
+          if (jj_2_112(3)) {
             if (!hasError) {
             group_template_declaration();
             }
@@ -9629,7 +9630,7 @@ void VhdlParser::protected_type_body_declarative_item() {
               break;
               }
             default:
-              jj_la1[250] = jj_gen;
+              jj_la1[251] = jj_gen;
               jj_consume_token(-1);
               errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
             }
@@ -9663,7 +9664,7 @@ void VhdlParser::protected_type_body_declarative_part() {
         break;
         }
       default:
-        jj_la1[251] = jj_gen;
+        jj_la1[252] = jj_gen;
         goto end_label_48;
       }
       if (!hasError) {
@@ -9704,7 +9705,7 @@ outlineParser()->error_skipto(END_T);
       break;
       }
     default:
-      jj_la1[252] = jj_gen;
+      jj_la1[253] = jj_gen;
       ;
     }
     }
@@ -9737,7 +9738,7 @@ void VhdlParser::protected_type_declarative_item() {
       break;
       }
     default:
-      jj_la1[253] = jj_gen;
+      jj_la1[254] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -9758,7 +9759,7 @@ void VhdlParser::protected_type_declarative_part() {
         break;
         }
       default:
-        jj_la1[254] = jj_gen;
+        jj_la1[255] = jj_gen;
         goto end_label_49;
       }
       if (!hasError) {
@@ -9811,7 +9812,7 @@ m_sharedState->parse_sec=CONTEXT_SEC;
         break;
         }
       default:
-        jj_la1[255] = jj_gen;
+        jj_la1[256] = jj_gen;
         goto end_label_50;
       }
       if (!hasError) {
@@ -9832,7 +9833,7 @@ m_sharedState->parse_sec=CONTEXT_SEC;
       break;
       }
     default:
-      jj_la1[256] = jj_gen;
+      jj_la1[257] = jj_gen;
       ;
     }
     }
@@ -9846,7 +9847,7 @@ m_sharedState->parse_sec=CONTEXT_SEC;
       break;
       }
     default:
-      jj_la1[257] = jj_gen;
+      jj_la1[258] = jj_gen;
       ;
     }
     }
@@ -9888,7 +9889,7 @@ return s;
       break;
       }
     default:
-      jj_la1[258] = jj_gen;
+      jj_la1[259] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -9924,7 +9925,7 @@ void VhdlParser::package_instantiation_declaration() {QCString s,s1,s2;
       break;
       }
     default:
-      jj_la1[259] = jj_gen;
+      jj_la1[260] = jj_gen;
       ;
     }
     }
@@ -9961,7 +9962,7 @@ QCString VhdlParser::interface_package_declaration() {QCString s,s1;
       break;
       }
     default:
-      jj_la1[260] = jj_gen;
+      jj_la1[261] = jj_gen;
       ;
     }
     }
@@ -9999,7 +10000,7 @@ QCString VhdlParser::subprogram_instantiation_declaration() {QCString s,s1,s2;
       break;
       }
     default:
-      jj_la1[261] = jj_gen;
+      jj_la1[262] = jj_gen;
       ;
     }
     }
@@ -10070,7 +10071,7 @@ void VhdlParser::case_scheme() {
     when_stats();
     }
     if (!hasError) {
-    if (jj_2_114(3)) {
+    if (jj_2_113(3)) {
       if (!hasError) {
       ttend();
       }
@@ -10100,7 +10101,7 @@ void VhdlParser::when_stats() {
       jj_consume_token(WHEN_T);
       }
       if (!hasError) {
-      if (jj_2_115(2)) {
+      if (jj_2_114(2)) {
         if (!hasError) {
         label();
         }
@@ -10126,7 +10127,7 @@ void VhdlParser::when_stats() {
         break;
         }
       default:
-        jj_la1[262] = jj_gen;
+        jj_la1[263] = jj_gen;
         goto end_label_51;
       }
     }
@@ -10149,7 +10150,7 @@ void VhdlParser::ttend() {
       break;
       }
     default:
-      jj_la1[263] = jj_gen;
+      jj_la1[264] = jj_gen;
       ;
     }
     }
@@ -10183,7 +10184,7 @@ void VhdlParser::generate_statement_body() {
     case VARIABLE_T:{
       if (!hasError) {
       while (!hasError) {
-        if (jj_2_116(2147483647)) {
+        if (jj_2_115(2147483647)) {
           ;
         } else {
           goto end_label_52;
@@ -10200,7 +10201,7 @@ void VhdlParser::generate_statement_body() {
       break;
       }
     default:
-      jj_la1[264] = jj_gen;
+      jj_la1[265] = jj_gen;
       ;
     }
     }
@@ -10222,7 +10223,7 @@ void VhdlParser::generate_statement_body() {
         break;
         }
       default:
-        jj_la1[265] = jj_gen;
+        jj_la1[266] = jj_gen;
         goto end_label_53;
       }
       if (!hasError) {
@@ -10250,7 +10251,7 @@ void VhdlParser::generate_statement_body1() {
       break;
       }
     default:
-      jj_la1[266] = jj_gen;
+      jj_la1[267] = jj_gen;
       ;
     }
     }
@@ -10266,7 +10267,7 @@ void VhdlParser::generate_scheme_1() {
         break;
         }
       default:
-        jj_la1[267] = jj_gen;
+        jj_la1[268] = jj_gen;
         goto end_label_54;
       }
       if (!hasError) {
@@ -10283,7 +10284,7 @@ void VhdlParser::generate_scheme_2() {
     jj_consume_token(ELSE_T);
     }
     if (!hasError) {
-    if (jj_2_117(2)) {
+    if (jj_2_116(2)) {
       if (!hasError) {
       identifier();
       }
@@ -10308,7 +10309,7 @@ void VhdlParser::generate_scheme_3() {
     jj_consume_token(ELSIF_T);
     }
     if (!hasError) {
-    if (jj_2_118(2)) {
+    if (jj_2_117(2)) {
       if (!hasError) {
       identifier();
       }
@@ -10387,7 +10388,7 @@ return t->image.data();
       break;
       }
     default:
-      jj_la1[268] = jj_gen;
+      jj_la1[269] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -10425,7 +10426,7 @@ return s;
       break;
       }
     default:
-      jj_la1[269] = jj_gen;
+      jj_la1[270] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -10434,7 +10435,7 @@ assert(false);
 
 
 QCString VhdlParser::absolute_pathname() {QCString s,s1;
-    if (jj_2_119(2147483647)) {
+    if (jj_2_118(2147483647)) {
       if (!hasError) {
       jj_consume_token(DOT_T);
       }
@@ -10462,7 +10463,7 @@ return "."+s;
         break;
         }
       default:
-        jj_la1[270] = jj_gen;
+        jj_la1[271] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -10476,7 +10477,7 @@ QCString VhdlParser::relative_pathname() {QCString s,s1,s2;
     s = neg_list();
     }
     if (!hasError) {
-    if (jj_2_120(2147483647)) {
+    if (jj_2_119(2147483647)) {
       if (!hasError) {
       s1 = pathname_element_list();
       }
@@ -10510,7 +10511,7 @@ s+="^.";
         break;
         }
       default:
-        jj_la1[271] = jj_gen;
+        jj_la1[272] = jj_gen;
         goto end_label_55;
       }
     }
@@ -10540,7 +10541,7 @@ QCString VhdlParser::pathname_element() {QCString s,s1;
       break;
       }
     default:
-      jj_la1[272] = jj_gen;
+      jj_la1[273] = jj_gen;
       ;
     }
     }
@@ -10566,7 +10567,7 @@ s+=".";
     }
     if (!hasError) {
     while (!hasError) {
-      if (jj_2_121(2147483647)) {
+      if (jj_2_120(2147483647)) {
         ;
       } else {
         goto end_label_56;
@@ -10601,7 +10602,7 @@ assert(false);
 
 
 void VhdlParser::conditional_signal_assignment_wave() {
-    if (jj_2_122(2147483647)) {
+    if (jj_2_121(2147483647)) {
       if (!hasError) {
       conditional_force_assignment();
       }
@@ -10618,7 +10619,7 @@ void VhdlParser::conditional_signal_assignment_wave() {
         break;
         }
       default:
-        jj_la1[273] = jj_gen;
+        jj_la1[274] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -10644,7 +10645,7 @@ void VhdlParser::conditional_waveform_assignment() {
       break;
       }
     default:
-      jj_la1[274] = jj_gen;
+      jj_la1[275] = jj_gen;
       ;
     }
     }
@@ -10666,7 +10667,7 @@ void VhdlParser::conditional_waveform_assignment() {
       break;
       }
     default:
-      jj_la1[275] = jj_gen;
+      jj_la1[276] = jj_gen;
       ;
     }
     }
@@ -10695,7 +10696,7 @@ void VhdlParser::else_wave_list() {
       break;
       }
     default:
-      jj_la1[276] = jj_gen;
+      jj_la1[277] = jj_gen;
       ;
     }
     }
@@ -10722,7 +10723,7 @@ void VhdlParser::conditional_force_assignment() {
       break;
       }
     default:
-      jj_la1[277] = jj_gen;
+      jj_la1[278] = jj_gen;
       ;
     }
     }
@@ -10766,7 +10767,7 @@ void VhdlParser::conditional_force_assignment() {
       break;
       }
     default:
-      jj_la1[278] = jj_gen;
+      jj_la1[279] = jj_gen;
       ;
     }
     }
@@ -10777,7 +10778,7 @@ void VhdlParser::conditional_force_assignment() {
 
 
 void VhdlParser::selected_signal_assignment_wave() {
-    if (jj_2_123(2147483647)) {
+    if (jj_2_122(2147483647)) {
       if (!hasError) {
       selected_force_assignment();
       }
@@ -10790,7 +10791,7 @@ void VhdlParser::selected_signal_assignment_wave() {
         break;
         }
       default:
-        jj_la1[279] = jj_gen;
+        jj_la1[280] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -10817,7 +10818,7 @@ void VhdlParser::selected_variable_assignment() {
       break;
       }
     default:
-      jj_la1[280] = jj_gen;
+      jj_la1[281] = jj_gen;
       ;
     }
     }
@@ -10834,7 +10835,7 @@ void VhdlParser::selected_variable_assignment() {
 
 
 void VhdlParser::select_name() {
-    if (jj_2_124(2147483647)) {
+    if (jj_2_123(2147483647)) {
       if (!hasError) {
       aggregate();
       }
@@ -10850,7 +10851,7 @@ void VhdlParser::select_name() {
         break;
         }
       default:
-        jj_la1[281] = jj_gen;
+        jj_la1[282] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -10877,7 +10878,7 @@ void VhdlParser::selected_waveform_assignment() {
       break;
       }
     default:
-      jj_la1[282] = jj_gen;
+      jj_la1[283] = jj_gen;
       ;
     }
     }
@@ -10898,7 +10899,7 @@ void VhdlParser::selected_waveform_assignment() {
       break;
       }
     default:
-      jj_la1[283] = jj_gen;
+      jj_la1[284] = jj_gen;
       ;
     }
     }
@@ -10927,7 +10928,7 @@ void VhdlParser::selected_force_assignment() {
       break;
       }
     default:
-      jj_la1[284] = jj_gen;
+      jj_la1[285] = jj_gen;
       ;
     }
     }
@@ -10950,7 +10951,7 @@ void VhdlParser::selected_force_assignment() {
       break;
       }
     default:
-      jj_la1[285] = jj_gen;
+      jj_la1[286] = jj_gen;
       ;
     }
     }
@@ -10986,7 +10987,7 @@ void VhdlParser::sel_var_list() {
       break;
       }
     default:
-      jj_la1[286] = jj_gen;
+      jj_la1[287] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -10994,7 +10995,7 @@ void VhdlParser::sel_var_list() {
     }
     if (!hasError) {
     while (!hasError) {
-      if (jj_2_125(2147483647)) {
+      if (jj_2_124(2147483647)) {
         ;
       } else {
         goto end_label_57;
@@ -11023,7 +11024,7 @@ void VhdlParser::sel_var_list() {
         break;
         }
       default:
-        jj_la1[287] = jj_gen;
+        jj_la1[288] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -11052,7 +11053,7 @@ void VhdlParser::sel_wave_list() {
         break;
         }
       default:
-        jj_la1[288] = jj_gen;
+        jj_la1[289] = jj_gen;
         goto end_label_58;
       }
       if (!hasError) {
@@ -11085,7 +11086,7 @@ void VhdlParser::inout_stat() {
       break;
       }
     default:
-      jj_la1[289] = jj_gen;
+      jj_la1[290] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -11113,7 +11114,7 @@ void VhdlParser::else_stat() {
         break;
         }
       default:
-        jj_la1[290] = jj_gen;
+        jj_la1[291] = jj_gen;
         ;
       }
       }
@@ -11123,7 +11124,7 @@ void VhdlParser::else_stat() {
         break;
         }
       default:
-        jj_la1[291] = jj_gen;
+        jj_la1[292] = jj_gen;
         goto end_label_59;
       }
     }
@@ -11155,7 +11156,7 @@ return s;
       break;
       }
     default:
-      jj_la1[292] = jj_gen;
+      jj_la1[293] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -11198,14 +11199,14 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *
         break;
         }
       default:
-        jj_la1[293] = jj_gen;
+        jj_la1[294] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
       break;
       }
     default:
-      jj_la1[294] = jj_gen;
+      jj_la1[295] = jj_gen;
       ;
     }
     }
@@ -11246,7 +11247,7 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *
         break;
         }
       default:
-        jj_la1[295] = jj_gen;
+        jj_la1[296] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -11254,7 +11255,7 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *
       break;
       }
     default:
-      jj_la1[296] = jj_gen;
+      jj_la1[297] = jj_gen;
       ;
     }
     }
@@ -11290,7 +11291,7 @@ QCString VhdlParser::param() {QCString s,s1;Token *tok=0;
       break;
       }
     default:
-      jj_la1[297] = jj_gen;
+      jj_la1[298] = jj_gen;
       ;
     }
     }
@@ -11312,7 +11313,7 @@ m_sharedState->param_sec=PARAM_SEC;
       break;
       }
     default:
-      jj_la1[298] = jj_gen;
+      jj_la1[299] = jj_gen;
       ;
     }
     }
@@ -11347,7 +11348,7 @@ void VhdlParser::parseInline() {
       break;
       }
     default:
-      jj_la1[299] = jj_gen;
+      jj_la1[300] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -11381,7 +11382,7 @@ void VhdlParser::ReInit(TokenManager* tokenManager){
     trace = false;
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 300; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 301; i++) jj_la1[i] = -1;
   }
 
 
@@ -11412,7 +11413,7 @@ Token * VhdlParser::jj_consume_token(int kind)  {
       jj_gen++;
       if (++jj_gc > 100) {
         jj_gc = 0;
-        for (int i = 0; i < 125; i++) {
+        for (int i = 0; i < 124; i++) {
           JJCalls *c = &jj_2_rtns[i];
           while (c != nullptr) {
             if (c->gen < jj_gen) c->first = nullptr;
@@ -11506,7 +11507,7 @@ int VhdlParser::jj_ntk_f(){
 
   void VhdlParser::jj_rescan_token(){
     jj_rescan = true;
-    for (int i = 0; i < 125; i++) {
+    for (int i = 0; i < 124; i++) {
       JJCalls *p = &jj_2_rtns[i];
       do {
         if (p->gen > jj_gen) {
@@ -11636,7 +11637,6 @@ int VhdlParser::jj_ntk_f(){
             case 121: jj_3_122(); break;
             case 122: jj_3_123(); break;
             case 123: jj_3_124(); break;
-            case 124: jj_3_125(); break;
           }
         }
         p = p->next;