diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 4922bb258641c..79f1b7c6ddc12 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -236,6 +236,10 @@ jobs:
       run: |
         perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/tests/IDL_Test -workers 4
       shell: pwsh
+    - name: Run mwc.pl on $(TAO_ROOT)/tests/IDLv4
+      run: |
+        perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/tests/IDLv4 -workers 4
+      shell: pwsh
     - name: Build TAO_ACE workspace
       run: |
         make -j 6 -C ${env:TAO_ROOT}
@@ -249,6 +253,10 @@ jobs:
         make -j 6 -C ${env:TAO_ROOT}/tests/IDL_Test
       shell: pwsh
       if: matrix.feature != 'CORBA/e micro'
+    - name: Build TAO/tests/IDLv4 project
+      run: |
+        make -j 6 -C ${env:TAO_ROOT}/tests/IDLv4
+      shell: pwsh
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
       if: matrix.feature == 'CodeQL'
diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml
index 4227b0a65e233..365dec69a0780 100644
--- a/.github/workflows/macosx.yml
+++ b/.github/workflows/macosx.yml
@@ -61,6 +61,10 @@ jobs:
       run: |
         perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/tests/IDL_Test -workers 4
       shell: pwsh
+    - name: Run mwc.pl on $(TAO_ROOT)/tests/IDLv4
+      run: |
+        perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/tests/IDLv4 -workers 4
+      shell: pwsh
     - name: Build TAO_ACE project
       run: |
         make -j 6 -C ${env:TAO_ROOT}
@@ -73,3 +77,8 @@ jobs:
       run: |
         make -j 6 -C ${env:TAO_ROOT}/tests/IDL_Test
       shell: pwsh
+    - name: Build TAO/tests/IDLv4/maps project
+      run: |
+        make -j 6 -C ${env:TAO_ROOT}/tests/IDLv4
+      shell: pwsh
+
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index 2c5ee1816c412..7c45a62d0d844 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -801,6 +801,9 @@ AST_Decl::node_type_to_string (NodeType nt)
     case NT_sequence:
       return "sequence";
 
+    case NT_map:
+      return "map";
+
     case NT_typedef:
       return "typedef";
 
diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp
index 0e08c14098dc7..f7870d57fd424 100644
--- a/TAO/TAO_IDL/ast/ast_generator.cpp
+++ b/TAO/TAO_IDL/ast/ast_generator.cpp
@@ -97,6 +97,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_enum_val.h"
 #include "ast_array.h"
 #include "ast_sequence.h"
+#include "ast_map.h"
 #include "ast_string.h"
 #include "ast_structure_fwd.h"
 #include "ast_typedef.h"
@@ -867,6 +868,27 @@ AST_Generator::create_sequence (AST_Expression *ms,
   return retval;
 }
 
+AST_Map *
+AST_Generator::create_map (AST_Expression *ms,
+                           AST_Type *key_bt,
+                           AST_Type *val_bt,
+                           UTL_ScopedName *n,
+                           bool is_local,
+                           bool is_abstract)
+{
+  AST_Map *retval = nullptr;
+  ACE_NEW_RETURN (retval,
+                  AST_Map (ms,
+                           key_bt,
+                           val_bt,
+                           n,
+                           is_local,
+                           is_abstract),
+                  nullptr);
+
+  return retval;
+}
+
 AST_String *
 AST_Generator::create_string (AST_Expression *ms)
 {
diff --git a/TAO/TAO_IDL/ast/ast_map.cpp b/TAO/TAO_IDL/ast/ast_map.cpp
new file mode 100644
index 0000000000000..3b1255a518538
--- /dev/null
+++ b/TAO/TAO_IDL/ast/ast_map.cpp
@@ -0,0 +1,399 @@
+/*
+
+COPYRIGHT
+
+Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
+States of America.  All Rights Reserved.
+
+This product is protected by copyright and distributed under the following
+license restricting its use.
+
+The Interface Definition Language Compiler Front End (CFE) is made
+available for your use provided that you include this license and copyright
+notice on all media and documentation and the software program in which
+this product is incorporated in whole or part. You may copy and extend
+functionality (but may not remove functionality) of the Interface
+Definition Language CFE without charge, but you are not authorized to
+license or distribute it to anyone else except as part of a product or
+program developed by you or with the express written consent of Sun
+Microsystems, Inc. ("Sun").
+
+The names of Sun Microsystems, Inc. and any of its subsidiaries or
+affiliates may not be used in advertising or publicity pertaining to
+distribution of Interface Definition Language CFE as permitted herein.
+
+This license is effective until terminated by Sun for failure to comply
+with this license.  Upon termination, you shall destroy or return all code
+and documentation for the Interface Definition Language CFE.
+
+INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
+ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
+FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
+DEALING, USAGE OR TRADE PRACTICE.
+
+INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
+ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
+TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
+
+SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
+RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
+INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
+
+IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
+ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
+DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+Use, duplication, or disclosure by the government is subject to
+restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
+Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
+52.227-19.
+
+Sun, Sun Microsystems and the Sun logo are trademarks or registered
+trademarks of Sun Microsystems, Inc.
+
+SunSoft, Inc.
+2550 Garcia Avenue
+Mountain View, California  94043
+
+NOTE:
+
+SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
+trademarks or registered trademarks of Sun Microsystems, Inc.
+
+*/
+
+// AST_Map nodes represent IDL map declarations.
+// AST_Map is a subclass of AST_ConcreteType.
+// AST_Map nodes have a maximum size (an AST_Expression which
+// must evaluate to a positive integer) and a base type (a subclass
+// of AST_Type).
+
+#include "ast_map.h"
+#include "ast_typedef.h"
+#include "ast_expression.h"
+#include "ast_param_holder.h"
+#include "ast_visitor.h"
+#include "ast_annotation_appl.h"
+
+#include "utl_identifier.h"
+#include "utl_err.h"
+
+#include "global_extern.h"
+#include "fe_extern.h"
+
+#include "ace/Log_Msg.h"
+#include "ace/OS_Memory.h"
+#include "ace/OS_NS_string.h"
+
+#include <cstring>
+
+AST_Decl::NodeType const
+AST_Map::NT = AST_Decl::NT_map;
+
+AST_Map::AST_Map (AST_Expression *ms,
+                  AST_Type *key_bt,
+                  AST_Type *val_bt,
+                  UTL_ScopedName *n,
+                  bool local,
+                  bool abstract)
+  : COMMON_Base (key_bt->is_local () || val_bt->is_local() || local,
+                 abstract),
+    AST_Decl (AST_Decl::NT_map,
+              n,
+              true),
+    AST_Type (AST_Decl::NT_map,
+              n),
+    AST_ConcreteType (AST_Decl::NT_map,
+                      n),
+    pd_max_size (ms),
+    key_pd_type (key_bt),
+    value_pd_type (val_bt),
+    unbounded_ (true),
+    owns_key_type_ (false),
+    owns_value_type_ (false)
+{
+  FE_Utils::tmpl_mod_ref_check (this, key_bt);
+
+  AST_Decl::NodeType knt = key_bt->node_type ();
+
+  if (knt == AST_Decl::NT_param_holder)
+    {
+      AST_Param_Holder *ph = dynamic_cast<AST_Param_Holder *> (key_bt);
+
+      if (ph->info ()->type_ == AST_Decl::NT_const)
+        {
+          idl_global->err ()->not_a_type (key_bt);
+          key_bt->destroy ();
+          delete key_bt;
+          key_bt = nullptr;
+          throw Bailout ();
+        }
+    }
+
+  FE_Utils::tmpl_mod_ref_check (this, val_bt);
+
+  AST_Decl::NodeType vnt = val_bt->node_type ();
+
+  if (vnt == AST_Decl::NT_param_holder)
+    {
+      AST_Param_Holder *ph = dynamic_cast<AST_Param_Holder*> (val_bt);
+
+      if (ph->info ()->type_ == AST_Decl::NT_const)
+        {
+          idl_global->err ()->not_a_type (val_bt);
+          val_bt->destroy ();
+          delete val_bt;
+          val_bt = nullptr;
+          throw Bailout ();
+        }
+    }
+
+  // Check if we are bounded or unbounded. An expression value of 0 means
+  // unbounded. If our bound is a template parameter, skip the
+  // check altogether, this node will trigger no code generation.
+  if (ms->param_holder () == nullptr)
+    {
+      this->unbounded_ = (ms->ev ()->u.ulval == 0);
+    }
+
+  // A map data type is always VARIABLE.
+  this->size_type (AST_Type::VARIABLE);
+
+  this->owns_key_type_ =
+    knt == AST_Decl::NT_array
+    || knt == AST_Decl::NT_map
+    || knt == AST_Decl::NT_param_holder;
+
+  this->owns_value_type_ =
+    vnt == AST_Decl::NT_array
+    || vnt == AST_Decl::NT_map
+    || vnt == AST_Decl::NT_param_holder;
+}
+
+// Public operations.
+
+bool
+AST_Map::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
+{
+  if (list.is_empty ()) // only structs, unions and valuetypes can be recursive
+    return false;
+
+  list.enqueue_tail(this);
+
+  AST_Type *key_type = dynamic_cast<AST_Type*> (this->key_type ());
+  AST_Type *val_type = dynamic_cast<AST_Type*> (this->value_type());
+
+  if (key_type == nullptr)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("AST_Map::in_recursion - ")
+                         ACE_TEXT ("bad key type\n")),
+                        false);
+    }
+
+  if (val_type == nullptr)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("AST_Map::in_recursion - ")
+                         ACE_TEXT ("bad value type\n")),
+                        false);
+    }
+
+  AST_Decl::NodeType kt = key_type->node_type ();
+  AST_Decl::NodeType vt = val_type->node_type ();
+
+  if (kt == AST_Decl::NT_typedef)
+    {
+      AST_Typedef *td = dynamic_cast<AST_Typedef*> (key_type);
+      key_type = td->primitive_base_type ();
+      kt = key_type->node_type ();
+    }
+
+  if (vt == AST_Decl::NT_typedef)
+    {
+      AST_Typedef *td = dynamic_cast<AST_Typedef*>(val_type);
+      val_type = td->primitive_base_type();
+      vt = val_type->node_type();
+    }
+
+  if (kt != AST_Decl::NT_struct
+      && kt != AST_Decl::NT_union
+      && kt != AST_Decl::NT_valuetype
+      && kt != AST_Decl::NT_map
+      && vt != AST_Decl::NT_struct
+      && vt != AST_Decl::NT_union
+      && vt != AST_Decl::NT_valuetype
+      && vt != AST_Decl::NT_map)
+    {
+      return false;
+    }
+
+  bool recursion_found = false;
+  AST_Type** recursable_type = nullptr;
+  list.get (recursable_type, 0);
+  if (!std::strcmp (key_type->full_name (),
+                  (*recursable_type)->full_name ())
+      || !std::strcmp(val_type->full_name (),
+                  (*recursable_type)->full_name ()))
+    {
+      // They match.
+      recursion_found = true;
+      idl_global->recursive_type_seen_ = true;
+    }
+  else
+    {
+      // Check the element type.
+      recursion_found = key_type->in_recursion (list) && val_type->in_recursion (list);
+    }
+
+  return recursion_found;
+}
+
+// Redefinition of inherited virtual operations.
+
+// Dump this AST_Map node to the ostream o.
+void
+AST_Map::dump (ACE_OSTREAM_TYPE &o)
+{
+  this->dump_i (o, "map <");
+  AST_Annotation_Appls::iterator i,
+    finished = key_type_annotations ().end ();
+  for (i = key_type_annotations ().begin (); i != finished; ++i)
+    {
+      AST_Annotation_Appl *a = i->get ();
+      a->dump (o);
+      dump_i (o, " ");
+    }
+  this->key_pd_type->dump (o);
+  this->dump_i (o, ", ");
+
+  finished = value_type_annotations ().end ();
+  for (i = value_type_annotations ().begin (); i != finished; ++i)
+    {
+      AST_Annotation_Appl *a = i->get ();
+      a->dump (o);
+      dump_i (o, " ");
+    }
+  this->value_pd_type->dump (o);
+  this->dump_i (o, ", ");
+  this->pd_max_size->dump (o);
+  this->dump_i (o, ">");
+}
+
+int
+AST_Map::ast_accept (ast_visitor *visitor)
+{
+  return visitor->visit_map (this);
+}
+
+// Data accessors.
+
+AST_Expression *
+AST_Map::max_size () const
+{
+  return this->pd_max_size;
+}
+
+AST_Type *
+AST_Map::key_type () const
+{
+  return this->key_pd_type;
+}
+
+AST_Type *
+AST_Map::value_type () const
+{
+  return this->value_pd_type;
+}
+
+AST_Type *
+AST_Map::primitive_key_type () const
+{
+  AST_Type *type_node = key_type ();
+  if (type_node && type_node->node_type () == AST_Decl::NT_typedef)
+    {
+      AST_Typedef *const typedef_node = dynamic_cast<AST_Typedef *> (type_node);
+      if (!typedef_node) return nullptr;
+      type_node = typedef_node->primitive_base_type ();
+    }
+  return type_node;
+}
+
+AST_Type *
+AST_Map::primitive_value_type () const
+{
+  AST_Type *type_node = value_type();
+  if (type_node && type_node->node_type() == AST_Decl::NT_typedef)
+    {
+      AST_Typedef * const typedef_node = dynamic_cast<AST_Typedef*>(type_node);
+      if (!typedef_node) return nullptr;
+      type_node = typedef_node->primitive_base_type();
+    }
+  return type_node;
+}
+
+bool
+AST_Map::unbounded () const
+{
+  return this->unbounded_;
+}
+
+bool
+AST_Map::legal_for_primary_key () const
+{
+  return this->key_type ()->legal_for_primary_key ();
+}
+
+bool
+AST_Map::is_defined ()
+{
+  return this->key_pd_type->is_defined () && this->value_pd_type->is_defined();
+}
+
+void
+AST_Map::destroy ()
+{
+  if (this->owns_key_type_)
+    {
+      this->key_pd_type->destroy ();
+      delete this->key_pd_type;
+      this->key_pd_type = nullptr;
+    }
+
+  if (this->owns_value_type_)
+    {
+      this->value_pd_type->destroy();
+      delete this->value_pd_type;
+      this->value_pd_type = nullptr;
+    }
+
+  this->pd_max_size->destroy ();
+  delete this->pd_max_size;
+  this->pd_max_size = nullptr;
+
+  this->AST_ConcreteType::destroy ();
+}
+
+AST_Annotation_Appls &
+AST_Map::key_type_annotations ()
+{
+  return value_type_annotations_;
+}
+
+void
+AST_Map::key_type_annotations (const AST_Annotation_Appls &annotations)
+{
+  key_type_annotations_ = annotations;
+}
+
+AST_Annotation_Appls &
+AST_Map::value_type_annotations ()
+{
+  return value_type_annotations_;
+}
+
+void
+AST_Map::value_type_annotations (const AST_Annotation_Appls &annotations)
+{
+  value_type_annotations_ = annotations;
+}
diff --git a/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp b/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp
index c3282d8947ee4..e0f41fff792f5 100644
--- a/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp
+++ b/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp
@@ -19,6 +19,7 @@
 #include "ast_typedef.h"
 #include "ast_array.h"
 #include "ast_sequence.h"
+#include "ast_map.h"
 #include "ast_union.h"
 #include "ast_enum.h"
 #include "ast_predefined_type.h"
@@ -488,6 +489,74 @@ ast_visitor_reifying::visit_sequence (AST_Sequence *node)
   return 0;
 }
 
+int
+ast_visitor_reifying::visit_map (AST_Map *node)
+{
+  AST_Type *key_bt = node->key_type ();
+  AST_Type *value_bt = node->value_type ();
+
+  if (key_bt->ast_accept (this) != 0)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("ast_visitor_reifying::")
+                         ACE_TEXT ("visit_map - ")
+                         ACE_TEXT ("visit of key type failed\n")),
+                        -1);
+    }
+
+  key_bt = dynamic_cast<AST_Type*> (this->reified_node_);
+
+  if (value_bt->ast_accept (this) != 0)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("ast_visitor_reifying::")
+                         ACE_TEXT ("visit_map - ")
+                         ACE_TEXT ("visit of value type failed\n")),
+                        -1);
+    }
+
+  value_bt = dynamic_cast<AST_Type*> (this->reified_node_);
+
+  AST_Expression *v = node->max_size ();
+  AST_Param_Holder *ph = v->param_holder ();
+
+  if (ph != nullptr)
+    {
+      if (this->visit_param_holder (ph) != 0)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("ast_visitor_reifying::")
+                             ACE_TEXT ("visit_map - ")
+                             ACE_TEXT ("visit_param_holder() ")
+                             ACE_TEXT ("failed\n")),
+                            -1);
+        }
+
+      AST_Constant *c = dynamic_cast<AST_Constant*> (this->reified_node_);
+
+      v = c->constant_value ();
+    }
+
+  AST_Expression *bound =
+    idl_global->gen ()->create_expr (v,
+                                     AST_Expression::EV_ulong);
+  Identifier id ("map");
+  UTL_ScopedName sn (&id, nullptr);
+
+  this->reified_node_ =
+    idl_global->gen ()->create_map (bound,
+                                    key_bt,
+                                    value_bt,
+                                    &sn,
+                                    false,
+                                    false);
+
+  // No need to add this new node to any scope - it's anonymous
+  // and owned by the node that references it.
+
+  return 0;
+}
+
 int
 ast_visitor_reifying::visit_predefined_type (AST_PredefinedType *node)
 {
diff --git a/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp b/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp
index 759370f41a392..94efdb43bdbf3 100644
--- a/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp
+++ b/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp
@@ -632,6 +632,12 @@ ast_visitor_tmpl_module_inst::visit_sequence (AST_Sequence *)
   return 0;
 }
 
+int
+ast_visitor_tmpl_module_inst::visit_map (AST_Map *)
+{
+  return 0;
+}
+
 int
 ast_visitor_tmpl_module_inst::visit_string (AST_String *)
 {
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index caa96561985fb..a78e2c8c8a10a 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -3037,6 +3037,14 @@ TAO_CodeGen::gen_stub_arg_file_includes (TAO_OutStream * stream)
       stream
     );
 
+  be_global->changing_standard_include_files (0);
+  this->gen_cond_file_include (
+    idl_global->map_seen_,
+    "map",
+    stream
+  );
+  be_global->changing_standard_include_files (1);
+
   // If we have a bound string and we have any generation enabled we must
   // include Any.h to get the <<= operator for BD_String
   this->gen_cond_file_include (
diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp
index 3fcadb0a14c63..e4774e03b17f0 100644
--- a/TAO/TAO_IDL/be/be_generator.cpp
+++ b/TAO/TAO_IDL/be/be_generator.cpp
@@ -108,6 +108,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "be_enum_val.h"
 #include "be_array.h"
 #include "be_sequence.h"
+#include "be_map.h"
 #include "be_string.h"
 #include "be_typedef.h"
 #include "be_native.h"
@@ -881,6 +882,27 @@ be_generator::create_sequence (AST_Expression *v,
   return retval;
 }
 
+AST_Map *
+be_generator::create_map (AST_Expression *v,
+                          AST_Type *kt,
+                          AST_Type *vt,
+                          UTL_ScopedName *n,
+                          bool is_local,
+                          bool is_abstract)
+{
+  be_map *retval = nullptr;
+  ACE_NEW_RETURN (retval,
+                  be_map (v,
+                          kt,
+                          vt,
+                          n,
+                          is_local,
+                          is_abstract),
+                  nullptr);
+
+  return retval;
+}
+
 AST_String *
 be_generator::create_string (AST_Expression *v)
 {
diff --git a/TAO/TAO_IDL/be/be_map.cpp b/TAO/TAO_IDL/be/be_map.cpp
new file mode 100644
index 0000000000000..db7f531cea78e
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_map.cpp
@@ -0,0 +1,302 @@
+
+//=============================================================================
+/**
+ *  @file    be_map.cpp
+ *
+ *  Extension of class AST_Sequence that provides additional means for C++
+ *  mapping.
+ *
+ *  @author Tyler Mayoff
+ */
+//=============================================================================
+
+#include "be_map.h"
+#include "ast_decl.h"
+#include "ast_predefined_type.h"
+#include "be_typedef.h"
+#include "be_interface.h"
+#include "be_interface_fwd.h"
+#include "be_predefined_type.h"
+#include "be_field.h"
+#include "be_string.h"
+#include "be_visitor.h"
+#include "be_helper.h"
+#include "be_extern.h"
+
+#include "utl_identifier.h"
+#include "idl_defines.h"
+#include "nr_extern.h"
+#include "global_extern.h"
+
+#include "ace/Log_Msg.h"
+
+be_map::be_map (AST_Expression *v,
+                AST_Type *kt,
+                AST_Type *vt,
+                UTL_ScopedName *n,
+                bool local,
+                bool abstract)
+  : COMMON_Base (kt->is_local () || vt->is_local() || local,
+                 abstract),
+    AST_Decl (AST_Decl::NT_map,
+              n,
+              true),
+    AST_Type (AST_Decl::NT_map,
+              n),
+    AST_ConcreteType (AST_Decl::NT_map,
+                      n),
+    AST_Map (v,
+             kt,
+             vt,
+             n,
+             kt->is_local () || vt->is_local () || local,
+             abstract),
+    UTL_Scope (AST_Decl::NT_map),
+    be_scope (AST_Decl::NT_map),
+    be_decl (AST_Decl::NT_map,
+             n),
+    be_type (AST_Decl::NT_map,
+             n),
+    field_node_ (nullptr)
+{
+  // Always the case.
+  this->has_constructor (true);
+
+  // Don't want to set any bits below for imported nodes.
+  if (this->imported ())
+    {
+      return;
+    }
+
+  // This one gets set for all maps
+  idl_global->map_seen_ = true;
+  idl_global->var_size_decl_seen_ = true;
+}
+
+be_type *
+be_map::key_type () const
+{
+  return dynamic_cast<be_type*> (this->AST_Map::key_type ());
+}
+
+be_type *
+be_map::value_type () const
+{
+  return dynamic_cast<be_type*> (this->AST_Map::value_type ());
+}
+
+be_type *
+be_map::primitive_key_type () const
+{
+  be_type *type_node = key_type ();
+  if (type_node && type_node->node_type () == AST_Decl::NT_typedef)
+    {
+      be_typedef *const typedef_node = dynamic_cast<be_typedef *> (type_node);
+      if (!typedef_node) return nullptr;
+      type_node = typedef_node->primitive_base_type ();
+    }
+  return type_node;
+}
+
+be_type *
+be_map::primitive_value_type () const
+{
+  be_type *type_node = value_type ();
+  if (type_node && type_node->node_type () == AST_Decl::NT_typedef)
+    {
+      be_typedef *const typedef_node = dynamic_cast<be_typedef *> (type_node);
+      if (!typedef_node) return nullptr;
+      type_node = typedef_node->primitive_base_type ();
+    }
+  return type_node;
+}
+
+// Helper to create_name.
+char *
+be_map::gen_name ()
+{
+  char namebuf [NAMEBUFSIZE];
+  be_type *kt = nullptr;
+  be_type *vt = nullptr;
+
+  // Reset the buffer.
+  ACE_OS::memset (namebuf,
+                  '\0',
+                  NAMEBUFSIZE);
+
+  // Retrieve the base type.
+  kt = dynamic_cast<be_type*> (this->key_type ());
+  vt = dynamic_cast<be_type*> (this->value_type ());
+
+  if (kt == nullptr)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_map::"
+                         "gen_name - "
+                         "bad key type\n"),
+                        0);
+    }
+
+  if (kt == nullptr)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_map::"
+                         "gen_name - "
+                         "bad value type\n"),
+                        0);
+    }
+
+  std::snprintf (namebuf,
+                    NAMEBUFSIZE,
+                    "_tao_map_%s_%s_",
+                    kt->flat_name (), vt->flat_name ());
+
+  // Append the size (if any).
+  if (this->unbounded () == false)
+    {
+      char ulval_str [NAMEBUFSIZE];
+      std::snprintf (ulval_str,
+                      NAMEBUFSIZE,
+                      "_" ACE_UINT32_FORMAT_SPECIFIER_ASCII,
+                      this->max_size ()->ev ()->u.ulval);
+      ACE_OS::strcat (namebuf,
+                      ulval_str);
+    }
+
+  return ACE::strnew (namebuf);
+}
+
+// Create a name for ourselves.
+int
+be_map::create_name (be_typedef *node)
+{
+  UTL_ScopedName *n = nullptr;
+
+  // Scope in which we are defined.
+  be_decl *scope = nullptr;
+
+  // If there is a typedef node, we use its name as our name.
+  if (node)
+    {
+      this->set_name (
+          dynamic_cast<UTL_ScopedName *> (node->name ()->copy ()));
+    }
+  else
+    {
+      // Generate a local name.
+      char *namebuf = this->gen_name ();
+
+      // Now see if we have a fully scoped name and if so, generate one.
+      UTL_Scope *us = this->defined_in ();
+
+      scope = dynamic_cast<be_scope*> (us)->decl ();
+
+      if (scope != nullptr)
+        {
+          // Make a copy of the enclosing scope's name.
+          n = static_cast<UTL_ScopedName *> (scope->name ()->copy ());
+
+          Identifier *id = nullptr;
+          ACE_NEW_RETURN (id,
+                          Identifier (namebuf),
+                          -1);
+
+          UTL_ScopedName *conc_name = nullptr;
+          ACE_NEW_RETURN (conc_name,
+                          UTL_ScopedName (id,
+                                          nullptr),
+                          -1);
+
+          // Add our local name as the last component.
+          n->nconc (conc_name);
+
+          // Set the fully scoped name.
+          this->set_name (n);
+        }
+      else
+        {
+          // We better be not here because we must be inside some scope,
+          // at least the ROOT scope.
+          return -1;
+        }
+
+      ACE::strdelete (namebuf);
+    }
+
+  return 0;
+}
+
+// Add this be_sequence to the locally defined types in this scope
+AST_Map *
+be_map::fe_add_map (AST_Map *t)
+{
+  if (t == nullptr)
+    {
+      return nullptr;
+    }
+
+  this->add_to_local_types (t);
+  return t;
+}
+
+// Overridden method
+be_decl *
+be_map::decl ()
+{
+  return this;
+}
+
+// Overridden method
+void
+be_map::gen_ostream_operator (TAO_OutStream * /*os*/,
+                              bool /* use_underscore */)
+{
+}
+
+int
+be_map::accept (be_visitor *visitor)
+{
+  return visitor->visit_map (this);
+}
+
+
+const char *
+be_map::instance_name ()
+{
+  return "";
+}
+
+be_field *
+be_map::field_node () const
+{
+  return this->field_node_;
+}
+
+void
+be_map::field_node (be_field *node)
+{
+  this->field_node_ = node;
+}
+
+const char *
+be_map::smart_fwd_helper_name (AST_Decl *ctx_scope,
+                                    be_type *elem)
+{
+  if (ScopeAsDecl (elem->defined_in ()) == ctx_scope)
+    {
+      ACE_CString retval = "tao_";
+      retval += elem->local_name ()->get_string ();
+      return retval.rep ();
+    }
+
+  return elem->fwd_helper_name ();
+}
+
+void
+be_map::destroy ()
+{
+  // Call the destroy methods of our base classes.
+  this->be_scope::destroy ();
+  this->be_type::destroy ();
+  this->AST_Map::destroy ();
+}
diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp
index 04e8801b11240..d48378e000d63 100644
--- a/TAO/TAO_IDL/be/be_type.cpp
+++ b/TAO/TAO_IDL/be/be_type.cpp
@@ -347,6 +347,18 @@ be_type::seen_in_sequence (bool val)
   this->seen_in_sequence_ = val;
 }
 
+bool
+be_type::seen_in_map () const
+{
+  return this->seen_in_map_;
+}
+
+void
+be_type::seen_in_map (bool val)
+{
+  this->seen_in_map_ = val;
+}
+
 bool
 be_type::seen_in_operation () const
 {
diff --git a/TAO/TAO_IDL/be/be_visitor.cpp b/TAO/TAO_IDL/be/be_visitor.cpp
index e8b1736bb7761..ba10e58eb0b57 100644
--- a/TAO/TAO_IDL/be/be_visitor.cpp
+++ b/TAO/TAO_IDL/be/be_visitor.cpp
@@ -305,6 +305,12 @@ be_visitor::visit_array (be_array *)
   return 0;
 }
 
+int
+be_visitor::visit_map (be_map *)
+{
+  return 0;
+}
+
 int
 be_visitor::visit_sequence (be_sequence *)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp
index 09909a0f4fe46..c24decb4ef284 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp
@@ -15,6 +15,7 @@
 #include "be_visitor_sequence/cdr_op_ch.h"
 #include "be_visitor_structure/structure.h"
 #include "be_visitor_structure/cdr_op_ch.h"
+#include "be_visitor_map/cdr_op_ch.h"
 #include "be_visitor_union/union.h"
 #include "be_visitor_union/cdr_op_ch.h"
 
@@ -147,6 +148,34 @@ be_visitor_field_cdr_op_ch::visit_sequence (be_sequence *node)
   return 0;
 }
 
+int
+be_visitor_field_cdr_op_ch::visit_map (be_map *node)
+{
+  // If not a typedef and we are defined in the use scope, we must be defined.
+  if (!this->ctx_->alias () // not a typedef
+      && node->is_child (this->ctx_->scope ()->decl ()))
+    {
+      // Instantiate a visitor context with a copy of our context. This info
+      // will be modified based on what type of node we are visiting.
+      be_visitor_context ctx (*this->ctx_);
+      ctx.node (node);
+
+      // First generate the map declaration.
+      be_visitor_map_cdr_op_ch visitor (&ctx);
+
+      if (node->accept (&visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_field_cdr_op_ch::"
+                             "visit_map - "
+                             "codegen failed\n"
+                             ), -1);
+        }
+    }
+
+  return 0;
+}
+
 int
 be_visitor_field_cdr_op_ch::visit_structure (be_structure *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
index 78bdd8dc7cb21..f731c29339958 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
@@ -12,6 +12,7 @@
 #include "field.h"
 #include "be_visitor_array/cdr_op_cs.h"
 #include "be_visitor_sequence/cdr_op_cs.h"
+#include "be_visitor_map/cdr_op_cs.h"
 #include "be_visitor_structure/cdr_op_cs.h"
 #include "be_visitor_union/cdr_op_cs.h"
 
@@ -637,6 +638,69 @@ be_visitor_field_cdr_op_cs::visit_sequence (be_sequence *node)
   return 0;
 }
 
+int
+be_visitor_field_cdr_op_cs::visit_map (be_map *node)
+{
+  // If the map is defined in this scope, generate its
+  // CDR stream operators here.
+  if (node->node_type () != AST_Decl::NT_typedef
+      && node->is_child (this->ctx_->scope ()->decl ()))
+    {
+      be_visitor_context ctx (*this->ctx_);
+      ctx.node (node);
+      be_visitor_map_cdr_op_cs visitor (&ctx);
+
+      if (node->accept (&visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_field_cdr_op_cs::"
+                             "visit_map - "
+                             "codegen failed\n"),
+                            -1);
+        }
+    }
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // Retrieve the field node.
+  be_field *f =
+    dynamic_cast<be_field*> (this->ctx_->node ());
+
+  if (f == nullptr)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_field_cdr_op_cs::"
+                         "visit_map - "
+                         "cannot retrieve field node\n"),
+                        -1);
+    }
+
+  // Check what is the code generations substate. Are we generating code for
+  // the in/out operators for our parent or for us?
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_CDR_INPUT:
+      *os << "(strm >> _tao_aggregate." << f->local_name () << ")";
+
+      return 0;
+    case TAO_CodeGen::TAO_CDR_OUTPUT:
+      *os << "(strm << _tao_aggregate." << f->local_name () << ")";
+
+      return 0;
+    case TAO_CodeGen::TAO_CDR_SCOPE:
+      // Proceed further.
+      break;
+    default:
+      // Error.
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_field_cdr_op_cs::"
+                         "visit_map - "
+                         "bad sub state\n"),
+                        -1);
+    }
+  return 0;
+}
+
 int
 be_visitor_field_cdr_op_cs::visit_string (be_string *str)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field.h b/TAO/TAO_IDL/be/be_visitor_field/field.h
index 2db9d73616cda..3ebecb03921a7 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field.h
+++ b/TAO/TAO_IDL/be/be_visitor_field/field.h
@@ -24,6 +24,7 @@
 #include "be_eventtype_fwd.h"
 #include "be_predefined_type.h"
 #include "be_sequence.h"
+#include "be_map.h"
 #include "be_string.h"
 #include "be_structure.h"
 #include "be_structure_fwd.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
index 29bfdc295db06..fcdf4dfbff86b 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
@@ -12,6 +12,7 @@
 #include "field.h"
 #include "be_visitor_enum/enum_ch.h"
 #include "be_visitor_sequence/sequence_ch.h"
+#include "be_visitor_map/map_ch.h"
 #include "nr_extern.h"
 
 // **********************************************
@@ -362,6 +363,85 @@ be_visitor_field_ch::visit_sequence (be_sequence *node)
   return 0;
 }
 
+int
+be_visitor_field_ch::visit_map (be_map *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_type *bt = nullptr;
+  if (this->ctx_->alias ())
+    {
+      bt = this->ctx_->alias ();
+    }
+  else
+    {
+      bt = node;
+    }
+
+  if (!this->ctx_->alias ()
+      && node->is_child (this->ctx_->scope ()->decl ()))
+    {
+      // Put the field node into the (anonymous) sequence node, to be
+      // used later for unique name generation.
+      be_field *member_node =
+        dynamic_cast<be_field*> (this->ctx_->node ());
+      node->field_node (member_node);
+
+      // This was already generated in the corresponding valuetype class.
+      if (this->ctx_->state () != TAO_CodeGen::TAO_VALUETYPE_OBV_CH)
+        {
+          be_visitor_context ctx (*this->ctx_);
+          ctx.node (node);
+
+          // First generate the map declaration.
+          be_visitor_map_ch visitor (&ctx);
+          if (node->accept (&visitor) == -1)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                "(%N:%l) be_visitor_field_ch::"
+                                "visit_map - "
+                                "codegen failed\n"),
+                                -1);
+            }
+        }
+
+        // If we are being reused by valutype, this would get generated
+        // in the private section of the OBV_xx class, so we must
+        // generate the typedef for that case elsewhere.
+        AST_Decl::NodeType snt =
+          this->ctx_->scope ()->decl ()->node_type ();
+
+        if (snt != AST_Decl::NT_valuetype && snt != AST_Decl::NT_eventtype)
+          {
+            // Generate the anonymous sequence member typedef.
+            be_decl *bs = this->ctx_->scope ()->decl ();
+
+            TAO_INSERT_COMMENT (os);
+
+            *os << "typedef " << bt->nested_type_name (bs)
+                << " _" << this->ctx_->node ()->local_name ()
+                << "_map;" << be_nl;
+          }
+    }
+
+  be_typedef *tdef = dynamic_cast<be_typedef*> (bt);
+
+  UTL_Scope *holds_container =
+    this->ctx_->scope ()->decl ()->defined_in ();
+  AST_Decl *hc_decl = ScopeAsDecl (holds_container);
+
+  if (hc_decl->node_type () != AST_Decl::NT_module
+      || !tdef)
+    {
+      *os << bt->nested_type_name (this->ctx_->scope ()->decl ());
+    }
+  else
+    {
+      *os << bt->name ();
+    }
+
+  return 0;
+}
+
 int
 be_visitor_field_ch::visit_string (be_string *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp
index 07781ae74ff43..fabd02fc260a9 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp
@@ -83,6 +83,12 @@ be_visitor_field_ci::visit_sequence (be_sequence *)
   return 0;
 }
 
+int
+be_visitor_field_ci::visit_map (be_map *)
+{
+  return 0;
+}
+
 int
 be_visitor_field_ci::visit_structure (be_structure *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp
index 8ba9303460945..da3a08de2f8ee 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp
@@ -126,6 +126,12 @@ be_visitor_field_cs::visit_sequence (be_sequence *node)
   return 0;
 }
 
+int
+be_visitor_field_cs::visit_map (be_map *)
+{
+  return 0;
+}
+
 int
 be_visitor_field_cs::visit_structure (be_structure *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_map/buffer_type.cpp b/TAO/TAO_IDL/be/be_visitor_map/buffer_type.cpp
new file mode 100644
index 0000000000000..cc6ffa339357e
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_map/buffer_type.cpp
@@ -0,0 +1,277 @@
+//=============================================================================
+/**
+ *  @file    buffer_type.cpp
+ *
+ *  Visitor generating code for the internal buffer type of the Map node
+ *
+ *  @author Tyler Mayoff
+ */
+//=============================================================================
+
+#include "map.h"
+
+// ****************************************************************
+// We have to generate the buffer type in the constructor
+// ****************************************************************
+
+be_visitor_map_buffer_type::be_visitor_map_buffer_type (
+      be_visitor_context *ctx
+  )
+  : be_visitor_decl(ctx)
+{
+}
+
+be_visitor_map_buffer_type::~be_visitor_map_buffer_type ()
+{
+}
+
+int
+be_visitor_map_buffer_type::visit_node (be_type *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_type *bt = nullptr;
+
+  if (this->ctx_->alias ())
+    {
+      bt = this->ctx_->alias ();
+    }
+  else
+    {
+      bt = node;
+    }
+
+  if (this->ctx_->state () == TAO_CodeGen::TAO_MAP_BUFFER_TYPE_CH)
+    {
+      *os << bt->nested_type_name (this->ctx_->scope ()->decl ());
+    }
+  else
+    {
+      *os << bt->name ();
+    }
+
+  return 0;
+}
+
+int
+be_visitor_map_buffer_type::visit_predefined_type (be_predefined_type *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  AST_PredefinedType::PredefinedType pt = node->pt ();
+
+  *os << "::";
+
+  if (pt == AST_PredefinedType::PT_pseudo
+      || pt == AST_PredefinedType::PT_object
+      || pt == AST_PredefinedType::PT_abstract)
+    {
+      *os << node->name () << "_ptr";
+    }
+  else if (pt == AST_PredefinedType::PT_value)
+    {
+       *os << node->name () << " *";
+    }
+  else
+    {
+      *os << node->name ();
+    }
+
+  return 0;
+}
+
+
+int
+be_visitor_map_buffer_type::visit_sequence (be_sequence *node)
+{
+  return this->visit_node(node);
+}
+
+int
+be_visitor_map_buffer_type::visit_interface (be_interface *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  if (this->ctx_->state () == TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CH)
+    {
+      *os << node->nested_type_name (this->ctx_->scope ()->decl (),
+                                     "_ptr");
+    }
+  else
+    {
+      *os << node->name () << "_ptr";
+    }
+
+  return 0;
+}
+
+int
+be_visitor_map_buffer_type::visit_interface_fwd (be_interface_fwd *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  if (this->ctx_->state () == TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CH)
+    {
+      *os << node->nested_type_name (this->ctx_->scope ()->decl (), "_ptr");
+    }
+  else
+    {
+      *os << node->name () << "_ptr";
+    }
+
+  return 0;
+}
+
+int
+be_visitor_map_buffer_type::visit_component (be_component *node)
+{
+  return this->visit_interface (node);
+}
+
+int
+be_visitor_map_buffer_type::visit_component_fwd (be_component_fwd *node)
+{
+  return this->visit_interface_fwd (node);
+}
+
+int
+be_visitor_map_buffer_type::visit_valuebox (be_valuebox *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  if (this->ctx_->state () == TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CH)
+    {
+      *os << node->nested_type_name (this->ctx_->scope ()->decl (), " *");
+    }
+  else
+    {
+      *os << node->name () << " *";
+    }
+
+  return 0;
+}
+
+int
+be_visitor_map_buffer_type::visit_valuetype (be_valuetype *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  if (this->ctx_->state () == TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CH)
+    {
+      *os << node->nested_type_name (this->ctx_->scope ()->decl (), " *");
+    }
+  else
+    {
+      *os << node->name () << " *";
+    }
+
+  return 0;
+}
+
+int
+be_visitor_map_buffer_type::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  if (this->ctx_->state () == TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CH)
+    {
+      *os << node->nested_type_name (this->ctx_->scope ()->decl (), " *");
+    }
+  else
+    {
+      *os << node->name () << " *";
+    }
+
+  return 0;
+}
+
+int
+be_visitor_map_buffer_type::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
+
+int
+be_visitor_map_buffer_type::visit_eventtype_fwd (be_eventtype_fwd *node)
+{
+  return this->visit_valuetype_fwd (node);
+}
+
+int
+be_visitor_map_buffer_type::visit_string (be_string *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  if (node->width () == (long) sizeof (char))
+    {
+      *os << "const ::CORBA::Char *";
+    }
+  else
+    {
+      *os << "const ::CORBA::WChar *";
+    }
+
+  return 0;
+}
+
+int
+be_visitor_map_buffer_type::visit_structure (be_structure *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_buffer_type::visit_structure_fwd (be_structure_fwd *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_buffer_type::visit_union (be_union *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_buffer_type::visit_union_fwd (be_union_fwd *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_buffer_type::visit_enum (be_enum *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_buffer_type::visit_exception (be_exception *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_buffer_type::visit_array (be_array *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_buffer_type::visit_typedef (be_typedef *node)
+{
+  this->ctx_->alias (node);
+
+  if (node->primitive_base_type ()->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_map_buffer_type::"
+                         "visit_typedef - "
+                         "accept on primitive type failed\n"),
+                        -1);
+    }
+
+  this->ctx_->alias (nullptr);
+  return 0;
+}
+
+int be_visitor_map_buffer_type::visit_map (be_map *node) {
+  return this->visit_node(node);
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_map/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_map/cdr_op_ch.cpp
new file mode 100644
index 0000000000000..c8f3bfc015c85
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_map/cdr_op_ch.cpp
@@ -0,0 +1,111 @@
+
+//=============================================================================
+/**
+ *  @file    cdr_op_ch.cpp
+ *
+ *  Visitor generating code for CDR operators for maps. This uses
+ *  compiled marshaling.
+ *
+ *  @author Tyler Mayoff
+ */
+//=============================================================================
+
+#include "map.h"
+
+// ***************************************************************************
+// Map visitor for generating CDR operator declarations in the client header
+// ***************************************************************************
+
+be_visitor_map_cdr_op_ch::be_visitor_map_cdr_op_ch (
+    be_visitor_context *ctx) : be_visitor_decl (ctx)
+{
+}
+
+int
+be_visitor_map_cdr_op_ch::visit_map (be_map *node)
+{
+  if (node->cli_hdr_cdr_op_gen()
+      || node->imported()
+      || node->is_local())
+    {
+      return 0;
+    }
+
+  be_type *key_type = dynamic_cast<be_type*> (node->key_type ());
+
+  // If our base type is an anonymous map, generate code for it here.
+  if (key_type->node_type () == AST_Decl::NT_map)
+    {
+      if (key_type->accept (this) != 0)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_map_cdr_op_ch::visit_map -"
+                             "codegen for nested anonymous map failed\n"),
+                            -1);
+        }
+    }
+
+  be_type *value_type = dynamic_cast<be_type*> (node->value_type ());
+
+  // If our base type is an anonymous map, generate code for it here.
+  if (value_type->node_type () == AST_Decl::NT_map)
+    {
+      if (value_type->accept (this) != 0)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_map_cdr_op_ch::visit_map -"
+                             "codegen for nested anonymous map failed\n"),
+                            -1);
+        }
+    }
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  be_type *bt = dynamic_cast<be_type*> (node);
+  be_typedef *tdef = dynamic_cast<be_typedef*> (bt);
+
+  TAO_INSERT_COMMENT(os);
+
+  // If we're an anonymous map, we must protect against
+  // being declared more than once.
+  if (tdef == nullptr)
+    {
+      *os << "\n\n#if !defined _TAO_CDR_OP_"
+          << node->flat_name () << "_H_"
+          << "\n#define _TAO_CDR_OP_" << node->flat_name () << "_H_";
+    }
+
+  *os << be_global->core_versioning_begin();
+
+  *os << be_nl_2
+      << be_global->stub_export_macro () << " ::CORBA::Boolean"
+      << " operator<< (" << be_idt << be_idt_nl
+      << "TAO_OutputCDR &strm," << be_nl
+      << "const " << node->name()
+      << " &_tao_map);"
+      << be_uidt << be_uidt_nl;
+
+  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
+      << " operator>> (" << be_idt << be_idt_nl
+      << "TAO_InputCDR &strm," << be_nl
+      <<  node->name()
+      << " &_tao_map);"
+      << be_uidt << be_uidt;
+
+  if (be_global->gen_ostream_operators())
+    {
+      node->gen_ostream_operator(os, false);
+    }
+
+  *os << be_nl << be_global->core_versioning_end() << be_nl;
+
+  if (tdef == nullptr)
+    {
+      *os << "\n\n#endif /* _TAO_CDR_OP_"
+          << node->flat_name () << "_H_ */";
+    }
+
+  node->cli_hdr_cdr_op_gen (true);
+
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_map/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_map/cdr_op_cs.cpp
new file mode 100644
index 0000000000000..4856711f04c3e
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_map/cdr_op_cs.cpp
@@ -0,0 +1,196 @@
+
+//=============================================================================
+/**
+ *  @file    cdr_op_cs.cpp
+ *
+ *  Visitor for code generation of Maps for the CDR operators
+ *  in the client stubs.
+ *
+ *  @author Tyler Mayoff
+ */
+//=============================================================================
+
+#include "map.h"
+
+// ***************************************************************************
+// Map visitor for generating CDR operator declarations in the client
+// stubs file.
+// ***************************************************************************
+
+be_visitor_map_cdr_op_cs::be_visitor_map_cdr_op_cs (be_visitor_context *ctx)
+  : be_visitor_decl (ctx)
+{
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_map (be_map *node)
+{
+  if (this->ctx_->alias ())
+    {
+      return this->visit_node(node);
+    }
+
+  if (node->cli_stub_cdr_op_gen()
+      || node->imported()
+      || node->is_local())
+    {
+      return 0;
+    }
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  TAO_INSERT_COMMENT (os);
+
+  *os << "#if !defined _TAO_CDR_OP_"
+      << node->flat_name () << "_CPP_" << be_nl
+      << "#define _TAO_CDR_OP_" << node->flat_name () << "_CPP_"
+      << be_nl;
+
+  *os << be_global->core_versioning_begin () << be_nl;
+
+  //  Set the sub state as generating code for the output operator.
+  this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
+
+  *os << "::CORBA::Boolean operator<< (" << be_idt_nl
+          << "TAO_OutputCDR &," << be_nl
+          << "const "
+          <<  node->name() << "&)"
+          << be_uidt_nl
+          << "{" << be_idt_nl
+          << "throw ::CORBA::NO_IMPLEMENT ();" << be_nl
+          << "return false;" << be_uidt_nl
+          << "}" << be_nl_2;
+
+  *os << "::CORBA::Boolean operator>> ("<< be_idt_nl
+        << "TAO_InputCDR &," << be_nl
+        <<  node->name() << "&)"
+        << be_uidt_nl
+        << "{" << be_idt_nl
+        << "throw ::CORBA::NO_IMPLEMENT ();" << be_nl
+        << "return false;" << be_uidt_nl
+        << "}" << be_nl_2;
+
+  if (be_global->gen_ostream_operators ())
+    {
+      node->gen_ostream_operator (os, false);
+    }
+
+  *os << be_nl << be_global->core_versioning_end ();
+
+  *os << be_nl
+      << "#endif /* _TAO_CDR_OP_"
+      << node->flat_name () << "_CPP_ */";
+
+  node->cli_stub_cdr_op_gen (true);
+  return 0;
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_array (be_array *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_enum (be_enum *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_interface (be_interface *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_component (be_component *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_component_fwd (be_component_fwd *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_home (be_home *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_valuebox (be_valuebox *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_valuetype (be_valuetype *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_eventtype_fwd (be_eventtype_fwd *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_predefined_type (
+    be_predefined_type *node
+  )
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_string (be_string *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_structure (be_structure *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_union (be_union *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_typedef (be_typedef *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_map_cdr_op_cs::visit_node (be_type *)
+{
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_map/map.h b/TAO/TAO_IDL/be/be_visitor_map/map.h
new file mode 100644
index 0000000000000..77e00dadf700b
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_map/map.h
@@ -0,0 +1,48 @@
+
+//=============================================================================
+/**
+ *  @file    map.h
+ *
+ *  Visitors for generation of code for Map
+ *
+ *  @author Tyler Mayoff
+ */
+//=============================================================================
+
+#include "ace/Log_Msg.h"
+
+#include "be_array.h"
+#include "be_enum.h"
+#include "be_exception.h"
+#include "be_module.h"
+#include "be_util.h"
+#include "be_interface.h"
+#include "be_interface_fwd.h"
+#include "be_component.h"
+#include "be_component_fwd.h"
+#include "be_home.h"
+#include "be_predefined_type.h"
+#include "be_map.h"
+#include "be_string.h"
+#include "be_structure.h"
+#include "be_structure_fwd.h"
+#include "be_union.h"
+#include "be_union_fwd.h"
+#include "be_type.h"
+#include "be_typedef.h"
+#include "be_valuebox.h"
+#include "be_valuetype.h"
+#include "be_valuetype_fwd.h"
+#include "be_eventtype.h"
+#include "be_eventtype_fwd.h"
+#include "be_sequence.h"
+#include "be_helper.h"
+#include "be_extern.h"
+#include "ast_root.h"
+#include "utl_identifier.h"
+#include "nr_extern.h"
+#include "global_extern.h"
+
+#include "be_visitor_map.h"
+#include "be_visitor_context.h"
+
diff --git a/TAO/TAO_IDL/be/be_visitor_map/map_ch.cpp b/TAO/TAO_IDL/be/be_visitor_map/map_ch.cpp
new file mode 100644
index 0000000000000..f552c5d7db3fd
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_map/map_ch.cpp
@@ -0,0 +1,84 @@
+
+//=============================================================================
+/**
+ *  @file    map_ch.cpp
+ *
+ *  Visitor generating code for Map in the client header
+ *
+ *  @author Tyler Mayoff
+ */
+//=============================================================================
+
+#include "map.h"
+
+// Root visitor for client header.
+be_visitor_map_ch::be_visitor_map_ch (be_visitor_context *ctx)
+  : be_visitor_decl (ctx)
+{
+}
+
+int be_visitor_map_ch::visit_map (be_map *node)
+{
+  if (node->defined_in () == nullptr)
+    {
+      // The node is a nested map, and has had no scope defined.
+      node->set_defined_in (DeclAsScope (this->ctx_->scope ()->decl ()));
+    }
+
+  // First create a name for ourselves.
+  if (node->create_name (this->ctx_->tdef ()) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_map_ch::")
+                         ACE_TEXT ("visit_map - ")
+                         ACE_TEXT ("failed creating name\n")),
+                        -1);
+    }
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  *os << be_nl_2;
+
+  TAO_INSERT_COMMENT (os);
+
+  os->gen_ifdef_macro (node->flat_name ());
+
+  *os << be_nl_2;
+
+  *os << "using " << node->local_name () << " = std::map<";
+
+  be_type* kt = node->key_type();
+  be_type* vt = node->value_type();
+
+  // Generate the base type for the buffer.
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_MAP_BUFFER_TYPE_CH);
+  be_visitor_map_buffer_type bt_visitor (&ctx);
+
+  if (kt->accept (&bt_visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                        ACE_TEXT ("be_visitor_map_ch::")
+                        ACE_TEXT ("visit_map - ")
+                        ACE_TEXT ("buffer type visit failed\n")),
+                        -1);
+    }
+
+  *os << ", ";
+
+  if (vt->accept (&bt_visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                        ACE_TEXT ("be_visitor_map_ch::")
+                        ACE_TEXT ("visit_map - ")
+                        ACE_TEXT ("buffer type visit failed\n")),
+                        -1);
+    }
+
+  *os << ">;";
+
+  os->gen_endif ();
+  node->cli_hdr_gen (true);
+
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_map/map_cs.cpp b/TAO/TAO_IDL/be/be_visitor_map/map_cs.cpp
new file mode 100644
index 0000000000000..2c1f831d08150
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_map/map_cs.cpp
@@ -0,0 +1,26 @@
+
+//=============================================================================
+/**
+ *  @file    map_cs.cpp
+ *
+ *  Visitor generating code for Maps in the client stubs file
+ *
+ *  @author Tyler Mayoff
+ */
+//=============================================================================
+
+#include "map.h"
+
+// ************************************************************
+// Root visitor for client stub class
+// ************************************************************
+
+be_visitor_map_cs::be_visitor_map_cs (be_visitor_context *ctx)
+  : be_visitor_decl (ctx)
+{
+}
+
+int be_visitor_map_cs::visit_map (be_map *)
+{
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp
index 070e3c679ab4c..400b79ec80e1d 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp
@@ -255,6 +255,80 @@ be_visitor_typedef::visit_sequence (be_sequence *node)
   return 0;
 }
 
+int
+be_visitor_typedef::visit_map (be_map *node)
+{
+  // Instantiate a visitor context with a copy of our context. This info
+  // will be modified based on what type of node we are visiting.
+  be_visitor_context ctx (*this->ctx_);
+  ctx.node (node);
+  int status = 0;
+
+  switch (this->ctx_->state ())
+    {
+    case TAO_CodeGen::TAO_ROOT_CH:
+    case TAO_CodeGen::TAO_INTERFACE_CH:
+      {
+        be_visitor_map_ch visitor (&ctx);
+        status = node->accept (&visitor);
+        break;
+      }
+    case TAO_CodeGen::TAO_ROOT_CI:
+      {
+        break;
+      }
+    case TAO_CodeGen::TAO_ROOT_CS:
+      {
+        be_visitor_map_cs visitor (&ctx);
+        status = node->accept (&visitor);
+        break;
+      }
+    case TAO_CodeGen::TAO_ROOT_ANY_OP_CH:
+      {
+        // be_visitor_sequence_any_op_ch visitor (&ctx);
+        // status = node->accept (&visitor);
+        break;
+      }
+    case TAO_CodeGen::TAO_ROOT_ANY_OP_CS:
+      {
+        // be_visitor_sequence_any_op_cs visitor (&ctx);
+        // status = node->accept (&visitor);
+        break;
+      }
+    case TAO_CodeGen::TAO_ROOT_CDR_OP_CH:
+      {
+        be_visitor_map_cdr_op_ch visitor (&ctx);
+        status = node->accept (&visitor);
+        break;
+      }
+    case TAO_CodeGen::TAO_ROOT_CDR_OP_CS:
+      {
+        be_visitor_map_cdr_op_cs visitor (&ctx);
+        status = node->accept (&visitor);
+        break;
+      }
+    default:
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%N:%l) be_visitor_typedef::"
+                           "visit_map - "
+                           "Bad context state\n"),
+                          -1);
+      }
+    }
+
+  if (status == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_typedef::"
+                         "visit_map - "
+                         "failed to accept visitor\n"),
+                        -1);
+    }
+
+  return 0;
+}
+
 // visit an structure
 int
 be_visitor_typedef::visit_structure (be_structure *node)
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef.h b/TAO/TAO_IDL/be/be_visitor_typedef/typedef.h
index beaddccd32c64..b5709c736e359 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef.h
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef.h
@@ -17,6 +17,7 @@
 #include "be_module.h"
 #include "be_predefined_type.h"
 #include "be_sequence.h"
+#include "be_map.h"
 #include "be_string.h"
 #include "be_structure.h"
 #include "be_type.h"
@@ -31,6 +32,7 @@
 #include "be_visitor_array.h"
 #include "be_visitor_enum.h"
 #include "be_visitor_sequence.h"
+#include "be_visitor_map.h"
 #include "be_visitor_structure.h"
 #include "be_visitor_typecode.h"
 #include "be_visitor_union.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
index 888c585b085f4..a5fe571d32e18 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
@@ -469,6 +469,53 @@ be_visitor_typedef_ch::visit_sequence (be_sequence *node)
   return 0;
 }
 
+int
+be_visitor_typedef_ch::visit_map (be_map *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_typedef *tdef = this->ctx_->tdef ();
+  be_decl *scope = this->ctx_->scope ()->decl ();
+  be_type *bt = nullptr;
+
+  // Typedef of a typedef?
+  if (this->ctx_->alias ())
+    {
+      bt = this->ctx_->alias ();
+    }
+  else
+    {
+      bt = node;
+    }
+
+  if (bt->node_type () == AST_Decl::NT_map)
+    {
+      // Let the base class visitor handle this case.
+      if (this->be_visitor_typedef::visit_map (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_typedef_ch::"
+                             "visit_map - "
+                             "base class visitor failed\n"),
+                            -1);
+        }
+    }
+  else
+    {
+      TAO_INSERT_COMMENT (os);
+
+      // Typedef the type.
+      *os << "typedef " << bt->nested_type_name (scope)
+          << " " << tdef->nested_type_name (scope) << ";" << be_nl;
+      // Typedef the _var and _out types.
+      *os << "typedef " << bt->nested_type_name (scope, "_var")
+          << " " << tdef->nested_type_name (scope, "_var") << ";" << be_nl;
+      *os << "typedef " << bt->nested_type_name (scope, "_out")
+          << " " << tdef->nested_type_name (scope, "_out") << ";";
+    }
+
+  return 0;
+}
+
 int
 be_visitor_typedef_ch::visit_structure (be_structure *node)
 {
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index bcbb638e7eb4f..462657a06d538 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -142,6 +142,7 @@ class TAO_IDL_BE_Export TAO_CodeGen
 
       // For sequence buffer types.
       TAO_SEQUENCE_BUFFER_TYPE_CH,
+      TAO_MAP_BUFFER_TYPE_CH,
 
       // Emitting code for the public members of the union.
       TAO_UNION_PUBLIC_CH,
diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h
index 9fcdcbab9f8fd..115ac3a31a45a 100644
--- a/TAO/TAO_IDL/be_include/be_generator.h
+++ b/TAO/TAO_IDL/be_include/be_generator.h
@@ -256,6 +256,13 @@ class TAO_IDL_BE_Export be_generator : public AST_Generator
                                          bool is_local,
                                          bool is_abstract);
 
+  virtual AST_Map *create_map (AST_Expression *v,
+                               AST_Type *kt,
+                               AST_Type *vt,
+                               UTL_ScopedName *n,
+                               bool is_local,
+                               bool is_abstract);
+
   virtual AST_String *create_string (AST_Expression *v);
 
   virtual AST_String *create_wstring (AST_Expression *v);
diff --git a/TAO/TAO_IDL/be_include/be_map.h b/TAO/TAO_IDL/be_include/be_map.h
new file mode 100644
index 0000000000000..d95a7a4bd8dd3
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_map.h
@@ -0,0 +1,100 @@
+// -*- C++ -*-
+
+
+//=============================================================================
+/**
+ *  @file    be_map.h
+ *
+ *  Extension of class AST_Map that provides additional means for C++
+ *  mapping.
+ *
+ *  @author Tyler Mayoff
+ */
+//=============================================================================
+
+#ifndef BE_MAP_H
+#define BE_MAP_H
+
+#include "be_scope.h"
+#include "be_type.h"
+#include "ast_map.h"
+
+class AST_Expression;
+class AST_Type;
+class be_visitor;
+class be_typedef;
+class be_field;
+
+// A map in OMG IDL does not define a scoping construct just as a struct
+// or union or an interface do. However, in the C++ mapping, a map becomes
+// a class. If the base type of a map is another anonymous map, then
+// the base type is defined in the scope of this map. Hence we define
+// be_map to possess the additional characteristics of a scope.
+class be_map : public virtual AST_Map,
+               public virtual be_scope,
+               public virtual be_type
+{
+public:
+  be_map (AST_Expression *v,
+          AST_Type *kt,
+          AST_Type *vt,
+          UTL_ScopedName *n,
+          bool local,
+          bool abstract);
+
+  /// Non-virtual override of frontend method.
+  be_type *key_type () const;
+  be_type *value_type () const;
+
+  /**
+   * Returns the fully dealiased key type if it's a typedef. If it's not a
+   * typedef, the it returns the same value as as key_type().
+   */
+  be_type *primitive_key_type () const;
+
+  /**
+   * Returns the fully dealiased key type if it's a typedef. If it's not a
+   * typedef, the it returns the same value as as value_type().
+   */
+  be_type *primitive_value_type () const;
+
+  /// Create a name for ourselves. If we are typedefed, then we get the name of
+  /// the typedef node, else we generate a name for ourselves.
+  int create_name (be_typedef *node);
+
+  // Scope management functions.
+  virtual AST_Map *fe_add_map (AST_Map *);
+
+  /// Overridden method on the be_scope class.
+  virtual be_decl *decl ();
+
+  /// Overridden from class be_type.
+  virtual void gen_ostream_operator (TAO_OutStream *os,
+                                     bool use_underscore);
+
+  /// Cleanup method.
+  virtual void destroy ();
+
+  // Visiting.
+  virtual int accept (be_visitor *visitor);
+
+  /// Report the instance name for instantiation.
+  const char *instance_name ();
+
+  /// Accessors for the member.
+  be_field *field_node () const;
+  void field_node (be_field *node);
+
+  /// Helper to create_name, also used by the traits visitor.
+  virtual char *gen_name ();
+
+private:
+  const char *smart_fwd_helper_name (AST_Decl *elem_scope,
+                                     be_type *elem);
+
+private:
+  /// Used if we are an anonymous member, to help generate a unique name.
+  be_field *field_node_;
+};
+
+#endif
diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h
index e70c6e2c9fcd1..8be691be0299c 100644
--- a/TAO/TAO_IDL/be_include/be_type.h
+++ b/TAO/TAO_IDL/be_include/be_type.h
@@ -70,6 +70,10 @@ class be_type : public virtual AST_Type,
   bool seen_in_sequence () const;
   virtual void seen_in_sequence (bool val);
 
+  /// Accessors for the member.
+  bool seen_in_map () const;
+  virtual void seen_in_map (bool val);
+
   /// Accessors for the member.
   bool seen_in_operation () const;
   virtual void seen_in_operation (bool val);
@@ -104,6 +108,9 @@ class be_type : public virtual AST_Type,
   /// Has this declaration been used as a sequence element?
   bool seen_in_sequence_;
 
+  /// Has this declaration been used as a map element?
+  bool seen_in_map_;
+
   /// Has this declaration been used as a return type or parameter?
   bool seen_in_operation_;
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor.h b/TAO/TAO_IDL/be_include/be_visitor.h
index ca89ed5f9c85e..7c95f2f9c491a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor.h
+++ b/TAO/TAO_IDL/be_include/be_visitor.h
@@ -62,6 +62,7 @@ class be_constant;
 class be_enum_val;
 class be_array;
 class be_sequence;
+class be_map;
 class be_string;
 class be_typedef;
 class be_root;
@@ -134,6 +135,7 @@ class be_visitor
   virtual int visit_enum_val (be_enum_val *node);
   virtual int visit_array (be_array *node);
   virtual int visit_sequence (be_sequence *node);
+  virtual int visit_map (be_map *node);
   virtual int visit_string (be_string *node);
   virtual int visit_typedef (be_typedef *node);
   virtual int visit_root (be_root *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h
index 04fb0dc86fe7f..644a32273dee8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h
@@ -32,6 +32,7 @@ class be_visitor_field_cdr_op_ch : public be_visitor_decl
   virtual int visit_array (be_array *node);
   virtual int visit_enum (be_enum *node);
   virtual int visit_sequence (be_sequence *node);
+  virtual int visit_map (be_map *node);
   virtual int visit_structure (be_structure *node);
   virtual int visit_structure_fwd (be_structure_fwd *node);
   virtual int visit_typedef (be_typedef *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h
index ee844d8c9dd45..dc5142edcd290 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h
@@ -44,6 +44,7 @@ class be_visitor_field_cdr_op_cs : public be_visitor_decl
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
   virtual int visit_predefined_type (be_predefined_type *node);
   virtual int visit_sequence (be_sequence *node);
+  virtual int visit_map (be_map *node);
   virtual int visit_string (be_string *node);
   virtual int visit_structure (be_structure *node);
   virtual int visit_structure_fwd (be_structure_fwd *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
index 2145b28220323..cc9bae99333d1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
@@ -36,6 +36,7 @@ class be_visitor_field_ch : public be_visitor_decl
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
   virtual int visit_predefined_type (be_predefined_type *node);
   virtual int visit_sequence (be_sequence *node);
+  virtual int visit_map (be_map *node);
   virtual int visit_string (be_string *node);
   virtual int visit_structure (be_structure *node);
   virtual int visit_structure_fwd (be_structure_fwd *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h
index dd22e9f168208..ebe3867ca6882 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h
@@ -31,6 +31,7 @@ class be_visitor_field_ci : public be_visitor_decl
 
   virtual int visit_array (be_array *node);
   virtual int visit_sequence (be_sequence *node);
+  virtual int visit_map (be_map *node);
   virtual int visit_structure (be_structure *node);
   virtual int visit_structure_fwd (be_structure_fwd *node);
   virtual int visit_typedef (be_typedef *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h
index 533b0a28dcd9c..f5fdb1534a68b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h
@@ -32,6 +32,7 @@ class be_visitor_field_cs : public be_visitor_decl
   virtual int visit_array (be_array *node);
   virtual int visit_enum (be_enum *node);
   virtual int visit_sequence (be_sequence *node);
+  virtual int visit_map (be_map *node);
   virtual int visit_structure (be_structure *node);
   virtual int visit_structure_fwd (be_structure_fwd *node);
   virtual int visit_typedef (be_typedef *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_map.h b/TAO/TAO_IDL/be_include/be_visitor_map.h
new file mode 100644
index 0000000000000..bc255bfcc982d
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_map.h
@@ -0,0 +1,15 @@
+/* -*- c++ -*- */
+
+#ifndef TAO_BE_VISITOR_MAP_H
+#define TAO_BE_VISITOR_MAP_H
+
+#include "idl_defines.h"
+
+#include "be_visitor_decl.h"
+#include "be_visitor_map/map_ch.h"
+#include "be_visitor_map/map_cs.h"
+#include "be_visitor_map/buffer_type.h"
+#include "be_visitor_map/cdr_op_ch.h"
+#include "be_visitor_map/cdr_op_cs.h"
+
+#endif /* TAO_BE_VISITOR_MAP_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_map/buffer_type.h b/TAO/TAO_IDL/be_include/be_visitor_map/buffer_type.h
new file mode 100644
index 0000000000000..da7ff7df83358
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_map/buffer_type.h
@@ -0,0 +1,64 @@
+/* -*- c++ -*- */
+
+//=============================================================================
+/**
+ *  @file    buffer_type.h
+ *
+ *  Concrete visitor for the Map class
+ *  This one provides code generation for the buffer type of the Map
+ *  node.
+ *
+ *  @author Tyler Mayoff
+ */
+//=============================================================================
+
+
+#ifndef _BE_VISITOR_MAP_BUFFER_TYPE_H_
+#define _BE_VISITOR_MAP_BUFFER_TYPE_H_
+
+/**
+ * @class be_visitor_map_buffer_type
+ *
+ * @brief be_visitor_map_buffer_type
+ *
+ * This is a concrete visitor to generate the buffer type
+ * for a map instantiation.
+ */
+class be_visitor_map_buffer_type : public be_visitor_decl
+{
+public:
+  /// Constructor
+  be_visitor_map_buffer_type (be_visitor_context *ctx);
+
+  /// destructor
+  ~be_visitor_map_buffer_type ();
+
+  // = Visitor methods.
+  virtual int visit_predefined_type (be_predefined_type *node);
+  virtual int visit_interface (be_interface *node);
+  virtual int visit_interface_fwd (be_interface_fwd *node);
+  virtual int visit_component (be_component *node);
+  virtual int visit_component_fwd (be_component_fwd *node);
+  virtual int visit_valuebox (be_valuebox *node);
+  virtual int visit_valuetype (be_valuetype *node);
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  virtual int visit_eventtype (be_eventtype *node);
+  virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
+  virtual int visit_structure (be_structure *node);
+  virtual int visit_structure_fwd (be_structure_fwd *node);
+  virtual int visit_enum (be_enum *node);
+  virtual int visit_exception (be_exception *node);
+  virtual int visit_union (be_union *node);
+  virtual int visit_union_fwd (be_union_fwd *node);
+  virtual int visit_array (be_array *node);
+  virtual int visit_string (be_string *node);
+  virtual int visit_map (be_map *node);
+  virtual int visit_sequence (be_sequence *node);
+  virtual int visit_typedef (be_typedef *node);
+
+protected:
+  /// helper that does the common job
+  int visit_node (be_type *);
+};
+
+#endif /* _BE_VISITOR_MAP_BUFFER_TYPE_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_map/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_map/cdr_op_ch.h
new file mode 100644
index 0000000000000..6194bcc986d17
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_map/cdr_op_ch.h
@@ -0,0 +1,40 @@
+/* -*- c++ -*- */
+
+//=============================================================================
+/**
+ *  @file    cdr_op_ch.h
+ *
+ *  Concrete visitor for the Map class
+ *  This one provides code generation for the CDR operators for the map
+ *  in the client header.
+ *
+ *  @author Tyler Mayoff
+ */
+//=============================================================================
+
+
+#ifndef _BE_VISITOR_MAP_CDR_OP_CH_H_
+#define _BE_VISITOR_MAP_CDR_OP_CH_H_
+
+/**
+ * @class be_visitor_map_cdr_op_ch
+ *
+ * @brief be_visitor_map_cdr_op_ch
+ *
+ * This is a concrete visitor for map that generates the CDR operator
+ * declarations
+ */
+class be_visitor_map_cdr_op_ch : public be_visitor_decl
+{
+public:
+  /// constructor
+  be_visitor_map_cdr_op_ch (be_visitor_context *ctx);
+
+  /// destructor
+  ~be_visitor_map_cdr_op_ch () = default;
+
+  /// visit map
+  int visit_map (be_map *node) override;
+};
+
+#endif /* _BE_VISITOR_MAP_CDR_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_map/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_map/cdr_op_cs.h
new file mode 100644
index 0000000000000..589875c890265
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_map/cdr_op_cs.h
@@ -0,0 +1,95 @@
+
+//=============================================================================
+/**
+ *  @file    cdr_op_cs.h
+ *
+ *  Visitors for generation of code for Map in client stubs. This one
+ *  generates the CDR operators.
+ *
+ *  @author Tyler Mayoff
+ */
+//=============================================================================
+
+
+#ifndef _BE_VISITOR_MAP_CDR_OP_CS_H_
+#define _BE_VISITOR_MAP_CDR_OP_CS_H_
+
+/**
+ * @class be_visitor_map_cdr_op_cs
+ *
+ * @brief be_visitor_map_cdr_op_cs
+ *
+ * This is a concrete visitor for map that generates the CDR operator
+ * implementations
+ */
+class be_visitor_map_cdr_op_cs : public be_visitor_decl
+{
+public:
+  /// constructor
+  be_visitor_map_cdr_op_cs (be_visitor_context *ctx);
+
+  /// destructor
+  ~be_visitor_map_cdr_op_cs () = default;
+
+  /// visit map
+  virtual int visit_map (be_map *node);
+
+  // = Visitor methods on map types
+
+  /// visit map
+  virtual int visit_array (be_array *node);
+
+  /// visit an enum
+  virtual int visit_enum (be_enum *node);
+
+  /// visit an interface
+  virtual int visit_interface (be_interface *node);
+
+  /// visit an interface forward node
+  virtual int visit_interface_fwd (be_interface_fwd *node);
+
+  /// visit a component
+  virtual int visit_component (be_component *node);
+
+  /// visit a component forward node
+  virtual int visit_component_fwd (be_component_fwd *node);
+
+  /// visit a home
+  virtual int visit_home (be_home *node);
+
+  /// visit valuebox
+  virtual int visit_valuebox (be_valuebox *node);
+
+  /// visit a valuetype
+  virtual int visit_valuetype (be_valuetype *node);
+
+  /// visit a valuetype forward node
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+
+  /// visit an eventtype
+  virtual int visit_eventtype (be_eventtype *node);
+
+  /// visit an eventtype forward node
+  virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
+
+  /// visit a predefined type node
+  virtual int visit_predefined_type (be_predefined_type *node);
+
+  /// visit string
+  virtual int visit_string (be_string *node);
+
+  /// visit structure
+  virtual int visit_structure (be_structure *node);
+
+  /// visit typedef
+  virtual int visit_typedef (be_typedef *node);
+
+  /// visit union
+  virtual int visit_union (be_union *node);
+
+protected:
+  /// helper that does the common job
+  int visit_node (be_type *);
+};
+
+#endif /* _BE_VISITOR_MAP_CDR_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_map/map_ch.h b/TAO/TAO_IDL/be_include/be_visitor_map/map_ch.h
new file mode 100644
index 0000000000000..a94eabc33665f
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_map/map_ch.h
@@ -0,0 +1,39 @@
+/* -*- c++ -*- */
+
+//=============================================================================
+/**
+ *  @file    map_ch.h
+ *
+ *  Concrete visitor for the Map class
+ *  This one provides code generation for the Map node in the client
+ *  header.
+ *
+ *  @author Tyler Mayoff
+ */
+//=============================================================================
+
+#ifndef _BE_VISITOR_MAP_MAP_CH_H_
+#define _BE_VISITOR_MAP_MAP_CH_H_
+
+/**
+ * @class be_visitor_map_ch
+ *
+ * @brief be_visitor_map_ch
+ *
+ * This is a concrete visitor to generate the client header for
+ * maps
+ */
+class be_visitor_map_ch : public be_visitor_decl
+{
+public:
+  /// constructor
+  be_visitor_map_ch (be_visitor_context *ctx);
+
+  /// destructor
+  ~be_visitor_map_ch () = default;
+
+  /// visit map node.
+  virtual int visit_map (be_map *node);
+};
+
+#endif /* _BE_VISITOR_MAP_MAP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_map/map_cs.h b/TAO/TAO_IDL/be_include/be_visitor_map/map_cs.h
new file mode 100644
index 0000000000000..bb3f651e9efd0
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_map/map_cs.h
@@ -0,0 +1,41 @@
+/* -*- c++ -*- */
+
+//=============================================================================
+/**
+ *  @file    map_cs.h
+ *
+ *  Concrete visitor for the Map class
+ *  This one provides code generation for the Map node in the client
+ *  stubs.
+ *
+ *  @author Tyler Mayoff
+ */
+//=============================================================================
+
+
+#ifndef _BE_VISITOR_MAP_MAP_CS_H_
+#define _BE_VISITOR_MAP_MAP_CS_H_
+
+/**
+ * @class be_visitor_map_cs
+ *
+ * @brief be_visitor_map_cs
+ *
+ * This is a concrete visitor to generate the client stubs for
+ * maps
+ */
+class TAO_OutStream;
+class be_visitor_map_cs : public be_visitor_decl
+{
+public:
+  /// constructor
+  be_visitor_map_cs (be_visitor_context *ctx);
+
+  /// destructor
+  ~be_visitor_map_cs () = default;
+
+  /// visit map node
+  virtual int visit_map (be_map *node);
+};
+
+#endif /* _BE_VISITOR_MAP_MAP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h
index bf544c41446d3..a31f7b09e77f9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h
@@ -46,6 +46,9 @@ class be_visitor_typedef : public be_visitor_decl
   /// visit a sequence
   virtual int visit_sequence (be_sequence *node);
 
+  /// visit a map
+  virtual int visit_map (be_map *node);
+
   /// visit a structure
   virtual int visit_structure (be_structure *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h
index 8e88c8a599cd7..507c88a96fde3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h
@@ -59,6 +59,9 @@ class be_visitor_typedef_ch : public be_visitor_typedef
   /// visit a sequence
   virtual int visit_sequence (be_sequence *node);
 
+  /// visit a masp
+  virtual int visit_map (be_map *node);
+
   /// visit a structure
   virtual int visit_structure (be_structure *node);
 
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index a07db88242771..4306c74383201 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -138,6 +138,7 @@ enum            return IDL_ENUM;
 string          return IDL_STRING;
 wstring         return IDL_WSTRING;
 sequence        return IDL_SEQUENCE;
+map             return IDL_MAP;
 union           return IDL_UNION;
 fixed           return IDL_FIXED;
 switch          return IDL_SWITCH;
@@ -221,6 +222,14 @@ uint64 {
       REJECT;
     }
 }
+map {
+  if (idl_global->idl_version_ >= IDL_VERSION_4)
+    return IDL_MAP;
+  else
+    {
+      REJECT;
+    }
+}
 
 custom          return IDL_CUSTOM;
 factory         return IDL_FACTORY;
diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp
index 3273f214299ec..43432b2741c45 100644
--- a/TAO/TAO_IDL/fe/idl.tab.cpp
+++ b/TAO/TAO_IDL/fe/idl.tab.cpp
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.7.6.  */
+/* A Bison parser, made by GNU Bison 3.8.2.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
@@ -46,10 +46,10 @@
    USER NAME SPACE" below.  */
 
 /* Identify Bison output, and Bison version.  */
-#define YYBISON 30706
+#define YYBISON 30802
 
 /* Bison version string.  */
-#define YYBISON_VERSION "3.7.6"
+#define YYBISON_VERSION "3.8.2"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -137,6 +137,7 @@
 #include <ast_consumes.h>
 #include <ast_extended_port.h>
 #include <ast_mirror_port.h>
+#include <ast_map.h>
 
 #include <fe_declarator.h>
 #include <fe_interface_header.h>
@@ -146,8 +147,8 @@
 #include <fe_utils.h>
 
 void tao_yyerror (const char *);
-int tao_yylex ();
-extern "C" int tao_yywrap ();
+int tao_yylex (void);
+extern "C" int tao_yywrap (void);
 
 extern char tao_yytext[];
 extern int tao_yyleng;
@@ -161,7 +162,7 @@ bool stack_based_lookup_for_primary_expr = false;
 // Compile Optional Tracing Output for Parser, can be enabled with --bison-trace
 #define YYDEBUG 1
 
-#line 165 "fe/idl.tab.cpp"
+#line 166 "fe/idl.tab.cpp"
 
 # ifndef YY_CAST
 #  ifdef __cplusplus
@@ -214,501 +215,507 @@ enum yysymbol_kind_t
   YYSYMBOL_IDL_SWITCH = 22,                /* IDL_SWITCH  */
   YYSYMBOL_IDL_ENUM = 23,                  /* IDL_ENUM  */
   YYSYMBOL_IDL_SEQUENCE = 24,              /* IDL_SEQUENCE  */
-  YYSYMBOL_IDL_STRING = 25,                /* IDL_STRING  */
-  YYSYMBOL_IDL_WSTRING = 26,               /* IDL_WSTRING  */
-  YYSYMBOL_IDL_EXCEPTION = 27,             /* IDL_EXCEPTION  */
-  YYSYMBOL_IDL_CASE = 28,                  /* IDL_CASE  */
-  YYSYMBOL_IDL_DEFAULT = 29,               /* IDL_DEFAULT  */
-  YYSYMBOL_IDL_READONLY = 30,              /* IDL_READONLY  */
-  YYSYMBOL_IDL_ATTRIBUTE = 31,             /* IDL_ATTRIBUTE  */
-  YYSYMBOL_IDL_ONEWAY = 32,                /* IDL_ONEWAY  */
-  YYSYMBOL_IDL_IDEMPOTENT = 33,            /* IDL_IDEMPOTENT  */
-  YYSYMBOL_IDL_VOID = 34,                  /* IDL_VOID  */
-  YYSYMBOL_IDL_IN = 35,                    /* IDL_IN  */
-  YYSYMBOL_IDL_OUT = 36,                   /* IDL_OUT  */
-  YYSYMBOL_IDL_INOUT = 37,                 /* IDL_INOUT  */
-  YYSYMBOL_IDL_RAISES = 38,                /* IDL_RAISES  */
-  YYSYMBOL_IDL_CONTEXT = 39,               /* IDL_CONTEXT  */
-  YYSYMBOL_IDL_NATIVE = 40,                /* IDL_NATIVE  */
-  YYSYMBOL_IDL_LOCAL = 41,                 /* IDL_LOCAL  */
-  YYSYMBOL_IDL_ABSTRACT = 42,              /* IDL_ABSTRACT  */
-  YYSYMBOL_IDL_CUSTOM = 43,                /* IDL_CUSTOM  */
-  YYSYMBOL_IDL_FACTORY = 44,               /* IDL_FACTORY  */
-  YYSYMBOL_IDL_PRIVATE = 45,               /* IDL_PRIVATE  */
-  YYSYMBOL_IDL_PUBLIC = 46,                /* IDL_PUBLIC  */
-  YYSYMBOL_IDL_SUPPORTS = 47,              /* IDL_SUPPORTS  */
-  YYSYMBOL_IDL_TRUNCATABLE = 48,           /* IDL_TRUNCATABLE  */
-  YYSYMBOL_IDL_VALUETYPE = 49,             /* IDL_VALUETYPE  */
-  YYSYMBOL_IDL_COMPONENT = 50,             /* IDL_COMPONENT  */
-  YYSYMBOL_IDL_CONSUMES = 51,              /* IDL_CONSUMES  */
-  YYSYMBOL_IDL_EMITS = 52,                 /* IDL_EMITS  */
-  YYSYMBOL_IDL_EVENTTYPE = 53,             /* IDL_EVENTTYPE  */
-  YYSYMBOL_IDL_FINDER = 54,                /* IDL_FINDER  */
-  YYSYMBOL_IDL_GETRAISES = 55,             /* IDL_GETRAISES  */
-  YYSYMBOL_IDL_HOME = 56,                  /* IDL_HOME  */
-  YYSYMBOL_IDL_IMPORT = 57,                /* IDL_IMPORT  */
-  YYSYMBOL_IDL_MULTIPLE = 58,              /* IDL_MULTIPLE  */
-  YYSYMBOL_IDL_PRIMARYKEY = 59,            /* IDL_PRIMARYKEY  */
-  YYSYMBOL_IDL_PROVIDES = 60,              /* IDL_PROVIDES  */
-  YYSYMBOL_IDL_PUBLISHES = 61,             /* IDL_PUBLISHES  */
-  YYSYMBOL_IDL_SETRAISES = 62,             /* IDL_SETRAISES  */
-  YYSYMBOL_IDL_TYPEID = 63,                /* IDL_TYPEID  */
-  YYSYMBOL_IDL_TYPEPREFIX = 64,            /* IDL_TYPEPREFIX  */
-  YYSYMBOL_IDL_USES = 65,                  /* IDL_USES  */
-  YYSYMBOL_IDL_MANAGES = 66,               /* IDL_MANAGES  */
-  YYSYMBOL_IDL_TYPENAME = 67,              /* IDL_TYPENAME  */
-  YYSYMBOL_IDL_PORT = 68,                  /* IDL_PORT  */
-  YYSYMBOL_IDL_MIRRORPORT = 69,            /* IDL_MIRRORPORT  */
-  YYSYMBOL_IDL_PORTTYPE = 70,              /* IDL_PORTTYPE  */
-  YYSYMBOL_IDL_CONNECTOR = 71,             /* IDL_CONNECTOR  */
-  YYSYMBOL_IDL_ALIAS = 72,                 /* IDL_ALIAS  */
-  YYSYMBOL_IDL_INTEGER_LITERAL = 73,       /* IDL_INTEGER_LITERAL  */
-  YYSYMBOL_IDL_UINTEGER_LITERAL = 74,      /* IDL_UINTEGER_LITERAL  */
-  YYSYMBOL_IDL_STRING_LITERAL = 75,        /* IDL_STRING_LITERAL  */
-  YYSYMBOL_IDL_CHARACTER_LITERAL = 76,     /* IDL_CHARACTER_LITERAL  */
-  YYSYMBOL_IDL_FLOATING_PT_LITERAL = 77,   /* IDL_FLOATING_PT_LITERAL  */
-  YYSYMBOL_IDL_FIXED_PT_LITERAL = 78,      /* IDL_FIXED_PT_LITERAL  */
-  YYSYMBOL_IDL_TRUETOK = 79,               /* IDL_TRUETOK  */
-  YYSYMBOL_IDL_FALSETOK = 80,              /* IDL_FALSETOK  */
-  YYSYMBOL_IDL_INT8 = 81,                  /* IDL_INT8  */
-  YYSYMBOL_IDL_UINT8 = 82,                 /* IDL_UINT8  */
-  YYSYMBOL_IDL_INT16 = 83,                 /* IDL_INT16  */
-  YYSYMBOL_IDL_UINT16 = 84,                /* IDL_UINT16  */
-  YYSYMBOL_IDL_INT32 = 85,                 /* IDL_INT32  */
-  YYSYMBOL_IDL_UINT32 = 86,                /* IDL_UINT32  */
-  YYSYMBOL_IDL_INT64 = 87,                 /* IDL_INT64  */
-  YYSYMBOL_IDL_UINT64 = 88,                /* IDL_UINT64  */
-  YYSYMBOL_IDL_SCOPE_DELIMITOR = 89,       /* IDL_SCOPE_DELIMITOR  */
-  YYSYMBOL_IDL_LEFT_SHIFT = 90,            /* IDL_LEFT_SHIFT  */
-  YYSYMBOL_IDL_RIGHT_SHIFT = 91,           /* IDL_RIGHT_SHIFT  */
-  YYSYMBOL_IDL_WCHAR_LITERAL = 92,         /* IDL_WCHAR_LITERAL  */
-  YYSYMBOL_IDL_WSTRING_LITERAL = 93,       /* IDL_WSTRING_LITERAL  */
-  YYSYMBOL_IDL_ANNOTATION_DECL = 94,       /* IDL_ANNOTATION_DECL  */
-  YYSYMBOL_IDL_ANNOTATION_SYMBOL = 95,     /* IDL_ANNOTATION_SYMBOL  */
-  YYSYMBOL_96_ = 96,                       /* ';'  */
-  YYSYMBOL_97_ = 97,                       /* '{'  */
-  YYSYMBOL_98_ = 98,                       /* '}'  */
-  YYSYMBOL_99_ = 99,                       /* '<'  */
-  YYSYMBOL_100_ = 100,                     /* '>'  */
-  YYSYMBOL_101_ = 101,                     /* ':'  */
-  YYSYMBOL_102_ = 102,                     /* ','  */
-  YYSYMBOL_103_ = 103,                     /* '='  */
-  YYSYMBOL_104_ = 104,                     /* '|'  */
-  YYSYMBOL_105_ = 105,                     /* '^'  */
-  YYSYMBOL_106_ = 106,                     /* '&'  */
-  YYSYMBOL_107_ = 107,                     /* '+'  */
-  YYSYMBOL_108_ = 108,                     /* '-'  */
-  YYSYMBOL_109_ = 109,                     /* '*'  */
-  YYSYMBOL_110_ = 110,                     /* '/'  */
-  YYSYMBOL_111_ = 111,                     /* '%'  */
-  YYSYMBOL_112_ = 112,                     /* '~'  */
-  YYSYMBOL_113_ = 113,                     /* '('  */
-  YYSYMBOL_114_ = 114,                     /* ')'  */
-  YYSYMBOL_115_ = 115,                     /* '['  */
-  YYSYMBOL_116_ = 116,                     /* ']'  */
-  YYSYMBOL_YYACCEPT = 117,                 /* $accept  */
-  YYSYMBOL_start = 118,                    /* start  */
-  YYSYMBOL_definitions = 119,              /* definitions  */
-  YYSYMBOL_at_least_one_definition = 120,  /* at_least_one_definition  */
-  YYSYMBOL_definition = 121,               /* definition  */
-  YYSYMBOL_fixed_definition = 122,         /* fixed_definition  */
-  YYSYMBOL_123_1 = 123,                    /* $@1  */
-  YYSYMBOL_124_2 = 124,                    /* $@2  */
-  YYSYMBOL_125_3 = 125,                    /* $@3  */
-  YYSYMBOL_126_4 = 126,                    /* $@4  */
-  YYSYMBOL_127_5 = 127,                    /* $@5  */
-  YYSYMBOL_128_6 = 128,                    /* $@6  */
-  YYSYMBOL_129_7 = 129,                    /* $@7  */
-  YYSYMBOL_130_8 = 130,                    /* $@8  */
-  YYSYMBOL_131_9 = 131,                    /* $@9  */
-  YYSYMBOL_132_10 = 132,                   /* $@10  */
-  YYSYMBOL_133_11 = 133,                   /* $@11  */
-  YYSYMBOL_134_12 = 134,                   /* $@12  */
-  YYSYMBOL_135_13 = 135,                   /* $@13  */
-  YYSYMBOL_136_14 = 136,                   /* $@14  */
-  YYSYMBOL_137_15 = 137,                   /* $@15  */
-  YYSYMBOL_module_header = 138,            /* module_header  */
-  YYSYMBOL_139_16 = 139,                   /* $@16  */
-  YYSYMBOL_module = 140,                   /* module  */
-  YYSYMBOL_141_17 = 141,                   /* @17  */
-  YYSYMBOL_142_18 = 142,                   /* $@18  */
-  YYSYMBOL_143_19 = 143,                   /* $@19  */
-  YYSYMBOL_template_module_header = 144,   /* template_module_header  */
-  YYSYMBOL_template_module = 145,          /* template_module  */
-  YYSYMBOL_146_20 = 146,                   /* $@20  */
-  YYSYMBOL_147_21 = 147,                   /* $@21  */
-  YYSYMBOL_148_22 = 148,                   /* $@22  */
-  YYSYMBOL_149_23 = 149,                   /* $@23  */
-  YYSYMBOL_150_24 = 150,                   /* $@24  */
-  YYSYMBOL_at_least_one_tpl_definition = 151, /* at_least_one_tpl_definition  */
-  YYSYMBOL_tpl_definitions = 152,          /* tpl_definitions  */
-  YYSYMBOL_tpl_definition = 153,           /* tpl_definition  */
-  YYSYMBOL_template_module_ref = 154,      /* template_module_ref  */
-  YYSYMBOL_155_25 = 155,                   /* $@25  */
-  YYSYMBOL_156_26 = 156,                   /* $@26  */
-  YYSYMBOL_template_module_inst = 157,     /* template_module_inst  */
-  YYSYMBOL_158_27 = 158,                   /* $@27  */
-  YYSYMBOL_159_28 = 159,                   /* $@28  */
-  YYSYMBOL_interface_def = 160,            /* interface_def  */
-  YYSYMBOL_interface = 161,                /* interface  */
-  YYSYMBOL_162_29 = 162,                   /* $@29  */
-  YYSYMBOL_163_30 = 163,                   /* $@30  */
-  YYSYMBOL_164_31 = 164,                   /* $@31  */
-  YYSYMBOL_interface_decl = 165,           /* interface_decl  */
-  YYSYMBOL_166_32 = 166,                   /* $@32  */
-  YYSYMBOL_interface_header = 167,         /* interface_header  */
-  YYSYMBOL_inheritance_spec = 168,         /* inheritance_spec  */
-  YYSYMBOL_169_33 = 169,                   /* $@33  */
-  YYSYMBOL_value_def = 170,                /* value_def  */
-  YYSYMBOL_valuetype = 171,                /* valuetype  */
-  YYSYMBOL_value_concrete_decl = 172,      /* value_concrete_decl  */
-  YYSYMBOL_173_34 = 173,                   /* @34  */
-  YYSYMBOL_174_35 = 174,                   /* $@35  */
-  YYSYMBOL_175_36 = 175,                   /* $@36  */
-  YYSYMBOL_value_abs_decl = 176,           /* value_abs_decl  */
-  YYSYMBOL_177_37 = 177,                   /* $@37  */
-  YYSYMBOL_178_38 = 178,                   /* $@38  */
-  YYSYMBOL_179_39 = 179,                   /* $@39  */
-  YYSYMBOL_value_header = 180,             /* value_header  */
-  YYSYMBOL_181_40 = 181,                   /* $@40  */
-  YYSYMBOL_value_decl = 182,               /* value_decl  */
-  YYSYMBOL_183_41 = 183,                   /* $@41  */
-  YYSYMBOL_opt_truncatable = 184,          /* opt_truncatable  */
-  YYSYMBOL_supports_spec = 185,            /* supports_spec  */
-  YYSYMBOL_value_forward_decl = 186,       /* value_forward_decl  */
-  YYSYMBOL_value_box_decl = 187,           /* value_box_decl  */
-  YYSYMBOL_value_elements = 188,           /* value_elements  */
-  YYSYMBOL_value_element = 189,            /* value_element  */
-  YYSYMBOL_190_42 = 190,                   /* @42  */
-  YYSYMBOL_visibility = 191,               /* visibility  */
-  YYSYMBOL_state_member = 192,             /* state_member  */
-  YYSYMBOL_exports = 193,                  /* exports  */
-  YYSYMBOL_at_least_one_export = 194,      /* at_least_one_export  */
-  YYSYMBOL_export = 195,                   /* export  */
-  YYSYMBOL_196_43 = 196,                   /* $@43  */
-  YYSYMBOL_197_44 = 197,                   /* $@44  */
-  YYSYMBOL_198_45 = 198,                   /* $@45  */
-  YYSYMBOL_199_46 = 199,                   /* $@46  */
-  YYSYMBOL_200_47 = 200,                   /* $@47  */
-  YYSYMBOL_201_48 = 201,                   /* $@48  */
-  YYSYMBOL_202_49 = 202,                   /* $@49  */
-  YYSYMBOL_203_50 = 203,                   /* $@50  */
-  YYSYMBOL_at_least_one_scoped_name = 204, /* at_least_one_scoped_name  */
-  YYSYMBOL_scoped_names = 205,             /* scoped_names  */
-  YYSYMBOL_206_51 = 206,                   /* $@51  */
-  YYSYMBOL_scoped_name = 207,              /* scoped_name  */
-  YYSYMBOL_208_52 = 208,                   /* $@52  */
-  YYSYMBOL_209_53 = 209,                   /* $@53  */
-  YYSYMBOL_id = 210,                       /* id  */
-  YYSYMBOL_defining_id = 211,              /* defining_id  */
-  YYSYMBOL_interface_forward = 212,        /* interface_forward  */
-  YYSYMBOL_const_dcl = 213,                /* const_dcl  */
-  YYSYMBOL_214_54 = 214,                   /* $@54  */
-  YYSYMBOL_215_55 = 215,                   /* $@55  */
-  YYSYMBOL_216_56 = 216,                   /* $@56  */
-  YYSYMBOL_217_57 = 217,                   /* $@57  */
-  YYSYMBOL_const_type = 218,               /* const_type  */
-  YYSYMBOL_expression = 219,               /* expression  */
-  YYSYMBOL_const_expr = 220,               /* const_expr  */
-  YYSYMBOL_or_expr = 221,                  /* or_expr  */
-  YYSYMBOL_xor_expr = 222,                 /* xor_expr  */
-  YYSYMBOL_and_expr = 223,                 /* and_expr  */
-  YYSYMBOL_shift_expr = 224,               /* shift_expr  */
-  YYSYMBOL_add_expr = 225,                 /* add_expr  */
-  YYSYMBOL_mult_expr = 226,                /* mult_expr  */
-  YYSYMBOL_unary_expr = 227,               /* unary_expr  */
-  YYSYMBOL_primary_expr = 228,             /* primary_expr  */
-  YYSYMBOL_literal = 229,                  /* literal  */
-  YYSYMBOL_positive_int_expr = 230,        /* positive_int_expr  */
-  YYSYMBOL_annotation_dcl = 231,           /* annotation_dcl  */
-  YYSYMBOL_232_58 = 232,                   /* $@58  */
-  YYSYMBOL_annotation_body = 233,          /* annotation_body  */
-  YYSYMBOL_annotation_statement = 234,     /* annotation_statement  */
-  YYSYMBOL_235_59 = 235,                   /* $@59  */
-  YYSYMBOL_annotation_member_type = 236,   /* annotation_member_type  */
-  YYSYMBOL_annotation_member = 237,        /* annotation_member  */
-  YYSYMBOL_annotation_member_default = 238, /* annotation_member_default  */
-  YYSYMBOL_at_least_one_annotation = 239,  /* at_least_one_annotation  */
-  YYSYMBOL_annotations_maybe = 240,        /* annotations_maybe  */
-  YYSYMBOL_annotation_appl = 241,          /* annotation_appl  */
-  YYSYMBOL_242_60 = 242,                   /* @60  */
-  YYSYMBOL_annotation_appl_params_maybe = 243, /* annotation_appl_params_maybe  */
-  YYSYMBOL_annotation_appl_params = 244,   /* annotation_appl_params  */
-  YYSYMBOL_named_annotation_appl_params = 245, /* named_annotation_appl_params  */
-  YYSYMBOL_more_named_annotation_appl_params = 246, /* more_named_annotation_appl_params  */
-  YYSYMBOL_named_annotation_appl_param = 247, /* named_annotation_appl_param  */
-  YYSYMBOL_type_dcl = 248,                 /* type_dcl  */
-  YYSYMBOL_249_61 = 249,                   /* $@61  */
-  YYSYMBOL_type_declarator = 250,          /* type_declarator  */
-  YYSYMBOL_251_62 = 251,                   /* $@62  */
-  YYSYMBOL_type_spec = 252,                /* type_spec  */
-  YYSYMBOL_simple_type_spec = 253,         /* simple_type_spec  */
-  YYSYMBOL_base_type_spec = 254,           /* base_type_spec  */
-  YYSYMBOL_template_type_spec = 255,       /* template_type_spec  */
-  YYSYMBOL_constructed_type_spec = 256,    /* constructed_type_spec  */
-  YYSYMBOL_constructed_forward_type_spec = 257, /* constructed_forward_type_spec  */
-  YYSYMBOL_at_least_one_declarator = 258,  /* at_least_one_declarator  */
-  YYSYMBOL_declarators = 259,              /* declarators  */
-  YYSYMBOL_260_63 = 260,                   /* $@63  */
-  YYSYMBOL_declarator = 261,               /* declarator  */
-  YYSYMBOL_at_least_one_simple_declarator = 262, /* at_least_one_simple_declarator  */
-  YYSYMBOL_simple_declarators = 263,       /* simple_declarators  */
-  YYSYMBOL_264_64 = 264,                   /* $@64  */
-  YYSYMBOL_simple_declarator = 265,        /* simple_declarator  */
-  YYSYMBOL_complex_declarator = 266,       /* complex_declarator  */
-  YYSYMBOL_integer_type = 267,             /* integer_type  */
-  YYSYMBOL_signed_int = 268,               /* signed_int  */
-  YYSYMBOL_unsigned_int = 269,             /* unsigned_int  */
-  YYSYMBOL_floating_pt_type = 270,         /* floating_pt_type  */
-  YYSYMBOL_fixed_type = 271,               /* fixed_type  */
-  YYSYMBOL_char_type = 272,                /* char_type  */
-  YYSYMBOL_octet_type = 273,               /* octet_type  */
-  YYSYMBOL_boolean_type = 274,             /* boolean_type  */
-  YYSYMBOL_any_type = 275,                 /* any_type  */
-  YYSYMBOL_object_type = 276,              /* object_type  */
-  YYSYMBOL_struct_decl = 277,              /* struct_decl  */
-  YYSYMBOL_278_65 = 278,                   /* $@65  */
-  YYSYMBOL_struct_type = 279,              /* struct_type  */
-  YYSYMBOL_280_66 = 280,                   /* $@66  */
-  YYSYMBOL_281_67 = 281,                   /* $@67  */
-  YYSYMBOL_282_68 = 282,                   /* $@68  */
-  YYSYMBOL_at_least_one_member = 283,      /* at_least_one_member  */
-  YYSYMBOL_members = 284,                  /* members  */
-  YYSYMBOL_member = 285,                   /* member  */
-  YYSYMBOL_member_i = 286,                 /* member_i  */
-  YYSYMBOL_287_69 = 287,                   /* $@69  */
-  YYSYMBOL_288_70 = 288,                   /* $@70  */
-  YYSYMBOL_289_71 = 289,                   /* $@71  */
-  YYSYMBOL_union_decl = 290,               /* union_decl  */
-  YYSYMBOL_291_72 = 291,                   /* $@72  */
-  YYSYMBOL_union_type = 292,               /* union_type  */
-  YYSYMBOL_293_73 = 293,                   /* $@73  */
-  YYSYMBOL_294_74 = 294,                   /* $@74  */
-  YYSYMBOL_295_75 = 295,                   /* $@75  */
-  YYSYMBOL_296_76 = 296,                   /* $@76  */
-  YYSYMBOL_297_77 = 297,                   /* $@77  */
-  YYSYMBOL_298_78 = 298,                   /* $@78  */
-  YYSYMBOL_switch_type_spec = 299,         /* switch_type_spec  */
-  YYSYMBOL_at_least_one_case_branch = 300, /* at_least_one_case_branch  */
-  YYSYMBOL_case_branches = 301,            /* case_branches  */
-  YYSYMBOL_case_branch = 302,              /* case_branch  */
-  YYSYMBOL_303_79 = 303,                   /* $@79  */
-  YYSYMBOL_304_80 = 304,                   /* $@80  */
-  YYSYMBOL_305_81 = 305,                   /* $@81  */
-  YYSYMBOL_at_least_one_case_label = 306,  /* at_least_one_case_label  */
-  YYSYMBOL_case_labels = 307,              /* case_labels  */
-  YYSYMBOL_case_label = 308,               /* case_label  */
-  YYSYMBOL_309_82 = 309,                   /* $@82  */
-  YYSYMBOL_310_83 = 310,                   /* $@83  */
-  YYSYMBOL_311_84 = 311,                   /* $@84  */
-  YYSYMBOL_element_spec = 312,             /* element_spec  */
-  YYSYMBOL_313_85 = 313,                   /* $@85  */
-  YYSYMBOL_struct_forward_type = 314,      /* struct_forward_type  */
-  YYSYMBOL_union_forward_type = 315,       /* union_forward_type  */
-  YYSYMBOL_enum_type = 316,                /* enum_type  */
-  YYSYMBOL_317_86 = 317,                   /* $@86  */
-  YYSYMBOL_318_87 = 318,                   /* $@87  */
-  YYSYMBOL_319_88 = 319,                   /* $@88  */
-  YYSYMBOL_320_89 = 320,                   /* $@89  */
-  YYSYMBOL_at_least_one_enumerator = 321,  /* at_least_one_enumerator  */
-  YYSYMBOL_enumerators = 322,              /* enumerators  */
-  YYSYMBOL_323_90 = 323,                   /* $@90  */
-  YYSYMBOL_enumerator = 324,               /* enumerator  */
-  YYSYMBOL_sequence_type_spec = 325,       /* sequence_type_spec  */
-  YYSYMBOL_326_91 = 326,                   /* $@91  */
-  YYSYMBOL_327_92 = 327,                   /* $@92  */
-  YYSYMBOL_seq_head = 328,                 /* seq_head  */
-  YYSYMBOL_329_93 = 329,                   /* $@93  */
-  YYSYMBOL_330_94 = 330,                   /* $@94  */
-  YYSYMBOL_fixed_type_spec = 331,          /* fixed_type_spec  */
-  YYSYMBOL_string_type_spec = 332,         /* string_type_spec  */
-  YYSYMBOL_333_95 = 333,                   /* $@95  */
-  YYSYMBOL_334_96 = 334,                   /* $@96  */
-  YYSYMBOL_string_head = 335,              /* string_head  */
-  YYSYMBOL_wstring_type_spec = 336,        /* wstring_type_spec  */
-  YYSYMBOL_337_97 = 337,                   /* $@97  */
-  YYSYMBOL_338_98 = 338,                   /* $@98  */
-  YYSYMBOL_wstring_head = 339,             /* wstring_head  */
-  YYSYMBOL_array_declarator = 340,         /* array_declarator  */
-  YYSYMBOL_341_99 = 341,                   /* $@99  */
-  YYSYMBOL_at_least_one_array_dim = 342,   /* at_least_one_array_dim  */
-  YYSYMBOL_array_dims = 343,               /* array_dims  */
-  YYSYMBOL_array_dim = 344,                /* array_dim  */
-  YYSYMBOL_345_100 = 345,                  /* $@100  */
+  YYSYMBOL_IDL_MAP = 25,                   /* IDL_MAP  */
+  YYSYMBOL_IDL_STRING = 26,                /* IDL_STRING  */
+  YYSYMBOL_IDL_WSTRING = 27,               /* IDL_WSTRING  */
+  YYSYMBOL_IDL_EXCEPTION = 28,             /* IDL_EXCEPTION  */
+  YYSYMBOL_IDL_CASE = 29,                  /* IDL_CASE  */
+  YYSYMBOL_IDL_DEFAULT = 30,               /* IDL_DEFAULT  */
+  YYSYMBOL_IDL_READONLY = 31,              /* IDL_READONLY  */
+  YYSYMBOL_IDL_ATTRIBUTE = 32,             /* IDL_ATTRIBUTE  */
+  YYSYMBOL_IDL_ONEWAY = 33,                /* IDL_ONEWAY  */
+  YYSYMBOL_IDL_IDEMPOTENT = 34,            /* IDL_IDEMPOTENT  */
+  YYSYMBOL_IDL_VOID = 35,                  /* IDL_VOID  */
+  YYSYMBOL_IDL_IN = 36,                    /* IDL_IN  */
+  YYSYMBOL_IDL_OUT = 37,                   /* IDL_OUT  */
+  YYSYMBOL_IDL_INOUT = 38,                 /* IDL_INOUT  */
+  YYSYMBOL_IDL_RAISES = 39,                /* IDL_RAISES  */
+  YYSYMBOL_IDL_CONTEXT = 40,               /* IDL_CONTEXT  */
+  YYSYMBOL_IDL_NATIVE = 41,                /* IDL_NATIVE  */
+  YYSYMBOL_IDL_LOCAL = 42,                 /* IDL_LOCAL  */
+  YYSYMBOL_IDL_ABSTRACT = 43,              /* IDL_ABSTRACT  */
+  YYSYMBOL_IDL_CUSTOM = 44,                /* IDL_CUSTOM  */
+  YYSYMBOL_IDL_FACTORY = 45,               /* IDL_FACTORY  */
+  YYSYMBOL_IDL_PRIVATE = 46,               /* IDL_PRIVATE  */
+  YYSYMBOL_IDL_PUBLIC = 47,                /* IDL_PUBLIC  */
+  YYSYMBOL_IDL_SUPPORTS = 48,              /* IDL_SUPPORTS  */
+  YYSYMBOL_IDL_TRUNCATABLE = 49,           /* IDL_TRUNCATABLE  */
+  YYSYMBOL_IDL_VALUETYPE = 50,             /* IDL_VALUETYPE  */
+  YYSYMBOL_IDL_COMPONENT = 51,             /* IDL_COMPONENT  */
+  YYSYMBOL_IDL_CONSUMES = 52,              /* IDL_CONSUMES  */
+  YYSYMBOL_IDL_EMITS = 53,                 /* IDL_EMITS  */
+  YYSYMBOL_IDL_EVENTTYPE = 54,             /* IDL_EVENTTYPE  */
+  YYSYMBOL_IDL_FINDER = 55,                /* IDL_FINDER  */
+  YYSYMBOL_IDL_GETRAISES = 56,             /* IDL_GETRAISES  */
+  YYSYMBOL_IDL_HOME = 57,                  /* IDL_HOME  */
+  YYSYMBOL_IDL_IMPORT = 58,                /* IDL_IMPORT  */
+  YYSYMBOL_IDL_MULTIPLE = 59,              /* IDL_MULTIPLE  */
+  YYSYMBOL_IDL_PRIMARYKEY = 60,            /* IDL_PRIMARYKEY  */
+  YYSYMBOL_IDL_PROVIDES = 61,              /* IDL_PROVIDES  */
+  YYSYMBOL_IDL_PUBLISHES = 62,             /* IDL_PUBLISHES  */
+  YYSYMBOL_IDL_SETRAISES = 63,             /* IDL_SETRAISES  */
+  YYSYMBOL_IDL_TYPEID = 64,                /* IDL_TYPEID  */
+  YYSYMBOL_IDL_TYPEPREFIX = 65,            /* IDL_TYPEPREFIX  */
+  YYSYMBOL_IDL_USES = 66,                  /* IDL_USES  */
+  YYSYMBOL_IDL_MANAGES = 67,               /* IDL_MANAGES  */
+  YYSYMBOL_IDL_TYPENAME = 68,              /* IDL_TYPENAME  */
+  YYSYMBOL_IDL_PORT = 69,                  /* IDL_PORT  */
+  YYSYMBOL_IDL_MIRRORPORT = 70,            /* IDL_MIRRORPORT  */
+  YYSYMBOL_IDL_PORTTYPE = 71,              /* IDL_PORTTYPE  */
+  YYSYMBOL_IDL_CONNECTOR = 72,             /* IDL_CONNECTOR  */
+  YYSYMBOL_IDL_ALIAS = 73,                 /* IDL_ALIAS  */
+  YYSYMBOL_IDL_INTEGER_LITERAL = 74,       /* IDL_INTEGER_LITERAL  */
+  YYSYMBOL_IDL_UINTEGER_LITERAL = 75,      /* IDL_UINTEGER_LITERAL  */
+  YYSYMBOL_IDL_STRING_LITERAL = 76,        /* IDL_STRING_LITERAL  */
+  YYSYMBOL_IDL_CHARACTER_LITERAL = 77,     /* IDL_CHARACTER_LITERAL  */
+  YYSYMBOL_IDL_FLOATING_PT_LITERAL = 78,   /* IDL_FLOATING_PT_LITERAL  */
+  YYSYMBOL_IDL_FIXED_PT_LITERAL = 79,      /* IDL_FIXED_PT_LITERAL  */
+  YYSYMBOL_IDL_TRUETOK = 80,               /* IDL_TRUETOK  */
+  YYSYMBOL_IDL_FALSETOK = 81,              /* IDL_FALSETOK  */
+  YYSYMBOL_IDL_INT8 = 82,                  /* IDL_INT8  */
+  YYSYMBOL_IDL_UINT8 = 83,                 /* IDL_UINT8  */
+  YYSYMBOL_IDL_INT16 = 84,                 /* IDL_INT16  */
+  YYSYMBOL_IDL_UINT16 = 85,                /* IDL_UINT16  */
+  YYSYMBOL_IDL_INT32 = 86,                 /* IDL_INT32  */
+  YYSYMBOL_IDL_UINT32 = 87,                /* IDL_UINT32  */
+  YYSYMBOL_IDL_INT64 = 88,                 /* IDL_INT64  */
+  YYSYMBOL_IDL_UINT64 = 89,                /* IDL_UINT64  */
+  YYSYMBOL_IDL_SCOPE_DELIMITOR = 90,       /* IDL_SCOPE_DELIMITOR  */
+  YYSYMBOL_IDL_LEFT_SHIFT = 91,            /* IDL_LEFT_SHIFT  */
+  YYSYMBOL_IDL_RIGHT_SHIFT = 92,           /* IDL_RIGHT_SHIFT  */
+  YYSYMBOL_IDL_WCHAR_LITERAL = 93,         /* IDL_WCHAR_LITERAL  */
+  YYSYMBOL_IDL_WSTRING_LITERAL = 94,       /* IDL_WSTRING_LITERAL  */
+  YYSYMBOL_IDL_ANNOTATION_DECL = 95,       /* IDL_ANNOTATION_DECL  */
+  YYSYMBOL_IDL_ANNOTATION_SYMBOL = 96,     /* IDL_ANNOTATION_SYMBOL  */
+  YYSYMBOL_97_ = 97,                       /* ';'  */
+  YYSYMBOL_98_ = 98,                       /* '{'  */
+  YYSYMBOL_99_ = 99,                       /* '}'  */
+  YYSYMBOL_100_ = 100,                     /* '<'  */
+  YYSYMBOL_101_ = 101,                     /* '>'  */
+  YYSYMBOL_102_ = 102,                     /* ':'  */
+  YYSYMBOL_103_ = 103,                     /* ','  */
+  YYSYMBOL_104_ = 104,                     /* '='  */
+  YYSYMBOL_105_ = 105,                     /* '|'  */
+  YYSYMBOL_106_ = 106,                     /* '^'  */
+  YYSYMBOL_107_ = 107,                     /* '&'  */
+  YYSYMBOL_108_ = 108,                     /* '+'  */
+  YYSYMBOL_109_ = 109,                     /* '-'  */
+  YYSYMBOL_110_ = 110,                     /* '*'  */
+  YYSYMBOL_111_ = 111,                     /* '/'  */
+  YYSYMBOL_112_ = 112,                     /* '%'  */
+  YYSYMBOL_113_ = 113,                     /* '~'  */
+  YYSYMBOL_114_ = 114,                     /* '('  */
+  YYSYMBOL_115_ = 115,                     /* ')'  */
+  YYSYMBOL_116_ = 116,                     /* '['  */
+  YYSYMBOL_117_ = 117,                     /* ']'  */
+  YYSYMBOL_YYACCEPT = 118,                 /* $accept  */
+  YYSYMBOL_start = 119,                    /* start  */
+  YYSYMBOL_definitions = 120,              /* definitions  */
+  YYSYMBOL_at_least_one_definition = 121,  /* at_least_one_definition  */
+  YYSYMBOL_definition = 122,               /* definition  */
+  YYSYMBOL_fixed_definition = 123,         /* fixed_definition  */
+  YYSYMBOL_124_1 = 124,                    /* $@1  */
+  YYSYMBOL_125_2 = 125,                    /* $@2  */
+  YYSYMBOL_126_3 = 126,                    /* $@3  */
+  YYSYMBOL_127_4 = 127,                    /* $@4  */
+  YYSYMBOL_128_5 = 128,                    /* $@5  */
+  YYSYMBOL_129_6 = 129,                    /* $@6  */
+  YYSYMBOL_130_7 = 130,                    /* $@7  */
+  YYSYMBOL_131_8 = 131,                    /* $@8  */
+  YYSYMBOL_132_9 = 132,                    /* $@9  */
+  YYSYMBOL_133_10 = 133,                   /* $@10  */
+  YYSYMBOL_134_11 = 134,                   /* $@11  */
+  YYSYMBOL_135_12 = 135,                   /* $@12  */
+  YYSYMBOL_136_13 = 136,                   /* $@13  */
+  YYSYMBOL_137_14 = 137,                   /* $@14  */
+  YYSYMBOL_138_15 = 138,                   /* $@15  */
+  YYSYMBOL_module_header = 139,            /* module_header  */
+  YYSYMBOL_140_16 = 140,                   /* $@16  */
+  YYSYMBOL_module = 141,                   /* module  */
+  YYSYMBOL_142_17 = 142,                   /* @17  */
+  YYSYMBOL_143_18 = 143,                   /* $@18  */
+  YYSYMBOL_144_19 = 144,                   /* $@19  */
+  YYSYMBOL_template_module_header = 145,   /* template_module_header  */
+  YYSYMBOL_template_module = 146,          /* template_module  */
+  YYSYMBOL_147_20 = 147,                   /* $@20  */
+  YYSYMBOL_148_21 = 148,                   /* $@21  */
+  YYSYMBOL_149_22 = 149,                   /* $@22  */
+  YYSYMBOL_150_23 = 150,                   /* $@23  */
+  YYSYMBOL_151_24 = 151,                   /* $@24  */
+  YYSYMBOL_at_least_one_tpl_definition = 152, /* at_least_one_tpl_definition  */
+  YYSYMBOL_tpl_definitions = 153,          /* tpl_definitions  */
+  YYSYMBOL_tpl_definition = 154,           /* tpl_definition  */
+  YYSYMBOL_template_module_ref = 155,      /* template_module_ref  */
+  YYSYMBOL_156_25 = 156,                   /* $@25  */
+  YYSYMBOL_157_26 = 157,                   /* $@26  */
+  YYSYMBOL_template_module_inst = 158,     /* template_module_inst  */
+  YYSYMBOL_159_27 = 159,                   /* $@27  */
+  YYSYMBOL_160_28 = 160,                   /* $@28  */
+  YYSYMBOL_interface_def = 161,            /* interface_def  */
+  YYSYMBOL_interface = 162,                /* interface  */
+  YYSYMBOL_163_29 = 163,                   /* $@29  */
+  YYSYMBOL_164_30 = 164,                   /* $@30  */
+  YYSYMBOL_165_31 = 165,                   /* $@31  */
+  YYSYMBOL_interface_decl = 166,           /* interface_decl  */
+  YYSYMBOL_167_32 = 167,                   /* $@32  */
+  YYSYMBOL_interface_header = 168,         /* interface_header  */
+  YYSYMBOL_inheritance_spec = 169,         /* inheritance_spec  */
+  YYSYMBOL_170_33 = 170,                   /* $@33  */
+  YYSYMBOL_value_def = 171,                /* value_def  */
+  YYSYMBOL_valuetype = 172,                /* valuetype  */
+  YYSYMBOL_value_concrete_decl = 173,      /* value_concrete_decl  */
+  YYSYMBOL_174_34 = 174,                   /* @34  */
+  YYSYMBOL_175_35 = 175,                   /* $@35  */
+  YYSYMBOL_176_36 = 176,                   /* $@36  */
+  YYSYMBOL_value_abs_decl = 177,           /* value_abs_decl  */
+  YYSYMBOL_178_37 = 178,                   /* $@37  */
+  YYSYMBOL_179_38 = 179,                   /* $@38  */
+  YYSYMBOL_180_39 = 180,                   /* $@39  */
+  YYSYMBOL_value_header = 181,             /* value_header  */
+  YYSYMBOL_182_40 = 182,                   /* $@40  */
+  YYSYMBOL_value_decl = 183,               /* value_decl  */
+  YYSYMBOL_184_41 = 184,                   /* $@41  */
+  YYSYMBOL_opt_truncatable = 185,          /* opt_truncatable  */
+  YYSYMBOL_supports_spec = 186,            /* supports_spec  */
+  YYSYMBOL_value_forward_decl = 187,       /* value_forward_decl  */
+  YYSYMBOL_value_box_decl = 188,           /* value_box_decl  */
+  YYSYMBOL_value_elements = 189,           /* value_elements  */
+  YYSYMBOL_value_element = 190,            /* value_element  */
+  YYSYMBOL_191_42 = 191,                   /* @42  */
+  YYSYMBOL_visibility = 192,               /* visibility  */
+  YYSYMBOL_state_member = 193,             /* state_member  */
+  YYSYMBOL_exports = 194,                  /* exports  */
+  YYSYMBOL_at_least_one_export = 195,      /* at_least_one_export  */
+  YYSYMBOL_export = 196,                   /* export  */
+  YYSYMBOL_197_43 = 197,                   /* $@43  */
+  YYSYMBOL_198_44 = 198,                   /* $@44  */
+  YYSYMBOL_199_45 = 199,                   /* $@45  */
+  YYSYMBOL_200_46 = 200,                   /* $@46  */
+  YYSYMBOL_201_47 = 201,                   /* $@47  */
+  YYSYMBOL_202_48 = 202,                   /* $@48  */
+  YYSYMBOL_203_49 = 203,                   /* $@49  */
+  YYSYMBOL_204_50 = 204,                   /* $@50  */
+  YYSYMBOL_at_least_one_scoped_name = 205, /* at_least_one_scoped_name  */
+  YYSYMBOL_scoped_names = 206,             /* scoped_names  */
+  YYSYMBOL_207_51 = 207,                   /* $@51  */
+  YYSYMBOL_scoped_name = 208,              /* scoped_name  */
+  YYSYMBOL_209_52 = 209,                   /* $@52  */
+  YYSYMBOL_210_53 = 210,                   /* $@53  */
+  YYSYMBOL_id = 211,                       /* id  */
+  YYSYMBOL_defining_id = 212,              /* defining_id  */
+  YYSYMBOL_interface_forward = 213,        /* interface_forward  */
+  YYSYMBOL_const_dcl = 214,                /* const_dcl  */
+  YYSYMBOL_215_54 = 215,                   /* $@54  */
+  YYSYMBOL_216_55 = 216,                   /* $@55  */
+  YYSYMBOL_217_56 = 217,                   /* $@56  */
+  YYSYMBOL_218_57 = 218,                   /* $@57  */
+  YYSYMBOL_const_type = 219,               /* const_type  */
+  YYSYMBOL_expression = 220,               /* expression  */
+  YYSYMBOL_const_expr = 221,               /* const_expr  */
+  YYSYMBOL_or_expr = 222,                  /* or_expr  */
+  YYSYMBOL_xor_expr = 223,                 /* xor_expr  */
+  YYSYMBOL_and_expr = 224,                 /* and_expr  */
+  YYSYMBOL_shift_expr = 225,               /* shift_expr  */
+  YYSYMBOL_add_expr = 226,                 /* add_expr  */
+  YYSYMBOL_mult_expr = 227,                /* mult_expr  */
+  YYSYMBOL_unary_expr = 228,               /* unary_expr  */
+  YYSYMBOL_primary_expr = 229,             /* primary_expr  */
+  YYSYMBOL_literal = 230,                  /* literal  */
+  YYSYMBOL_positive_int_expr = 231,        /* positive_int_expr  */
+  YYSYMBOL_annotation_dcl = 232,           /* annotation_dcl  */
+  YYSYMBOL_233_58 = 233,                   /* $@58  */
+  YYSYMBOL_annotation_body = 234,          /* annotation_body  */
+  YYSYMBOL_annotation_statement = 235,     /* annotation_statement  */
+  YYSYMBOL_236_59 = 236,                   /* $@59  */
+  YYSYMBOL_annotation_member_type = 237,   /* annotation_member_type  */
+  YYSYMBOL_annotation_member = 238,        /* annotation_member  */
+  YYSYMBOL_annotation_member_default = 239, /* annotation_member_default  */
+  YYSYMBOL_at_least_one_annotation = 240,  /* at_least_one_annotation  */
+  YYSYMBOL_annotations_maybe = 241,        /* annotations_maybe  */
+  YYSYMBOL_annotation_appl = 242,          /* annotation_appl  */
+  YYSYMBOL_243_60 = 243,                   /* @60  */
+  YYSYMBOL_annotation_appl_params_maybe = 244, /* annotation_appl_params_maybe  */
+  YYSYMBOL_annotation_appl_params = 245,   /* annotation_appl_params  */
+  YYSYMBOL_named_annotation_appl_params = 246, /* named_annotation_appl_params  */
+  YYSYMBOL_more_named_annotation_appl_params = 247, /* more_named_annotation_appl_params  */
+  YYSYMBOL_named_annotation_appl_param = 248, /* named_annotation_appl_param  */
+  YYSYMBOL_type_dcl = 249,                 /* type_dcl  */
+  YYSYMBOL_250_61 = 250,                   /* $@61  */
+  YYSYMBOL_type_declarator = 251,          /* type_declarator  */
+  YYSYMBOL_252_62 = 252,                   /* $@62  */
+  YYSYMBOL_type_spec = 253,                /* type_spec  */
+  YYSYMBOL_simple_type_spec = 254,         /* simple_type_spec  */
+  YYSYMBOL_base_type_spec = 255,           /* base_type_spec  */
+  YYSYMBOL_template_type_spec = 256,       /* template_type_spec  */
+  YYSYMBOL_constructed_type_spec = 257,    /* constructed_type_spec  */
+  YYSYMBOL_constructed_forward_type_spec = 258, /* constructed_forward_type_spec  */
+  YYSYMBOL_at_least_one_declarator = 259,  /* at_least_one_declarator  */
+  YYSYMBOL_declarators = 260,              /* declarators  */
+  YYSYMBOL_261_63 = 261,                   /* $@63  */
+  YYSYMBOL_declarator = 262,               /* declarator  */
+  YYSYMBOL_at_least_one_simple_declarator = 263, /* at_least_one_simple_declarator  */
+  YYSYMBOL_simple_declarators = 264,       /* simple_declarators  */
+  YYSYMBOL_265_64 = 265,                   /* $@64  */
+  YYSYMBOL_simple_declarator = 266,        /* simple_declarator  */
+  YYSYMBOL_complex_declarator = 267,       /* complex_declarator  */
+  YYSYMBOL_integer_type = 268,             /* integer_type  */
+  YYSYMBOL_signed_int = 269,               /* signed_int  */
+  YYSYMBOL_unsigned_int = 270,             /* unsigned_int  */
+  YYSYMBOL_floating_pt_type = 271,         /* floating_pt_type  */
+  YYSYMBOL_fixed_type = 272,               /* fixed_type  */
+  YYSYMBOL_char_type = 273,                /* char_type  */
+  YYSYMBOL_octet_type = 274,               /* octet_type  */
+  YYSYMBOL_boolean_type = 275,             /* boolean_type  */
+  YYSYMBOL_any_type = 276,                 /* any_type  */
+  YYSYMBOL_object_type = 277,              /* object_type  */
+  YYSYMBOL_struct_decl = 278,              /* struct_decl  */
+  YYSYMBOL_279_65 = 279,                   /* $@65  */
+  YYSYMBOL_struct_type = 280,              /* struct_type  */
+  YYSYMBOL_281_66 = 281,                   /* $@66  */
+  YYSYMBOL_282_67 = 282,                   /* $@67  */
+  YYSYMBOL_283_68 = 283,                   /* $@68  */
+  YYSYMBOL_at_least_one_member = 284,      /* at_least_one_member  */
+  YYSYMBOL_members = 285,                  /* members  */
+  YYSYMBOL_member = 286,                   /* member  */
+  YYSYMBOL_member_i = 287,                 /* member_i  */
+  YYSYMBOL_288_69 = 288,                   /* $@69  */
+  YYSYMBOL_289_70 = 289,                   /* $@70  */
+  YYSYMBOL_290_71 = 290,                   /* $@71  */
+  YYSYMBOL_union_decl = 291,               /* union_decl  */
+  YYSYMBOL_292_72 = 292,                   /* $@72  */
+  YYSYMBOL_union_type = 293,               /* union_type  */
+  YYSYMBOL_294_73 = 294,                   /* $@73  */
+  YYSYMBOL_295_74 = 295,                   /* $@74  */
+  YYSYMBOL_296_75 = 296,                   /* $@75  */
+  YYSYMBOL_297_76 = 297,                   /* $@76  */
+  YYSYMBOL_298_77 = 298,                   /* $@77  */
+  YYSYMBOL_299_78 = 299,                   /* $@78  */
+  YYSYMBOL_switch_type_spec = 300,         /* switch_type_spec  */
+  YYSYMBOL_at_least_one_case_branch = 301, /* at_least_one_case_branch  */
+  YYSYMBOL_case_branches = 302,            /* case_branches  */
+  YYSYMBOL_case_branch = 303,              /* case_branch  */
+  YYSYMBOL_304_79 = 304,                   /* $@79  */
+  YYSYMBOL_305_80 = 305,                   /* $@80  */
+  YYSYMBOL_306_81 = 306,                   /* $@81  */
+  YYSYMBOL_at_least_one_case_label = 307,  /* at_least_one_case_label  */
+  YYSYMBOL_case_labels = 308,              /* case_labels  */
+  YYSYMBOL_case_label = 309,               /* case_label  */
+  YYSYMBOL_310_82 = 310,                   /* $@82  */
+  YYSYMBOL_311_83 = 311,                   /* $@83  */
+  YYSYMBOL_312_84 = 312,                   /* $@84  */
+  YYSYMBOL_element_spec = 313,             /* element_spec  */
+  YYSYMBOL_314_85 = 314,                   /* $@85  */
+  YYSYMBOL_struct_forward_type = 315,      /* struct_forward_type  */
+  YYSYMBOL_union_forward_type = 316,       /* union_forward_type  */
+  YYSYMBOL_enum_type = 317,                /* enum_type  */
+  YYSYMBOL_318_86 = 318,                   /* $@86  */
+  YYSYMBOL_319_87 = 319,                   /* $@87  */
+  YYSYMBOL_320_88 = 320,                   /* $@88  */
+  YYSYMBOL_321_89 = 321,                   /* $@89  */
+  YYSYMBOL_at_least_one_enumerator = 322,  /* at_least_one_enumerator  */
+  YYSYMBOL_enumerators = 323,              /* enumerators  */
+  YYSYMBOL_324_90 = 324,                   /* $@90  */
+  YYSYMBOL_enumerator = 325,               /* enumerator  */
+  YYSYMBOL_map_type_spec = 326,            /* map_type_spec  */
+  YYSYMBOL_map_head = 327,                 /* map_head  */
+  YYSYMBOL_328_91 = 328,                   /* $@91  */
+  YYSYMBOL_329_92 = 329,                   /* $@92  */
+  YYSYMBOL_sequence_type_spec = 330,       /* sequence_type_spec  */
+  YYSYMBOL_331_93 = 331,                   /* $@93  */
+  YYSYMBOL_332_94 = 332,                   /* $@94  */
+  YYSYMBOL_seq_head = 333,                 /* seq_head  */
+  YYSYMBOL_334_95 = 334,                   /* $@95  */
+  YYSYMBOL_335_96 = 335,                   /* $@96  */
+  YYSYMBOL_fixed_type_spec = 336,          /* fixed_type_spec  */
+  YYSYMBOL_string_type_spec = 337,         /* string_type_spec  */
+  YYSYMBOL_338_97 = 338,                   /* $@97  */
+  YYSYMBOL_339_98 = 339,                   /* $@98  */
+  YYSYMBOL_string_head = 340,              /* string_head  */
+  YYSYMBOL_wstring_type_spec = 341,        /* wstring_type_spec  */
+  YYSYMBOL_342_99 = 342,                   /* $@99  */
+  YYSYMBOL_343_100 = 343,                  /* $@100  */
+  YYSYMBOL_wstring_head = 344,             /* wstring_head  */
+  YYSYMBOL_array_declarator = 345,         /* array_declarator  */
   YYSYMBOL_346_101 = 346,                  /* $@101  */
-  YYSYMBOL_attribute = 347,                /* attribute  */
-  YYSYMBOL_attribute_readonly = 348,       /* attribute_readonly  */
-  YYSYMBOL_349_102 = 349,                  /* $@102  */
-  YYSYMBOL_350_103 = 350,                  /* $@103  */
-  YYSYMBOL_351_104 = 351,                  /* $@104  */
-  YYSYMBOL_352_105 = 352,                  /* $@105  */
-  YYSYMBOL_attribute_readwrite = 353,      /* attribute_readwrite  */
-  YYSYMBOL_354_106 = 354,                  /* $@106  */
-  YYSYMBOL_355_107 = 355,                  /* $@107  */
-  YYSYMBOL_356_108 = 356,                  /* $@108  */
-  YYSYMBOL_357_109 = 357,                  /* $@109  */
-  YYSYMBOL_exception = 358,                /* exception  */
-  YYSYMBOL_359_110 = 359,                  /* $@110  */
-  YYSYMBOL_360_111 = 360,                  /* @111  */
-  YYSYMBOL_361_112 = 361,                  /* $@112  */
-  YYSYMBOL_362_113 = 362,                  /* $@113  */
-  YYSYMBOL_operation = 363,                /* operation  */
-  YYSYMBOL_364_114 = 364,                  /* $@114  */
-  YYSYMBOL_365_115 = 365,                  /* $@115  */
-  YYSYMBOL_366_116 = 366,                  /* $@116  */
-  YYSYMBOL_367_117 = 367,                  /* $@117  */
-  YYSYMBOL_opt_op_attribute = 368,         /* opt_op_attribute  */
-  YYSYMBOL_op_type_spec = 369,             /* op_type_spec  */
-  YYSYMBOL_init_decl = 370,                /* init_decl  */
+  YYSYMBOL_at_least_one_array_dim = 347,   /* at_least_one_array_dim  */
+  YYSYMBOL_array_dims = 348,               /* array_dims  */
+  YYSYMBOL_array_dim = 349,                /* array_dim  */
+  YYSYMBOL_350_102 = 350,                  /* $@102  */
+  YYSYMBOL_351_103 = 351,                  /* $@103  */
+  YYSYMBOL_attribute = 352,                /* attribute  */
+  YYSYMBOL_attribute_readonly = 353,       /* attribute_readonly  */
+  YYSYMBOL_354_104 = 354,                  /* $@104  */
+  YYSYMBOL_355_105 = 355,                  /* $@105  */
+  YYSYMBOL_356_106 = 356,                  /* $@106  */
+  YYSYMBOL_357_107 = 357,                  /* $@107  */
+  YYSYMBOL_attribute_readwrite = 358,      /* attribute_readwrite  */
+  YYSYMBOL_359_108 = 359,                  /* $@108  */
+  YYSYMBOL_360_109 = 360,                  /* $@109  */
+  YYSYMBOL_361_110 = 361,                  /* $@110  */
+  YYSYMBOL_362_111 = 362,                  /* $@111  */
+  YYSYMBOL_exception = 363,                /* exception  */
+  YYSYMBOL_364_112 = 364,                  /* $@112  */
+  YYSYMBOL_365_113 = 365,                  /* @113  */
+  YYSYMBOL_366_114 = 366,                  /* $@114  */
+  YYSYMBOL_367_115 = 367,                  /* $@115  */
+  YYSYMBOL_operation = 368,                /* operation  */
+  YYSYMBOL_369_116 = 369,                  /* $@116  */
+  YYSYMBOL_370_117 = 370,                  /* $@117  */
   YYSYMBOL_371_118 = 371,                  /* $@118  */
-  YYSYMBOL_372_119 = 372,                  /* @119  */
-  YYSYMBOL_373_120 = 373,                  /* $@120  */
-  YYSYMBOL_init_parameter_list = 374,      /* init_parameter_list  */
-  YYSYMBOL_375_121 = 375,                  /* $@121  */
-  YYSYMBOL_376_122 = 376,                  /* $@122  */
-  YYSYMBOL_at_least_one_in_parameter = 377, /* at_least_one_in_parameter  */
-  YYSYMBOL_in_parameters = 378,            /* in_parameters  */
-  YYSYMBOL_379_123 = 379,                  /* $@123  */
-  YYSYMBOL_in_parameter = 380,             /* in_parameter  */
+  YYSYMBOL_372_119 = 372,                  /* $@119  */
+  YYSYMBOL_opt_op_attribute = 373,         /* opt_op_attribute  */
+  YYSYMBOL_op_type_spec = 374,             /* op_type_spec  */
+  YYSYMBOL_init_decl = 375,                /* init_decl  */
+  YYSYMBOL_376_120 = 376,                  /* $@120  */
+  YYSYMBOL_377_121 = 377,                  /* @121  */
+  YYSYMBOL_378_122 = 378,                  /* $@122  */
+  YYSYMBOL_init_parameter_list = 379,      /* init_parameter_list  */
+  YYSYMBOL_380_123 = 380,                  /* $@123  */
   YYSYMBOL_381_124 = 381,                  /* $@124  */
-  YYSYMBOL_382_125 = 382,                  /* $@125  */
-  YYSYMBOL_parameter_list = 383,           /* parameter_list  */
-  YYSYMBOL_384_126 = 384,                  /* $@126  */
-  YYSYMBOL_385_127 = 385,                  /* $@127  */
-  YYSYMBOL_at_least_one_parameter = 386,   /* at_least_one_parameter  */
-  YYSYMBOL_parameters = 387,               /* parameters  */
-  YYSYMBOL_388_128 = 388,                  /* $@128  */
-  YYSYMBOL_parameter = 389,                /* parameter  */
+  YYSYMBOL_at_least_one_in_parameter = 382, /* at_least_one_in_parameter  */
+  YYSYMBOL_in_parameters = 383,            /* in_parameters  */
+  YYSYMBOL_384_125 = 384,                  /* $@125  */
+  YYSYMBOL_in_parameter = 385,             /* in_parameter  */
+  YYSYMBOL_386_126 = 386,                  /* $@126  */
+  YYSYMBOL_387_127 = 387,                  /* $@127  */
+  YYSYMBOL_parameter_list = 388,           /* parameter_list  */
+  YYSYMBOL_389_128 = 389,                  /* $@128  */
   YYSYMBOL_390_129 = 390,                  /* $@129  */
-  YYSYMBOL_391_130 = 391,                  /* $@130  */
-  YYSYMBOL_param_type_spec = 392,          /* param_type_spec  */
-  YYSYMBOL_direction = 393,                /* direction  */
-  YYSYMBOL_opt_raises = 394,               /* opt_raises  */
+  YYSYMBOL_at_least_one_parameter = 391,   /* at_least_one_parameter  */
+  YYSYMBOL_parameters = 392,               /* parameters  */
+  YYSYMBOL_393_130 = 393,                  /* $@130  */
+  YYSYMBOL_parameter = 394,                /* parameter  */
   YYSYMBOL_395_131 = 395,                  /* $@131  */
   YYSYMBOL_396_132 = 396,                  /* $@132  */
-  YYSYMBOL_opt_getraises = 397,            /* opt_getraises  */
-  YYSYMBOL_398_133 = 398,                  /* $@133  */
-  YYSYMBOL_399_134 = 399,                  /* $@134  */
-  YYSYMBOL_opt_setraises = 400,            /* opt_setraises  */
-  YYSYMBOL_401_135 = 401,                  /* $@135  */
-  YYSYMBOL_402_136 = 402,                  /* $@136  */
-  YYSYMBOL_opt_context = 403,              /* opt_context  */
-  YYSYMBOL_404_137 = 404,                  /* $@137  */
-  YYSYMBOL_405_138 = 405,                  /* $@138  */
-  YYSYMBOL_at_least_one_string_literal = 406, /* at_least_one_string_literal  */
-  YYSYMBOL_string_literals = 407,          /* string_literals  */
-  YYSYMBOL_408_139 = 408,                  /* $@139  */
-  YYSYMBOL_typeid_dcl = 409,               /* typeid_dcl  */
-  YYSYMBOL_typeprefix_dcl = 410,           /* typeprefix_dcl  */
-  YYSYMBOL_component = 411,                /* component  */
-  YYSYMBOL_component_forward_decl = 412,   /* component_forward_decl  */
-  YYSYMBOL_component_decl = 413,           /* component_decl  */
-  YYSYMBOL_414_140 = 414,                  /* @140  */
-  YYSYMBOL_415_141 = 415,                  /* $@141  */
-  YYSYMBOL_416_142 = 416,                  /* $@142  */
-  YYSYMBOL_component_header = 417,         /* component_header  */
-  YYSYMBOL_418_143 = 418,                  /* $@143  */
-  YYSYMBOL_419_144 = 419,                  /* $@144  */
-  YYSYMBOL_component_inheritance_spec = 420, /* component_inheritance_spec  */
-  YYSYMBOL_421_145 = 421,                  /* $@145  */
-  YYSYMBOL_component_exports = 422,        /* component_exports  */
-  YYSYMBOL_component_export = 423,         /* component_export  */
+  YYSYMBOL_param_type_spec = 397,          /* param_type_spec  */
+  YYSYMBOL_direction = 398,                /* direction  */
+  YYSYMBOL_opt_raises = 399,               /* opt_raises  */
+  YYSYMBOL_400_133 = 400,                  /* $@133  */
+  YYSYMBOL_401_134 = 401,                  /* $@134  */
+  YYSYMBOL_opt_getraises = 402,            /* opt_getraises  */
+  YYSYMBOL_403_135 = 403,                  /* $@135  */
+  YYSYMBOL_404_136 = 404,                  /* $@136  */
+  YYSYMBOL_opt_setraises = 405,            /* opt_setraises  */
+  YYSYMBOL_406_137 = 406,                  /* $@137  */
+  YYSYMBOL_407_138 = 407,                  /* $@138  */
+  YYSYMBOL_opt_context = 408,              /* opt_context  */
+  YYSYMBOL_409_139 = 409,                  /* $@139  */
+  YYSYMBOL_410_140 = 410,                  /* $@140  */
+  YYSYMBOL_at_least_one_string_literal = 411, /* at_least_one_string_literal  */
+  YYSYMBOL_string_literals = 412,          /* string_literals  */
+  YYSYMBOL_413_141 = 413,                  /* $@141  */
+  YYSYMBOL_typeid_dcl = 414,               /* typeid_dcl  */
+  YYSYMBOL_typeprefix_dcl = 415,           /* typeprefix_dcl  */
+  YYSYMBOL_component = 416,                /* component  */
+  YYSYMBOL_component_forward_decl = 417,   /* component_forward_decl  */
+  YYSYMBOL_component_decl = 418,           /* component_decl  */
+  YYSYMBOL_419_142 = 419,                  /* @142  */
+  YYSYMBOL_420_143 = 420,                  /* $@143  */
+  YYSYMBOL_421_144 = 421,                  /* $@144  */
+  YYSYMBOL_component_header = 422,         /* component_header  */
+  YYSYMBOL_423_145 = 423,                  /* $@145  */
   YYSYMBOL_424_146 = 424,                  /* $@146  */
-  YYSYMBOL_425_147 = 425,                  /* $@147  */
-  YYSYMBOL_426_148 = 426,                  /* $@148  */
-  YYSYMBOL_427_149 = 427,                  /* $@149  */
-  YYSYMBOL_428_150 = 428,                  /* $@150  */
-  YYSYMBOL_429_151 = 429,                  /* $@151  */
-  YYSYMBOL_430_152 = 430,                  /* $@152  */
-  YYSYMBOL_provides_decl = 431,            /* provides_decl  */
-  YYSYMBOL_interface_type = 432,           /* interface_type  */
-  YYSYMBOL_uses_decl = 433,                /* uses_decl  */
-  YYSYMBOL_uses_opt_multiple = 434,        /* uses_opt_multiple  */
-  YYSYMBOL_opt_multiple = 435,             /* opt_multiple  */
-  YYSYMBOL_emits_decl = 436,               /* emits_decl  */
-  YYSYMBOL_publishes_decl = 437,           /* publishes_decl  */
-  YYSYMBOL_consumes_decl = 438,            /* consumes_decl  */
-  YYSYMBOL_home_decl = 439,                /* home_decl  */
-  YYSYMBOL_440_153 = 440,                  /* $@153  */
-  YYSYMBOL_home_header = 441,              /* home_header  */
-  YYSYMBOL_442_154 = 442,                  /* $@154  */
-  YYSYMBOL_443_155 = 443,                  /* $@155  */
-  YYSYMBOL_444_156 = 444,                  /* $@156  */
-  YYSYMBOL_445_157 = 445,                  /* $@157  */
-  YYSYMBOL_446_158 = 446,                  /* $@158  */
-  YYSYMBOL_447_159 = 447,                  /* $@159  */
-  YYSYMBOL_home_inheritance_spec = 448,    /* home_inheritance_spec  */
-  YYSYMBOL_449_160 = 449,                  /* $@160  */
-  YYSYMBOL_primary_key_spec = 450,         /* primary_key_spec  */
-  YYSYMBOL_home_body = 451,                /* home_body  */
+  YYSYMBOL_component_inheritance_spec = 425, /* component_inheritance_spec  */
+  YYSYMBOL_426_147 = 426,                  /* $@147  */
+  YYSYMBOL_component_exports = 427,        /* component_exports  */
+  YYSYMBOL_component_export = 428,         /* component_export  */
+  YYSYMBOL_429_148 = 429,                  /* $@148  */
+  YYSYMBOL_430_149 = 430,                  /* $@149  */
+  YYSYMBOL_431_150 = 431,                  /* $@150  */
+  YYSYMBOL_432_151 = 432,                  /* $@151  */
+  YYSYMBOL_433_152 = 433,                  /* $@152  */
+  YYSYMBOL_434_153 = 434,                  /* $@153  */
+  YYSYMBOL_435_154 = 435,                  /* $@154  */
+  YYSYMBOL_provides_decl = 436,            /* provides_decl  */
+  YYSYMBOL_interface_type = 437,           /* interface_type  */
+  YYSYMBOL_uses_decl = 438,                /* uses_decl  */
+  YYSYMBOL_uses_opt_multiple = 439,        /* uses_opt_multiple  */
+  YYSYMBOL_opt_multiple = 440,             /* opt_multiple  */
+  YYSYMBOL_emits_decl = 441,               /* emits_decl  */
+  YYSYMBOL_publishes_decl = 442,           /* publishes_decl  */
+  YYSYMBOL_consumes_decl = 443,            /* consumes_decl  */
+  YYSYMBOL_home_decl = 444,                /* home_decl  */
+  YYSYMBOL_445_155 = 445,                  /* $@155  */
+  YYSYMBOL_home_header = 446,              /* home_header  */
+  YYSYMBOL_447_156 = 447,                  /* $@156  */
+  YYSYMBOL_448_157 = 448,                  /* $@157  */
+  YYSYMBOL_449_158 = 449,                  /* $@158  */
+  YYSYMBOL_450_159 = 450,                  /* $@159  */
+  YYSYMBOL_451_160 = 451,                  /* $@160  */
   YYSYMBOL_452_161 = 452,                  /* $@161  */
-  YYSYMBOL_453_162 = 453,                  /* $@162  */
-  YYSYMBOL_home_exports = 454,             /* home_exports  */
-  YYSYMBOL_home_export = 455,              /* home_export  */
-  YYSYMBOL_456_163 = 456,                  /* $@163  */
-  YYSYMBOL_457_164 = 457,                  /* $@164  */
-  YYSYMBOL_factory_decl = 458,             /* factory_decl  */
-  YYSYMBOL_459_165 = 459,                  /* $@165  */
-  YYSYMBOL_460_166 = 460,                  /* $@166  */
-  YYSYMBOL_finder_decl = 461,              /* finder_decl  */
-  YYSYMBOL_462_167 = 462,                  /* $@167  */
-  YYSYMBOL_463_168 = 463,                  /* $@168  */
-  YYSYMBOL_event = 464,                    /* event  */
-  YYSYMBOL_event_forward_decl = 465,       /* event_forward_decl  */
-  YYSYMBOL_event_concrete_forward_decl = 466, /* event_concrete_forward_decl  */
-  YYSYMBOL_event_abs_forward_decl = 467,   /* event_abs_forward_decl  */
-  YYSYMBOL_event_abs_decl = 468,           /* event_abs_decl  */
-  YYSYMBOL_469_169 = 469,                  /* $@169  */
-  YYSYMBOL_470_170 = 470,                  /* $@170  */
-  YYSYMBOL_471_171 = 471,                  /* $@171  */
-  YYSYMBOL_event_abs_header = 472,         /* event_abs_header  */
-  YYSYMBOL_event_custom_header = 473,      /* event_custom_header  */
-  YYSYMBOL_event_plain_header = 474,       /* event_plain_header  */
-  YYSYMBOL_event_rest_of_header = 475,     /* event_rest_of_header  */
-  YYSYMBOL_476_172 = 476,                  /* $@172  */
-  YYSYMBOL_event_decl = 477,               /* event_decl  */
-  YYSYMBOL_478_173 = 478,                  /* @173  */
-  YYSYMBOL_479_174 = 479,                  /* $@174  */
-  YYSYMBOL_480_175 = 480,                  /* $@175  */
-  YYSYMBOL_event_header = 481,             /* event_header  */
-  YYSYMBOL_formal_parameter_type = 482,    /* formal_parameter_type  */
-  YYSYMBOL_at_least_one_formal_parameter = 483, /* at_least_one_formal_parameter  */
-  YYSYMBOL_formal_parameters = 484,        /* formal_parameters  */
-  YYSYMBOL_formal_parameter = 485,         /* formal_parameter  */
-  YYSYMBOL_at_least_one_formal_parameter_name = 486, /* at_least_one_formal_parameter_name  */
-  YYSYMBOL_formal_parameter_names = 487,   /* formal_parameter_names  */
-  YYSYMBOL_formal_parameter_name = 488,    /* formal_parameter_name  */
-  YYSYMBOL_porttype_decl = 489,            /* porttype_decl  */
-  YYSYMBOL_490_176 = 490,                  /* $@176  */
-  YYSYMBOL_491_177 = 491,                  /* @177  */
-  YYSYMBOL_492_178 = 492,                  /* $@178  */
-  YYSYMBOL_493_179 = 493,                  /* $@179  */
-  YYSYMBOL_at_least_one_port_export = 494, /* at_least_one_port_export  */
-  YYSYMBOL_port_exports = 495,             /* port_exports  */
-  YYSYMBOL_port_export = 496,              /* port_export  */
+  YYSYMBOL_home_inheritance_spec = 453,    /* home_inheritance_spec  */
+  YYSYMBOL_454_162 = 454,                  /* $@162  */
+  YYSYMBOL_primary_key_spec = 455,         /* primary_key_spec  */
+  YYSYMBOL_home_body = 456,                /* home_body  */
+  YYSYMBOL_457_163 = 457,                  /* $@163  */
+  YYSYMBOL_458_164 = 458,                  /* $@164  */
+  YYSYMBOL_home_exports = 459,             /* home_exports  */
+  YYSYMBOL_home_export = 460,              /* home_export  */
+  YYSYMBOL_461_165 = 461,                  /* $@165  */
+  YYSYMBOL_462_166 = 462,                  /* $@166  */
+  YYSYMBOL_factory_decl = 463,             /* factory_decl  */
+  YYSYMBOL_464_167 = 464,                  /* $@167  */
+  YYSYMBOL_465_168 = 465,                  /* $@168  */
+  YYSYMBOL_finder_decl = 466,              /* finder_decl  */
+  YYSYMBOL_467_169 = 467,                  /* $@169  */
+  YYSYMBOL_468_170 = 468,                  /* $@170  */
+  YYSYMBOL_event = 469,                    /* event  */
+  YYSYMBOL_event_forward_decl = 470,       /* event_forward_decl  */
+  YYSYMBOL_event_concrete_forward_decl = 471, /* event_concrete_forward_decl  */
+  YYSYMBOL_event_abs_forward_decl = 472,   /* event_abs_forward_decl  */
+  YYSYMBOL_event_abs_decl = 473,           /* event_abs_decl  */
+  YYSYMBOL_474_171 = 474,                  /* $@171  */
+  YYSYMBOL_475_172 = 475,                  /* $@172  */
+  YYSYMBOL_476_173 = 476,                  /* $@173  */
+  YYSYMBOL_event_abs_header = 477,         /* event_abs_header  */
+  YYSYMBOL_event_custom_header = 478,      /* event_custom_header  */
+  YYSYMBOL_event_plain_header = 479,       /* event_plain_header  */
+  YYSYMBOL_event_rest_of_header = 480,     /* event_rest_of_header  */
+  YYSYMBOL_481_174 = 481,                  /* $@174  */
+  YYSYMBOL_event_decl = 482,               /* event_decl  */
+  YYSYMBOL_483_175 = 483,                  /* @175  */
+  YYSYMBOL_484_176 = 484,                  /* $@176  */
+  YYSYMBOL_485_177 = 485,                  /* $@177  */
+  YYSYMBOL_event_header = 486,             /* event_header  */
+  YYSYMBOL_formal_parameter_type = 487,    /* formal_parameter_type  */
+  YYSYMBOL_at_least_one_formal_parameter = 488, /* at_least_one_formal_parameter  */
+  YYSYMBOL_formal_parameters = 489,        /* formal_parameters  */
+  YYSYMBOL_formal_parameter = 490,         /* formal_parameter  */
+  YYSYMBOL_at_least_one_formal_parameter_name = 491, /* at_least_one_formal_parameter_name  */
+  YYSYMBOL_formal_parameter_names = 492,   /* formal_parameter_names  */
+  YYSYMBOL_formal_parameter_name = 493,    /* formal_parameter_name  */
+  YYSYMBOL_porttype_decl = 494,            /* porttype_decl  */
+  YYSYMBOL_495_178 = 495,                  /* $@178  */
+  YYSYMBOL_496_179 = 496,                  /* @179  */
   YYSYMBOL_497_180 = 497,                  /* $@180  */
-  YYSYMBOL_extended_port_decl = 498,       /* extended_port_decl  */
-  YYSYMBOL_at_least_one_actual_parameter = 499, /* at_least_one_actual_parameter  */
-  YYSYMBOL_actual_parameters = 500,        /* actual_parameters  */
-  YYSYMBOL_actual_parameter = 501,         /* actual_parameter  */
-  YYSYMBOL_connector_decl = 502,           /* connector_decl  */
-  YYSYMBOL_connector_header = 503,         /* connector_header  */
-  YYSYMBOL_504_181 = 504,                  /* $@181  */
-  YYSYMBOL_505_182 = 505,                  /* $@182  */
-  YYSYMBOL_connector_body = 506,           /* connector_body  */
-  YYSYMBOL_507_183 = 507,                  /* $@183  */
-  YYSYMBOL_508_184 = 508,                  /* $@184  */
-  YYSYMBOL_connector_exports = 509,        /* connector_exports  */
-  YYSYMBOL_connector_export = 510,         /* connector_export  */
-  YYSYMBOL_511_185 = 511,                  /* $@185  */
-  YYSYMBOL_512_186 = 512,                  /* $@186  */
-  YYSYMBOL_513_187 = 513,                  /* $@187  */
-  YYSYMBOL_514_188 = 514                   /* $@188  */
+  YYSYMBOL_498_181 = 498,                  /* $@181  */
+  YYSYMBOL_at_least_one_port_export = 499, /* at_least_one_port_export  */
+  YYSYMBOL_port_exports = 500,             /* port_exports  */
+  YYSYMBOL_port_export = 501,              /* port_export  */
+  YYSYMBOL_502_182 = 502,                  /* $@182  */
+  YYSYMBOL_extended_port_decl = 503,       /* extended_port_decl  */
+  YYSYMBOL_at_least_one_actual_parameter = 504, /* at_least_one_actual_parameter  */
+  YYSYMBOL_actual_parameters = 505,        /* actual_parameters  */
+  YYSYMBOL_actual_parameter = 506,         /* actual_parameter  */
+  YYSYMBOL_connector_decl = 507,           /* connector_decl  */
+  YYSYMBOL_connector_header = 508,         /* connector_header  */
+  YYSYMBOL_509_183 = 509,                  /* $@183  */
+  YYSYMBOL_510_184 = 510,                  /* $@184  */
+  YYSYMBOL_connector_body = 511,           /* connector_body  */
+  YYSYMBOL_512_185 = 512,                  /* $@185  */
+  YYSYMBOL_513_186 = 513,                  /* $@186  */
+  YYSYMBOL_connector_exports = 514,        /* connector_exports  */
+  YYSYMBOL_connector_export = 515,         /* connector_export  */
+  YYSYMBOL_516_187 = 516,                  /* $@187  */
+  YYSYMBOL_517_188 = 517,                  /* $@188  */
+  YYSYMBOL_518_189 = 518,                  /* $@189  */
+  YYSYMBOL_519_190 = 519                   /* $@190  */
 };
 typedef enum yysymbol_kind_t yysymbol_kind_t;
 
 
 
+
 #ifdef short
 # undef short
 #endif
@@ -848,12 +855,18 @@ typedef int yy_state_fast_t;
 # define YY_USE(E) /* empty */
 #endif
 
-#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                            \
+#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__
+# if __GNUC__ * 100 + __GNUC_MINOR__ < 407
+#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
+    _Pragma ("GCC diagnostic push")                                     \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")
+# else
+#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
     _Pragma ("GCC diagnostic push")                                     \
     _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")              \
     _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# endif
 # define YY_IGNORE_MAYBE_UNINITIALIZED_END      \
     _Pragma ("GCC diagnostic pop")
 #else
@@ -1012,19 +1025,19 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  4
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   2102
+#define YYLAST   2130
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  117
+#define YYNTOKENS  118
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  398
+#define YYNNTS  402
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  607
+#define YYNRULES  613
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  888
+#define YYNSTATES  901
 
 /* YYMAXUTOK -- Last valid token kind.  */
-#define YYMAXUTOK   350
+#define YYMAXUTOK   351
 
 
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
@@ -1041,16 +1054,16 @@ static const yytype_int8 yytranslate[] =
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,   111,   106,     2,
-     113,   114,   109,   107,   102,   108,     2,   110,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,   101,    96,
-      99,   103,   100,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,   112,   107,     2,
+     114,   115,   110,   108,   103,   109,     2,   111,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,   102,    97,
+     100,   104,   101,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   115,     2,   116,   105,     2,     2,     2,     2,     2,
+       2,   116,     2,   117,   106,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    97,   104,    98,   112,     2,     2,     2,
+       2,     2,     2,    98,   105,    99,   113,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1073,74 +1086,75 @@ static const yytype_int8 yytranslate[] =
       65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
       75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95
+      95,    96
 };
 
 #if YYDEBUG
-  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+/* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_int16 yyrline[] =
 {
-       0,   414,   414,   417,   418,   426,   441,   445,   446,   447,
-     452,   451,   460,   459,   468,   467,   476,   475,   484,   483,
-     492,   491,   500,   499,   508,   507,   516,   515,   524,   523,
-     532,   531,   540,   539,   548,   547,   556,   555,   564,   563,
-     577,   576,   588,   627,   631,   587,   647,   655,   669,   679,
-     709,   713,   654,   738,   742,   743,   747,   748,   753,   758,
-     752,   844,   849,   843,   920,   921,   926,   964,   968,   925,
-     985,   984,   996,  1033,  1063,  1096,  1095,  1104,  1111,  1112,
-    1113,  1114,  1118,  1123,  1128,  1175,  1179,  1127,  1208,  1251,
-    1255,  1206,  1274,  1272,  1312,  1311,  1323,  1327,  1334,  1339,
-    1346,  1371,  1399,  1465,  1484,  1488,  1492,  1493,  1505,  1504,
-    1522,  1526,  1533,  1554,  1555,  1559,  1574,  1579,  1578,  1587,
-    1586,  1595,  1594,  1603,  1602,  1611,  1610,  1619,  1618,  1627,
-    1626,  1635,  1634,  1647,  1659,  1657,  1682,  1689,  1699,  1698,
-    1724,  1722,  1747,  1757,  1768,  1812,  1839,  1871,  1875,  1879,
-    1883,  1870,  1945,  1946,  1947,  1948,  1949,  1950,  1951,  1955,
-    1959,  2027,  2029,  2031,  2032,  2044,  2045,  2057,  2058,  2070,
-    2071,  2080,  2092,  2093,  2102,  2114,  2115,  2124,  2133,  2145,
-    2146,  2155,  2164,  2176,  2233,  2234,  2241,  2245,  2250,  2257,
-    2264,  2268,  2273,  2277,  2281,  2285,  2292,  2361,  2360,  2389,
-    2390,  2394,  2395,  2396,  2398,  2397,  2406,  2407,  2411,  2467,
-    2471,  2478,  2491,  2501,  2509,  2508,  2596,  2600,  2607,  2616,
-    2623,  2631,  2637,  2644,  2657,  2656,  2665,  2669,  2673,  2677,
-    2705,  2713,  2712,  2783,  2784,  2788,  2795,  2796,  2822,  2823,
-    2824,  2825,  2826,  2827,  2828,  2829,  2833,  2834,  2835,  2836,
-    2840,  2841,  2842,  2846,  2847,  2851,  2863,  2861,  2886,  2893,
-    2894,  2898,  2910,  2908,  2933,  2940,  2956,  2974,  2975,  2979,
-    2983,  2987,  2991,  2995,  2999,  3003,  3010,  3014,  3018,  3022,
-    3026,  3030,  3034,  3041,  3045,  3049,  3056,  3063,  3067,  3074,
-    3081,  3088,  3095,  3103,  3102,  3116,  3147,  3151,  3115,  3168,
-    3171,  3172,  3176,  3194,  3198,  3193,  3256,  3255,  3268,  3267,
-    3280,  3284,  3317,  3321,  3380,  3384,  3279,  3406,  3413,  3426,
-    3435,  3442,  3443,  3552,  3555,  3556,  3561,  3565,  3560,  3601,
-    3600,  3612,  3622,  3640,  3648,  3647,  3661,  3665,  3660,  3681,
-    3680,  3730,  3755,  3779,  3783,  3814,  3818,  3778,  3842,  3847,
-    3845,  3851,  3855,  3895,  3899,  3893,  3983,  4050,  4059,  4049,
-    4073,  4083,  4087,  4081,  4129,  4155,  4164,  4168,  4162,  4210,
-    4236,  4244,  4243,  4286,  4296,  4314,  4322,  4326,  4321,  4386,
-    4387,  4392,  4396,  4400,  4404,  4391,  4463,  4467,  4471,  4475,
-    4462,  4543,  4547,  4579,  4583,  4542,  4600,  4604,  4665,  4669,
-    4599,  4706,  4711,  4716,  4723,  4724,  4735,  4740,  4783,  4734,
-    4805,  4804,  4813,  4812,  4823,  4828,  4826,  4832,  4837,  4841,
-    4836,  4880,  4879,  4888,  4887,  4898,  4903,  4901,  4907,  4912,
-    4916,  4911,  4961,  4968,  4969,  4970,  5077,  5081,  5085,  5093,
-    5097,  5092,  5106,  5114,  5118,  5113,  5127,  5135,  5139,  5134,
-    5148,  5156,  5160,  5155,  5169,  5176,  5188,  5186,  5209,  5216,
-    5246,  5285,  5286,  5290,  5321,  5363,  5367,  5320,  5386,  5390,
-    5384,  5431,  5430,  5438,  5445,  5460,  5461,  5466,  5465,  5475,
-    5474,  5484,  5483,  5493,  5492,  5502,  5501,  5511,  5510,  5520,
-    5519,  5530,  5623,  5629,  5654,  5761,  5770,  5774,  5781,  5856,
-    5928,  6004,  6003,  6053,  6057,  6061,  6065,  6069,  6073,  6052,
-    6126,  6125,  6133,  6140,  6145,  6153,  6157,  6152,  6167,  6168,
-    6172,  6174,  6173,  6182,  6181,  6194,  6217,  6192,  6243,  6270,
-    6241,  6294,  6295,  6296,  6300,  6301,  6305,  6334,  6366,  6410,
-    6414,  6364,  6431,  6440,  6458,  6469,  6468,  6506,  6557,  6561,
-    6504,  6578,  6582,  6589,  6593,  6597,  6601,  6605,  6609,  6613,
-    6617,  6621,  6625,  6633,  6664,  6677,  6684,  6709,  6727,  6734,
-    6749,  6756,  6766,  6770,  6789,  6797,  6765,  6812,  6827,  6831,
-    6832,  6836,  6837,  6839,  6838,  6849,  6916,  6964,  6980,  6993,
-    7000,  7059,  7067,  7071,  7066,  7132,  7136,  7131,  7149,  7150,
-    7155,  7154,  7163,  7162,  7171,  7170,  7179,  7178
+       0,   419,   419,   422,   423,   431,   446,   450,   451,   452,
+     457,   456,   465,   464,   473,   472,   481,   480,   489,   488,
+     497,   496,   505,   504,   513,   512,   521,   520,   529,   528,
+     537,   536,   545,   544,   553,   552,   561,   560,   569,   568,
+     582,   581,   593,   632,   636,   592,   652,   660,   674,   684,
+     714,   718,   659,   743,   747,   748,   752,   753,   758,   763,
+     757,   849,   854,   848,   925,   926,   931,   969,   973,   930,
+     990,   989,  1001,  1038,  1068,  1101,  1100,  1109,  1116,  1117,
+    1118,  1119,  1123,  1128,  1133,  1180,  1184,  1132,  1213,  1256,
+    1260,  1211,  1279,  1277,  1317,  1316,  1328,  1332,  1339,  1344,
+    1351,  1376,  1404,  1470,  1489,  1493,  1497,  1498,  1510,  1509,
+    1527,  1531,  1538,  1559,  1560,  1564,  1579,  1584,  1583,  1592,
+    1591,  1600,  1599,  1608,  1607,  1616,  1615,  1624,  1623,  1632,
+    1631,  1640,  1639,  1652,  1664,  1662,  1687,  1694,  1704,  1703,
+    1729,  1727,  1752,  1762,  1773,  1817,  1844,  1876,  1880,  1884,
+    1888,  1875,  1950,  1951,  1952,  1953,  1954,  1955,  1956,  1960,
+    1964,  2032,  2034,  2036,  2037,  2049,  2050,  2062,  2063,  2075,
+    2076,  2085,  2097,  2098,  2107,  2119,  2120,  2129,  2138,  2150,
+    2151,  2160,  2169,  2181,  2238,  2239,  2246,  2250,  2255,  2262,
+    2269,  2273,  2278,  2282,  2286,  2290,  2297,  2366,  2365,  2394,
+    2395,  2399,  2400,  2401,  2403,  2402,  2411,  2412,  2416,  2472,
+    2476,  2483,  2496,  2506,  2514,  2513,  2601,  2605,  2612,  2621,
+    2628,  2636,  2642,  2649,  2662,  2661,  2670,  2674,  2678,  2682,
+    2710,  2718,  2717,  2788,  2789,  2793,  2800,  2801,  2827,  2828,
+    2829,  2830,  2831,  2832,  2833,  2834,  2838,  2839,  2840,  2841,
+    2842,  2846,  2847,  2848,  2852,  2853,  2857,  2869,  2867,  2892,
+    2899,  2900,  2904,  2916,  2914,  2939,  2946,  2962,  2980,  2981,
+    2985,  2989,  2993,  2997,  3001,  3005,  3009,  3016,  3020,  3024,
+    3028,  3032,  3036,  3040,  3047,  3051,  3055,  3062,  3069,  3073,
+    3080,  3087,  3094,  3101,  3109,  3108,  3122,  3153,  3157,  3121,
+    3174,  3177,  3178,  3182,  3200,  3204,  3199,  3262,  3261,  3274,
+    3273,  3286,  3290,  3323,  3327,  3386,  3390,  3285,  3412,  3419,
+    3432,  3441,  3448,  3449,  3558,  3561,  3562,  3567,  3571,  3566,
+    3607,  3606,  3618,  3628,  3646,  3654,  3653,  3667,  3671,  3666,
+    3687,  3686,  3736,  3761,  3785,  3789,  3820,  3824,  3784,  3848,
+    3853,  3851,  3857,  3861,  3899,  3963,  3973,  3962,  3998,  4002,
+    3996,  4086,  4153,  4162,  4152,  4176,  4186,  4190,  4184,  4232,
+    4258,  4267,  4271,  4265,  4313,  4339,  4347,  4346,  4389,  4399,
+    4417,  4425,  4429,  4424,  4489,  4490,  4495,  4499,  4503,  4507,
+    4494,  4566,  4570,  4574,  4578,  4565,  4646,  4650,  4682,  4686,
+    4645,  4703,  4707,  4768,  4772,  4702,  4809,  4814,  4819,  4826,
+    4827,  4838,  4843,  4886,  4837,  4908,  4907,  4916,  4915,  4926,
+    4931,  4929,  4935,  4940,  4944,  4939,  4983,  4982,  4991,  4990,
+    5001,  5006,  5004,  5010,  5015,  5019,  5014,  5064,  5071,  5072,
+    5073,  5228,  5232,  5236,  5244,  5248,  5243,  5257,  5265,  5269,
+    5264,  5278,  5286,  5290,  5285,  5299,  5307,  5311,  5306,  5320,
+    5327,  5339,  5337,  5360,  5367,  5397,  5436,  5437,  5441,  5472,
+    5514,  5518,  5471,  5537,  5541,  5535,  5582,  5581,  5589,  5596,
+    5611,  5612,  5617,  5616,  5626,  5625,  5635,  5634,  5644,  5643,
+    5653,  5652,  5662,  5661,  5671,  5670,  5681,  5774,  5780,  5805,
+    5912,  5921,  5925,  5932,  6007,  6079,  6155,  6154,  6204,  6208,
+    6212,  6216,  6220,  6224,  6203,  6277,  6276,  6284,  6291,  6296,
+    6304,  6308,  6303,  6318,  6319,  6323,  6325,  6324,  6333,  6332,
+    6345,  6368,  6343,  6394,  6421,  6392,  6445,  6446,  6447,  6451,
+    6452,  6456,  6485,  6517,  6561,  6565,  6515,  6582,  6591,  6609,
+    6620,  6619,  6657,  6708,  6712,  6655,  6729,  6733,  6740,  6744,
+    6748,  6752,  6756,  6760,  6764,  6768,  6772,  6776,  6780,  6788,
+    6819,  6832,  6839,  6864,  6882,  6889,  6904,  6911,  6921,  6925,
+    6944,  6952,  6920,  6967,  6982,  6986,  6987,  6991,  6992,  6994,
+    6993,  7004,  7071,  7119,  7135,  7148,  7155,  7214,  7222,  7226,
+    7221,  7287,  7291,  7286,  7304,  7305,  7310,  7309,  7318,  7317,
+    7326,  7325,  7334,  7333
 };
 #endif
 
@@ -1161,8 +1175,8 @@ static const char *const yytname[] =
   "IDL_SHORT", "IDL_UNSIGNED", "IDL_DOUBLE", "IDL_FLOAT", "IDL_CHAR",
   "IDL_WCHAR", "IDL_OCTET", "IDL_BOOLEAN", "IDL_FIXED", "IDL_ANY",
   "IDL_OBJECT", "IDL_STRUCT", "IDL_UNION", "IDL_SWITCH", "IDL_ENUM",
-  "IDL_SEQUENCE", "IDL_STRING", "IDL_WSTRING", "IDL_EXCEPTION", "IDL_CASE",
-  "IDL_DEFAULT", "IDL_READONLY", "IDL_ATTRIBUTE", "IDL_ONEWAY",
+  "IDL_SEQUENCE", "IDL_MAP", "IDL_STRING", "IDL_WSTRING", "IDL_EXCEPTION",
+  "IDL_CASE", "IDL_DEFAULT", "IDL_READONLY", "IDL_ATTRIBUTE", "IDL_ONEWAY",
   "IDL_IDEMPOTENT", "IDL_VOID", "IDL_IN", "IDL_OUT", "IDL_INOUT",
   "IDL_RAISES", "IDL_CONTEXT", "IDL_NATIVE", "IDL_LOCAL", "IDL_ABSTRACT",
   "IDL_CUSTOM", "IDL_FACTORY", "IDL_PRIVATE", "IDL_PUBLIC", "IDL_SUPPORTS",
@@ -1224,46 +1238,47 @@ static const char *const yytname[] =
   "$@82", "$@83", "$@84", "element_spec", "$@85", "struct_forward_type",
   "union_forward_type", "enum_type", "$@86", "$@87", "$@88", "$@89",
   "at_least_one_enumerator", "enumerators", "$@90", "enumerator",
-  "sequence_type_spec", "$@91", "$@92", "seq_head", "$@93", "$@94",
-  "fixed_type_spec", "string_type_spec", "$@95", "$@96", "string_head",
-  "wstring_type_spec", "$@97", "$@98", "wstring_head", "array_declarator",
-  "$@99", "at_least_one_array_dim", "array_dims", "array_dim", "$@100",
-  "$@101", "attribute", "attribute_readonly", "$@102", "$@103", "$@104",
-  "$@105", "attribute_readwrite", "$@106", "$@107", "$@108", "$@109",
-  "exception", "$@110", "@111", "$@112", "$@113", "operation", "$@114",
-  "$@115", "$@116", "$@117", "opt_op_attribute", "op_type_spec",
-  "init_decl", "$@118", "@119", "$@120", "init_parameter_list", "$@121",
-  "$@122", "at_least_one_in_parameter", "in_parameters", "$@123",
-  "in_parameter", "$@124", "$@125", "parameter_list", "$@126", "$@127",
-  "at_least_one_parameter", "parameters", "$@128", "parameter", "$@129",
-  "$@130", "param_type_spec", "direction", "opt_raises", "$@131", "$@132",
-  "opt_getraises", "$@133", "$@134", "opt_setraises", "$@135", "$@136",
-  "opt_context", "$@137", "$@138", "at_least_one_string_literal",
-  "string_literals", "$@139", "typeid_dcl", "typeprefix_dcl", "component",
-  "component_forward_decl", "component_decl", "@140", "$@141", "$@142",
-  "component_header", "$@143", "$@144", "component_inheritance_spec",
-  "$@145", "component_exports", "component_export", "$@146", "$@147",
-  "$@148", "$@149", "$@150", "$@151", "$@152", "provides_decl",
+  "map_type_spec", "map_head", "$@91", "$@92", "sequence_type_spec",
+  "$@93", "$@94", "seq_head", "$@95", "$@96", "fixed_type_spec",
+  "string_type_spec", "$@97", "$@98", "string_head", "wstring_type_spec",
+  "$@99", "$@100", "wstring_head", "array_declarator", "$@101",
+  "at_least_one_array_dim", "array_dims", "array_dim", "$@102", "$@103",
+  "attribute", "attribute_readonly", "$@104", "$@105", "$@106", "$@107",
+  "attribute_readwrite", "$@108", "$@109", "$@110", "$@111", "exception",
+  "$@112", "@113", "$@114", "$@115", "operation", "$@116", "$@117",
+  "$@118", "$@119", "opt_op_attribute", "op_type_spec", "init_decl",
+  "$@120", "@121", "$@122", "init_parameter_list", "$@123", "$@124",
+  "at_least_one_in_parameter", "in_parameters", "$@125", "in_parameter",
+  "$@126", "$@127", "parameter_list", "$@128", "$@129",
+  "at_least_one_parameter", "parameters", "$@130", "parameter", "$@131",
+  "$@132", "param_type_spec", "direction", "opt_raises", "$@133", "$@134",
+  "opt_getraises", "$@135", "$@136", "opt_setraises", "$@137", "$@138",
+  "opt_context", "$@139", "$@140", "at_least_one_string_literal",
+  "string_literals", "$@141", "typeid_dcl", "typeprefix_dcl", "component",
+  "component_forward_decl", "component_decl", "@142", "$@143", "$@144",
+  "component_header", "$@145", "$@146", "component_inheritance_spec",
+  "$@147", "component_exports", "component_export", "$@148", "$@149",
+  "$@150", "$@151", "$@152", "$@153", "$@154", "provides_decl",
   "interface_type", "uses_decl", "uses_opt_multiple", "opt_multiple",
-  "emits_decl", "publishes_decl", "consumes_decl", "home_decl", "$@153",
-  "home_header", "$@154", "$@155", "$@156", "$@157", "$@158", "$@159",
-  "home_inheritance_spec", "$@160", "primary_key_spec", "home_body",
-  "$@161", "$@162", "home_exports", "home_export", "$@163", "$@164",
-  "factory_decl", "$@165", "$@166", "finder_decl", "$@167", "$@168",
+  "emits_decl", "publishes_decl", "consumes_decl", "home_decl", "$@155",
+  "home_header", "$@156", "$@157", "$@158", "$@159", "$@160", "$@161",
+  "home_inheritance_spec", "$@162", "primary_key_spec", "home_body",
+  "$@163", "$@164", "home_exports", "home_export", "$@165", "$@166",
+  "factory_decl", "$@167", "$@168", "finder_decl", "$@169", "$@170",
   "event", "event_forward_decl", "event_concrete_forward_decl",
-  "event_abs_forward_decl", "event_abs_decl", "$@169", "$@170", "$@171",
+  "event_abs_forward_decl", "event_abs_decl", "$@171", "$@172", "$@173",
   "event_abs_header", "event_custom_header", "event_plain_header",
-  "event_rest_of_header", "$@172", "event_decl", "@173", "$@174", "$@175",
+  "event_rest_of_header", "$@174", "event_decl", "@175", "$@176", "$@177",
   "event_header", "formal_parameter_type", "at_least_one_formal_parameter",
   "formal_parameters", "formal_parameter",
   "at_least_one_formal_parameter_name", "formal_parameter_names",
-  "formal_parameter_name", "porttype_decl", "$@176", "@177", "$@178",
-  "$@179", "at_least_one_port_export", "port_exports", "port_export",
-  "$@180", "extended_port_decl", "at_least_one_actual_parameter",
+  "formal_parameter_name", "porttype_decl", "$@178", "@179", "$@180",
+  "$@181", "at_least_one_port_export", "port_exports", "port_export",
+  "$@182", "extended_port_decl", "at_least_one_actual_parameter",
   "actual_parameters", "actual_parameter", "connector_decl",
-  "connector_header", "$@181", "$@182", "connector_body", "$@183", "$@184",
-  "connector_exports", "connector_export", "$@185", "$@186", "$@187",
-  "$@188", YY_NULLPTR
+  "connector_header", "$@183", "$@184", "connector_body", "$@185", "$@186",
+  "connector_exports", "connector_export", "$@187", "$@188", "$@189",
+  "$@190", YY_NULLPTR
 };
 
 static const char *
@@ -1273,912 +1288,907 @@ yysymbol_name (yysymbol_kind_t yysymbol)
 }
 #endif
 
-#ifdef YYPRINT
-/* YYTOKNUM[NUM] -- (External) token number corresponding to the
-   (internal) symbol number NUM (which must be that of a token).  */
-static const yytype_int16 yytoknum[] =
-{
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,   346,   347,   348,   349,   350,    59,   123,   125,    60,
-      62,    58,    44,    61,   124,    94,    38,    43,    45,    42,
-      47,    37,   126,    40,    41,    91,    93
-};
-#endif
-
-#define YYPACT_NINF (-672)
+#define YYPACT_NINF (-679)
 
 #define yypact_value_is_default(Yyn) \
   ((Yyn) == YYPACT_NINF)
 
-#define YYTABLE_NINF (-576)
+#define YYTABLE_NINF (-582)
 
 #define yytable_value_is_error(Yyn) \
   0
 
-  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-     STATE-NUM.  */
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
-    -672,    90,  1339,  -672,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,   141,   144,    57,    58,  -672,   141,
-     141,  -672,    56,    56,  -672,  -672,   141,  -672,  -672,    60,
-    -672,   461,    79,    81,  -672,  -672,    -8,  -672,  -672,  -672,
-    -672,  -672,  -672,   537,  -672,  -672,  -672,  -672,  -672,  1539,
-      61,  -672,  -672,    85,  -672,   146,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,    70,  -672,  -672,  -672,    70,  -672,
-    -672,   119,   139,  2013,    56,   141,  1892,   141,   141,   141,
-     141,  -672,  -672,  -672,    13,   141,    39,  -672,    40,   141,
-    -672,    70,   141,   149,   150,   141,  -672,  -672,    26,  -672,
-      33,   233,  -672,   153,  -672,   154,   157,  1651,  -672,  -672,
-    -672,   158,   207,  -672,   168,   170,   172,   140,  -672,   198,
-    -672,  -672,  -672,  -672,  -672,  -672,   171,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,   184,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,   146,
-    -672,  -672,  -672,    72,  -672,  -672,   175,  -672,   178,   182,
-     185,  -672,    56,   188,   190,   187,  -672,   191,   194,   195,
-     196,   197,   199,   202,   204,  -672,  -672,  -672,   205,   208,
-    -672,  -672,  -672,  -672,   184,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,   184,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,   211,  -672,   206,  -672,  -672,   148,  -672,
-     276,  -672,  -672,  -672,  -672,    44,  -672,  -672,  -672,  2013,
-    -672,  -672,  -672,  -672,   181,  -672,  -672,  -672,  -672,   290,
-    -672,  -672,    54,   210,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,   303,  -672,   135,   214,   267,  -672,  -672,  -672,
-    -672,  -672,  -672,   184,  -672,  -672,   203,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,  -672,   267,   218,   223,  -672,
-    -672,  -672,   141,   141,   224,   230,  -672,  -672,  -672,   227,
-    -672,   276,   236,  -672,  -672,  -672,  -672,  -672,   327,  -672,
-     238,   239,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,   183,   183,   183,   135,   184,  -672,  -672,   235,
-     241,   234,   128,   114,    14,  -672,  -672,  -672,  -672,  -672,
-      56,  -672,  -672,  -672,  -672,   240,  -672,    56,  -672,   135,
-     135,   135,   231,  -672,  -672,  -672,  -672,  -672,  -672,  -672,
-     133,  -672,     1,  -672,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,    56,   267,  -672,  -672,  -672,  -672,   148,   565,  1453,
-     245,   247,  -672,  1651,  -672,  -672,  -672,   244,   135,   135,
-     135,   135,   135,   135,   135,   135,   135,   135,   246,   141,
-    -672,   184,  1103,  -672,   825,   135,  -672,  -672,  -672,  -672,
-    -672,   135,  -672,  1403,  -672,  -672,  -672,   381,  1011,  -672,
-    -672,  -672,  -672,    68,   292,    56,    56,  -672,  -672,  -672,
-    -672,  -672,    68,  -672,   253,  -672,   249,  -672,   252,  -672,
-    -672,  1196,   184,  -672,    56,   267,  -672,  -672,  -672,  -672,
-     263,  -672,  -672,   141,  -672,  -672,   264,   265,   359,   268,
-    -672,  -672,   241,   234,   128,   114,   114,    14,    14,  -672,
-    -672,  -672,  -672,  -672,   262,  -672,  -672,  -672,   269,  -672,
-    -672,  1805,  -672,  -672,  -672,  -672,  1926,  -672,  -672,  -672,
-    -672,  -672,   270,  -672,  1839,  -672,  -672,  1716,  -672,   266,
-    1627,   271,   277,   278,   280,  -672,   255,  -672,   285,  -672,
-    -672,  -672,   281,   282,   711,    56,    56,    56,   237,  -672,
-     294,  -672,  -672,  -672,  -672,  -672,  -672,  -672,   141,   141,
-    -672,   295,  -672,  -672,  -672,  1289,   918,   357,  1979,  -672,
-     184,   276,  -672,  -672,    65,    66,   298,   302,   309,   276,
-     310,  -672,  -672,     2,  -672,    47,  -672,  -672,   301,   311,
-     184,  -672,   315,   160,  1892,  -672,   378,  -672,  -672,  -672,
-    -672,    54,  -672,   312,  -672,   319,  -672,   322,   324,   325,
-     328,  -672,   184,  -672,  -672,  -672,  -672,  -672,   329,   330,
-     420,  -672,  -672,  -672,   338,  -672,  -672,  -672,  -672,  -672,
-     135,  -672,   276,  -672,   339,   141,  -672,  -672,   428,   184,
-    -672,  -672,  -672,  -672,  -672,  -672,    69,    69,    69,  -672,
-     342,  -672,   343,   348,   349,   351,   355,   356,  -672,  -672,
-    -672,   364,   365,   368,   372,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,   135,  -672,  -672,  -672,   141,
-    -672,   373,   375,   376,  -672,   409,   382,   160,  -672,   387,
-     390,  -672,   391,   135,   393,  1514,  -672,    56,  -672,  -672,
-    -672,  -672,  -672,  -672,   487,  -672,  -672,  -672,  -672,  -672,
-     280,   285,  -672,  -672,   377,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,   383,   383,  -672,  -672,  -672,
-    -672,  1979,   141,  -672,   135,   384,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,   401,  -672,  -672,  -672,  -672,  -672,    56,
-    -672,  -672,  -672,  -672,   402,   184,  -672,   383,  -672,   404,
-    -672,   466,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,
-      56,  -672,   184,   405,   635,  -672,   389,  -672,  -672,   407,
-     394,   470,   471,   471,   141,   456,   410,   397,  -672,   184,
-     416,  -672,  -672,   403,  -672,   471,  -672,  -672,  -672,   406,
-    -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,   462,
-     519,   411,   152,   471,  -672,    75,  1979,  -672,   427,   417,
-     471,   418,   472,   141,    56,  -672,  -672,   433,  -672,  -672,
-    -672,  -672,  -672,   421,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,   184,  -672,   434,  -672,   436,  1979,   500,   445,
-     135,   442,   446,    55,  -672,   201,   141,   470,    56,    56,
-     451,   141,   519,  -672,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,  1603,  -672,  -672,  -672,   452,   453,  -672,  -672,
-    -672,   152,   141,   457,   464,  -672,  -672,  -672,  -672,    56,
-    -672,  -672,  -672,  -672,   141,   475,   473,   509,  -672,  -672,
-    -672,  -672,   478,   483,  -672,  -672,   514,  -672
+    -679,    94,  1414,  -679,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,    83,    51,    70,   106,  -679,    83,
+      83,  -679,    57,    57,  -679,  -679,    83,  -679,  -679,    15,
+    -679,   577,    29,    69,  -679,  -679,     7,  -679,  -679,  -679,
+    -679,  -679,  -679,   550,  -679,  -679,  -679,  -679,  -679,  1616,
+      21,  -679,  -679,    78,  -679,   126,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,    60,  -679,  -679,  -679,    60,  -679,
+    -679,    87,    91,  2010,    57,    83,  1887,    83,    83,    83,
+      83,  -679,  -679,  -679,    10,    83,    25,  -679,    76,    83,
+    -679,    60,    83,    97,   127,    83,  -679,  -679,    23,  -679,
+      26,   148,  -679,    92,  -679,   129,   138,  2062,  -679,  -679,
+    -679,   155,   196,  -679,   156,   158,   159,    85,  -679,   150,
+    -679,  -679,  -679,  -679,  -679,  -679,   168,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679,   163,  -679,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,
+     126,  -679,  -679,  -679,   157,  -679,     5,  -679,  -679,   169,
+    -679,   172,   176,   177,  -679,    57,   160,   178,   180,  -679,
+     184,   188,   189,   190,   191,   193,   194,   199,  -679,  -679,
+    -679,   200,   204,  -679,  -679,  -679,  -679,   163,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,   163,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,   205,  -679,   195,  -679,
+    -679,   207,  -679,   288,  -679,  -679,  -679,  -679,    44,  -679,
+    -679,  -679,  2010,  -679,  -679,  -679,  -679,   198,  -679,  -679,
+    -679,  -679,  -679,   300,  -679,  -679,    56,   210,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,   298,  -679,   186,   212,
+     216,   271,  -679,  -679,  -679,  -679,  -679,  -679,  -679,   163,
+    -679,  -679,   211,  -679,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679,   271,   228,   242,  -679,  -679,  -679,    83,    83,
+     250,   251,  -679,  -679,  -679,   253,  -679,   288,   254,  -679,
+    -679,  -679,  -679,  -679,   350,  -679,   257,   256,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,   135,   135,
+     135,   186,   163,  -679,  -679,   249,   255,   259,    89,    93,
+      86,  -679,  -679,  -679,  -679,  -679,    57,  -679,  -679,  -679,
+    -679,   264,  -679,  -679,    57,  -679,   186,   186,   186,   246,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,   173,  -679,    -6,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,    57,   271,
+    -679,  -679,  -679,  -679,   207,  1342,  1529,   269,   268,  -679,
+    2062,  -679,  -679,  -679,   258,   186,   186,   186,   186,   186,
+     186,   186,   186,   186,   186,   267,    83,  -679,   163,  1119,
+    -679,   838,   186,  -679,  1435,  -679,  -679,  -679,  -679,   186,
+    -679,  1479,  -679,  -679,  -679,   252,  1026,  -679,  -679,  -679,
+    -679,    53,   312,    57,    57,  -679,  -679,  -679,  -679,  -679,
+      53,  -679,   273,  -679,   272,  -679,   275,  -679,  -679,  1213,
+     163,  -679,    57,   271,  -679,  -679,  -679,  -679,   278,  -679,
+    -679,    83,  -679,  -679,   282,   283,   382,   289,  -679,  -679,
+     255,   259,    89,    93,    93,    86,    86,  -679,  -679,  -679,
+    -679,  -679,   285,  -679,  -679,  -679,   287,  -679,  -679,  1799,
+    -679,  -679,  -679,  -679,  1922,  -679,  -679,  -679,  -679,  -679,
+     292,  -679,  1834,  -679,  -679,  1709,  -679,   293,  1435,  -679,
+     299,   304,   306,   297,  -679,   301,  -679,   290,  -679,  -679,
+    -679,   314,   315,   503,    57,    57,    57,   276,  -679,   316,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,    83,    83,  -679,
+     318,  -679,  -679,  -679,  1307,   932,   388,  1975,  -679,   163,
+     288,  -679,  -679,    65,    67,   324,   328,   330,   288,   331,
+    -679,  -679,    -5,  -679,    49,  -679,  -679,   332,   333,   163,
+    -679,   337,   110,  1887,  -679,   399,  -679,  -679,  -679,  -679,
+      56,  -679,   341,  -679,   344,  -679,   345,   346,   347,   348,
+    -679,   163,  -679,  -679,  -679,  -679,  -679,   349,   352,   444,
+    -679,  -679,  -679,   353,  -679,  -679,   351,  -679,  -679,  -679,
+     186,  -679,   288,  -679,   355,    83,  -679,  -679,   445,   163,
+    -679,  -679,  -679,  -679,  -679,  -679,    71,    71,    71,  -679,
+     358,  -679,   359,   360,   362,   363,   366,   369,  -679,  -679,
+    -679,   370,   371,   376,   377,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,   186,  -679,  -679,  -679,    83,
+    -679,   379,   378,   384,  -679,   402,   386,   110,  -679,   390,
+     391,  -679,   392,   186,   393,  1591,  -679,    57,  -679,  -679,
+    -679,  -679,  -679,  -679,   488,  -679,  -679,  -679,  -679,  -679,
+    -679,   297,   290,  -679,  -679,   380,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,   383,   383,  -679,  -679,
+    -679,  -679,  1975,    83,  -679,   186,   389,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,   395,  -679,  -679,  -679,  -679,  -679,
+      57,  -679,  -679,  -679,  -679,   396,   163,  -679,   383,  1435,
+    -679,   397,  -679,   460,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679,    57,  -679,   163,   400,   668,  -679,   394,  -679,
+    -679,  -679,   409,   385,   462,   470,   470,    83,   454,   417,
+     404,  -679,   163,   422,  -679,  -679,   408,  -679,   470,  -679,
+    -679,  -679,   414,  -679,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679,   464,   527,   416,   170,   470,  -679,   153,  1975,
+    -679,   431,   423,   470,   424,   476,    83,    57,  -679,  -679,
+     439,  -679,  -679,  -679,  -679,  -679,   427,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,   163,  -679,   440,  -679,   441,
+    1975,   506,   450,   186,   446,   451,    54,  -679,   201,    83,
+     462,    57,    57,   435,    83,   527,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  1681,  -679,  -679,  -679,   437,
+     457,  -679,  -679,  -679,   170,    83,   442,   452,  -679,  -679,
+    -679,  -679,    57,  -679,  -679,  -679,  -679,    83,   458,   463,
+     504,  -679,  -679,  -679,  -679,   467,   491,  -679,  -679,   519,
+    -679
 };
 
-  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
-     Performed when YYTABLE does not specify something else to do.  Zero
-     means the default is an error.  */
+/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+   Performed when YYTABLE does not specify something else to do.  Zero
+   means the default is an error.  */
 static const yytype_int16 yydefact[] =
 {
        4,     0,     0,     3,     1,    38,   147,    40,    70,   224,
-     293,   308,   343,   391,     0,     0,     0,     0,    94,     0,
-       0,   503,     0,     0,   572,   592,     0,     6,     7,    42,
+     294,   309,   344,   396,     0,     0,     0,     0,    94,     0,
+       0,   508,     0,     0,   578,   598,     0,     6,     7,    42,
       24,    61,     0,     0,    22,    64,    77,    66,    26,    78,
       83,    79,    84,    77,    80,    81,    65,    18,    10,     0,
-       0,    12,   230,   295,   226,   342,   227,   253,   254,   228,
-      20,    14,    16,    28,   462,   461,   464,    30,   501,    32,
-     533,   535,   534,   532,    77,   551,   552,   531,    77,    34,
+       0,    12,   230,   296,   226,   343,   227,   254,   255,   228,
+      20,    14,    16,    28,   467,   466,   469,    30,   506,    32,
+     538,   540,   539,   537,    77,   556,   557,   536,    77,    34,
       36,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   143,   265,   229,    77,     0,    77,    88,    77,     0,
-      82,    77,     0,   468,   544,     0,   142,   138,     0,   137,
+       0,   143,   266,   229,    77,     0,    77,    88,    77,     0,
+      82,    77,     0,   473,   549,     0,   142,   138,     0,   137,
        0,     0,   213,     0,    46,     0,     0,     0,   213,     8,
-       9,     0,    97,    72,     0,     0,     0,   269,   271,     0,
-     283,   284,   287,   288,   289,   290,   286,   291,   292,   357,
-     365,   370,   272,   279,   273,   280,   274,   281,   275,   282,
-      92,   237,   102,   233,   235,   236,   234,   238,   267,   268,
-     239,   243,   240,   242,   241,   244,   245,   295,   250,     0,
-     251,   252,   246,     0,   249,   247,   364,   248,   369,     0,
-       0,     5,     0,   211,     0,     0,   310,     0,     0,     0,
-       0,     0,     0,     0,     0,   545,   538,   547,     0,     0,
-     595,   591,    39,   286,   160,   148,   152,   156,   157,   153,
-     154,   155,   158,   159,    41,    71,   225,   231,   294,   309,
-     344,   392,    73,   542,    74,     0,   543,    95,   473,   504,
-       0,   459,   140,   460,   573,     0,   197,    43,    25,     0,
-     558,   554,   555,   560,   557,   561,   559,   556,   553,     0,
-      48,   565,     0,     0,    23,    96,    75,    67,    27,    85,
-     270,   285,   276,   278,     0,     0,    99,   356,   353,   361,
-     366,    19,    11,   214,    13,   296,     0,    21,    15,    17,
-      29,   465,    31,   515,   502,    33,    99,     0,     0,    35,
-      37,   599,     0,     0,     0,     0,    89,   471,   469,   512,
-     139,     0,     0,   593,   212,   200,     4,   562,     0,   566,
-       0,   563,   186,   187,   188,   190,   193,   192,   194,   195,
-     191,   189,     0,     0,     0,     0,   183,   590,   161,   162,
-     163,   165,   167,   169,   172,   175,   179,   184,   589,    62,
-       0,   114,   105,   277,   196,     0,   358,     0,    93,     0,
-       0,     0,   217,   213,   311,   476,   519,   546,   539,   548,
-     596,   149,   265,   232,   258,   259,   260,   266,   345,   393,
-     114,     0,    99,   510,   505,   141,   574,   473,     0,     0,
-       3,     0,    49,     0,   180,   181,   182,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   587,     0,
-      76,   136,     0,   113,     0,     0,   213,    98,   354,   362,
-     367,     0,   215,     0,   297,   301,   213,   213,     0,   114,
-     105,   381,   386,     0,   497,     0,     0,   604,   379,   380,
-     600,   602,     0,   606,     0,   598,     0,   213,   255,   213,
-     301,     0,   472,   470,     0,    99,   580,   594,   204,   198,
-       0,   206,   199,     0,   201,   207,     0,     0,     0,     0,
-     564,   185,   164,   166,   168,   170,   171,   173,   174,   176,
-     177,   178,   213,    63,   133,   131,   401,   402,     0,   116,
-     123,     0,   117,   127,   125,   129,     0,   119,   121,   406,
-     111,   110,     0,   104,     0,   106,   107,     0,   108,     0,
-       0,     0,     0,     0,   137,   218,     0,   219,   222,   306,
-     303,   302,     0,   213,     0,     0,     0,     0,     0,   487,
-       0,   475,   477,   479,   481,   483,   485,   489,     0,     0,
-     520,     0,   518,   521,   523,     0,     0,     0,     0,   493,
-     492,     0,   496,   495,     0,     0,     0,     0,     0,     0,
-       0,   597,   150,     0,   256,     0,   346,   351,   213,     0,
-     511,   506,   579,   213,     0,   202,   210,   203,    45,   567,
-      50,     0,   134,     0,    69,     0,   115,     0,     0,     0,
-       0,   405,   435,   432,   433,   434,   396,   404,     0,     0,
-       0,    87,   112,   103,     0,   360,   359,   355,   363,   368,
-       0,   216,     0,   220,     0,     0,   298,   300,   269,   322,
-     317,   318,   319,   320,   312,   321,     0,     0,     0,   474,
-       0,   467,     0,     0,     0,     0,     0,     0,   525,   528,
-     517,     0,     0,     0,     0,   382,   387,   491,   585,   586,
-     605,   601,   603,   494,   607,     0,   376,   372,   375,     0,
-     352,     0,   348,     0,    91,     0,     0,     0,   583,     0,
-       0,   578,     0,     0,     0,     0,   588,     0,   132,   124,
-     118,   128,   126,   130,     0,   120,   122,   407,   109,   223,
-       0,   222,   307,   304,     0,   500,   498,   499,   488,   478,
-     480,   482,   484,   486,   490,     0,     0,   522,   524,   541,
-     550,     0,     0,   151,     0,   373,   257,   347,   349,   395,
-     507,   576,   577,     0,   581,   582,   205,   209,   208,     0,
-      56,    42,    51,    55,     0,   135,   397,     0,   221,     0,
-     313,   410,   526,   529,   383,   388,   264,   377,   374,   213,
-       0,   584,    58,     0,     0,    57,     0,   408,   305,     0,
-       0,     0,   442,   442,     0,   446,   261,     0,   350,   508,
-       0,    52,    54,   423,   398,   442,   314,   411,   418,     0,
-     417,   439,   527,   530,   384,   443,   389,   262,   378,   514,
-       0,     0,     0,   442,   409,     0,     0,   413,   414,     0,
-     442,     0,   450,     0,     0,   509,   571,     0,   570,   422,
-     436,   437,   438,     0,   428,   429,   399,   329,   336,   334,
-     315,   325,   326,   333,   419,   415,   440,   385,   444,   447,
-     390,   263,   513,    59,   568,   424,   425,     0,   454,     0,
-       0,     0,     0,     0,   213,   331,     0,     0,     0,     0,
-       0,     0,     0,   426,   430,   451,   400,   330,   337,   335,
-     316,   324,     0,   332,   420,   416,     0,     0,   448,    60,
-     569,     0,     0,     0,     0,   339,   327,   441,   445,     0,
-     427,   431,   452,   338,     0,     0,     0,     0,   340,   328,
-     449,   458,     0,   455,   453,   456,     0,   457
+       9,     0,    97,    72,     0,     0,     0,   270,   272,     0,
+     284,   285,   288,   289,   290,   291,   287,   292,   293,   362,
+     355,   370,   375,   273,   280,   274,   281,   275,   282,   276,
+     283,    92,   237,   102,   233,   235,   236,   234,   238,   268,
+     269,   239,   243,   240,   242,   241,   244,   245,   296,   251,
+       0,   252,   253,   250,     0,   246,     0,   249,   247,   369,
+     248,   374,     0,     0,     5,     0,   211,     0,     0,   311,
+       0,     0,     0,     0,     0,     0,     0,     0,   550,   543,
+     552,     0,     0,   601,   597,    39,   287,   160,   148,   152,
+     156,   157,   153,   154,   155,   158,   159,    41,    71,   225,
+     231,   295,   310,   345,   397,    73,   547,    74,     0,   548,
+      95,   478,   509,     0,   464,   140,   465,   579,     0,   197,
+      43,    25,     0,   564,   559,   560,   566,   562,   563,   567,
+     565,   561,   558,     0,    48,   571,     0,     0,    23,    96,
+      75,    67,    27,    85,   271,   286,   277,   279,     0,     0,
+       0,    99,   354,   361,   358,   366,   371,    19,    11,   214,
+      13,   297,     0,    21,    15,    17,    29,   470,    31,   520,
+     507,    33,    99,     0,     0,    35,    37,   605,     0,     0,
+       0,     0,    89,   476,   474,   517,   139,     0,     0,   599,
+     212,   200,     4,   568,     0,   572,     0,   569,   186,   187,
+     188,   190,   193,   192,   194,   195,   191,   189,     0,     0,
+       0,     0,   183,   596,   161,   162,   163,   165,   167,   169,
+     172,   175,   179,   184,   595,    62,     0,   114,   105,   278,
+     196,     0,   363,   213,     0,    93,     0,     0,     0,   217,
+     213,   312,   481,   524,   551,   544,   553,   602,   149,   266,
+     232,   259,   260,   261,   267,   346,   398,   114,     0,    99,
+     515,   510,   141,   580,   478,     0,     0,     3,     0,    49,
+       0,   180,   181,   182,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   593,     0,    76,   136,     0,
+     113,     0,     0,   213,     0,    98,   359,   367,   372,     0,
+     215,     0,   298,   302,   213,   213,     0,   114,   105,   386,
+     391,     0,   502,     0,     0,   610,   384,   385,   606,   608,
+       0,   612,     0,   604,     0,   213,   256,   213,   302,     0,
+     477,   475,     0,    99,   586,   600,   204,   198,     0,   206,
+     199,     0,   201,   207,     0,     0,     0,     0,   570,   185,
+     164,   166,   168,   170,   171,   173,   174,   176,   177,   178,
+     213,    63,   133,   131,   406,   407,     0,   116,   123,     0,
+     117,   127,   125,   129,     0,   119,   121,   411,   111,   110,
+       0,   104,     0,   106,   107,     0,   108,     0,     0,   356,
+       0,     0,     0,   137,   218,     0,   219,   222,   307,   304,
+     303,     0,   213,     0,     0,     0,     0,     0,   492,     0,
+     480,   482,   484,   486,   488,   490,   494,     0,     0,   525,
+       0,   523,   526,   528,     0,     0,     0,     0,   498,   497,
+       0,   501,   500,     0,     0,     0,     0,     0,     0,     0,
+     603,   150,     0,   257,     0,   347,   352,   213,     0,   516,
+     511,   585,   213,     0,   202,   210,   203,    45,   573,    50,
+       0,   134,     0,    69,     0,   115,     0,     0,     0,     0,
+     410,   440,   437,   438,   439,   401,   409,     0,     0,     0,
+      87,   112,   103,     0,   365,   364,     0,   360,   368,   373,
+       0,   216,     0,   220,     0,     0,   299,   301,   270,   323,
+     318,   319,   320,   321,   313,   322,     0,     0,     0,   479,
+       0,   472,     0,     0,     0,     0,     0,     0,   530,   533,
+     522,     0,     0,     0,     0,   387,   392,   496,   591,   592,
+     611,   607,   609,   499,   613,     0,   381,   377,   380,     0,
+     353,     0,   349,     0,    91,     0,     0,     0,   589,     0,
+       0,   584,     0,     0,     0,     0,   594,     0,   132,   124,
+     118,   128,   126,   130,     0,   120,   122,   412,   109,   213,
+     223,     0,   222,   308,   305,     0,   505,   503,   504,   493,
+     483,   485,   487,   489,   491,   495,     0,     0,   527,   529,
+     546,   555,     0,     0,   151,     0,   378,   258,   348,   350,
+     400,   512,   582,   583,     0,   587,   588,   205,   209,   208,
+       0,    56,    42,    51,    55,     0,   135,   402,     0,     0,
+     221,     0,   314,   415,   531,   534,   388,   393,   265,   382,
+     379,   213,     0,   590,    58,     0,     0,    57,     0,   413,
+     357,   306,     0,     0,     0,   447,   447,     0,   451,   262,
+       0,   351,   513,     0,    52,    54,   428,   403,   447,   315,
+     416,   423,     0,   422,   444,   532,   535,   389,   448,   394,
+     263,   383,   519,     0,     0,     0,   447,   414,     0,     0,
+     418,   419,     0,   447,     0,   455,     0,     0,   514,   577,
+       0,   576,   427,   441,   442,   443,     0,   433,   434,   404,
+     330,   337,   335,   316,   326,   327,   334,   424,   420,   445,
+     390,   449,   452,   395,   264,   518,    59,   574,   429,   430,
+       0,   459,     0,     0,     0,     0,     0,   213,   332,     0,
+       0,     0,     0,     0,     0,     0,   431,   435,   456,   405,
+     331,   338,   336,   317,   325,     0,   333,   425,   421,     0,
+       0,   453,    60,   575,     0,     0,     0,     0,   340,   328,
+     446,   450,     0,   432,   436,   457,   339,     0,     0,     0,
+       0,   341,   329,   454,   463,     0,   460,   458,   461,     0,
+     462
 };
 
-  /* YYPGOTO[NTERM-NUM].  */
+/* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -672,  -672,   287,   288,   546,  -592,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,  -579,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,  -672,  -148,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,    37,  -672,
-    -672,    24,  -672,  -672,  -672,   580,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,   582,  -672,   215,  -672,  -672,  -246,  -672,
-    -672,   179,   103,  -672,  -672,  -672,  -319,  -672,  -360,  -672,
-    -672,  -672,  -672,  -672,  -672,  -672,  -672,  -332,  -672,  -672,
-     -22,  -672,  -672,  -188,   -10,  -672,     6,  -672,  -672,  -672,
-    -672,  -196,   -44,  -226,  -672,   217,   213,   216,  -158,  -154,
-    -201,  -119,  -672,  -318,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,    23,   -82,   553,  -672,  -672,  -672,  -672,   -74,
-       7,    16,  -672,    46,  -672,   -31,   108,  -457,  -672,  -672,
-    -672,     8,  -672,  -672,  -610,  -143,  -672,  -672,    -7,  -672,
-     -66,  -672,  -672,   -61,   -42,   -59,   -56,   -55,   250,  -672,
-     -40,  -672,   -38,  -672,  -672,  -672,  -672,   174,   259,   121,
-    -672,  -672,  -672,   -37,  -672,   -32,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,  -217,  -672,  -672,  -672,  -672,
-    -672,  -218,  -672,  -672,  -672,  -672,  -672,  -672,  -672,   -41,
-    -672,  -672,  -672,  -672,  -672,  -672,  -672,  -112,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,   -70,  -672,  -672,  -672,   -69,
-    -672,  -672,  -672,  -672,  -672,  -672,  -672,   -76,  -672,  -672,
-    -326,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,    17,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,  -672,  -672,  -622,  -672,  -672,
-    -672,  -672,  -672,  -207,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,  -227,  -672,  -672,  -501,  -672,  -671,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,    18,    21,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,   258,  -672,  -672,   125,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,  -325,   212,  -322,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,   559,  -672,
-    -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672,   283,  -672,
-    -672,  -183,  -672,  -672,  -672,  -672,  -672,  -672,  -672,     3,
-    -672,   304,  -672,  -672,    94,  -672,  -672,  -672,  -672,  -672,
-    -672,  -672,  -672,  -672,  -672,  -672,  -672,  -672
+    -679,  -679,   284,   291,   530,  -617,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -588,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,  -152,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,   222,  -679,
+    -679,    27,  -679,  -679,  -679,   590,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,   592,  -679,   224,  -679,  -679,  -250,  -679,
+    -679,   181,   107,  -679,  -679,  -679,  -324,  -679,  -361,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,  -337,  -679,  -679,
+     -22,  -679,  -679,  -193,   -10,  -679,    17,  -679,  -679,  -679,
+    -679,  -198,   -44,  -233,  -679,   218,   219,   217,  -151,  -150,
+    -185,  -107,  -679,  -320,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679,    12,   -83,   566,  -679,  -679,  -679,  -679,   -74,
+       8,    18,  -679,    46,  -679,   -31,  -389,  -466,  -679,  -679,
+    -679,     2,  -679,  -679,  -616,  -146,  -679,  -679,    -7,  -679,
+     -75,  -679,  -679,   -51,   -42,   -65,   -50,   -49,   237,  -679,
+     -40,  -679,   -38,  -679,  -679,  -679,  -679,   175,   265,   122,
+    -679,  -679,  -679,   -37,  -679,   -32,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -220,  -679,  -679,  -679,  -679,
+    -679,  -219,  -679,  -679,  -679,  -679,  -679,  -679,  -679,   -41,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,  -123,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,   -70,
+    -679,  -679,  -679,   -68,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,   -86,  -679,  -679,  -328,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,    20,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -656,  -679,  -679,  -679,  -679,  -679,  -209,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,  -231,  -679,  -679,  -517,
+    -679,  -678,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,    22,    24,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,   262,  -679,  -679,
+     121,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -340,   209,
+    -336,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679,   572,  -679,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679,   261,  -679,  -679,  -202,  -679,  -679,  -679,  -679,
+    -679,  -679,  -679,   -13,  -679,   294,  -679,  -679,    77,  -679,
+    -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,  -679,
+    -679,  -679
 };
 
-  /* YYDEFGOTO[NTERM-NUM].  */
+/* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-       0,     1,     2,     3,    27,    28,   180,   184,   188,   189,
-     179,   187,   121,   116,   125,   190,   192,   194,   198,   199,
-      82,    29,    84,    30,   115,   306,   457,    31,    32,   117,
-     310,   459,   665,   743,   722,   744,   723,   724,   760,   841,
-      33,   118,   399,    34,    35,   124,   341,   478,    36,    85,
-      37,   150,   340,    38,    39,    40,   126,   342,   492,    41,
-     225,   370,   559,    42,   266,    43,   102,   256,   348,    44,
-      45,   404,   493,   594,   494,   495,   402,   403,   479,   577,
-     588,   589,   575,   579,   578,   580,   573,   400,   474,   667,
-     326,   230,   301,   109,   362,    46,   480,    83,   292,   436,
-     645,   205,   327,   344,   329,   330,   331,   332,   333,   334,
-     335,   336,   337,   345,    48,   305,   378,   452,   564,   453,
-     454,   664,   481,    50,   304,   352,   412,   506,   507,   603,
-     508,   482,    86,   216,   293,   217,   153,   154,   155,   156,
-      52,   363,   438,   649,   364,   735,   756,   793,   365,   366,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-      53,    87,    54,   185,   353,   512,   414,   513,   607,   511,
-     605,   729,   604,    55,    88,    56,   276,   416,   684,   749,
-     785,   832,   614,   810,   833,   811,   834,   875,   829,   812,
-     835,   813,   831,   830,   864,   866,   874,    57,    58,    59,
-      89,   294,   439,   651,   556,   652,   739,   557,   172,   349,
-     501,   173,   265,   406,   174,   175,   350,   502,   176,   177,
-     351,   503,   178,   367,   437,   647,   705,   648,   704,   757,
-     483,   428,   537,   701,   754,   790,   429,   538,   702,   755,
-     792,   484,    90,   295,   440,   653,   485,   674,   746,   783,
-     828,   486,   586,   498,   590,   727,   765,   732,   750,   751,
-     769,   788,   837,   770,   786,   836,   764,   781,   782,   803,
-     826,   861,   804,   827,   862,   587,   805,   772,   789,   838,
-     776,   791,   839,   820,   840,   869,   846,   863,   877,   882,
-     883,   886,   487,   488,    63,    64,    65,   191,   355,   520,
-      66,   228,   372,   298,   371,   417,   521,   622,   623,   624,
-     625,   626,   620,   627,   522,   541,   523,   432,   543,   524,
-     525,   526,    67,   193,    68,   105,   299,   445,   655,   740,
-     779,   374,   444,   795,   284,   356,   531,   418,   532,   631,
-     632,   533,   695,   752,   534,   696,   753,    69,    70,    71,
-      72,    73,   287,   419,   633,    74,    75,    76,   196,   286,
-      77,   288,   420,   634,    78,   249,   250,   311,   251,   797,
-     824,   798,    79,   111,   302,   446,   656,   562,   563,   661,
-     713,   527,   253,   398,   338,    80,    81,   112,   377,   201,
-     291,   434,   360,   435,   547,   548,   546,   550
+       0,     1,     2,     3,    27,    28,   183,   187,   191,   192,
+     182,   190,   121,   116,   125,   193,   195,   197,   201,   202,
+      82,    29,    84,    30,   115,   312,   465,    31,    32,   117,
+     316,   467,   675,   755,   733,   756,   734,   735,   773,   854,
+      33,   118,   406,    34,    35,   124,   347,   486,    36,    85,
+      37,   151,   346,    38,    39,    40,   126,   348,   500,    41,
+     228,   377,   568,    42,   271,    43,   102,   260,   355,    44,
+      45,   411,   501,   603,   502,   503,   409,   410,   487,   586,
+     597,   598,   584,   588,   587,   589,   582,   407,   482,   677,
+     332,   233,   307,   109,   369,    46,   488,    83,   298,   444,
+     655,   208,   333,   350,   335,   336,   337,   338,   339,   340,
+     341,   342,   343,   351,    48,   311,   385,   460,   573,   461,
+     462,   674,   489,    50,   310,   359,   420,   515,   516,   613,
+     517,   490,    86,   219,   299,   220,   154,   155,   156,   157,
+      52,   370,   446,   659,   371,   747,   769,   806,   372,   373,
+     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
+      53,    87,    54,   188,   360,   521,   422,   522,   617,   520,
+     615,   741,   614,    55,    88,    56,   282,   424,   695,   762,
+     798,   845,   624,   823,   846,   824,   847,   888,   842,   825,
+     848,   826,   844,   843,   877,   879,   887,    57,    58,    59,
+      89,   300,   447,   661,   565,   662,   751,   566,   173,   174,
+     270,   606,   175,   356,   510,   176,   269,   413,   177,   178,
+     357,   511,   179,   180,   358,   512,   181,   374,   445,   657,
+     716,   658,   715,   770,   491,   436,   546,   712,   767,   803,
+     437,   547,   713,   768,   805,   492,    90,   301,   448,   663,
+     493,   684,   758,   796,   841,   494,   595,   506,   599,   738,
+     778,   744,   763,   764,   782,   801,   850,   783,   799,   849,
+     777,   794,   795,   816,   839,   874,   817,   840,   875,   596,
+     818,   785,   802,   851,   789,   804,   852,   833,   853,   882,
+     859,   876,   890,   895,   896,   899,   495,   496,    63,    64,
+      65,   194,   362,   529,    66,   231,   379,   304,   378,   425,
+     530,   632,   633,   634,   635,   636,   630,   637,   531,   550,
+     532,   440,   552,   533,   534,   535,    67,   196,    68,   105,
+     305,   453,   665,   752,   792,   381,   452,   808,   290,   363,
+     540,   426,   541,   641,   642,   542,   706,   765,   543,   707,
+     766,    69,    70,    71,    72,    73,   293,   427,   643,    74,
+      75,    76,   199,   292,    77,   294,   428,   644,    78,   253,
+     254,   317,   255,   810,   837,   811,    79,   111,   308,   454,
+     666,   571,   572,   671,   724,   536,   257,   405,   344,    80,
+      81,   112,   384,   204,   297,   442,   367,   443,   556,   557,
+     555,   559
 };
 
-  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
-     positive, shift that token.  If negative, reduce the rule whose
-     number is the opposite.  If YYTABLE_NINF, syntax error.  */
+/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule whose
+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-     108,   110,   171,   167,    92,   168,   169,    93,    47,   103,
-     104,   170,   152,   212,   213,   407,   113,   206,    51,    60,
-      61,   151,   207,    62,   209,    49,   328,   210,   211,   583,
-     235,   408,   409,   410,   427,   430,   252,   636,   431,   706,
-     357,   208,   300,   307,   496,   171,   167,   303,   168,   169,
-     650,   441,    94,    96,   170,    47,   807,   106,   530,   106,
-     123,   204,   214,     8,   151,    51,    60,    61,   638,   639,
-      62,   106,   106,   720,   733,   215,   807,   218,   219,   220,
-     221,   583,   773,   808,   809,   223,   721,   539,  -144,   226,
-       4,   519,   227,   122,   784,   229,  -371,   182,   195,   387,
-     535,   231,   195,   808,   809,   747,    18,    18,   233,  -145,
-      95,    99,   806,   375,   122,   232,  -371,   646,   222,   817,
-     224,   576,   232,   395,   396,   397,   443,   312,   313,   314,
-     315,   316,   317,   318,   319,  -146,  -100,   496,   106,   182,
-     122,   122,   182,   107,    91,   107,   320,   321,   260,   182,
-       8,   261,   720,  -323,   232,   232,   182,   107,   232,   114,
-     273,   322,   323,   421,   422,   721,   324,   325,   186,   212,
-     213,   122,   267,   206,   268,   119,   496,   120,   207,   499,
-     209,  -341,   451,   210,   211,   505,   106,   800,   801,   802,
-     421,   422,   519,   423,   469,   470,   471,   208,   424,   561,
-     734,   425,   426,   384,   385,   386,   262,   263,   312,   313,
-     314,   315,   316,   317,   318,   319,   200,   204,   391,   392,
-     423,   393,   394,   504,   107,   424,   854,   320,   321,   808,
-     809,    98,   101,   465,   466,   202,   234,   658,   659,   467,
-     468,   660,   322,   323,   583,  -463,  -536,   324,   325,   297,
-     236,   237,   871,   238,   254,   255,   312,   313,   314,   315,
-     316,   317,   318,   319,   878,   257,   258,   421,   422,   259,
-     264,   413,   107,   232,   269,   320,   321,   270,   271,   106,
-     308,   272,   361,  -212,   275,   814,   274,   277,   515,   516,
-     278,   279,   280,   309,   281,   282,   325,   423,   517,   283,
-     285,   289,   424,   296,   290,   425,   426,  -537,   212,   213,
-     339,   343,   206,   346,   347,   358,   354,   207,   401,   209,
-     359,   368,   210,   211,   500,   401,   844,   369,   373,   583,
-     381,   658,   659,   376,   514,   660,   208,   456,   382,   388,
-     390,   383,   405,   -44,   411,   328,   389,   458,   472,   442,
-     542,   551,   552,   637,   554,   553,   204,   555,   461,   565,
-     567,   643,   569,   568,   572,   570,   595,   574,   591,   601,
-     583,   597,   171,   167,   679,   168,   169,   598,   599,   606,
-    -299,   170,   510,   600,   450,    47,   737,   602,   635,   473,
-     571,   151,   621,   630,   640,    51,    60,    61,   641,  -394,
-      62,   540,    49,   544,   545,   642,   644,   663,   668,   654,
-     540,   421,   422,  -575,   680,   669,   584,   585,   670,   328,
-     671,   672,   560,   677,   673,   675,   676,   497,   685,   686,
-     687,   413,   515,   516,   678,   682,   260,   717,   688,   689,
-     518,   423,   517,   566,   690,   691,   424,   692,   610,   425,
-     426,   693,   694,   171,   167,   611,   168,   169,   612,   613,
-     697,   698,   170,   510,   582,   -47,   699,   -47,   584,   585,
-     700,   707,   151,   615,   709,   710,   413,   708,   151,  -466,
-     711,   -47,   -47,   714,   -47,   -47,   715,   716,   -47,   718,
-     726,   730,   609,   616,   617,   618,   731,   741,   745,   646,
-     748,  -412,   763,   761,   766,   768,   856,   857,   767,   771,
-     -47,   775,   777,   778,   -47,   780,   582,  -421,   628,   629,
-     787,   794,   796,   171,   167,   799,   168,   169,   -47,   815,
-     816,   818,   170,   823,   819,   825,   842,   876,   843,   845,
-     106,   847,   151,   849,   850,   127,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,   137,   138,    10,    11,   497,
-      12,   139,   140,   141,   858,   873,   867,   868,   106,     6,
-     872,   879,   448,   127,   128,   129,   130,   131,   132,   133,
-     134,   135,   203,   137,   881,   885,   657,   880,    12,   887,
-     140,   141,   884,   379,   380,   181,   762,   100,    97,   536,
-     593,   703,   463,   183,   848,   462,   464,   728,   596,   681,
-     662,   774,   415,   683,   558,   592,   851,   853,   142,   143,
-     144,   145,   146,   147,   148,   149,   107,   758,   455,   738,
-     855,   584,   585,  -101,   870,   447,     5,   197,   122,     6,
-       7,     8,     9,   619,   549,   725,   142,   143,   144,   145,
-     146,   147,   148,   149,   107,    10,    11,   555,    12,   860,
-     712,     0,    13,   449,   433,   666,   460,     0,     0,     0,
-       0,    47,     0,     0,     0,    14,    15,    16,    17,   582,
-       0,    51,    60,    61,    18,    19,    62,     0,    20,     0,
-       0,    21,    92,     0,     0,   736,     0,   742,    22,    23,
-       0,     0,     0,     0,     0,    24,    25,   719,     0,     0,
-       0,     0,     0,     0,   106,     0,   584,   585,   759,   608,
-     128,   129,     0,     0,   132,   133,   134,   135,     0,    26,
-       0,     0,     0,   -53,    12,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    92,     0,     0,   736,     0,     0,
-      47,     0,   852,     0,     0,     0,     0,   584,   585,     0,
-      51,    60,    61,     0,   582,    62,     0,     0,     0,     0,
-       0,     0,   822,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    92,     0,     0,   821,     0,     0,     0,
-       0,     0,   142,   143,   144,   145,   146,   147,   148,   149,
-     107,     0,     0,     0,     0,   582,   182,     0,     0,     0,
-       0,   171,   167,     0,   168,   169,   401,   401,     0,     0,
-     170,   865,     0,     0,     0,     0,   475,     0,  -403,     6,
-     151,   859,     9,  -403,  -403,  -403,  -403,  -403,  -403,  -403,
-    -403,  -403,  -403,  -403,  -403,    10,    11,   401,    12,     0,
-    -403,  -403,    13,     0,     0,   421,   422,   476,   477,  -403,
-       0,     0,     0,     0,     0,    14,     0,     0,     0,   489,
-     490,   491,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    22,    23,
+     108,   110,   172,   168,    92,   169,   170,    93,   209,   103,
+     104,   171,   153,   215,    49,   216,   113,   415,   212,    47,
+      51,   152,    60,   334,    61,   509,    62,   438,   592,   238,
+     646,   439,   210,   213,   214,   256,   416,   417,   418,   435,
+     306,   211,   364,   717,   313,   172,   168,   309,   169,   170,
+     504,   745,   660,   449,   171,   820,   106,     8,   731,   106,
+     106,   207,   217,   123,   152,   539,    47,    51,   648,    60,
+     649,    61,   548,    62,   106,   218,     8,   221,   222,   223,
+     224,   592,   759,   821,   822,   226,    91,   732,   786,   229,
+    -376,   185,   230,   264,     4,   232,   265,   528,   394,   234,
+     797,   198,   236,   544,  -144,   198,   273,  -145,   274,   122,
+    -376,   656,   122,   235,   382,   114,   235,   185,   819,   605,
+      18,   225,  -146,   227,    95,   830,   119,   122,   585,   451,
+     318,   319,   320,   321,   322,   323,   324,   325,   106,   731,
+     185,   429,   430,   107,   504,   185,   107,   107,   189,   326,
+     327,   237,   185,  -324,   820,   235,    18,   235,   266,   267,
+      99,   235,   122,   279,   328,   329,   120,   209,   732,   330,
+     331,   431,   215,  -100,   216,  -342,   432,   212,   122,   507,
+     398,   399,   821,   822,   504,   203,   514,   459,   205,   106,
+     239,   210,   213,   214,  -468,   746,   402,   403,   404,   528,
+     211,   400,   401,   570,   429,   430,   813,   814,   815,   318,
+     319,   320,   321,   322,   323,   324,   325,   477,   478,   479,
+     207,   391,   392,   393,  -541,   107,   513,   240,   326,   327,
+     821,   822,   669,   867,   431,   241,   670,    94,    96,   432,
+      98,   101,   433,   434,   668,   259,   592,   473,   474,   331,
+     475,   476,   258,   235,   261,   262,  -212,   263,   272,   884,
+     318,   319,   320,   321,   322,   323,   324,   325,   268,   275,
+     414,   891,   276,   277,   278,   280,   107,   421,   281,   326,
+     327,   283,   827,   429,   430,   284,   285,   286,   368,   287,
+     288,   106,   289,   302,   328,   329,   291,   295,   314,   330,
+     331,   296,  -542,   315,   524,   525,   349,   429,   430,   303,
+     209,   345,   352,   431,   526,   215,   353,   216,   432,   354,
+     212,   433,   434,   857,   408,   361,   365,   669,   524,   525,
+     508,   670,   408,   592,   210,   213,   214,   431,   526,   668,
+     366,   523,   432,   211,   464,   433,   434,   334,   375,   376,
+     760,  -471,   383,   388,   395,   380,   450,   647,   389,   390,
+     419,   396,   562,   207,   564,   653,   397,   412,   -44,   466,
+     480,   551,   560,   469,   592,   574,   561,   690,   563,   576,
+     172,   168,   577,   169,   170,   578,   583,   579,   581,   171,
+     519,   600,   152,   612,   604,   749,   481,   580,    49,   152,
+     607,   610,   458,    47,    51,   608,    60,   609,    61,   549,
+      62,   553,   554,   616,  -300,   631,   611,   640,   549,   691,
+     645,   650,   334,   505,   593,   651,   594,   652,   654,   673,
+     569,  -399,   664,   696,   697,   698,  -581,   527,   678,   421,
+     728,   679,   680,   681,   682,   683,   685,   687,   620,   686,
+     688,   575,   693,   264,   689,   699,   700,   701,   621,   702,
+     703,   172,   168,   704,   169,   170,   705,   708,   709,   721,
+     171,   519,   591,   622,   623,   710,   711,   593,   718,   594,
+     152,   719,   625,   720,   421,   722,   152,   725,   726,   727,
+     729,   737,   753,   757,   761,   742,  -417,   743,   781,   774,
+     780,   619,   626,   627,   628,   656,   106,   779,   776,   784,
+     788,   618,   128,   129,   869,   870,   132,   133,   134,   135,
+     790,   791,   793,  -426,   807,   591,    12,   638,   639,   800,
+     809,   812,   172,   168,   828,   169,   170,   829,   831,   832,
+     836,   171,   838,   855,   856,   889,   858,   860,   862,   871,
+     863,   152,   880,   106,   886,   892,   885,   505,   127,   128,
+     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
+      10,    11,   881,    12,   139,   140,   141,   142,   893,   184,
+     894,   -47,   897,   -47,   667,   143,   144,   145,   146,   147,
+     148,   149,   150,   107,   898,   900,   386,   -47,   -47,   185,
+     -47,   -47,   -47,   387,   775,   -47,   739,   100,    97,   545,
+     861,   714,   602,   470,   472,   471,   186,   694,   740,   672,
+     692,   787,   463,   567,   601,   423,   864,   -47,   771,   866,
+     750,   -47,   143,   144,   145,   146,   147,   148,   149,   150,
+     107,   868,   593,   883,   594,   -47,   455,  -101,   629,   558,
+     200,   468,   122,   873,   723,   736,     0,   676,     0,     0,
+       0,   441,     0,     0,     0,     0,     0,     0,   564,     5,
+       0,     0,     6,     7,     8,     9,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    10,    11,
+     591,    12,    47,    51,     0,    60,    13,    61,     0,    62,
+       0,     0,     0,    92,     0,     0,   748,     0,   754,    14,
+      15,    16,    17,     0,     0,     0,     0,   152,    18,    19,
+       0,     0,    20,     0,     0,    21,     0,     0,     0,   593,
+     772,   594,    22,    23,     0,     0,     0,     0,     0,    24,
+      25,   730,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    92,     0,     0,
+     748,     0,     0,    26,   865,     0,     0,   -53,     0,     0,
+     593,     0,   594,    47,    51,     0,    60,   591,    61,     0,
+      62,     0,     0,     0,     0,   835,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    92,     0,     0,   834,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  -403,  -403,  -403,  -403,
-    -403,  -403,  -403,  -403,  -403,     0,     0,     0,     0,   475,
-    -213,  -403,     6,   -86,     0,     9,  -403,  -403,  -403,  -403,
-    -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,    10,    11,
-       0,    12,     0,  -403,  -403,    13,     0,     0,   421,   422,
-     476,   477,  -403,     0,     0,     0,     0,     0,    14,     0,
-       0,     0,   489,   490,   491,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   591,     0,
+       0,     0,     0,     0,   172,   168,     0,   169,   170,   408,
+     408,     0,     0,   171,   878,     0,     0,     0,     0,   483,
+       0,  -408,     6,   152,   872,     9,  -408,  -408,  -408,  -408,
+    -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,    10,    11,
+     408,    12,     0,     0,  -408,  -408,    13,     0,     0,   429,
+     430,   484,   485,  -408,     0,     0,     0,     0,     0,    14,
+       0,     0,     0,   497,   498,   499,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    22,    23,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  -403,
-    -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,     0,     0,
-       0,     0,   475,  -213,  -403,     6,  -549,     0,     9,  -403,
-    -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,
-    -403,    10,    11,     0,    12,     0,  -403,  -403,    13,     0,
-       0,   421,   422,   476,   477,  -403,     0,     0,     0,     0,
-       0,    14,     0,     0,     0,   528,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   529,     0,     0,     0,     0,
-       0,     0,     0,     0,    22,    23,     0,     0,     0,     0,
+       0,     0,    22,    23,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,
-    -403,     0,     0,     0,   475,     0,  -403,     6,     0,  -516,
-       9,  -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,
-    -403,  -403,  -403,    10,    11,     0,    12,     0,  -403,  -403,
-      13,     0,     0,   421,   422,   476,   477,  -403,     0,     0,
-       0,     0,     0,    14,     0,     0,     0,     0,     0,     0,
+    -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,     0,
+       0,     0,     0,   483,  -213,  -408,     6,   -86,     0,     9,
+    -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,
+    -408,  -408,    10,    11,     0,    12,     0,     0,  -408,  -408,
+      13,     0,     0,   429,   430,   484,   485,  -408,     0,     0,
+       0,     0,     0,    14,     0,     0,     0,   497,   498,   499,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,    22,    23,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  -403,  -403,  -403,  -403,  -403,  -403,
-    -403,  -403,  -403,     0,     0,     0,     0,   475,  -213,  -403,
-       6,   -68,     0,     9,  -403,  -403,  -403,  -403,  -403,  -403,
-    -403,  -403,  -403,  -403,  -403,  -403,    10,    11,     0,    12,
-       0,  -403,  -403,    13,     0,     0,   421,   422,   476,   477,
-    -403,     0,     0,     0,     0,     0,    14,     0,     0,     0,
+       0,     0,     0,     0,  -408,  -408,  -408,  -408,  -408,  -408,
+    -408,  -408,  -408,     0,     0,     0,     0,   483,  -213,  -408,
+       6,  -554,     0,     9,  -408,  -408,  -408,  -408,  -408,  -408,
+    -408,  -408,  -408,  -408,  -408,  -408,    10,    11,     0,    12,
+       0,     0,  -408,  -408,    13,     0,     0,   429,   430,   484,
+     485,  -408,     0,     0,     0,     0,     0,    14,     0,     0,
+       0,   537,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   538,     0,     0,     0,     0,     0,     0,     0,     0,
+      22,    23,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  -408,  -408,
+    -408,  -408,  -408,  -408,  -408,  -408,  -408,     0,     0,     0,
+     483,     0,  -408,     6,     0,  -521,     9,  -408,  -408,  -408,
+    -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,    10,
+      11,     0,    12,     0,     0,  -408,  -408,    13,     0,     0,
+     429,   430,   484,   485,  -408,     0,     0,     0,     0,     0,
+      14,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    22,    23,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    22,
-      23,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  -403,  -403,  -403,
-    -403,  -403,  -403,  -403,  -403,  -403,     0,     0,     0,     0,
-     475,  -213,  -403,     6,   -90,     0,     9,  -403,  -403,  -403,
-    -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,    10,
-      11,     0,    12,     0,  -403,  -403,    13,     0,     0,   421,
-     422,   476,   477,  -403,     0,     0,     0,     0,     0,    14,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    -2,
-       5,     0,     0,     6,     7,     8,     9,     0,     0,     0,
-       0,     0,    22,    23,     0,     0,     0,     0,     0,    10,
-      11,     0,    12,     0,     0,     0,    13,     0,     0,     0,
-    -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,    14,
-      15,    16,    17,     0,  -213,     0,     0,  -540,    18,    19,
-       0,     0,    20,     0,     0,    21,     0,     0,     0,     0,
-       0,     0,    22,    23,   509,     0,   106,     0,     0,    24,
-      25,   127,   128,   129,   130,   131,   132,   133,   134,   135,
-     136,   137,   138,    10,    11,     0,    12,   139,   140,   141,
-       0,     0,     0,    26,  -213,     0,     0,     0,     0,     0,
+       0,  -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,
+       0,     0,     0,     0,   483,  -213,  -408,     6,   -68,     0,
+       9,  -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,
+    -408,  -408,  -408,    10,    11,     0,    12,     0,     0,  -408,
+    -408,    13,     0,     0,   429,   430,   484,   485,  -408,     0,
+       0,     0,     0,     0,    14,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     5,     0,     0,     6,     7,     8,
-       9,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    10,    11,     0,    12,     0,     0,     0,
-      13,     0,     0,     0,   142,   143,   144,   145,   146,   147,
-     148,   149,   107,    14,    15,    16,    17,     0,   182,     0,
-       0,     0,    18,    19,     0,     0,    20,     0,     0,    21,
-       0,     0,     0,     0,     0,     5,    22,    23,     6,     7,
-       8,     9,     0,    24,    25,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    10,    11,     0,    12,     0,     0,
-       5,    13,     0,     6,     7,     8,     9,    26,  -213,     0,
-       0,     0,     0,     0,    14,    15,    16,    17,     0,    10,
-      11,     0,    12,    18,    19,     0,    13,    20,     0,     0,
-      21,     0,     0,     0,     0,     0,     0,    22,    23,    14,
-      15,    16,    17,     0,    24,    25,   719,     0,    18,    19,
-       0,     0,    20,     0,     0,    21,     0,     0,     0,     0,
-       0,     0,    22,    23,     0,     0,   106,     0,    26,    24,
-      25,   127,   128,   129,   130,   131,   132,   133,   134,   135,
-     136,   137,   138,    10,    11,     0,    12,   139,   140,   141,
-     106,     0,     0,    26,     0,   127,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,   137,   138,     0,     0,     0,
-       0,   139,   140,   141,     0,   239,     0,   240,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    22,    23,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   241,   242,     0,   243,   244,     0,     0,   245,     0,
-       0,     0,     0,     0,   142,   143,   144,   145,   146,   147,
-     148,   149,   107,     0,     0,     0,     0,     0,   182,     0,
-     246,     0,     0,     0,   247,     0,     0,     0,   142,   143,
-     144,   145,   146,   147,   148,   149,   107,   475,   248,  -403,
-       6,     0,   182,     9,  -403,  -403,  -403,  -403,  -403,  -403,
-    -403,  -403,  -403,  -403,  -403,  -403,    10,    11,     0,    12,
-       0,  -403,  -403,    13,     0,     0,   421,   422,   476,   477,
-    -403,     0,     0,     0,     0,     0,    14,     0,     0,     0,
-     489,   490,   491,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    22,
-      23,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  -403,  -403,  -403,
-    -403,  -403,  -403,  -403,  -403,  -403,   475,     0,  -403,     6,
-       0,     0,     9,  -403,  -403,  -403,  -403,  -403,  -403,  -403,
-    -403,  -403,  -403,  -403,  -403,    10,    11,     0,    12,     0,
-    -403,  -403,    13,     0,     0,   421,   422,   476,   477,  -403,
-     509,     0,   106,     0,     0,    14,     0,   127,   128,   129,
+       0,     0,     0,     0,     0,  -408,  -408,  -408,  -408,  -408,
+    -408,  -408,  -408,  -408,     0,     0,     0,     0,   483,  -213,
+    -408,     6,   -90,     0,     9,  -408,  -408,  -408,  -408,  -408,
+    -408,  -408,  -408,  -408,  -408,  -408,  -408,    10,    11,     0,
+      12,     0,     0,  -408,  -408,    13,     0,     0,   429,   430,
+     484,   485,  -408,     0,     0,   106,     6,     0,    14,   456,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   206,
+     137,     0,     0,     0,     0,    12,     0,     0,   141,   142,
+       0,    22,    23,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  -408,
+    -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,     0,     0,
+       0,     0,     0,  -213,     0,     0,  -545,     0,     0,     0,
+       0,     0,     0,     0,    -2,     5,     0,     0,     6,     7,
+       8,     9,     0,     0,   143,   144,   145,   146,   147,   148,
+     149,   150,   107,     0,    10,    11,     0,    12,   106,     0,
+       0,   457,    13,   127,   128,   129,   130,   131,   132,   133,
+     134,   135,   136,   137,   138,    14,    15,    16,    17,   139,
+     140,   141,   142,     0,    18,    19,     0,     0,    20,     0,
+       0,    21,     0,     0,     0,     0,     0,     0,    22,    23,
+     518,     0,   106,     0,     0,    24,    25,   127,   128,   129,
      130,   131,   132,   133,   134,   135,   136,   137,   138,    10,
-      11,     0,    12,   139,   140,   141,     0,     0,    22,    23,
+      11,     0,    12,   139,   140,   141,   142,     0,     0,    26,
+    -213,     0,     0,     0,     0,     0,     0,   143,   144,   145,
+     146,   147,   148,   149,   150,   107,     0,     0,     0,     0,
+       5,   185,     0,     6,     7,     8,     9,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    10,
+      11,     0,    12,     0,     0,     0,     0,    13,     0,     0,
+       0,   143,   144,   145,   146,   147,   148,   149,   150,   107,
+      14,    15,    16,    17,     0,   185,     0,     0,     0,    18,
+      19,     0,     0,    20,     0,     0,    21,     0,     0,     0,
+       0,     0,     5,    22,    23,     6,     7,     8,     9,     0,
+      24,    25,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    10,    11,     0,    12,     0,     0,     5,     0,    13,
+       6,     7,     8,     9,    26,  -213,     0,     0,     0,     0,
+       0,     0,    14,    15,    16,    17,    10,    11,     0,    12,
+       0,    18,    19,     0,    13,    20,     0,     0,    21,     0,
+       0,     0,     0,     0,     0,    22,    23,    14,    15,    16,
+      17,     0,    24,    25,   730,     0,    18,    19,     0,     0,
+      20,     0,     0,    21,     0,     0,     0,     0,     0,     0,
+      22,    23,     0,     0,   106,     0,    26,    24,    25,   127,
+     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
+     138,    10,    11,     0,    12,   139,   140,   141,   142,     0,
+     483,    26,  -408,     6,     0,     0,     9,  -408,  -408,  -408,
+    -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,    10,
+      11,     0,    12,     0,     0,  -408,  -408,    13,     0,     0,
+     429,   430,   484,   485,  -408,     0,     0,     0,     0,     0,
+      14,     0,     0,     0,   497,   498,   499,     0,     0,     0,
+       0,     0,     0,   143,   144,   145,   146,   147,   148,   149,
+     150,   107,     0,    22,    23,     0,     0,   185,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  -403,  -403,  -403,  -403,
-    -403,  -403,  -403,  -403,  -403,   106,     0,     0,     0,     0,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-     137,   138,    10,    11,     0,    12,   139,   140,   141,     0,
-     142,   143,   144,   145,   146,   147,   148,   149,   107,   106,
-       0,     0,     0,     0,   127,   128,   129,   130,   131,   132,
-     133,   134,   135,   203,   137,   138,     0,     0,     0,     0,
-       0,   140,   141,     0,     0,     0,     0,     0,     0,     0,
-     581,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   142,   143,   144,   145,   146,   147,   148,
-     149,   107,   106,     0,     0,     0,     0,   127,   128,   129,
-     130,   131,   132,   133,   134,   135,   203,   137,   138,     0,
-       0,     0,     0,     0,   140,   141,     0,   142,   143,   144,
-     145,   146,   147,   148,   149,   107,   106,     0,     0,     0,
-       0,   127,   128,   129,   130,   131,   132,   133,   134,   135,
-     203,     0,     0,     0,     0,     0,     0,     0,   140,   141,
+       0,  -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,
+     483,     0,  -408,     6,     0,     0,     9,  -408,  -408,  -408,
+    -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,    10,
+      11,     0,    12,     0,     0,  -408,  -408,    13,     0,     0,
+     429,   430,   484,   485,  -408,   518,     0,   106,     0,     0,
+      14,     0,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,    10,    11,     0,    12,   139,   140,
+     141,   142,     0,    22,    23,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,  -408,
+     106,     0,     0,     0,     0,   127,   128,   129,   130,   131,
+     132,   133,   134,   135,   136,   137,   138,    10,    11,     0,
+      12,   139,   140,   141,   142,     0,   143,   144,   145,   146,
+     147,   148,   149,   150,   107,   106,     0,     0,     0,     0,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   206,
+     137,   138,     0,     0,     0,     0,     0,     0,   141,   142,
+       0,     0,     0,     0,     0,     0,     0,   590,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   143,
+     144,   145,   146,   147,   148,   149,   150,   107,   106,     0,
+       0,     0,     0,   127,   128,   129,   130,   131,   132,   133,
+     134,   135,   206,   137,   138,     0,     0,     0,     0,     0,
+       0,   141,   142,     0,   143,   144,   145,   146,   147,   148,
+     149,   150,   107,   106,     0,     0,     0,     0,   127,   128,
+     129,   130,   131,   132,   133,   134,   135,   206,     0,     0,
+       0,     0,     0,     0,     0,     0,   141,   142,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     142,   143,   144,   145,   146,   147,   148,   149,   107,     0,
+       0,     0,     0,     0,     0,     0,     0,   143,   144,   145,
+     146,   147,   148,   149,   150,   107,   242,     0,   243,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   244,   245,     0,   246,   247,   248,     0,     0,
+     249,     0,   143,   144,   145,   146,   147,   148,   149,   150,
+     107,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   250,     0,     0,     0,   251,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   142,   143,   144,   145,   146,   147,
-     148,   149,   107
+     252
 };
 
 static const yytype_int16 yycheck[] =
 {
-      22,    23,    43,    43,    14,    43,    43,    14,     2,    19,
-      20,    43,    43,    83,    83,   347,    26,    83,     2,     2,
-       2,    43,    83,     2,    83,     2,   252,    83,    83,   486,
-     112,   349,   350,   351,   360,   360,   118,   538,   360,   649,
-     286,    83,   230,   239,   404,    86,    86,     3,    86,    86,
-       3,   370,    15,    16,    86,    49,     1,     3,   418,     3,
-      36,    83,    84,     6,    86,    49,    49,    49,     3,     3,
-      49,     3,     3,   665,   696,    85,     1,    87,    88,    89,
-      90,   538,   753,    28,    29,    95,   665,    19,    96,    99,
-       0,   417,   102,   101,   765,   105,    95,    95,    74,   325,
-     419,    75,    78,    28,    29,   727,    49,    49,    75,    96,
-      53,    53,   783,   301,   101,    89,   115,   115,    94,   790,
-      96,   481,    89,   109,   110,   111,   372,    73,    74,    75,
-      76,    77,    78,    79,    80,    96,    96,   497,     3,    95,
-     101,   101,    95,    89,     3,    89,    92,    93,     8,    95,
-       6,    11,   744,    98,    89,    89,    95,    89,    89,    99,
-     182,   107,   108,    30,    31,   744,   112,   113,    22,   239,
-     239,   101,   100,   239,   102,    96,   536,    96,   239,   405,
-     239,    96,   378,   239,   239,   411,     3,    35,    36,    37,
-      30,    31,   518,    60,   395,   396,   397,   239,    65,   445,
-     701,    68,    69,   322,   323,   324,     8,     9,    73,    74,
-      75,    76,    77,    78,    79,    80,    97,   239,    90,    91,
-      60,   107,   108,   411,    89,    65,   836,    92,    93,    28,
-      29,    16,    17,   391,   392,    96,     3,   563,   563,   393,
-     394,   563,   107,   108,   701,    96,    96,   112,   113,   101,
-      97,    97,   862,    96,    96,    48,    73,    74,    75,    76,
-      77,    78,    79,    80,   874,    97,    96,    30,    31,    97,
-      99,   353,    89,    89,    99,    92,    93,    99,    96,     3,
-      99,    96,   292,    95,    97,   786,    96,    96,    51,    52,
-      96,    96,    96,     3,    97,    96,   113,    60,    61,    97,
-      96,    96,    65,    97,    96,    68,    69,    96,   378,   378,
-     100,     8,   378,    99,    47,    97,   113,   378,   340,   378,
-      97,    97,   378,   378,   406,   347,   827,    97,   101,   786,
-       3,   657,   657,    97,   416,   657,   378,   378,   100,   104,
-     106,   102,   102,    98,   113,   571,   105,   100,   102,   371,
-      58,    98,   103,   541,   102,   437,   378,   439,   114,    96,
-      96,   549,     3,    98,   102,    97,   100,    98,    98,   114,
-     827,   100,   413,   413,   600,   413,   413,   100,   100,    98,
-      98,   413,   413,   103,   378,   379,   704,   102,    31,   399,
-     472,   413,    98,    98,    96,   379,   379,   379,    96,    98,
-     379,   423,   379,   425,   426,    96,    96,    29,    96,    98,
-     432,    30,    31,    98,   602,    96,   486,   486,    96,   645,
-      96,    96,   444,     3,    96,    96,    96,   404,   616,   617,
-     618,   513,    51,    52,    96,    96,     8,   663,    96,    96,
-     417,    60,    61,   453,    96,    96,    65,    96,   514,    68,
-      69,    96,    96,   494,   494,   514,   494,   494,   514,   514,
-      96,    96,   494,   494,   486,     4,    98,     6,   538,   538,
-      98,    98,   494,   514,    98,    66,   558,   102,   500,    98,
-      98,    20,    21,    96,    23,    24,    96,    96,    27,    96,
-       3,   114,   514,   515,   516,   517,   113,    96,    96,   115,
-      96,    35,   113,    98,    97,    35,   838,   839,   114,    38,
-      49,    55,   102,   116,    53,    99,   538,   114,   528,   529,
-     114,    59,     3,   564,   564,   114,   564,   564,    67,   102,
-     113,   113,   564,   100,    62,   114,   102,   869,   102,    39,
-       3,    96,   564,   101,    98,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,   536,
-      23,    24,    25,    26,   113,   101,   114,   114,     3,     4,
-     113,    96,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    75,   102,   563,   114,    23,    75,
-      25,    26,   114,   306,   306,    49,   744,    17,    16,   420,
-     497,   645,   389,    50,   830,   388,   390,   681,   500,   602,
-     564,   754,   353,   605,   440,   494,   833,   835,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,   739,   378,   705,
-     837,   701,   701,    96,   861,   377,     1,    78,   101,     4,
-       5,     6,     7,   518,   432,   667,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    20,    21,   739,    23,   842,
-     657,    -1,    27,    98,   360,   571,   383,    -1,    -1,    -1,
-      -1,   665,    -1,    -1,    -1,    40,    41,    42,    43,   701,
-      -1,   665,   665,   665,    49,    50,   665,    -1,    53,    -1,
-      -1,    56,   702,    -1,    -1,   702,    -1,   719,    63,    64,
-      -1,    -1,    -1,    -1,    -1,    70,    71,    72,    -1,    -1,
-      -1,    -1,    -1,    -1,     3,    -1,   786,   786,   740,     8,
-       9,    10,    -1,    -1,    13,    14,    15,    16,    -1,    94,
-      -1,    -1,    -1,    98,    23,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   754,    -1,    -1,   754,    -1,    -1,
-     744,    -1,   834,    -1,    -1,    -1,    -1,   827,   827,    -1,
-     744,   744,   744,    -1,   786,   744,    -1,    -1,    -1,    -1,
-      -1,    -1,   794,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   793,    -1,    -1,   793,    -1,    -1,    -1,
-      -1,    -1,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    -1,    -1,    -1,    -1,   827,    95,    -1,    -1,    -1,
-      -1,   852,   852,    -1,   852,   852,   838,   839,    -1,    -1,
-     852,   852,    -1,    -1,    -1,    -1,     1,    -1,     3,     4,
-     852,   841,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,   869,    23,    -1,
-      25,    26,    27,    -1,    -1,    30,    31,    32,    33,    34,
-      -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,    44,
-      45,    46,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    63,    64,
+      22,    23,    43,    43,    14,    43,    43,    14,    83,    19,
+      20,    43,    43,    83,     2,    83,    26,   354,    83,     2,
+       2,    43,     2,   256,     2,   414,     2,   367,   494,   112,
+     547,   367,    83,    83,    83,   118,   356,   357,   358,   367,
+     233,    83,   292,   659,   242,    86,    86,     3,    86,    86,
+     411,   707,     3,   377,    86,     1,     3,     6,   675,     3,
+       3,    83,    84,    36,    86,   426,    49,    49,     3,    49,
+       3,    49,    19,    49,     3,    85,     6,    87,    88,    89,
+      90,   547,   738,    29,    30,    95,     3,   675,   766,    99,
+      96,    96,   102,     8,     0,   105,    11,   425,   331,    76,
+     778,    74,    76,   427,    97,    78,   101,    97,   103,   102,
+     116,   116,   102,    90,   307,   100,    90,    96,   796,   508,
+      50,    94,    97,    96,    54,   803,    97,   102,   489,   379,
+      74,    75,    76,    77,    78,    79,    80,    81,     3,   756,
+      96,    31,    32,    90,   505,    96,    90,    90,    22,    93,
+      94,     3,    96,    99,     1,    90,    50,    90,     8,     9,
+      54,    90,   102,   185,   108,   109,    97,   242,   756,   113,
+     114,    61,   242,    97,   242,    97,    66,   242,   102,   412,
+      91,    92,    29,    30,   545,    98,   419,   385,    97,     3,
+      98,   242,   242,   242,    97,   712,   110,   111,   112,   527,
+     242,   108,   109,   453,    31,    32,    36,    37,    38,    74,
+      75,    76,    77,    78,    79,    80,    81,   402,   403,   404,
+     242,   328,   329,   330,    97,    90,   419,    98,    93,    94,
+      29,    30,   572,   849,    61,    97,   572,    15,    16,    66,
+      16,    17,    69,    70,   572,    49,   712,   398,   399,   114,
+     400,   401,    97,    90,    98,    97,    96,    98,   101,   875,
+      74,    75,    76,    77,    78,    79,    80,    81,   100,   100,
+     353,   887,   100,    97,    97,    97,    90,   360,    98,    93,
+      94,    97,   799,    31,    32,    97,    97,    97,   298,    98,
+      97,     3,    98,    98,   108,   109,    97,    97,   100,   113,
+     114,    97,    97,     3,    52,    53,     8,    31,    32,   102,
+     385,   101,   100,    61,    62,   385,   100,   385,    66,    48,
+     385,    69,    70,   840,   346,   114,    98,   667,    52,    53,
+     413,   667,   354,   799,   385,   385,   385,    61,    62,   667,
+      98,   424,    66,   385,   385,    69,    70,   580,    98,    98,
+     739,    99,    98,     3,   105,   102,   378,   550,   101,   103,
+     114,   106,   445,   385,   447,   558,   107,   103,    99,   101,
+     103,    59,    99,   115,   840,    97,   104,   610,   103,    97,
+     421,   421,    99,   421,   421,     3,    99,    98,   103,   421,
+     421,    99,   414,   103,   101,   715,   406,   480,   386,   421,
+     101,   104,   385,   386,   386,   101,   386,   101,   386,   431,
+     386,   433,   434,    99,    99,    99,   115,    99,   440,   612,
+      32,    97,   655,   411,   494,    97,   494,    97,    97,    30,
+     452,    99,    99,   626,   627,   628,    99,   425,    97,   522,
+     673,    97,    97,    97,    97,    97,    97,     3,   523,    97,
+      97,   461,    97,     8,   103,    97,    97,    97,   523,    97,
+      97,   502,   502,    97,   502,   502,    97,    97,    97,    67,
+     502,   502,   494,   523,   523,    99,    99,   547,    99,   547,
+     502,   103,   523,    99,   567,    99,   508,    97,    97,    97,
+      97,     3,    97,    97,    97,   115,    36,   114,    36,    99,
+     115,   523,   524,   525,   526,   116,     3,    98,   114,    39,
+      56,     8,     9,    10,   851,   852,    13,    14,    15,    16,
+     103,   117,   100,   115,    60,   547,    23,   537,   538,   115,
+       3,   115,   573,   573,   103,   573,   573,   114,   114,    63,
+     101,   573,   115,   103,   103,   882,    40,    97,   102,   114,
+      99,   573,   115,     3,   102,    97,   114,   545,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,   115,    23,    24,    25,    26,    27,   115,    49,
+      76,     4,   115,     6,   572,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,   103,    76,   312,    20,    21,    96,
+      23,    24,    25,   312,   756,    28,   689,    17,    16,   428,
+     843,   655,   505,   395,   397,   396,    50,   615,   692,   573,
+     612,   767,   385,   448,   502,   360,   846,    50,   751,   848,
+     716,    54,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,   850,   712,   874,   712,    68,   384,    97,   527,   440,
+      78,   390,   102,   855,   667,   677,    -1,   580,    -1,    -1,
+      -1,   367,    -1,    -1,    -1,    -1,    -1,    -1,   751,     1,
+      -1,    -1,     4,     5,     6,     7,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    20,    21,
+     712,    23,   675,   675,    -1,   675,    28,   675,    -1,   675,
+      -1,    -1,    -1,   713,    -1,    -1,   713,    -1,   730,    41,
+      42,    43,    44,    -1,    -1,    -1,    -1,   739,    50,    51,
+      -1,    -1,    54,    -1,    -1,    57,    -1,    -1,    -1,   799,
+     752,   799,    64,    65,    -1,    -1,    -1,    -1,    -1,    71,
+      72,    73,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   767,    -1,    -1,
+     767,    -1,    -1,    95,   847,    -1,    -1,    99,    -1,    -1,
+     840,    -1,   840,   756,   756,    -1,   756,   799,   756,    -1,
+     756,    -1,    -1,    -1,    -1,   807,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   806,    -1,    -1,   806,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    -1,    -1,    -1,    -1,     1,
-      95,     3,     4,    98,    -1,     7,     8,     9,    10,    11,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   840,    -1,
+      -1,    -1,    -1,    -1,   865,   865,    -1,   865,   865,   851,
+     852,    -1,    -1,   865,   865,    -1,    -1,    -1,    -1,     1,
+      -1,     3,     4,   865,   854,     7,     8,     9,    10,    11,
       12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      -1,    23,    -1,    25,    26,    27,    -1,    -1,    30,    31,
-      32,    33,    34,    -1,    -1,    -1,    -1,    -1,    40,    -1,
-      -1,    -1,    44,    45,    46,    -1,    -1,    -1,    -1,    -1,
+     882,    23,    -1,    -1,    26,    27,    28,    -1,    -1,    31,
+      32,    33,    34,    35,    -1,    -1,    -1,    -1,    -1,    41,
+      -1,    -1,    -1,    45,    46,    47,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    63,    64,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    -1,    -1,
-      -1,    -1,     1,    95,     3,     4,    98,    -1,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    -1,    23,    -1,    25,    26,    27,    -1,
-      -1,    30,    31,    32,    33,    34,    -1,    -1,    -1,    -1,
-      -1,    40,    -1,    -1,    -1,    44,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    54,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    63,    64,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    65,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    -1,    -1,    -1,     1,    -1,     3,     4,    -1,    98,
-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    -1,    23,    -1,    25,    26,
-      27,    -1,    -1,    30,    31,    32,    33,    34,    -1,    -1,
-      -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,    -1,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    -1,
+      -1,    -1,    -1,     1,    96,     3,     4,    99,    -1,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    -1,    23,    -1,    -1,    26,    27,
+      28,    -1,    -1,    31,    32,    33,    34,    35,    -1,    -1,
+      -1,    -1,    -1,    41,    -1,    -1,    -1,    45,    46,    47,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    63,    64,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    65,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    -1,    -1,    -1,    -1,     1,    95,     3,
-       4,    98,    -1,     7,     8,     9,    10,    11,    12,    13,
+      -1,    -1,    -1,    -1,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    -1,    -1,    -1,    -1,     1,    96,     3,
+       4,    99,    -1,     7,     8,     9,    10,    11,    12,    13,
       14,    15,    16,    17,    18,    19,    20,    21,    -1,    23,
-      -1,    25,    26,    27,    -1,    -1,    30,    31,    32,    33,
-      34,    -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    63,
-      64,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    81,    82,    83,
-      84,    85,    86,    87,    88,    89,    -1,    -1,    -1,    -1,
-       1,    95,     3,     4,    98,    -1,     7,     8,     9,    10,
+      -1,    -1,    26,    27,    28,    -1,    -1,    31,    32,    33,
+      34,    35,    -1,    -1,    -1,    -1,    -1,    41,    -1,    -1,
+      -1,    45,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    65,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    -1,    -1,    -1,
+       1,    -1,     3,     4,    -1,    99,     7,     8,     9,    10,
       11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    -1,    23,    -1,    25,    26,    27,    -1,    -1,    30,
-      31,    32,    33,    34,    -1,    -1,    -1,    -1,    -1,    40,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     0,
-       1,    -1,    -1,     4,     5,     6,     7,    -1,    -1,    -1,
-      -1,    -1,    63,    64,    -1,    -1,    -1,    -1,    -1,    20,
-      21,    -1,    23,    -1,    -1,    -1,    27,    -1,    -1,    -1,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    40,
-      41,    42,    43,    -1,    95,    -1,    -1,    98,    49,    50,
-      -1,    -1,    53,    -1,    -1,    56,    -1,    -1,    -1,    -1,
-      -1,    -1,    63,    64,     1,    -1,     3,    -1,    -1,    70,
-      71,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    -1,    23,    24,    25,    26,
-      -1,    -1,    -1,    94,    95,    -1,    -1,    -1,    -1,    -1,
+      21,    -1,    23,    -1,    -1,    26,    27,    28,    -1,    -1,
+      31,    32,    33,    34,    35,    -1,    -1,    -1,    -1,    -1,
+      41,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     1,    -1,    -1,     4,     5,     6,
-       7,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    20,    21,    -1,    23,    -1,    -1,    -1,
-      27,    -1,    -1,    -1,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    40,    41,    42,    43,    -1,    95,    -1,
-      -1,    -1,    49,    50,    -1,    -1,    53,    -1,    -1,    56,
-      -1,    -1,    -1,    -1,    -1,     1,    63,    64,     4,     5,
-       6,     7,    -1,    70,    71,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    20,    21,    -1,    23,    -1,    -1,
-       1,    27,    -1,     4,     5,     6,     7,    94,    95,    -1,
-      -1,    -1,    -1,    -1,    40,    41,    42,    43,    -1,    20,
-      21,    -1,    23,    49,    50,    -1,    27,    53,    -1,    -1,
-      56,    -1,    -1,    -1,    -1,    -1,    -1,    63,    64,    40,
-      41,    42,    43,    -1,    70,    71,    72,    -1,    49,    50,
-      -1,    -1,    53,    -1,    -1,    56,    -1,    -1,    -1,    -1,
-      -1,    -1,    63,    64,    -1,    -1,     3,    -1,    94,    70,
-      71,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    -1,    23,    24,    25,    26,
-       3,    -1,    -1,    94,    -1,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    -1,    -1,    -1,
-      -1,    24,    25,    26,    -1,     4,    -1,     6,    -1,    -1,
+      -1,    -1,    -1,    64,    65,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    20,    21,    -1,    23,    24,    -1,    -1,    27,    -1,
-      -1,    -1,    -1,    -1,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    -1,    -1,    -1,    -1,    -1,    95,    -1,
-      49,    -1,    -1,    -1,    53,    -1,    -1,    -1,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,     1,    67,     3,
-       4,    -1,    95,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    -1,    23,
-      -1,    25,    26,    27,    -1,    -1,    30,    31,    32,    33,
-      34,    -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,
-      44,    45,    46,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    63,
-      64,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    81,    82,    83,
-      84,    85,    86,    87,    88,    89,     1,    -1,     3,     4,
-      -1,    -1,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    -1,    23,    -1,
-      25,    26,    27,    -1,    -1,    30,    31,    32,    33,    34,
-       1,    -1,     3,    -1,    -1,    40,    -1,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    -1,    23,    24,    25,    26,    -1,    -1,    63,    64,
+      -1,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      -1,    -1,    -1,    -1,     1,    96,     3,     4,    99,    -1,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    -1,    23,    -1,    -1,    26,
+      27,    28,    -1,    -1,    31,    32,    33,    34,    35,    -1,
+      -1,    -1,    -1,    -1,    41,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    65,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,     3,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    -1,    -1,    -1,    -1,     1,    96,
+       3,     4,    99,    -1,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    -1,
+      23,    -1,    -1,    26,    27,    28,    -1,    -1,    31,    32,
+      33,    34,    35,    -1,    -1,     3,     4,    -1,    41,     7,
        8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    -1,    23,    24,    25,    26,    -1,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,     3,
-      -1,    -1,    -1,    -1,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    -1,    -1,    -1,    -1,
-      -1,    25,    26,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      34,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,     3,    -1,    -1,    -1,    -1,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    -1,
-      -1,    -1,    -1,    -1,    25,    26,    -1,    81,    82,    83,
-      84,    85,    86,    87,    88,    89,     3,    -1,    -1,    -1,
-      -1,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    25,    26,
+      18,    -1,    -1,    -1,    -1,    23,    -1,    -1,    26,    27,
+      -1,    64,    65,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,    -1,    -1,
+      -1,    -1,    -1,    96,    -1,    -1,    99,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,     0,     1,    -1,    -1,     4,     5,
+       6,     7,    -1,    -1,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    -1,    20,    21,    -1,    23,     3,    -1,
+      -1,    99,    28,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    41,    42,    43,    44,    24,
+      25,    26,    27,    -1,    50,    51,    -1,    -1,    54,    -1,
+      -1,    57,    -1,    -1,    -1,    -1,    -1,    -1,    64,    65,
+       1,    -1,     3,    -1,    -1,    71,    72,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    -1,    23,    24,    25,    26,    27,    -1,    -1,    95,
+      96,    -1,    -1,    -1,    -1,    -1,    -1,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    -1,    -1,    -1,    -1,
+       1,    96,    -1,     4,     5,     6,     7,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    20,
+      21,    -1,    23,    -1,    -1,    -1,    -1,    28,    -1,    -1,
+      -1,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      41,    42,    43,    44,    -1,    96,    -1,    -1,    -1,    50,
+      51,    -1,    -1,    54,    -1,    -1,    57,    -1,    -1,    -1,
+      -1,    -1,     1,    64,    65,     4,     5,     6,     7,    -1,
+      71,    72,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    20,    21,    -1,    23,    -1,    -1,     1,    -1,    28,
+       4,     5,     6,     7,    95,    96,    -1,    -1,    -1,    -1,
+      -1,    -1,    41,    42,    43,    44,    20,    21,    -1,    23,
+      -1,    50,    51,    -1,    28,    54,    -1,    -1,    57,    -1,
+      -1,    -1,    -1,    -1,    -1,    64,    65,    41,    42,    43,
+      44,    -1,    71,    72,    73,    -1,    50,    51,    -1,    -1,
+      54,    -1,    -1,    57,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    65,    -1,    -1,     3,    -1,    95,    71,    72,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    -1,    23,    24,    25,    26,    27,    -1,
+       1,    95,     3,     4,    -1,    -1,     7,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    -1,    23,    -1,    -1,    26,    27,    28,    -1,    -1,
+      31,    32,    33,    34,    35,    -1,    -1,    -1,    -1,    -1,
+      41,    -1,    -1,    -1,    45,    46,    47,    -1,    -1,    -1,
+      -1,    -1,    -1,    82,    83,    84,    85,    86,    87,    88,
+      89,    90,    -1,    64,    65,    -1,    -1,    96,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+       1,    -1,     3,     4,    -1,    -1,     7,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    -1,    23,    -1,    -1,    26,    27,    28,    -1,    -1,
+      31,    32,    33,    34,    35,     1,    -1,     3,    -1,    -1,
+      41,    -1,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    -1,    23,    24,    25,
+      26,    27,    -1,    64,    65,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+       3,    -1,    -1,    -1,    -1,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    -1,
+      23,    24,    25,    26,    27,    -1,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,     3,    -1,    -1,    -1,    -1,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    -1,    -1,    -1,    -1,    -1,    -1,    26,    27,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    35,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,     3,    -1,
+      -1,    -1,    -1,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    -1,    -1,    -1,    -1,    -1,
+      -1,    26,    27,    -1,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,     3,    -1,    -1,    -1,    -1,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    26,    27,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,     4,    -1,     6,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    20,    21,    -1,    23,    24,    25,    -1,    -1,
+      28,    -1,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    50,    -1,    -1,    -1,    54,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    81,    82,    83,    84,    85,    86,
-      87,    88,    89
+      68
 };
 
-  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-     symbol of state STATE-NUM.  */
+/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of
+   state STATE-NUM.  */
 static const yytype_int16 yystos[] =
 {
-       0,   118,   119,   120,     0,     1,     4,     5,     6,     7,
-      20,    21,    23,    27,    40,    41,    42,    43,    49,    50,
-      53,    56,    63,    64,    70,    71,    94,   121,   122,   138,
-     140,   144,   145,   157,   160,   161,   165,   167,   170,   171,
-     172,   176,   180,   182,   186,   187,   212,   213,   231,   239,
-     240,   248,   257,   277,   279,   290,   292,   314,   315,   316,
-     358,   409,   410,   411,   412,   413,   417,   439,   441,   464,
-     465,   466,   467,   468,   472,   473,   474,   477,   481,   489,
-     502,   503,   137,   214,   139,   166,   249,   278,   291,   317,
-     359,     3,   211,   265,   165,    53,   165,   180,   182,    53,
-     172,   182,   183,   211,   211,   442,     3,    89,   207,   210,
-     207,   490,   504,   211,    99,   141,   130,   146,   158,    96,
-      96,   129,   101,   168,   162,   131,   173,     8,     9,    10,
+       0,   119,   120,   121,     0,     1,     4,     5,     6,     7,
+      20,    21,    23,    28,    41,    42,    43,    44,    50,    51,
+      54,    57,    64,    65,    71,    72,    95,   122,   123,   139,
+     141,   145,   146,   158,   161,   162,   166,   168,   171,   172,
+     173,   177,   181,   183,   187,   188,   213,   214,   232,   240,
+     241,   249,   258,   278,   280,   291,   293,   315,   316,   317,
+     363,   414,   415,   416,   417,   418,   422,   444,   446,   469,
+     470,   471,   472,   473,   477,   478,   479,   482,   486,   494,
+     507,   508,   138,   215,   140,   167,   250,   279,   292,   318,
+     364,     3,   212,   266,   166,    54,   166,   181,   183,    54,
+     173,   183,   184,   212,   212,   447,     3,    90,   208,   211,
+     208,   495,   509,   212,   100,   142,   131,   147,   159,    97,
+      97,   130,   102,   169,   163,   132,   174,     8,     9,    10,
       11,    12,    13,    14,    15,    16,    17,    18,    19,    24,
-      25,    26,    81,    82,    83,    84,    85,    86,    87,    88,
-     168,   207,   252,   253,   254,   255,   256,   267,   268,   269,
-     270,   271,   272,   273,   274,   275,   276,   277,   279,   290,
-     292,   316,   325,   328,   331,   332,   335,   336,   339,   127,
-     123,   121,    95,   241,   124,   280,    22,   128,   125,   126,
-     132,   414,   133,   440,   134,   168,   475,   475,   135,   136,
-      97,   506,    96,    17,   207,   218,   267,   270,   271,   272,
-     273,   274,   332,   336,   207,   211,   250,   252,   211,   211,
-     211,   211,   168,   211,   168,   177,   211,   211,   418,   211,
-     208,    75,    89,    75,     3,   240,    97,    97,    96,     4,
-       6,    20,    21,    23,    24,    27,    49,    53,    67,   482,
-     483,   485,   240,   499,    96,    48,   184,    97,    96,    97,
-       8,    11,     8,     9,    99,   329,   181,   100,   102,    99,
-      99,    96,    96,   207,    96,    97,   293,    96,    96,    96,
-      96,    97,    96,    97,   451,    96,   476,   469,   478,    96,
-      96,   507,   215,   251,   318,   360,    97,   101,   420,   443,
-     210,   209,   491,     3,   241,   232,   142,   218,    99,     3,
-     147,   484,    73,    74,    75,    76,    77,    78,    79,    80,
-      92,    93,   107,   108,   112,   113,   207,   219,   220,   221,
-     222,   223,   224,   225,   226,   227,   228,   229,   501,   100,
-     169,   163,   174,     8,   220,   230,    99,    47,   185,   326,
-     333,   337,   242,   281,   113,   415,   452,   185,    97,    97,
-     509,   211,   211,   258,   261,   265,   266,   340,    97,    97,
-     178,   421,   419,   101,   448,   210,    97,   505,   233,   119,
-     120,     3,   100,   102,   228,   228,   228,   220,   104,   105,
-     106,    90,    91,   107,   108,   109,   110,   111,   500,   159,
-     204,   207,   193,   194,   188,   102,   330,   204,   230,   230,
-     230,   113,   243,   240,   283,   285,   294,   422,   454,   470,
-     479,    30,    31,    60,    65,    68,    69,   347,   348,   353,
-     431,   433,   434,   498,   508,   510,   216,   341,   259,   319,
-     361,   193,   207,   185,   449,   444,   492,   420,     7,    98,
-     213,   218,   234,   236,   237,   275,   316,   143,   100,   148,
-     485,   114,   222,   223,   224,   225,   225,   226,   226,   227,
-     227,   227,   102,   211,   205,     1,    32,    33,   164,   195,
-     213,   239,   248,   347,   358,   363,   368,   409,   410,    44,
-      45,    46,   175,   189,   191,   192,   195,   239,   370,   220,
-     240,   327,   334,   338,   210,   220,   244,   245,   247,     1,
-     252,   286,   282,   284,   240,    51,    52,    61,   239,   347,
-     416,   423,   431,   433,   436,   437,   438,   498,    44,    54,
-     195,   453,   455,   458,   461,   193,   188,   349,   354,    19,
-     207,   432,    58,   435,   207,   207,   513,   511,   512,   432,
-     514,    98,   103,   240,   102,   240,   321,   324,   284,   179,
-     207,   185,   494,   495,   235,    96,   211,    96,    98,     3,
-      97,   240,   102,   203,    98,   199,   195,   196,   201,   200,
-     202,    34,   207,   254,   332,   336,   369,   392,   197,   198,
-     371,    98,   286,   189,   190,   100,   253,   100,   100,   100,
-     103,   114,   102,   246,   289,   287,    98,   285,     8,   207,
-     267,   272,   273,   274,   299,   316,   207,   207,   207,   423,
-     429,    98,   424,   425,   426,   427,   428,   430,   211,   211,
-      98,   456,   457,   471,   480,    31,   392,   210,     3,     3,
-      96,    96,    96,   210,    96,   217,   115,   342,   344,   260,
-       3,   320,   322,   362,    98,   445,   493,   239,   347,   431,
-     433,   496,   250,    29,   238,   149,   501,   206,    96,    96,
-      96,    96,    96,    96,   364,    96,    96,     3,    96,   220,
-     210,   247,    96,   258,   295,   210,   210,   210,    96,    96,
-      96,    96,    96,    96,    96,   459,   462,    96,    96,    98,
-      98,   350,   355,   219,   345,   343,   261,    98,   102,    98,
-      66,    98,   496,   497,    96,    96,    96,   220,    96,    72,
-     122,   138,   151,   153,   154,   207,     3,   372,   246,   288,
-     114,   113,   374,   374,   392,   262,   265,   230,   344,   323,
-     446,    96,   207,   150,   152,    96,   365,   374,    96,   296,
-     375,   376,   460,   463,   351,   356,   263,   346,   324,   207,
-     155,    98,   153,   113,   383,   373,    97,   114,    35,   377,
-     380,    38,   394,   394,   262,    55,   397,   102,   116,   447,
-      99,   384,   385,   366,   394,   297,   381,   114,   378,   395,
-     352,   398,   357,   264,    59,   450,     3,   486,   488,   114,
-      35,    36,    37,   386,   389,   393,   394,     1,    28,    29,
-     300,   302,   306,   308,   392,   102,   113,   394,   113,    62,
-     400,   265,   207,   100,   487,   114,   387,   390,   367,   305,
-     310,   309,   298,   301,   303,   307,   382,   379,   396,   399,
-     401,   156,   102,   102,   392,    39,   403,    96,   220,   101,
-      98,   302,   240,   308,   261,   380,   204,   204,   113,   211,
-     488,   388,   391,   404,   311,   252,   312,   114,   114,   402,
-     389,   261,   113,   101,   313,   304,   204,   405,   261,    96,
-     114,    75,   406,   407,   114,   102,   408,    75
+      25,    26,    27,    82,    83,    84,    85,    86,    87,    88,
+      89,   169,   208,   253,   254,   255,   256,   257,   268,   269,
+     270,   271,   272,   273,   274,   275,   276,   277,   278,   280,
+     291,   293,   317,   326,   327,   330,   333,   336,   337,   340,
+     341,   344,   128,   124,   122,    96,   242,   125,   281,    22,
+     129,   126,   127,   133,   419,   134,   445,   135,   169,   480,
+     480,   136,   137,    98,   511,    97,    17,   208,   219,   268,
+     271,   272,   273,   274,   275,   337,   341,   208,   212,   251,
+     253,   212,   212,   212,   212,   169,   212,   169,   178,   212,
+     212,   423,   212,   209,    76,    90,    76,     3,   241,    98,
+      98,    97,     4,     6,    20,    21,    23,    24,    25,    28,
+      50,    54,    68,   487,   488,   490,   241,   504,    97,    49,
+     185,    98,    97,    98,     8,    11,     8,     9,   100,   334,
+     328,   182,   101,   101,   103,   100,   100,    97,    97,   208,
+      97,    98,   294,    97,    97,    97,    97,    98,    97,    98,
+     456,    97,   481,   474,   483,    97,    97,   512,   216,   252,
+     319,   365,    98,   102,   425,   448,   211,   210,   496,     3,
+     242,   233,   143,   219,   100,     3,   148,   489,    74,    75,
+      76,    77,    78,    79,    80,    81,    93,    94,   108,   109,
+     113,   114,   208,   220,   221,   222,   223,   224,   225,   226,
+     227,   228,   229,   230,   506,   101,   170,   164,   175,     8,
+     221,   231,   100,   100,    48,   186,   331,   338,   342,   243,
+     282,   114,   420,   457,   186,    98,    98,   514,   212,   212,
+     259,   262,   266,   267,   345,    98,    98,   179,   426,   424,
+     102,   453,   211,    98,   510,   234,   120,   121,     3,   101,
+     103,   229,   229,   229,   221,   105,   106,   107,    91,    92,
+     108,   109,   110,   111,   112,   505,   160,   205,   208,   194,
+     195,   189,   103,   335,   241,   205,   231,   231,   231,   114,
+     244,   241,   284,   286,   295,   427,   459,   475,   484,    31,
+      32,    61,    66,    69,    70,   352,   353,   358,   436,   438,
+     439,   503,   513,   515,   217,   346,   260,   320,   366,   194,
+     208,   186,   454,   449,   497,   425,     7,    99,   214,   219,
+     235,   237,   238,   276,   317,   144,   101,   149,   490,   115,
+     223,   224,   225,   226,   226,   227,   227,   228,   228,   228,
+     103,   212,   206,     1,    33,    34,   165,   196,   214,   240,
+     249,   352,   363,   368,   373,   414,   415,    45,    46,    47,
+     176,   190,   192,   193,   196,   240,   375,   221,   241,   254,
+     332,   339,   343,   211,   221,   245,   246,   248,     1,   253,
+     287,   283,   285,   241,    52,    53,    62,   240,   352,   421,
+     428,   436,   438,   441,   442,   443,   503,    45,    55,   196,
+     458,   460,   463,   466,   194,   189,   354,   359,    19,   208,
+     437,    59,   440,   208,   208,   518,   516,   517,   437,   519,
+      99,   104,   241,   103,   241,   322,   325,   285,   180,   208,
+     186,   499,   500,   236,    97,   212,    97,    99,     3,    98,
+     241,   103,   204,    99,   200,   196,   197,   202,   201,   203,
+      35,   208,   255,   337,   341,   374,   397,   198,   199,   376,
+      99,   287,   190,   191,   101,   254,   329,   101,   101,   101,
+     104,   115,   103,   247,   290,   288,    99,   286,     8,   208,
+     268,   273,   274,   275,   300,   317,   208,   208,   208,   428,
+     434,    99,   429,   430,   431,   432,   433,   435,   212,   212,
+      99,   461,   462,   476,   485,    32,   397,   211,     3,     3,
+      97,    97,    97,   211,    97,   218,   116,   347,   349,   261,
+       3,   321,   323,   367,    99,   450,   498,   240,   352,   436,
+     438,   501,   251,    30,   239,   150,   506,   207,    97,    97,
+      97,    97,    97,    97,   369,    97,    97,     3,    97,   103,
+     221,   211,   248,    97,   259,   296,   211,   211,   211,    97,
+      97,    97,    97,    97,    97,    97,   464,   467,    97,    97,
+      99,    99,   355,   360,   220,   350,   348,   262,    99,   103,
+      99,    67,    99,   501,   502,    97,    97,    97,   221,    97,
+      73,   123,   139,   152,   154,   155,   208,     3,   377,   241,
+     247,   289,   115,   114,   379,   379,   397,   263,   266,   231,
+     349,   324,   451,    97,   208,   151,   153,    97,   370,   379,
+     254,    97,   297,   380,   381,   465,   468,   356,   361,   264,
+     351,   325,   208,   156,    99,   154,   114,   388,   378,    98,
+     115,    36,   382,   385,    39,   399,   399,   263,    56,   402,
+     103,   117,   452,   100,   389,   390,   371,   399,   298,   386,
+     115,   383,   400,   357,   403,   362,   265,    60,   455,     3,
+     491,   493,   115,    36,    37,    38,   391,   394,   398,   399,
+       1,    29,    30,   301,   303,   307,   309,   397,   103,   114,
+     399,   114,    63,   405,   266,   208,   101,   492,   115,   392,
+     395,   372,   306,   311,   310,   299,   302,   304,   308,   387,
+     384,   401,   404,   406,   157,   103,   103,   397,    40,   408,
+      97,   221,   102,    99,   303,   241,   309,   262,   385,   205,
+     205,   114,   212,   493,   393,   396,   409,   312,   253,   313,
+     115,   115,   407,   394,   262,   114,   102,   314,   305,   205,
+     410,   262,    97,   115,    76,   411,   412,   115,   103,   413,
+      76
 };
 
-  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM.  */
 static const yytype_int16 yyr1[] =
 {
-       0,   117,   118,   119,   119,   120,   120,   121,   121,   121,
-     123,   122,   124,   122,   125,   122,   126,   122,   127,   122,
-     128,   122,   129,   122,   130,   122,   131,   122,   132,   122,
-     133,   122,   134,   122,   135,   122,   136,   122,   137,   122,
-     139,   138,   141,   142,   143,   140,   144,   146,   147,   148,
-     149,   150,   145,   151,   152,   152,   153,   153,   155,   156,
-     154,   158,   159,   157,   160,   160,   162,   163,   164,   161,
-     166,   165,   167,   167,   167,   169,   168,   168,   170,   170,
-     170,   170,   171,   171,   173,   174,   175,   172,   177,   178,
-     179,   176,   181,   180,   183,   182,   184,   184,   185,   185,
-     186,   186,   187,   188,   188,   188,   189,   189,   190,   189,
-     191,   191,   192,   193,   193,   194,   194,   196,   195,   197,
-     195,   198,   195,   199,   195,   200,   195,   201,   195,   202,
-     195,   203,   195,   204,   206,   205,   205,   207,   208,   207,
-     209,   207,   210,   211,   212,   212,   212,   214,   215,   216,
-     217,   213,   218,   218,   218,   218,   218,   218,   218,   218,
-     218,   219,   220,   221,   221,   222,   222,   223,   223,   224,
-     224,   224,   225,   225,   225,   226,   226,   226,   226,   227,
-     227,   227,   227,   228,   228,   228,   229,   229,   229,   229,
-     229,   229,   229,   229,   229,   229,   230,   232,   231,   233,
-     233,   234,   234,   234,   235,   234,   236,   236,   237,   238,
-     238,   239,   240,   240,   242,   241,   243,   243,   244,   244,
-     245,   246,   246,   247,   249,   248,   248,   248,   248,   248,
-     248,   251,   250,   252,   252,   253,   253,   253,   254,   254,
-     254,   254,   254,   254,   254,   254,   255,   255,   255,   255,
-     256,   256,   256,   257,   257,   258,   260,   259,   259,   261,
-     261,   262,   264,   263,   263,   265,   266,   267,   267,   268,
-     268,   268,   268,   268,   268,   268,   269,   269,   269,   269,
-     269,   269,   269,   270,   270,   270,   271,   272,   272,   273,
-     274,   275,   276,   278,   277,   280,   281,   282,   279,   283,
-     284,   284,   285,   287,   288,   286,   289,   286,   291,   290,
-     293,   294,   295,   296,   297,   298,   292,   299,   299,   299,
-     299,   299,   299,   300,   301,   301,   303,   304,   302,   305,
-     302,   306,   307,   307,   309,   308,   310,   311,   308,   313,
-     312,   314,   315,   317,   318,   319,   320,   316,   321,   323,
-     322,   322,   324,   326,   327,   325,   325,   329,   330,   328,
-     331,   333,   334,   332,   332,   335,   337,   338,   336,   336,
-     339,   341,   340,   342,   343,   343,   345,   346,   344,   347,
-     347,   349,   350,   351,   352,   348,   354,   355,   356,   357,
+       0,   118,   119,   120,   120,   121,   121,   122,   122,   122,
+     124,   123,   125,   123,   126,   123,   127,   123,   128,   123,
+     129,   123,   130,   123,   131,   123,   132,   123,   133,   123,
+     134,   123,   135,   123,   136,   123,   137,   123,   138,   123,
+     140,   139,   142,   143,   144,   141,   145,   147,   148,   149,
+     150,   151,   146,   152,   153,   153,   154,   154,   156,   157,
+     155,   159,   160,   158,   161,   161,   163,   164,   165,   162,
+     167,   166,   168,   168,   168,   170,   169,   169,   171,   171,
+     171,   171,   172,   172,   174,   175,   176,   173,   178,   179,
+     180,   177,   182,   181,   184,   183,   185,   185,   186,   186,
+     187,   187,   188,   189,   189,   189,   190,   190,   191,   190,
+     192,   192,   193,   194,   194,   195,   195,   197,   196,   198,
+     196,   199,   196,   200,   196,   201,   196,   202,   196,   203,
+     196,   204,   196,   205,   207,   206,   206,   208,   209,   208,
+     210,   208,   211,   212,   213,   213,   213,   215,   216,   217,
+     218,   214,   219,   219,   219,   219,   219,   219,   219,   219,
+     219,   220,   221,   222,   222,   223,   223,   224,   224,   225,
+     225,   225,   226,   226,   226,   227,   227,   227,   227,   228,
+     228,   228,   228,   229,   229,   229,   230,   230,   230,   230,
+     230,   230,   230,   230,   230,   230,   231,   233,   232,   234,
+     234,   235,   235,   235,   236,   235,   237,   237,   238,   239,
+     239,   240,   241,   241,   243,   242,   244,   244,   245,   245,
+     246,   247,   247,   248,   250,   249,   249,   249,   249,   249,
+     249,   252,   251,   253,   253,   254,   254,   254,   255,   255,
+     255,   255,   255,   255,   255,   255,   256,   256,   256,   256,
+     256,   257,   257,   257,   258,   258,   259,   261,   260,   260,
+     262,   262,   263,   265,   264,   264,   266,   267,   268,   268,
+     269,   269,   269,   269,   269,   269,   269,   270,   270,   270,
+     270,   270,   270,   270,   271,   271,   271,   272,   273,   273,
+     274,   275,   276,   277,   279,   278,   281,   282,   283,   280,
+     284,   285,   285,   286,   288,   289,   287,   290,   287,   292,
+     291,   294,   295,   296,   297,   298,   299,   293,   300,   300,
+     300,   300,   300,   300,   301,   302,   302,   304,   305,   303,
+     306,   303,   307,   308,   308,   310,   309,   311,   312,   309,
+     314,   313,   315,   316,   318,   319,   320,   321,   317,   322,
+     324,   323,   323,   325,   326,   328,   329,   327,   331,   332,
+     330,   330,   334,   335,   333,   336,   338,   339,   337,   337,
+     340,   342,   343,   341,   341,   344,   346,   345,   347,   348,
+     348,   350,   351,   349,   352,   352,   354,   355,   356,   357,
      353,   359,   360,   361,   362,   358,   364,   365,   366,   367,
-     363,   368,   368,   368,   369,   369,   371,   372,   373,   370,
-     375,   374,   376,   374,   377,   379,   378,   378,   381,   382,
-     380,   384,   383,   385,   383,   386,   388,   387,   387,   390,
-     391,   389,   392,   392,   392,   392,   393,   393,   393,   395,
-     396,   394,   394,   398,   399,   397,   397,   401,   402,   400,
-     400,   404,   405,   403,   403,   406,   408,   407,   407,   409,
-     410,   411,   411,   412,   414,   415,   416,   413,   418,   419,
-     417,   421,   420,   420,   422,   422,   422,   424,   423,   425,
-     423,   426,   423,   427,   423,   428,   423,   429,   423,   430,
-     423,   431,   432,   432,   433,   434,   435,   435,   436,   437,
-     438,   440,   439,   442,   443,   444,   445,   446,   447,   441,
-     449,   448,   448,   450,   450,   452,   453,   451,   454,   454,
-     455,   456,   455,   457,   455,   459,   460,   458,   462,   463,
-     461,   464,   464,   464,   465,   465,   466,   467,   469,   470,
-     471,   468,   472,   473,   474,   476,   475,   478,   479,   480,
-     477,   481,   481,   482,   482,   482,   482,   482,   482,   482,
-     482,   482,   482,   483,   484,   484,   485,   485,   486,   487,
-     487,   488,   490,   491,   492,   493,   489,   494,   494,   495,
-     495,   496,   496,   497,   496,   498,   498,   499,   500,   500,
-     501,   502,   504,   505,   503,   507,   508,   506,   509,   509,
-     511,   510,   512,   510,   513,   510,   514,   510
+     363,   369,   370,   371,   372,   368,   373,   373,   373,   374,
+     374,   376,   377,   378,   375,   380,   379,   381,   379,   382,
+     384,   383,   383,   386,   387,   385,   389,   388,   390,   388,
+     391,   393,   392,   392,   395,   396,   394,   397,   397,   397,
+     397,   398,   398,   398,   400,   401,   399,   399,   403,   404,
+     402,   402,   406,   407,   405,   405,   409,   410,   408,   408,
+     411,   413,   412,   412,   414,   415,   416,   416,   417,   419,
+     420,   421,   418,   423,   424,   422,   426,   425,   425,   427,
+     427,   427,   429,   428,   430,   428,   431,   428,   432,   428,
+     433,   428,   434,   428,   435,   428,   436,   437,   437,   438,
+     439,   440,   440,   441,   442,   443,   445,   444,   447,   448,
+     449,   450,   451,   452,   446,   454,   453,   453,   455,   455,
+     457,   458,   456,   459,   459,   460,   461,   460,   462,   460,
+     464,   465,   463,   467,   468,   466,   469,   469,   469,   470,
+     470,   471,   472,   474,   475,   476,   473,   477,   478,   479,
+     481,   480,   483,   484,   485,   482,   486,   486,   487,   487,
+     487,   487,   487,   487,   487,   487,   487,   487,   487,   488,
+     489,   489,   490,   490,   491,   492,   492,   493,   495,   496,
+     497,   498,   494,   499,   499,   500,   500,   501,   501,   502,
+     501,   503,   503,   504,   505,   505,   506,   507,   509,   510,
+     508,   512,   513,   511,   514,   514,   516,   515,   517,   515,
+     518,   515,   519,   515
 };
 
-  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM.  */
 static const yytype_int8 yyr2[] =
 {
        0,     2,     1,     1,     0,     3,     2,     1,     2,     2,
@@ -2206,42 +2216,43 @@ static const yytype_int8 yyr2[] =
        2,     3,     0,     3,     0,     3,     1,     1,     1,     2,
        1,     0,     3,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     2,     0,     4,     0,     1,
-       1,     2,     0,     4,     0,     1,     1,     1,     1,     1,
-       2,     1,     1,     1,     1,     1,     2,     3,     2,     1,
-       1,     1,     1,     1,     1,     2,     1,     1,     1,     1,
-       1,     1,     1,     0,     3,     0,     0,     0,     7,     2,
-       2,     0,     2,     0,     0,     5,     0,     3,     0,     3,
-       0,     0,     0,     0,     0,     0,    15,     1,     1,     1,
-       1,     1,     1,     2,     2,     0,     0,     0,     6,     0,
-       3,     2,     2,     0,     0,     3,     0,     0,     5,     0,
-       3,     1,     1,     0,     0,     0,     0,     9,     2,     0,
-       4,     0,     2,     0,     0,     6,     2,     0,     0,     6,
-       6,     0,     0,     6,     1,     1,     0,     0,     6,     1,
-       1,     0,     4,     2,     2,     0,     0,     0,     5,     1,
-       1,     0,     0,     0,     0,     9,     0,     0,     0,     0,
+       1,     1,     1,     1,     1,     1,     2,     0,     4,     0,
+       1,     1,     2,     0,     4,     0,     1,     1,     1,     1,
+       1,     2,     1,     1,     1,     1,     1,     2,     3,     2,
+       1,     1,     1,     1,     1,     1,     2,     1,     1,     1,
+       1,     1,     1,     1,     0,     3,     0,     0,     0,     7,
+       2,     2,     0,     2,     0,     0,     5,     0,     3,     0,
+       3,     0,     0,     0,     0,     0,     0,    15,     1,     1,
+       1,     1,     1,     1,     2,     2,     0,     0,     0,     6,
+       0,     3,     2,     2,     0,     0,     3,     0,     0,     5,
+       0,     3,     1,     1,     0,     0,     0,     0,     9,     2,
+       0,     4,     0,     2,     2,     0,     0,     9,     0,     0,
+       6,     2,     0,     0,     6,     6,     0,     0,     6,     1,
+       1,     0,     0,     6,     1,     1,     0,     4,     2,     2,
+       0,     0,     0,     5,     1,     1,     0,     0,     0,     0,
        9,     0,     0,     0,     0,     9,     0,     0,     0,     0,
-      10,     1,     1,     0,     1,     1,     0,     0,     0,     7,
-       0,     3,     0,     4,     2,     0,     4,     0,     0,     0,
-       5,     0,     3,     0,     4,     2,     0,     4,     0,     0,
-       0,     5,     1,     1,     1,     1,     1,     1,     1,     0,
-       0,     6,     0,     0,     0,     6,     0,     0,     0,     6,
-       0,     0,     0,     6,     0,     2,     0,     4,     0,     3,
-       3,     1,     1,     2,     0,     0,     0,     7,     0,     0,
-       6,     0,     3,     0,     3,     2,     0,     0,     3,     0,
-       3,     0,     3,     0,     3,     0,     3,     0,     3,     0,
-       3,     3,     1,     1,     3,     2,     1,     0,     3,     3,
-       3,     0,     3,     0,     0,     0,     0,     0,     0,    13,
-       0,     3,     0,     2,     0,     0,     0,     5,     2,     0,
-       1,     0,     3,     0,     3,     0,     0,     6,     0,     0,
-       6,     1,     1,     1,     1,     1,     2,     3,     0,     0,
-       0,     8,     3,     3,     2,     0,     3,     0,     0,     0,
-       8,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     2,     2,     3,     0,     2,     5,     2,     3,
-       0,     1,     0,     0,     0,     0,     9,     3,     2,     1,
-       0,     2,     2,     0,     3,     3,     3,     3,     4,     0,
-       1,     2,     0,     0,     6,     0,     0,     5,     2,     0,
-       0,     3,     0,     3,     0,     3,     0,     3
+       9,     0,     0,     0,     0,    10,     1,     1,     0,     1,
+       1,     0,     0,     0,     7,     0,     3,     0,     4,     2,
+       0,     4,     0,     0,     0,     5,     0,     3,     0,     4,
+       2,     0,     4,     0,     0,     0,     5,     1,     1,     1,
+       1,     1,     1,     1,     0,     0,     6,     0,     0,     0,
+       6,     0,     0,     0,     6,     0,     0,     0,     6,     0,
+       2,     0,     4,     0,     3,     3,     1,     1,     2,     0,
+       0,     0,     7,     0,     0,     6,     0,     3,     0,     3,
+       2,     0,     0,     3,     0,     3,     0,     3,     0,     3,
+       0,     3,     0,     3,     0,     3,     3,     1,     1,     3,
+       2,     1,     0,     3,     3,     3,     0,     3,     0,     0,
+       0,     0,     0,     0,    13,     0,     3,     0,     2,     0,
+       0,     0,     5,     2,     0,     1,     0,     3,     0,     3,
+       0,     0,     6,     0,     0,     6,     1,     1,     1,     1,
+       1,     2,     3,     0,     0,     0,     8,     3,     3,     2,
+       0,     3,     0,     0,     0,     8,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     2,     2,
+       3,     0,     2,     5,     2,     3,     0,     1,     0,     0,
+       0,     0,     9,     3,     2,     1,     0,     2,     2,     0,
+       3,     3,     3,     3,     4,     0,     1,     2,     0,     0,
+       6,     0,     0,     5,     2,     0,     0,     3,     0,     3,
+       0,     3,     0,     3
 };
 
 
@@ -2253,6 +2264,7 @@ enum { YYENOMEM = -2 };
 #define YYACCEPT        goto yyacceptlab
 #define YYABORT         goto yyabortlab
 #define YYERROR         goto yyerrorlab
+#define YYNOMEM         goto yyexhaustedlab
 
 
 #define YYRECOVERING()  (!!yyerrstatus)
@@ -2293,10 +2305,7 @@ do {                                            \
     YYFPRINTF Args;                             \
 } while (0)
 
-/* This macro is provided for backward compatibility. */
-# ifndef YY_LOCATION_PRINT
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+
 
 
 # define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
@@ -2323,10 +2332,6 @@ yy_symbol_value_print (FILE *yyo,
   YY_USE (yyoutput);
   if (!yyvaluep)
     return;
-# ifdef YYPRINT
-  if (yykind < YYNTOKENS)
-    YYPRINT (yyo, yytoknum[yykind], *yyvaluep);
-# endif
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   YY_USE (yykind);
   YY_IGNORE_MAYBE_UNINITIALIZED_END
@@ -2433,6 +2438,7 @@ int yydebug;
 
 
 
+
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
@@ -2462,12 +2468,13 @@ int yynerrs;
 
 
 
+
 /*----------.
 | yyparse.  |
 `----------*/
 
 int
-yyparse ()
+yyparse (void)
 {
     yy_state_fast_t yystate = 0;
     /* Number of tokens to shift before error messages enabled.  */
@@ -2499,6 +2506,7 @@ yyparse ()
   YYSTYPE yyval;
 
 
+
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
   /* The number of symbols on the RHS of the reduced rule.
@@ -2508,6 +2516,7 @@ yyparse ()
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yychar = YYEMPTY; /* Cause a token to be read.  */
+
   goto yysetstate;
 
 
@@ -2533,7 +2542,7 @@ yyparse ()
 
   if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
-    goto yyexhaustedlab;
+    YYNOMEM;
 #else
     {
       /* Get the current used size of the three stacks, in elements.  */
@@ -2561,7 +2570,7 @@ yyparse ()
 # else /* defined YYSTACK_RELOCATE */
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-        goto yyexhaustedlab;
+        YYNOMEM;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
         yystacksize = YYMAXDEPTH;
@@ -2572,7 +2581,7 @@ yyparse ()
           YY_CAST (union yyalloc *,
                    YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
         if (! yyptr)
-          goto yyexhaustedlab;
+          YYNOMEM;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
@@ -2594,6 +2603,7 @@ yyparse ()
     }
 #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
+
   if (yystate == YYFINAL)
     YYACCEPT;
 
@@ -2706,7 +2716,7 @@ yyparse ()
   switch (yyn)
     {
   case 5: /* at_least_one_definition: definitions at_least_one_annotation definition  */
-#line 427 "fe/idl.ypp"
+#line 432 "fe/idl.ypp"
         {
           AST_Annotation_Appls *&annotations = (yyvsp[-1].annotations_val);
           AST_Decl *&node = (yyvsp[0].dcval);
@@ -2721,269 +2731,269 @@ yyparse ()
             }
           delete annotations;
         }
-#line 2741 "fe/idl.tab.cpp"
+#line 2747 "fe/idl.tab.cpp"
     break;
 
   case 10: /* $@1: %empty  */
-#line 452 "fe/idl.ypp"
+#line 457 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_AnnotationDeclSeen);
         }
-#line 2749 "fe/idl.tab.cpp"
+#line 2755 "fe/idl.tab.cpp"
     break;
 
   case 11: /* fixed_definition: annotation_dcl $@1 ';'  */
-#line 456 "fe/idl.ypp"
+#line 461 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 2757 "fe/idl.tab.cpp"
+#line 2763 "fe/idl.tab.cpp"
     break;
 
   case 12: /* $@2: %empty  */
-#line 460 "fe/idl.ypp"
+#line 465 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen);
         }
-#line 2765 "fe/idl.tab.cpp"
+#line 2771 "fe/idl.tab.cpp"
     break;
 
   case 13: /* fixed_definition: type_dcl $@2 ';'  */
-#line 464 "fe/idl.ypp"
+#line 469 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 2773 "fe/idl.tab.cpp"
+#line 2779 "fe/idl.tab.cpp"
     break;
 
   case 14: /* $@3: %empty  */
-#line 468 "fe/idl.ypp"
+#line 473 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen);
         }
-#line 2781 "fe/idl.tab.cpp"
+#line 2787 "fe/idl.tab.cpp"
     break;
 
   case 15: /* fixed_definition: typeid_dcl $@3 ';'  */
-#line 472 "fe/idl.ypp"
+#line 477 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 2789 "fe/idl.tab.cpp"
+#line 2795 "fe/idl.tab.cpp"
     break;
 
   case 16: /* $@4: %empty  */
-#line 476 "fe/idl.ypp"
+#line 481 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen);
         }
-#line 2797 "fe/idl.tab.cpp"
+#line 2803 "fe/idl.tab.cpp"
     break;
 
   case 17: /* fixed_definition: typeprefix_dcl $@4 ';'  */
-#line 480 "fe/idl.ypp"
+#line 485 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 2805 "fe/idl.tab.cpp"
+#line 2811 "fe/idl.tab.cpp"
     break;
 
   case 18: /* $@5: %empty  */
-#line 484 "fe/idl.ypp"
+#line 489 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen);
         }
-#line 2813 "fe/idl.tab.cpp"
+#line 2819 "fe/idl.tab.cpp"
     break;
 
   case 19: /* fixed_definition: const_dcl $@5 ';'  */
-#line 488 "fe/idl.ypp"
+#line 493 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 2821 "fe/idl.tab.cpp"
+#line 2827 "fe/idl.tab.cpp"
     break;
 
   case 20: /* $@6: %empty  */
-#line 492 "fe/idl.ypp"
+#line 497 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen);
         }
-#line 2829 "fe/idl.tab.cpp"
+#line 2835 "fe/idl.tab.cpp"
     break;
 
   case 21: /* fixed_definition: exception $@6 ';'  */
-#line 496 "fe/idl.ypp"
+#line 501 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 2837 "fe/idl.tab.cpp"
+#line 2843 "fe/idl.tab.cpp"
     break;
 
   case 22: /* $@7: %empty  */
-#line 500 "fe/idl.ypp"
+#line 505 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceDeclSeen);
         }
-#line 2845 "fe/idl.tab.cpp"
+#line 2851 "fe/idl.tab.cpp"
     break;
 
   case 23: /* fixed_definition: interface_def $@7 ';'  */
-#line 504 "fe/idl.ypp"
+#line 509 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 2853 "fe/idl.tab.cpp"
+#line 2859 "fe/idl.tab.cpp"
     break;
 
   case 24: /* $@8: %empty  */
-#line 508 "fe/idl.ypp"
+#line 513 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ModuleDeclSeen);
         }
-#line 2861 "fe/idl.tab.cpp"
+#line 2867 "fe/idl.tab.cpp"
     break;
 
   case 25: /* fixed_definition: module $@8 ';'  */
-#line 512 "fe/idl.ypp"
+#line 517 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 2869 "fe/idl.tab.cpp"
+#line 2875 "fe/idl.tab.cpp"
     break;
 
   case 26: /* $@9: %empty  */
-#line 516 "fe/idl.ypp"
+#line 521 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeDeclSeen);
         }
-#line 2877 "fe/idl.tab.cpp"
+#line 2883 "fe/idl.tab.cpp"
     break;
 
   case 27: /* fixed_definition: value_def $@9 ';'  */
-#line 520 "fe/idl.ypp"
+#line 525 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 2885 "fe/idl.tab.cpp"
+#line 2891 "fe/idl.tab.cpp"
     break;
 
   case 28: /* $@10: %empty  */
-#line 524 "fe/idl.ypp"
+#line 529 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ComponentDeclSeen);
         }
-#line 2893 "fe/idl.tab.cpp"
+#line 2899 "fe/idl.tab.cpp"
     break;
 
   case 29: /* fixed_definition: component $@10 ';'  */
-#line 528 "fe/idl.ypp"
+#line 533 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 2901 "fe/idl.tab.cpp"
+#line 2907 "fe/idl.tab.cpp"
     break;
 
   case 30: /* $@11: %empty  */
-#line 532 "fe/idl.ypp"
+#line 537 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_HomeDeclSeen);
         }
-#line 2909 "fe/idl.tab.cpp"
+#line 2915 "fe/idl.tab.cpp"
     break;
 
   case 31: /* fixed_definition: home_decl $@11 ';'  */
-#line 536 "fe/idl.ypp"
+#line 541 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 2917 "fe/idl.tab.cpp"
+#line 2923 "fe/idl.tab.cpp"
     break;
 
   case 32: /* $@12: %empty  */
-#line 540 "fe/idl.ypp"
+#line 545 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_EventDeclSeen);
         }
-#line 2925 "fe/idl.tab.cpp"
+#line 2931 "fe/idl.tab.cpp"
     break;
 
   case 33: /* fixed_definition: event $@12 ';'  */
-#line 544 "fe/idl.ypp"
+#line 549 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 2933 "fe/idl.tab.cpp"
+#line 2939 "fe/idl.tab.cpp"
     break;
 
   case 34: /* $@13: %empty  */
-#line 548 "fe/idl.ypp"
+#line 553 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeDeclSeen);
         }
-#line 2941 "fe/idl.tab.cpp"
+#line 2947 "fe/idl.tab.cpp"
     break;
 
   case 35: /* fixed_definition: porttype_decl $@13 ';'  */
-#line 552 "fe/idl.ypp"
+#line 557 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 2949 "fe/idl.tab.cpp"
+#line 2955 "fe/idl.tab.cpp"
     break;
 
   case 36: /* $@14: %empty  */
-#line 556 "fe/idl.ypp"
+#line 561 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorDeclSeen);
         }
-#line 2957 "fe/idl.tab.cpp"
+#line 2963 "fe/idl.tab.cpp"
     break;
 
   case 37: /* fixed_definition: connector_decl $@14 ';'  */
-#line 560 "fe/idl.ypp"
+#line 565 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 2965 "fe/idl.tab.cpp"
+#line 2971 "fe/idl.tab.cpp"
     break;
 
   case 38: /* $@15: %empty  */
-#line 564 "fe/idl.ypp"
+#line 569 "fe/idl.ypp"
         {
           idl_global->err ()->syntax_error (idl_global->parse_state ());
         }
-#line 2973 "fe/idl.tab.cpp"
+#line 2979 "fe/idl.tab.cpp"
     break;
 
   case 39: /* fixed_definition: error $@15 ';'  */
-#line 568 "fe/idl.ypp"
+#line 573 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
           yyerrok;
           (yyval.dcval) = 0;
         }
-#line 2983 "fe/idl.tab.cpp"
+#line 2989 "fe/idl.tab.cpp"
     break;
 
   case 40: /* $@16: %empty  */
-#line 577 "fe/idl.ypp"
+#line 582 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSeen);
         }
-#line 2991 "fe/idl.tab.cpp"
+#line 2997 "fe/idl.tab.cpp"
     break;
 
   case 41: /* module_header: IDL_MODULE $@16 scoped_name  */
-#line 581 "fe/idl.ypp"
+#line 586 "fe/idl.ypp"
         {
           (yyval.idlist) = (yyvsp[0].idlist);
         }
-#line 2999 "fe/idl.tab.cpp"
+#line 3005 "fe/idl.tab.cpp"
     break;
 
   case 42: /* @17: %empty  */
-#line 588 "fe/idl.ypp"
+#line 593 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ModuleIDSeen);
 
@@ -3022,27 +3032,27 @@ yyparse ()
 
           (yyval.dcval) = m;
         }
-#line 3042 "fe/idl.tab.cpp"
+#line 3048 "fe/idl.tab.cpp"
     break;
 
   case 43: /* $@18: %empty  */
-#line 627 "fe/idl.ypp"
+#line 632 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSqSeen);
         }
-#line 3050 "fe/idl.tab.cpp"
+#line 3056 "fe/idl.tab.cpp"
     break;
 
   case 44: /* $@19: %empty  */
-#line 631 "fe/idl.ypp"
+#line 636 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ModuleBodySeen);
         }
-#line 3058 "fe/idl.tab.cpp"
+#line 3064 "fe/idl.tab.cpp"
     break;
 
   case 45: /* module: module_header @17 '{' $@18 at_least_one_definition $@19 '}'  */
-#line 635 "fe/idl.ypp"
+#line 640 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ModuleQsSeen);
           /*
@@ -3052,19 +3062,19 @@ yyparse ()
           idl_global->scopes ().pop ();
           (yyval.dcval) = (yyvsp[-5].dcval);
         }
-#line 3072 "fe/idl.tab.cpp"
+#line 3078 "fe/idl.tab.cpp"
     break;
 
   case 46: /* template_module_header: module_header '<'  */
-#line 648 "fe/idl.ypp"
+#line 653 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleIDSeen);
         }
-#line 3080 "fe/idl.tab.cpp"
+#line 3086 "fe/idl.tab.cpp"
     break;
 
   case 47: /* $@20: %empty  */
-#line 655 "fe/idl.ypp"
+#line 660 "fe/idl.ypp"
         {
           // The module_header rule is common to template module, fixed
           // module and instantiated template module. In the last
@@ -3078,11 +3088,11 @@ yyparse ()
                 IDL_GlobalData::PS_ModuleIDSeen);
             }
         }
-#line 3098 "fe/idl.tab.cpp"
+#line 3104 "fe/idl.tab.cpp"
     break;
 
   case 48: /* $@21: %empty  */
-#line 669 "fe/idl.ypp"
+#line 674 "fe/idl.ypp"
         {
           if (FE_Utils::duplicate_param_id ((yyvsp[0].plval)))
             {
@@ -3092,11 +3102,11 @@ yyparse ()
               return 1;
             }
         }
-#line 3112 "fe/idl.tab.cpp"
+#line 3118 "fe/idl.tab.cpp"
     break;
 
   case 49: /* $@22: %empty  */
-#line 679 "fe/idl.ypp"
+#line 684 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleParamsSeen);
 
@@ -3126,27 +3136,27 @@ yyparse ()
           // of the template module.
           idl_global->current_params ((yyvsp[-2].plval));
         }
-#line 3146 "fe/idl.tab.cpp"
+#line 3152 "fe/idl.tab.cpp"
     break;
 
   case 50: /* $@23: %empty  */
-#line 709 "fe/idl.ypp"
+#line 714 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleSqSeen);
         }
-#line 3154 "fe/idl.tab.cpp"
+#line 3160 "fe/idl.tab.cpp"
     break;
 
   case 51: /* $@24: %empty  */
-#line 713 "fe/idl.ypp"
+#line 718 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleBodySeen);
         }
-#line 3162 "fe/idl.tab.cpp"
+#line 3168 "fe/idl.tab.cpp"
     break;
 
   case 52: /* template_module: template_module_header $@20 at_least_one_formal_parameter $@21 '>' $@22 '{' $@23 at_least_one_tpl_definition $@24 '}'  */
-#line 717 "fe/idl.ypp"
+#line 722 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleQsSeen);
 
@@ -3165,29 +3175,29 @@ yyparse ()
 
           (yyval.dcval) = 0;
         }
-#line 3185 "fe/idl.tab.cpp"
+#line 3191 "fe/idl.tab.cpp"
     break;
 
   case 58: /* $@25: %empty  */
-#line 753 "fe/idl.ypp"
+#line 758 "fe/idl.ypp"
         {
           idl_global->set_parse_state (
             IDL_GlobalData::PS_ModuleRefSeen);
         }
-#line 3194 "fe/idl.tab.cpp"
+#line 3200 "fe/idl.tab.cpp"
     break;
 
   case 59: /* $@26: %empty  */
-#line 758 "fe/idl.ypp"
+#line 763 "fe/idl.ypp"
         {
           idl_global->set_parse_state (
             IDL_GlobalData::PS_ModuleRefParamsSeen);
         }
-#line 3203 "fe/idl.tab.cpp"
+#line 3209 "fe/idl.tab.cpp"
     break;
 
   case 60: /* template_module_ref: IDL_ALIAS scoped_name $@25 '<' at_least_one_formal_parameter_name '>' $@26 defining_id  */
-#line 763 "fe/idl.ypp"
+#line 768 "fe/idl.ypp"
         {
           idl_global->set_parse_state (
             IDL_GlobalData::PS_ModuleRefIDSeen);
@@ -3265,29 +3275,29 @@ yyparse ()
           idl_global->in_tmpl_mod_no_alias (itmna_flag);
           idl_global->in_tmpl_mod_alias (false);
         }
-#line 3285 "fe/idl.tab.cpp"
+#line 3291 "fe/idl.tab.cpp"
     break;
 
   case 61: /* $@27: %empty  */
-#line 844 "fe/idl.ypp"
+#line 849 "fe/idl.ypp"
         {
           idl_global->set_parse_state (
             IDL_GlobalData::PS_InstModuleSeen);
         }
-#line 3294 "fe/idl.tab.cpp"
+#line 3300 "fe/idl.tab.cpp"
     break;
 
   case 62: /* $@28: %empty  */
-#line 849 "fe/idl.ypp"
+#line 854 "fe/idl.ypp"
         {
           idl_global->set_parse_state (
             IDL_GlobalData::PS_InstModuleArgsSeen);
         }
-#line 3303 "fe/idl.tab.cpp"
+#line 3309 "fe/idl.tab.cpp"
     break;
 
   case 63: /* template_module_inst: template_module_header $@27 at_least_one_actual_parameter '>' $@28 defining_id  */
-#line 854 "fe/idl.ypp"
+#line 859 "fe/idl.ypp"
         {
           idl_global->set_parse_state (
             IDL_GlobalData::PS_InstModuleIDSeen);
@@ -3351,11 +3361,11 @@ yyparse ()
 
           (yyval.dcval) = 0;
         }
-#line 3371 "fe/idl.tab.cpp"
+#line 3377 "fe/idl.tab.cpp"
     break;
 
   case 66: /* $@29: %empty  */
-#line 926 "fe/idl.ypp"
+#line 931 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Interface *i = 0;
@@ -3393,27 +3403,27 @@ yyparse ()
            */
           idl_global->scopes ().push (i);
         }
-#line 3413 "fe/idl.tab.cpp"
+#line 3419 "fe/idl.tab.cpp"
     break;
 
   case 67: /* $@30: %empty  */
-#line 964 "fe/idl.ypp"
+#line 969 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSqSeen);
         }
-#line 3421 "fe/idl.tab.cpp"
+#line 3427 "fe/idl.tab.cpp"
     break;
 
   case 68: /* $@31: %empty  */
-#line 968 "fe/idl.ypp"
+#line 973 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceBodySeen);
         }
-#line 3429 "fe/idl.tab.cpp"
+#line 3435 "fe/idl.tab.cpp"
     break;
 
   case 69: /* interface: interface_header $@29 '{' $@30 exports $@31 '}'  */
-#line 972 "fe/idl.ypp"
+#line 977 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceQsSeen);
 
@@ -3423,28 +3433,28 @@ yyparse ()
            */
           idl_global->scopes ().pop ();
         }
-#line 3443 "fe/idl.tab.cpp"
+#line 3449 "fe/idl.tab.cpp"
     break;
 
   case 70: /* $@32: %empty  */
-#line 985 "fe/idl.ypp"
+#line 990 "fe/idl.ypp"
          {
            idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSeen);
          }
-#line 3451 "fe/idl.tab.cpp"
+#line 3457 "fe/idl.tab.cpp"
     break;
 
   case 71: /* interface_decl: IDL_INTERFACE $@32 defining_id  */
-#line 989 "fe/idl.ypp"
+#line 994 "fe/idl.ypp"
          {
            idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceIDSeen);
            (yyval.idval) = (yyvsp[0].idval);
          }
-#line 3460 "fe/idl.tab.cpp"
+#line 3466 "fe/idl.tab.cpp"
     break;
 
   case 72: /* interface_header: interface_decl inheritance_spec  */
-#line 997 "fe/idl.ypp"
+#line 1002 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
 
@@ -3480,11 +3490,11 @@ yyparse ()
               (yyvsp[0].nlval) = 0;
             }
         }
-#line 3500 "fe/idl.tab.cpp"
+#line 3506 "fe/idl.tab.cpp"
     break;
 
   case 73: /* interface_header: IDL_LOCAL interface_decl inheritance_spec  */
-#line 1034 "fe/idl.ypp"
+#line 1039 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
 
@@ -3513,11 +3523,11 @@ yyparse ()
               (yyvsp[0].nlval) = 0;
             }
         }
-#line 3533 "fe/idl.tab.cpp"
+#line 3539 "fe/idl.tab.cpp"
     break;
 
   case 74: /* interface_header: IDL_ABSTRACT interface_decl inheritance_spec  */
-#line 1064 "fe/idl.ypp"
+#line 1069 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
 
@@ -3546,45 +3556,45 @@ yyparse ()
               (yyvsp[0].nlval) = 0;
             }
         }
-#line 3566 "fe/idl.tab.cpp"
+#line 3572 "fe/idl.tab.cpp"
     break;
 
   case 75: /* $@33: %empty  */
-#line 1096 "fe/idl.ypp"
+#line 1101 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen);
         }
-#line 3574 "fe/idl.tab.cpp"
+#line 3580 "fe/idl.tab.cpp"
     break;
 
   case 76: /* inheritance_spec: ':' opt_truncatable $@33 at_least_one_scoped_name  */
-#line 1100 "fe/idl.ypp"
+#line 1105 "fe/idl.ypp"
         {
           (yyvsp[0].nlval)->truncatable ((yyvsp[-2].bval));
           (yyval.nlval) = (yyvsp[0].nlval);
         }
-#line 3583 "fe/idl.tab.cpp"
+#line 3589 "fe/idl.tab.cpp"
     break;
 
   case 77: /* inheritance_spec: %empty  */
-#line 1105 "fe/idl.ypp"
+#line 1110 "fe/idl.ypp"
         {
           (yyval.nlval) = 0;
         }
-#line 3591 "fe/idl.tab.cpp"
+#line 3597 "fe/idl.tab.cpp"
     break;
 
   case 82: /* valuetype: IDL_CUSTOM value_concrete_decl  */
-#line 1119 "fe/idl.ypp"
+#line 1124 "fe/idl.ypp"
         {
           idl_global->err ()->unsupported_error ("custom is not supported");
           (yyval.dcval) = (yyvsp[0].dcval);
         }
-#line 3600 "fe/idl.tab.cpp"
+#line 3606 "fe/idl.tab.cpp"
     break;
 
   case 84: /* @34: %empty  */
-#line 1128 "fe/idl.ypp"
+#line 1133 "fe/idl.ypp"
         {
           FE_OBVHeader *&valuetype_header = (yyvsp[0].vhval);
           UTL_Scope *scope = idl_global->scopes ().top_non_null ();
@@ -3631,27 +3641,27 @@ yyparse ()
 
           (yyval.dcval) = valuetype;
         }
-#line 3651 "fe/idl.tab.cpp"
+#line 3657 "fe/idl.tab.cpp"
     break;
 
   case 85: /* $@35: %empty  */
-#line 1175 "fe/idl.ypp"
+#line 1180 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen);
         }
-#line 3659 "fe/idl.tab.cpp"
+#line 3665 "fe/idl.tab.cpp"
     break;
 
   case 86: /* $@36: %empty  */
-#line 1179 "fe/idl.ypp"
+#line 1184 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen);
         }
-#line 3667 "fe/idl.tab.cpp"
+#line 3673 "fe/idl.tab.cpp"
     break;
 
   case 87: /* value_concrete_decl: value_header @34 '{' $@35 value_elements $@36 '}'  */
-#line 1183 "fe/idl.ypp"
+#line 1188 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen);
 
@@ -3672,11 +3682,11 @@ yyparse ()
 
           (yyval.dcval) = (yyvsp[-5].dcval);
         }
-#line 3692 "fe/idl.tab.cpp"
+#line 3698 "fe/idl.tab.cpp"
     break;
 
   case 88: /* $@37: %empty  */
-#line 1208 "fe/idl.ypp"
+#line 1213 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_ValueType *v = 0;
@@ -3719,27 +3729,27 @@ yyparse ()
            */
           idl_global->scopes ().push (v);
         }
-#line 3739 "fe/idl.tab.cpp"
+#line 3745 "fe/idl.tab.cpp"
     break;
 
   case 89: /* $@38: %empty  */
-#line 1251 "fe/idl.ypp"
+#line 1256 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen);
         }
-#line 3747 "fe/idl.tab.cpp"
+#line 3753 "fe/idl.tab.cpp"
     break;
 
   case 90: /* $@39: %empty  */
-#line 1255 "fe/idl.ypp"
+#line 1260 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen);
         }
-#line 3755 "fe/idl.tab.cpp"
+#line 3761 "fe/idl.tab.cpp"
     break;
 
   case 91: /* value_abs_decl: IDL_ABSTRACT value_header $@37 '{' $@38 exports $@39 '}'  */
-#line 1259 "fe/idl.ypp"
+#line 1264 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen);
 
@@ -3750,19 +3760,19 @@ yyparse ()
 
           (yyval.dcval) = 0;
         }
-#line 3770 "fe/idl.tab.cpp"
+#line 3776 "fe/idl.tab.cpp"
     break;
 
   case 92: /* $@40: %empty  */
-#line 1274 "fe/idl.ypp"
+#line 1279 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
         }
-#line 3778 "fe/idl.tab.cpp"
+#line 3784 "fe/idl.tab.cpp"
     break;
 
   case 93: /* value_header: value_decl inheritance_spec $@40 supports_spec  */
-#line 1278 "fe/idl.ypp"
+#line 1283 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);
 
@@ -3793,60 +3803,60 @@ yyparse ()
               (yyvsp[-2].nlval) = 0;
             }
         }
-#line 3813 "fe/idl.tab.cpp"
+#line 3819 "fe/idl.tab.cpp"
     break;
 
   case 94: /* $@41: %empty  */
-#line 1312 "fe/idl.ypp"
+#line 1317 "fe/idl.ypp"
         {
            idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSeen);
         }
-#line 3821 "fe/idl.tab.cpp"
+#line 3827 "fe/idl.tab.cpp"
     break;
 
   case 95: /* value_decl: IDL_VALUETYPE $@41 defining_id  */
-#line 1316 "fe/idl.ypp"
+#line 1321 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeIDSeen);
           (yyval.idval) = (yyvsp[0].idval);
         }
-#line 3830 "fe/idl.tab.cpp"
+#line 3836 "fe/idl.tab.cpp"
     break;
 
   case 96: /* opt_truncatable: IDL_TRUNCATABLE  */
-#line 1324 "fe/idl.ypp"
+#line 1329 "fe/idl.ypp"
         {
           (yyval.bval) = true;
         }
-#line 3838 "fe/idl.tab.cpp"
+#line 3844 "fe/idl.tab.cpp"
     break;
 
   case 97: /* opt_truncatable: %empty  */
-#line 1328 "fe/idl.ypp"
+#line 1333 "fe/idl.ypp"
         {
           (yyval.bval) = false;
         }
-#line 3846 "fe/idl.tab.cpp"
+#line 3852 "fe/idl.tab.cpp"
     break;
 
   case 98: /* supports_spec: IDL_SUPPORTS at_least_one_scoped_name  */
-#line 1336 "fe/idl.ypp"
+#line 1341 "fe/idl.ypp"
         {
           (yyval.nlval) = (yyvsp[0].nlval);
         }
-#line 3854 "fe/idl.tab.cpp"
+#line 3860 "fe/idl.tab.cpp"
     break;
 
   case 99: /* supports_spec: %empty  */
-#line 1340 "fe/idl.ypp"
+#line 1345 "fe/idl.ypp"
         {
           (yyval.nlval) = 0;
         }
-#line 3862 "fe/idl.tab.cpp"
+#line 3868 "fe/idl.tab.cpp"
     break;
 
   case 100: /* value_forward_decl: IDL_ABSTRACT value_decl  */
-#line 1348 "fe/idl.ypp"
+#line 1353 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
@@ -3869,11 +3879,11 @@ yyparse ()
           delete (yyvsp[0].idval);
           (yyvsp[0].idval) = 0;
         }
-#line 3889 "fe/idl.tab.cpp"
+#line 3895 "fe/idl.tab.cpp"
     break;
 
   case 101: /* value_forward_decl: value_decl  */
-#line 1372 "fe/idl.ypp"
+#line 1377 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
@@ -3898,11 +3908,11 @@ yyparse ()
 
           (yyval.dcval) = 0;
         }
-#line 3918 "fe/idl.tab.cpp"
+#line 3924 "fe/idl.tab.cpp"
     break;
 
   case 102: /* value_box_decl: value_decl type_spec  */
-#line 1400 "fe/idl.ypp"
+#line 1405 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ValueBoxDeclSeen);
 
@@ -3965,11 +3975,11 @@ yyparse ()
 
           (yyval.dcval) = 0;
         }
-#line 3985 "fe/idl.tab.cpp"
+#line 3991 "fe/idl.tab.cpp"
     break;
 
   case 103: /* value_elements: value_elements at_least_one_annotation value_element  */
-#line 1466 "fe/idl.ypp"
+#line 1471 "fe/idl.ypp"
         {
           AST_Annotation_Appls *&annotations = (yyvsp[-1].annotations_val);
           AST_Decls *&decls = (yyvsp[0].decls_val);
@@ -3988,19 +3998,19 @@ yyparse ()
           delete annotations;
           delete decls;
         }
-#line 4008 "fe/idl.tab.cpp"
+#line 4014 "fe/idl.tab.cpp"
     break;
 
   case 104: /* value_elements: value_elements value_element  */
-#line 1485 "fe/idl.ypp"
+#line 1490 "fe/idl.ypp"
         {
           delete (yyvsp[0].decls_val);
         }
-#line 4016 "fe/idl.tab.cpp"
+#line 4022 "fe/idl.tab.cpp"
     break;
 
   case 107: /* value_element: export  */
-#line 1494 "fe/idl.ypp"
+#line 1499 "fe/idl.ypp"
         {
           AST_Decl *&node = (yyvsp[0].dcval);
           AST_Decls *value = 0;
@@ -4011,11 +4021,11 @@ yyparse ()
             }
           (yyval.decls_val) = value;
         }
-#line 4031 "fe/idl.tab.cpp"
+#line 4037 "fe/idl.tab.cpp"
     break;
 
   case 108: /* @42: %empty  */
-#line 1505 "fe/idl.ypp"
+#line 1510 "fe/idl.ypp"
         {
           AST_Decl *&node = (yyvsp[0].dcval);
           AST_Decls *value = 0;
@@ -4026,35 +4036,35 @@ yyparse ()
             }
           (yyval.decls_val) = value;
         }
-#line 4046 "fe/idl.tab.cpp"
+#line 4052 "fe/idl.tab.cpp"
     break;
 
   case 109: /* value_element: init_decl @42 ';'  */
-#line 1516 "fe/idl.ypp"
+#line 1521 "fe/idl.ypp"
         {
           (yyval.decls_val) = (yyvsp[-1].decls_val);
         }
-#line 4054 "fe/idl.tab.cpp"
+#line 4060 "fe/idl.tab.cpp"
     break;
 
   case 110: /* visibility: IDL_PUBLIC  */
-#line 1523 "fe/idl.ypp"
+#line 1528 "fe/idl.ypp"
         {
           (yyval.vival) = AST_Field::vis_PUBLIC;
         }
-#line 4062 "fe/idl.tab.cpp"
+#line 4068 "fe/idl.tab.cpp"
     break;
 
   case 111: /* visibility: IDL_PRIVATE  */
-#line 1527 "fe/idl.ypp"
+#line 1532 "fe/idl.ypp"
         {
           (yyval.vival) = AST_Field::vis_PRIVATE;
         }
-#line 4070 "fe/idl.tab.cpp"
+#line 4076 "fe/idl.tab.cpp"
     break;
 
   case 112: /* state_member: visibility member_i  */
-#line 1534 "fe/idl.ypp"
+#line 1539 "fe/idl.ypp"
         {
           AST_Field::Visibility &visibility = (yyvsp[-1].vival);
           AST_Decls *&decls_ptr = (yyvsp[0].decls_val);
@@ -4072,11 +4082,11 @@ yyparse ()
             }
           (yyval.decls_val) = decls_ptr;
         }
-#line 4092 "fe/idl.tab.cpp"
+#line 4098 "fe/idl.tab.cpp"
     break;
 
   case 115: /* at_least_one_export: exports at_least_one_annotation export  */
-#line 1560 "fe/idl.ypp"
+#line 1565 "fe/idl.ypp"
         {
           AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val);
           AST_Decl *d = (yyvsp[0].dcval);
@@ -4091,160 +4101,160 @@ yyparse ()
             }
           delete annotations;
         }
-#line 4111 "fe/idl.tab.cpp"
+#line 4117 "fe/idl.tab.cpp"
     break;
 
   case 117: /* $@43: %empty  */
-#line 1579 "fe/idl.ypp"
+#line 1584 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen);
         }
-#line 4119 "fe/idl.tab.cpp"
+#line 4125 "fe/idl.tab.cpp"
     break;
 
   case 118: /* export: type_dcl $@43 ';'  */
-#line 1583 "fe/idl.ypp"
+#line 1588 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 4127 "fe/idl.tab.cpp"
+#line 4133 "fe/idl.tab.cpp"
     break;
 
   case 119: /* $@44: %empty  */
-#line 1587 "fe/idl.ypp"
+#line 1592 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen);
         }
-#line 4135 "fe/idl.tab.cpp"
+#line 4141 "fe/idl.tab.cpp"
     break;
 
   case 120: /* export: typeid_dcl $@44 ';'  */
-#line 1591 "fe/idl.ypp"
+#line 1596 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 4143 "fe/idl.tab.cpp"
+#line 4149 "fe/idl.tab.cpp"
     break;
 
   case 121: /* $@45: %empty  */
-#line 1595 "fe/idl.ypp"
+#line 1600 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen);
         }
-#line 4151 "fe/idl.tab.cpp"
+#line 4157 "fe/idl.tab.cpp"
     break;
 
   case 122: /* export: typeprefix_dcl $@45 ';'  */
-#line 1599 "fe/idl.ypp"
+#line 1604 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 4159 "fe/idl.tab.cpp"
+#line 4165 "fe/idl.tab.cpp"
     break;
 
   case 123: /* $@46: %empty  */
-#line 1603 "fe/idl.ypp"
+#line 1608 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen);
         }
-#line 4167 "fe/idl.tab.cpp"
+#line 4173 "fe/idl.tab.cpp"
     break;
 
   case 124: /* export: const_dcl $@46 ';'  */
-#line 1607 "fe/idl.ypp"
+#line 1612 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 4175 "fe/idl.tab.cpp"
+#line 4181 "fe/idl.tab.cpp"
     break;
 
   case 125: /* $@47: %empty  */
-#line 1611 "fe/idl.ypp"
+#line 1616 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen);
         }
-#line 4183 "fe/idl.tab.cpp"
+#line 4189 "fe/idl.tab.cpp"
     break;
 
   case 126: /* export: exception $@47 ';'  */
-#line 1615 "fe/idl.ypp"
+#line 1620 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 4191 "fe/idl.tab.cpp"
+#line 4197 "fe/idl.tab.cpp"
     break;
 
   case 127: /* $@48: %empty  */
-#line 1619 "fe/idl.ypp"
+#line 1624 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen);
         }
-#line 4199 "fe/idl.tab.cpp"
+#line 4205 "fe/idl.tab.cpp"
     break;
 
   case 128: /* export: attribute $@48 ';'  */
-#line 1623 "fe/idl.ypp"
+#line 1628 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 4207 "fe/idl.tab.cpp"
+#line 4213 "fe/idl.tab.cpp"
     break;
 
   case 129: /* $@49: %empty  */
-#line 1627 "fe/idl.ypp"
+#line 1632 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpDeclSeen);
         }
-#line 4215 "fe/idl.tab.cpp"
+#line 4221 "fe/idl.tab.cpp"
     break;
 
   case 130: /* export: operation $@49 ';'  */
-#line 1631 "fe/idl.ypp"
+#line 1636 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 4223 "fe/idl.tab.cpp"
+#line 4229 "fe/idl.tab.cpp"
     break;
 
   case 131: /* $@50: %empty  */
-#line 1635 "fe/idl.ypp"
+#line 1640 "fe/idl.ypp"
         {
           idl_global->err ()->syntax_error (idl_global->parse_state ());
         }
-#line 4231 "fe/idl.tab.cpp"
+#line 4237 "fe/idl.tab.cpp"
     break;
 
   case 132: /* export: error $@50 ';'  */
-#line 1639 "fe/idl.ypp"
+#line 1644 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
           yyerrok;
           (yyval.dcval) = 0;
         }
-#line 4241 "fe/idl.tab.cpp"
+#line 4247 "fe/idl.tab.cpp"
     break;
 
   case 133: /* at_least_one_scoped_name: scoped_name scoped_names  */
-#line 1648 "fe/idl.ypp"
+#line 1653 "fe/idl.ypp"
         {
           ACE_NEW_RETURN ((yyval.nlval),
                           UTL_NameList ((yyvsp[-1].idlist),
                                         (yyvsp[0].nlval)),
                           1);
         }
-#line 4252 "fe/idl.tab.cpp"
+#line 4258 "fe/idl.tab.cpp"
     break;
 
   case 134: /* $@51: %empty  */
-#line 1659 "fe/idl.ypp"
+#line 1664 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SNListCommaSeen);
         }
-#line 4260 "fe/idl.tab.cpp"
+#line 4266 "fe/idl.tab.cpp"
     break;
 
   case 135: /* scoped_names: scoped_names ',' $@51 scoped_name  */
-#line 1663 "fe/idl.ypp"
+#line 1668 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ScopedNameSeen);
 
@@ -4264,19 +4274,19 @@ yyparse ()
               (yyval.nlval) = (yyvsp[-3].nlval);
             }
         }
-#line 4284 "fe/idl.tab.cpp"
+#line 4290 "fe/idl.tab.cpp"
     break;
 
   case 136: /* scoped_names: %empty  */
-#line 1683 "fe/idl.ypp"
+#line 1688 "fe/idl.ypp"
         {
           (yyval.nlval) = 0;
         }
-#line 4292 "fe/idl.tab.cpp"
+#line 4298 "fe/idl.tab.cpp"
     break;
 
   case 137: /* scoped_name: id  */
-#line 1690 "fe/idl.ypp"
+#line 1695 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen);
 
@@ -4285,19 +4295,19 @@ yyparse ()
                                       0),
                           1);
         }
-#line 4305 "fe/idl.tab.cpp"
+#line 4311 "fe/idl.tab.cpp"
     break;
 
   case 138: /* $@52: %empty  */
-#line 1699 "fe/idl.ypp"
+#line 1704 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen);
         }
-#line 4313 "fe/idl.tab.cpp"
+#line 4319 "fe/idl.tab.cpp"
     break;
 
   case 139: /* scoped_name: IDL_SCOPE_DELIMITOR $@52 id  */
-#line 1703 "fe/idl.ypp"
+#line 1708 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen);
 
@@ -4317,11 +4327,11 @@ yyparse ()
                                       sn),
                           1);
         }
-#line 4337 "fe/idl.tab.cpp"
+#line 4343 "fe/idl.tab.cpp"
     break;
 
   case 140: /* $@53: %empty  */
-#line 1724 "fe/idl.ypp"
+#line 1729 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen);
 
@@ -4331,11 +4341,11 @@ yyparse ()
           ACE::strdelete ((yyvsp[0].strval));
           (yyvsp[0].strval) = 0;
         }
-#line 4351 "fe/idl.tab.cpp"
+#line 4357 "fe/idl.tab.cpp"
     break;
 
   case 141: /* scoped_name: scoped_name IDL_SCOPE_DELIMITOR $@53 id  */
-#line 1734 "fe/idl.ypp"
+#line 1739 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen);
 
@@ -4347,11 +4357,11 @@ yyparse ()
           (yyvsp[-3].idlist)->nconc (sn);
           (yyval.idlist) = (yyvsp[-3].idlist);
         }
-#line 4367 "fe/idl.tab.cpp"
+#line 4373 "fe/idl.tab.cpp"
     break;
 
   case 142: /* id: IDENTIFIER  */
-#line 1748 "fe/idl.ypp"
+#line 1753 "fe/idl.ypp"
         {
           ACE_NEW_RETURN ((yyval.idval),
                           Identifier ((yyvsp[0].strval)),
@@ -4359,11 +4369,11 @@ yyparse ()
           ACE::strdelete ((yyvsp[0].strval));
           (yyvsp[0].strval) = 0;
         }
-#line 4379 "fe/idl.tab.cpp"
+#line 4385 "fe/idl.tab.cpp"
     break;
 
   case 143: /* defining_id: IDENTIFIER  */
-#line 1758 "fe/idl.ypp"
+#line 1763 "fe/idl.ypp"
         {
           /* defining_id is a defining identifier
              whereas id is usually a reference to a defining identifier */
@@ -4371,11 +4381,11 @@ yyparse ()
           ACE::strdelete ((yyvsp[0].strval));
           (yyvsp[0].strval) = 0;
         }
-#line 4391 "fe/idl.tab.cpp"
+#line 4397 "fe/idl.tab.cpp"
     break;
 
   case 144: /* interface_forward: interface_decl  */
-#line 1769 "fe/idl.ypp"
+#line 1774 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval), 0);
@@ -4418,11 +4428,11 @@ yyparse ()
           delete (yyvsp[0].idval);
           (yyvsp[0].idval) = 0;
         }
-#line 4438 "fe/idl.tab.cpp"
+#line 4444 "fe/idl.tab.cpp"
     break;
 
   case 145: /* interface_forward: IDL_LOCAL interface_decl  */
-#line 1813 "fe/idl.ypp"
+#line 1818 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
@@ -4448,11 +4458,11 @@ yyparse ()
           delete (yyvsp[0].idval);
           (yyvsp[0].idval) = 0;
         }
-#line 4468 "fe/idl.tab.cpp"
+#line 4474 "fe/idl.tab.cpp"
     break;
 
   case 146: /* interface_forward: IDL_ABSTRACT interface_decl  */
-#line 1840 "fe/idl.ypp"
+#line 1845 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
@@ -4480,43 +4490,43 @@ yyparse ()
 
           (yyval.dcval) = dynamic_cast<AST_Decl *> (f);
         }
-#line 4500 "fe/idl.tab.cpp"
+#line 4506 "fe/idl.tab.cpp"
     break;
 
   case 147: /* $@54: %empty  */
-#line 1871 "fe/idl.ypp"
+#line 1876 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ConstSeen);
         }
-#line 4508 "fe/idl.tab.cpp"
+#line 4514 "fe/idl.tab.cpp"
     break;
 
   case 148: /* $@55: %empty  */
-#line 1875 "fe/idl.ypp"
+#line 1880 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ConstTypeSeen);
         }
-#line 4516 "fe/idl.tab.cpp"
+#line 4522 "fe/idl.tab.cpp"
     break;
 
   case 149: /* $@56: %empty  */
-#line 1879 "fe/idl.ypp"
+#line 1884 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ConstIDSeen);
         }
-#line 4524 "fe/idl.tab.cpp"
+#line 4530 "fe/idl.tab.cpp"
     break;
 
   case 150: /* $@57: %empty  */
-#line 1883 "fe/idl.ypp"
+#line 1888 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ConstAssignSeen);
         }
-#line 4532 "fe/idl.tab.cpp"
+#line 4538 "fe/idl.tab.cpp"
     break;
 
   case 151: /* const_dcl: IDL_CONST $@54 const_type $@55 defining_id $@56 '=' $@57 expression  */
-#line 1887 "fe/idl.ypp"
+#line 1892 "fe/idl.ypp"
         {
           (yyval.dcval) = 0;
           UTL_ScopedName n ((yyvsp[-4].idval), 0);
@@ -4572,27 +4582,27 @@ yyparse ()
           delete (yyvsp[-4].idval);
           (yyvsp[-4].idval) = 0;
         }
-#line 4592 "fe/idl.tab.cpp"
+#line 4598 "fe/idl.tab.cpp"
     break;
 
   case 158: /* const_type: string_type_spec  */
-#line 1952 "fe/idl.ypp"
+#line 1957 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_string;
         }
-#line 4600 "fe/idl.tab.cpp"
+#line 4606 "fe/idl.tab.cpp"
     break;
 
   case 159: /* const_type: wstring_type_spec  */
-#line 1956 "fe/idl.ypp"
+#line 1961 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_wstring;
         }
-#line 4608 "fe/idl.tab.cpp"
+#line 4614 "fe/idl.tab.cpp"
     break;
 
   case 160: /* const_type: scoped_name  */
-#line 1960 "fe/idl.ypp"
+#line 1965 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_PredefinedType *c = 0;
@@ -4658,11 +4668,11 @@ yyparse ()
           sn = 0;
           (yyvsp[0].idlist) = 0;
         }
-#line 4678 "fe/idl.tab.cpp"
+#line 4684 "fe/idl.tab.cpp"
     break;
 
   case 164: /* or_expr: or_expr '|' xor_expr  */
-#line 2033 "fe/idl.ypp"
+#line 2038 "fe/idl.ypp"
         {
           (yyval.exval) =
             idl_global->gen ()->create_expr (
@@ -4671,11 +4681,11 @@ yyparse ()
                                     (yyvsp[0].exval)
                                   );
         }
-#line 4691 "fe/idl.tab.cpp"
+#line 4697 "fe/idl.tab.cpp"
     break;
 
   case 166: /* xor_expr: xor_expr '^' and_expr  */
-#line 2046 "fe/idl.ypp"
+#line 2051 "fe/idl.ypp"
         {
           (yyval.exval) =
             idl_global->gen ()->create_expr (
@@ -4684,11 +4694,11 @@ yyparse ()
                                     (yyvsp[0].exval)
                                   );
         }
-#line 4704 "fe/idl.tab.cpp"
+#line 4710 "fe/idl.tab.cpp"
     break;
 
   case 168: /* and_expr: and_expr '&' shift_expr  */
-#line 2059 "fe/idl.ypp"
+#line 2064 "fe/idl.ypp"
         {
           (yyval.exval) =
             idl_global->gen ()->create_expr (
@@ -4697,11 +4707,11 @@ yyparse ()
                                     (yyvsp[0].exval)
                                   );
         }
-#line 4717 "fe/idl.tab.cpp"
+#line 4723 "fe/idl.tab.cpp"
     break;
 
   case 170: /* shift_expr: shift_expr IDL_LEFT_SHIFT add_expr  */
-#line 2072 "fe/idl.ypp"
+#line 2077 "fe/idl.ypp"
         {
           (yyval.exval) =
             idl_global->gen ()->create_expr (
@@ -4710,11 +4720,11 @@ yyparse ()
                                     (yyvsp[0].exval)
                                   );
         }
-#line 4730 "fe/idl.tab.cpp"
+#line 4736 "fe/idl.tab.cpp"
     break;
 
   case 171: /* shift_expr: shift_expr IDL_RIGHT_SHIFT add_expr  */
-#line 2081 "fe/idl.ypp"
+#line 2086 "fe/idl.ypp"
         {
           (yyval.exval) =
             idl_global->gen ()->create_expr (
@@ -4723,11 +4733,11 @@ yyparse ()
                                     (yyvsp[0].exval)
                                   );
         }
-#line 4743 "fe/idl.tab.cpp"
+#line 4749 "fe/idl.tab.cpp"
     break;
 
   case 173: /* add_expr: add_expr '+' mult_expr  */
-#line 2094 "fe/idl.ypp"
+#line 2099 "fe/idl.ypp"
         {
           (yyval.exval) =
             idl_global->gen ()->create_expr (
@@ -4736,11 +4746,11 @@ yyparse ()
                                     (yyvsp[0].exval)
                                   );
         }
-#line 4756 "fe/idl.tab.cpp"
+#line 4762 "fe/idl.tab.cpp"
     break;
 
   case 174: /* add_expr: add_expr '-' mult_expr  */
-#line 2103 "fe/idl.ypp"
+#line 2108 "fe/idl.ypp"
         {
           (yyval.exval) =
             idl_global->gen ()->create_expr (
@@ -4749,11 +4759,11 @@ yyparse ()
                                     (yyvsp[0].exval)
                                   );
         }
-#line 4769 "fe/idl.tab.cpp"
+#line 4775 "fe/idl.tab.cpp"
     break;
 
   case 176: /* mult_expr: mult_expr '*' unary_expr  */
-#line 2116 "fe/idl.ypp"
+#line 2121 "fe/idl.ypp"
         {
           (yyval.exval) =
             idl_global->gen ()->create_expr (
@@ -4762,11 +4772,11 @@ yyparse ()
                                     (yyvsp[0].exval)
                                   );
         }
-#line 4782 "fe/idl.tab.cpp"
+#line 4788 "fe/idl.tab.cpp"
     break;
 
   case 177: /* mult_expr: mult_expr '/' unary_expr  */
-#line 2125 "fe/idl.ypp"
+#line 2130 "fe/idl.ypp"
         {
           (yyval.exval) =
             idl_global->gen ()->create_expr (
@@ -4775,11 +4785,11 @@ yyparse ()
                                     (yyvsp[0].exval)
                                   );
         }
-#line 4795 "fe/idl.tab.cpp"
+#line 4801 "fe/idl.tab.cpp"
     break;
 
   case 178: /* mult_expr: mult_expr '%' unary_expr  */
-#line 2134 "fe/idl.ypp"
+#line 2139 "fe/idl.ypp"
         {
           (yyval.exval) =
             idl_global->gen ()->create_expr (
@@ -4788,11 +4798,11 @@ yyparse ()
                                     (yyvsp[0].exval)
                                   );
         }
-#line 4808 "fe/idl.tab.cpp"
+#line 4814 "fe/idl.tab.cpp"
     break;
 
   case 180: /* unary_expr: '+' primary_expr  */
-#line 2147 "fe/idl.ypp"
+#line 2152 "fe/idl.ypp"
         {
           (yyval.exval) =
             idl_global->gen ()->create_expr (
@@ -4801,11 +4811,11 @@ yyparse ()
                                     0
                                   );
         }
-#line 4821 "fe/idl.tab.cpp"
+#line 4827 "fe/idl.tab.cpp"
     break;
 
   case 181: /* unary_expr: '-' primary_expr  */
-#line 2156 "fe/idl.ypp"
+#line 2161 "fe/idl.ypp"
         {
           (yyval.exval) =
             idl_global->gen ()->create_expr (
@@ -4814,11 +4824,11 @@ yyparse ()
                                    0
                                  );
         }
-#line 4834 "fe/idl.tab.cpp"
+#line 4840 "fe/idl.tab.cpp"
     break;
 
   case 182: /* unary_expr: '~' primary_expr  */
-#line 2165 "fe/idl.ypp"
+#line 2170 "fe/idl.ypp"
         {
           (yyval.exval) =
             idl_global->gen ()->create_expr (
@@ -4827,11 +4837,11 @@ yyparse ()
                                    0
                                  );
         }
-#line 4847 "fe/idl.tab.cpp"
+#line 4853 "fe/idl.tab.cpp"
     break;
 
   case 183: /* primary_expr: scoped_name  */
-#line 2177 "fe/idl.ypp"
+#line 2182 "fe/idl.ypp"
         {
           UTL_ScopedName *name = (yyvsp[0].idlist);
 
@@ -4888,107 +4898,107 @@ yyparse ()
           delete name;
           (yyvsp[0].idlist) = name = 0;
         }
-#line 4908 "fe/idl.tab.cpp"
+#line 4914 "fe/idl.tab.cpp"
     break;
 
   case 185: /* primary_expr: '(' const_expr ')'  */
-#line 2235 "fe/idl.ypp"
+#line 2240 "fe/idl.ypp"
         {
           (yyval.exval) = (yyvsp[-1].exval);
         }
-#line 4916 "fe/idl.tab.cpp"
+#line 4922 "fe/idl.tab.cpp"
     break;
 
   case 186: /* literal: IDL_INTEGER_LITERAL  */
-#line 2242 "fe/idl.ypp"
+#line 2247 "fe/idl.ypp"
         {
           (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].ival));
         }
-#line 4924 "fe/idl.tab.cpp"
+#line 4930 "fe/idl.tab.cpp"
     break;
 
   case 187: /* literal: IDL_UINTEGER_LITERAL  */
-#line 2246 "fe/idl.ypp"
+#line 2251 "fe/idl.ypp"
         {
           (yyval.exval) =
             idl_global->gen ()->create_expr ((yyvsp[0].uival));
         }
-#line 4933 "fe/idl.tab.cpp"
+#line 4939 "fe/idl.tab.cpp"
     break;
 
   case 188: /* literal: IDL_STRING_LITERAL  */
-#line 2251 "fe/idl.ypp"
+#line 2256 "fe/idl.ypp"
         {
           (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].sval));
           (yyvsp[0].sval)->destroy ();
           delete (yyvsp[0].sval);
           (yyvsp[0].sval) = 0;
         }
-#line 4944 "fe/idl.tab.cpp"
+#line 4950 "fe/idl.tab.cpp"
     break;
 
   case 189: /* literal: IDL_WSTRING_LITERAL  */
-#line 2258 "fe/idl.ypp"
+#line 2263 "fe/idl.ypp"
         {
           char *wide_string = (yyvsp[0].wsval);
           (yyval.exval) = idl_global->gen ()->create_expr (wide_string);
           ACE_OS::free (wide_string);
           (yyvsp[0].wsval) = 0;
         }
-#line 4955 "fe/idl.tab.cpp"
+#line 4961 "fe/idl.tab.cpp"
     break;
 
   case 190: /* literal: IDL_CHARACTER_LITERAL  */
-#line 2265 "fe/idl.ypp"
+#line 2270 "fe/idl.ypp"
         {
           (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].cval));
         }
-#line 4963 "fe/idl.tab.cpp"
+#line 4969 "fe/idl.tab.cpp"
     break;
 
   case 191: /* literal: IDL_WCHAR_LITERAL  */
-#line 2269 "fe/idl.ypp"
+#line 2274 "fe/idl.ypp"
         {
           ACE_OutputCDR::from_wchar wc ((yyvsp[0].wcval));
           (yyval.exval) = idl_global->gen ()->create_expr (wc);
         }
-#line 4972 "fe/idl.tab.cpp"
+#line 4978 "fe/idl.tab.cpp"
     break;
 
   case 192: /* literal: IDL_FIXED_PT_LITERAL  */
-#line 2274 "fe/idl.ypp"
+#line 2279 "fe/idl.ypp"
         {
           (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].fixval));
         }
-#line 4980 "fe/idl.tab.cpp"
+#line 4986 "fe/idl.tab.cpp"
     break;
 
   case 193: /* literal: IDL_FLOATING_PT_LITERAL  */
-#line 2278 "fe/idl.ypp"
+#line 2283 "fe/idl.ypp"
         {
           (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].dval));
         }
-#line 4988 "fe/idl.tab.cpp"
+#line 4994 "fe/idl.tab.cpp"
     break;
 
   case 194: /* literal: IDL_TRUETOK  */
-#line 2282 "fe/idl.ypp"
+#line 2287 "fe/idl.ypp"
         {
           (yyval.exval) = idl_global->gen ()->create_expr (true);
         }
-#line 4996 "fe/idl.tab.cpp"
+#line 5002 "fe/idl.tab.cpp"
     break;
 
   case 195: /* literal: IDL_FALSETOK  */
-#line 2286 "fe/idl.ypp"
+#line 2291 "fe/idl.ypp"
         {
           (yyval.exval) = idl_global->gen ()->create_expr (false);
         }
-#line 5004 "fe/idl.tab.cpp"
+#line 5010 "fe/idl.tab.cpp"
     break;
 
   case 196: /* positive_int_expr: const_expr  */
-#line 2293 "fe/idl.ypp"
+#line 2298 "fe/idl.ypp"
         {
           int good_expression = 1;
           (yyvsp[0].exval)->evaluate (AST_Expression::EK_positive_int);
@@ -5053,11 +5063,11 @@ yyparse ()
               idl_global->err ()->syntax_error (idl_global->parse_state ());
             }
         }
-#line 5073 "fe/idl.tab.cpp"
+#line 5079 "fe/idl.tab.cpp"
     break;
 
   case 197: /* $@58: %empty  */
-#line 2361 "fe/idl.ypp"
+#line 2366 "fe/idl.ypp"
         {
           if (idl_global->idl_version_ < IDL_VERSION_4)
             {
@@ -5074,11 +5084,11 @@ yyparse ()
             fe_add_annotation_decl (annotation_decl);
           idl_global->scopes ().push (annotation_decl);
         }
-#line 5094 "fe/idl.tab.cpp"
+#line 5100 "fe/idl.tab.cpp"
     break;
 
   case 198: /* annotation_dcl: IDL_ANNOTATION_DECL defining_id '{' $@58 annotation_body '}'  */
-#line 2378 "fe/idl.ypp"
+#line 2383 "fe/idl.ypp"
         {
           Identifier *id = (yyvsp[-4].idval);
           idl_global->scopes ().pop ();
@@ -5087,20 +5097,20 @@ yyparse ()
 
           (yyval.dcval) = 0;
         }
-#line 5107 "fe/idl.tab.cpp"
+#line 5113 "fe/idl.tab.cpp"
     break;
 
   case 204: /* $@59: %empty  */
-#line 2398 "fe/idl.ypp"
+#line 2403 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen);
           idl_global->in_typedef (true);
         }
-#line 5116 "fe/idl.tab.cpp"
+#line 5122 "fe/idl.tab.cpp"
     break;
 
   case 208: /* annotation_member: annotation_member_type defining_id annotation_member_default ';'  */
-#line 2412 "fe/idl.ypp"
+#line 2417 "fe/idl.ypp"
         {
           UTL_Scope *scope = idl_global->scopes ().top_non_null ();
           UTL_Scope *root = idl_global->scopes ().bottom ();
@@ -5153,27 +5163,27 @@ yyparse ()
               delete result;
             }
         }
-#line 5173 "fe/idl.tab.cpp"
+#line 5179 "fe/idl.tab.cpp"
     break;
 
   case 209: /* annotation_member_default: IDL_DEFAULT const_expr  */
-#line 2468 "fe/idl.ypp"
+#line 2473 "fe/idl.ypp"
         {
           (yyval.exval) = (yyvsp[0].exval);
         }
-#line 5181 "fe/idl.tab.cpp"
+#line 5187 "fe/idl.tab.cpp"
     break;
 
   case 210: /* annotation_member_default: %empty  */
-#line 2472 "fe/idl.ypp"
+#line 2477 "fe/idl.ypp"
         {
           (yyval.exval) = 0;
         }
-#line 5189 "fe/idl.tab.cpp"
+#line 5195 "fe/idl.tab.cpp"
     break;
 
   case 211: /* at_least_one_annotation: annotations_maybe annotation_appl  */
-#line 2479 "fe/idl.ypp"
+#line 2484 "fe/idl.ypp"
         {
           AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val);
           AST_Annotation_Appl *annotation = (yyvsp[0].annotation_val);
@@ -5183,11 +5193,11 @@ yyparse ()
             }
           (yyval.annotations_val) = annotations;
         }
-#line 5203 "fe/idl.tab.cpp"
+#line 5209 "fe/idl.tab.cpp"
     break;
 
   case 212: /* annotations_maybe: annotations_maybe annotation_appl  */
-#line 2492 "fe/idl.ypp"
+#line 2497 "fe/idl.ypp"
         {
           AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val);
           AST_Annotation_Appl *annotation = (yyvsp[0].annotation_val);
@@ -5197,19 +5207,19 @@ yyparse ()
             }
           (yyval.annotations_val) = annotations;
         }
-#line 5217 "fe/idl.tab.cpp"
+#line 5223 "fe/idl.tab.cpp"
     break;
 
   case 213: /* annotations_maybe: %empty  */
-#line 2502 "fe/idl.ypp"
+#line 2507 "fe/idl.ypp"
         {
           (yyval.annotations_val) = new AST_Annotation_Appls ();
         }
-#line 5225 "fe/idl.tab.cpp"
+#line 5231 "fe/idl.tab.cpp"
     break;
 
   case 214: /* @60: %empty  */
-#line 2509 "fe/idl.ypp"
+#line 2514 "fe/idl.ypp"
         {
           if (idl_global->idl_version_ < IDL_VERSION_4)
             {
@@ -5266,11 +5276,11 @@ yyparse ()
 
           (yyval.annotation_decl_val) = decl;
         }
-#line 5286 "fe/idl.tab.cpp"
+#line 5292 "fe/idl.tab.cpp"
     break;
 
   case 215: /* annotation_appl: IDL_ANNOTATION_SYMBOL scoped_name @60 annotation_appl_params_maybe  */
-#line 2566 "fe/idl.ypp"
+#line 2571 "fe/idl.ypp"
         {
           idl_global->ignore_lookup_errors_ = false;
           stack_based_lookup_for_primary_expr = false;
@@ -5298,27 +5308,27 @@ yyparse ()
 
           (yyval.annotation_val) = appl;
         }
-#line 5318 "fe/idl.tab.cpp"
+#line 5324 "fe/idl.tab.cpp"
     break;
 
   case 216: /* annotation_appl_params_maybe: '(' annotation_appl_params ')'  */
-#line 2597 "fe/idl.ypp"
+#line 2602 "fe/idl.ypp"
         {
           (yyval.annotation_params_val) = (yyvsp[-1].annotation_params_val);
         }
-#line 5326 "fe/idl.tab.cpp"
+#line 5332 "fe/idl.tab.cpp"
     break;
 
   case 217: /* annotation_appl_params_maybe: %empty  */
-#line 2601 "fe/idl.ypp"
+#line 2606 "fe/idl.ypp"
         {
           (yyval.annotation_params_val) = 0;
         }
-#line 5334 "fe/idl.tab.cpp"
+#line 5340 "fe/idl.tab.cpp"
     break;
 
   case 218: /* annotation_appl_params: const_expr  */
-#line 2608 "fe/idl.ypp"
+#line 2613 "fe/idl.ypp"
         {
           AST_Annotation_Appl::Params *params = new AST_Annotation_Appl::Params;
           AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param;
@@ -5327,47 +5337,47 @@ yyparse ()
           params->push (param);
           (yyval.annotation_params_val) = params;
         }
-#line 5347 "fe/idl.tab.cpp"
+#line 5353 "fe/idl.tab.cpp"
     break;
 
   case 219: /* annotation_appl_params: named_annotation_appl_params  */
-#line 2617 "fe/idl.ypp"
+#line 2622 "fe/idl.ypp"
         {
           (yyval.annotation_params_val) = (yyvsp[0].annotation_params_val);
         }
-#line 5355 "fe/idl.tab.cpp"
+#line 5361 "fe/idl.tab.cpp"
     break;
 
   case 220: /* named_annotation_appl_params: named_annotation_appl_param more_named_annotation_appl_params  */
-#line 2624 "fe/idl.ypp"
+#line 2629 "fe/idl.ypp"
         {
           AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val);
           params->push ((yyvsp[-1].annotation_param_val));
           (yyval.annotation_params_val) = params;
         }
-#line 5365 "fe/idl.tab.cpp"
+#line 5371 "fe/idl.tab.cpp"
     break;
 
   case 221: /* more_named_annotation_appl_params: ',' named_annotation_appl_param more_named_annotation_appl_params  */
-#line 2632 "fe/idl.ypp"
+#line 2637 "fe/idl.ypp"
         {
           AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val);
           params->push ((yyvsp[-1].annotation_param_val));
           (yyval.annotation_params_val) = params;
         }
-#line 5375 "fe/idl.tab.cpp"
+#line 5381 "fe/idl.tab.cpp"
     break;
 
   case 222: /* more_named_annotation_appl_params: %empty  */
-#line 2638 "fe/idl.ypp"
+#line 2643 "fe/idl.ypp"
         {
           (yyval.annotation_params_val) = new AST_Annotation_Appl::Params;
         }
-#line 5383 "fe/idl.tab.cpp"
+#line 5389 "fe/idl.tab.cpp"
     break;
 
   case 223: /* named_annotation_appl_param: id '=' const_expr  */
-#line 2645 "fe/idl.ypp"
+#line 2650 "fe/idl.ypp"
         {
           AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param;
           param->id = (yyvsp[-2].idval);
@@ -5376,52 +5386,52 @@ yyparse ()
           param->expr = (yyvsp[0].exval);
           (yyval.annotation_param_val) = param;
         }
-#line 5396 "fe/idl.tab.cpp"
+#line 5402 "fe/idl.tab.cpp"
     break;
 
   case 224: /* $@61: %empty  */
-#line 2657 "fe/idl.ypp"
+#line 2662 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen);
           idl_global->in_typedef (true);
         }
-#line 5405 "fe/idl.tab.cpp"
+#line 5411 "fe/idl.tab.cpp"
     break;
 
   case 225: /* type_dcl: IDL_TYPEDEF $@61 type_declarator  */
-#line 2662 "fe/idl.ypp"
+#line 2667 "fe/idl.ypp"
         {
           (yyval.dcval) = (yyvsp[0].dcval);
         }
-#line 5413 "fe/idl.tab.cpp"
+#line 5419 "fe/idl.tab.cpp"
     break;
 
   case 226: /* type_dcl: struct_type  */
-#line 2666 "fe/idl.ypp"
+#line 2671 "fe/idl.ypp"
         {
           (yyval.dcval) = (yyvsp[0].dcval);
         }
-#line 5421 "fe/idl.tab.cpp"
+#line 5427 "fe/idl.tab.cpp"
     break;
 
   case 227: /* type_dcl: union_type  */
-#line 2670 "fe/idl.ypp"
+#line 2675 "fe/idl.ypp"
         {
           (yyval.dcval) = (yyvsp[0].dcval);
         }
-#line 5429 "fe/idl.tab.cpp"
+#line 5435 "fe/idl.tab.cpp"
     break;
 
   case 228: /* type_dcl: enum_type  */
-#line 2674 "fe/idl.ypp"
+#line 2679 "fe/idl.ypp"
         {
           (yyval.dcval) = (yyvsp[0].dcval);
         }
-#line 5437 "fe/idl.tab.cpp"
+#line 5443 "fe/idl.tab.cpp"
     break;
 
   case 229: /* type_dcl: IDL_NATIVE simple_declarator  */
-#line 2678 "fe/idl.ypp"
+#line 2683 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Native *node = 0;
@@ -5449,27 +5459,27 @@ yyparse ()
 
           (yyval.dcval) = 0;
         }
-#line 5469 "fe/idl.tab.cpp"
+#line 5475 "fe/idl.tab.cpp"
     break;
 
   case 230: /* type_dcl: constructed_forward_type_spec  */
-#line 2706 "fe/idl.ypp"
+#line 2711 "fe/idl.ypp"
         {
           (yyval.dcval) = 0;
         }
-#line 5477 "fe/idl.tab.cpp"
+#line 5483 "fe/idl.tab.cpp"
     break;
 
   case 231: /* $@62: %empty  */
-#line 2713 "fe/idl.ypp"
+#line 2718 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_TypeSpecSeen);
         }
-#line 5485 "fe/idl.tab.cpp"
+#line 5491 "fe/idl.tab.cpp"
     break;
 
   case 232: /* type_declarator: type_spec $@62 at_least_one_declarator  */
-#line 2717 "fe/idl.ypp"
+#line 2722 "fe/idl.ypp"
         {
           AST_Decl *type_spec = (yyvsp[-2].dcval);
           UTL_DeclList *decls = (yyvsp[0].dlval);
@@ -5533,22 +5543,22 @@ yyparse ()
 
           (yyval.dcval) = t;
         }
-#line 5553 "fe/idl.tab.cpp"
+#line 5559 "fe/idl.tab.cpp"
     break;
 
   case 235: /* simple_type_spec: base_type_spec  */
-#line 2789 "fe/idl.ypp"
+#line 2794 "fe/idl.ypp"
         {
           (yyval.dcval) =
             idl_global->scopes ().bottom ()->lookup_primitive_type (
                                                  (yyvsp[0].etval)
                                                );
         }
-#line 5564 "fe/idl.tab.cpp"
+#line 5570 "fe/idl.tab.cpp"
     break;
 
   case 237: /* simple_type_spec: scoped_name  */
-#line 2797 "fe/idl.ypp"
+#line 2802 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Decl *d = 0;
@@ -5571,30 +5581,30 @@ yyparse ()
 
           (yyval.dcval) = d;
         }
-#line 5591 "fe/idl.tab.cpp"
+#line 5597 "fe/idl.tab.cpp"
     break;
 
-  case 255: /* at_least_one_declarator: declarator declarators  */
-#line 2852 "fe/idl.ypp"
+  case 256: /* at_least_one_declarator: declarator declarators  */
+#line 2858 "fe/idl.ypp"
         {
           ACE_NEW_RETURN ((yyval.dlval),
                           UTL_DeclList ((yyvsp[-1].deval),
                                         (yyvsp[0].dlval)),
                           1);
         }
-#line 5602 "fe/idl.tab.cpp"
+#line 5608 "fe/idl.tab.cpp"
     break;
 
-  case 256: /* $@63: %empty  */
-#line 2863 "fe/idl.ypp"
+  case 257: /* $@63: %empty  */
+#line 2869 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen);
         }
-#line 5610 "fe/idl.tab.cpp"
+#line 5616 "fe/idl.tab.cpp"
     break;
 
-  case 257: /* declarators: declarators ',' $@63 declarator  */
-#line 2867 "fe/idl.ypp"
+  case 258: /* declarators: declarators ',' $@63 declarator  */
+#line 2873 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen);
 
@@ -5614,38 +5624,38 @@ yyparse ()
               (yyval.dlval) = (yyvsp[-3].dlval);
             }
         }
-#line 5634 "fe/idl.tab.cpp"
+#line 5640 "fe/idl.tab.cpp"
     break;
 
-  case 258: /* declarators: %empty  */
-#line 2887 "fe/idl.ypp"
+  case 259: /* declarators: %empty  */
+#line 2893 "fe/idl.ypp"
         {
           (yyval.dlval) = 0;
         }
-#line 5642 "fe/idl.tab.cpp"
+#line 5648 "fe/idl.tab.cpp"
     break;
 
-  case 261: /* at_least_one_simple_declarator: simple_declarator simple_declarators  */
-#line 2899 "fe/idl.ypp"
+  case 262: /* at_least_one_simple_declarator: simple_declarator simple_declarators  */
+#line 2905 "fe/idl.ypp"
         {
           ACE_NEW_RETURN ((yyval.dlval),
                           UTL_DeclList ((yyvsp[-1].deval),
                                         (yyvsp[0].dlval)),
                           1);
         }
-#line 5653 "fe/idl.tab.cpp"
+#line 5659 "fe/idl.tab.cpp"
     break;
 
-  case 262: /* $@64: %empty  */
-#line 2910 "fe/idl.ypp"
+  case 263: /* $@64: %empty  */
+#line 2916 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen);
         }
-#line 5661 "fe/idl.tab.cpp"
+#line 5667 "fe/idl.tab.cpp"
     break;
 
-  case 263: /* simple_declarators: simple_declarators ',' $@64 simple_declarator  */
-#line 2914 "fe/idl.ypp"
+  case 264: /* simple_declarators: simple_declarators ',' $@64 simple_declarator  */
+#line 2920 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen);
 
@@ -5665,19 +5675,19 @@ yyparse ()
               (yyval.dlval) = (yyvsp[-3].dlval);
             }
         }
-#line 5685 "fe/idl.tab.cpp"
+#line 5691 "fe/idl.tab.cpp"
     break;
 
-  case 264: /* simple_declarators: %empty  */
-#line 2934 "fe/idl.ypp"
+  case 265: /* simple_declarators: %empty  */
+#line 2940 "fe/idl.ypp"
         {
           (yyval.dlval) = 0;
         }
-#line 5693 "fe/idl.tab.cpp"
+#line 5699 "fe/idl.tab.cpp"
     break;
 
-  case 265: /* simple_declarator: defining_id  */
-#line 2941 "fe/idl.ypp"
+  case 266: /* simple_declarator: defining_id  */
+#line 2947 "fe/idl.ypp"
         {
           UTL_ScopedName *sn = 0;
           ACE_NEW_RETURN (sn,
@@ -5690,11 +5700,11 @@ yyparse ()
                                          0),
                           1);
         }
-#line 5710 "fe/idl.tab.cpp"
+#line 5716 "fe/idl.tab.cpp"
     break;
 
-  case 266: /* complex_declarator: array_declarator  */
-#line 2957 "fe/idl.ypp"
+  case 267: /* complex_declarator: array_declarator  */
+#line 2963 "fe/idl.ypp"
         {
           UTL_ScopedName *sn = 0;
           ACE_NEW_RETURN (sn,
@@ -5709,220 +5719,220 @@ yyparse ()
                                          (yyvsp[0].dcval)),
                           1);
         }
-#line 5729 "fe/idl.tab.cpp"
+#line 5735 "fe/idl.tab.cpp"
     break;
 
-  case 269: /* signed_int: IDL_LONG  */
-#line 2980 "fe/idl.ypp"
+  case 270: /* signed_int: IDL_LONG  */
+#line 2986 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_long;
         }
-#line 5737 "fe/idl.tab.cpp"
+#line 5743 "fe/idl.tab.cpp"
     break;
 
-  case 270: /* signed_int: IDL_LONG IDL_LONG  */
-#line 2984 "fe/idl.ypp"
+  case 271: /* signed_int: IDL_LONG IDL_LONG  */
+#line 2990 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_longlong;
         }
-#line 5745 "fe/idl.tab.cpp"
+#line 5751 "fe/idl.tab.cpp"
     break;
 
-  case 271: /* signed_int: IDL_SHORT  */
-#line 2988 "fe/idl.ypp"
+  case 272: /* signed_int: IDL_SHORT  */
+#line 2994 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_short;
         }
-#line 5753 "fe/idl.tab.cpp"
+#line 5759 "fe/idl.tab.cpp"
     break;
 
-  case 272: /* signed_int: IDL_INT8  */
-#line 2992 "fe/idl.ypp"
+  case 273: /* signed_int: IDL_INT8  */
+#line 2998 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_int8;
         }
-#line 5761 "fe/idl.tab.cpp"
+#line 5767 "fe/idl.tab.cpp"
     break;
 
-  case 273: /* signed_int: IDL_INT16  */
-#line 2996 "fe/idl.ypp"
+  case 274: /* signed_int: IDL_INT16  */
+#line 3002 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_short;
         }
-#line 5769 "fe/idl.tab.cpp"
+#line 5775 "fe/idl.tab.cpp"
     break;
 
-  case 274: /* signed_int: IDL_INT32  */
-#line 3000 "fe/idl.ypp"
+  case 275: /* signed_int: IDL_INT32  */
+#line 3006 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_long;
         }
-#line 5777 "fe/idl.tab.cpp"
+#line 5783 "fe/idl.tab.cpp"
     break;
 
-  case 275: /* signed_int: IDL_INT64  */
-#line 3004 "fe/idl.ypp"
+  case 276: /* signed_int: IDL_INT64  */
+#line 3010 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_longlong;
         }
-#line 5785 "fe/idl.tab.cpp"
+#line 5791 "fe/idl.tab.cpp"
     break;
 
-  case 276: /* unsigned_int: IDL_UNSIGNED IDL_LONG  */
-#line 3011 "fe/idl.ypp"
+  case 277: /* unsigned_int: IDL_UNSIGNED IDL_LONG  */
+#line 3017 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_ulong;
         }
-#line 5793 "fe/idl.tab.cpp"
+#line 5799 "fe/idl.tab.cpp"
     break;
 
-  case 277: /* unsigned_int: IDL_UNSIGNED IDL_LONG IDL_LONG  */
-#line 3015 "fe/idl.ypp"
+  case 278: /* unsigned_int: IDL_UNSIGNED IDL_LONG IDL_LONG  */
+#line 3021 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_ulonglong;
         }
-#line 5801 "fe/idl.tab.cpp"
+#line 5807 "fe/idl.tab.cpp"
     break;
 
-  case 278: /* unsigned_int: IDL_UNSIGNED IDL_SHORT  */
-#line 3019 "fe/idl.ypp"
+  case 279: /* unsigned_int: IDL_UNSIGNED IDL_SHORT  */
+#line 3025 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_ushort;
         }
-#line 5809 "fe/idl.tab.cpp"
+#line 5815 "fe/idl.tab.cpp"
     break;
 
-  case 279: /* unsigned_int: IDL_UINT8  */
-#line 3023 "fe/idl.ypp"
+  case 280: /* unsigned_int: IDL_UINT8  */
+#line 3029 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_uint8;
         }
-#line 5817 "fe/idl.tab.cpp"
+#line 5823 "fe/idl.tab.cpp"
     break;
 
-  case 280: /* unsigned_int: IDL_UINT16  */
-#line 3027 "fe/idl.ypp"
+  case 281: /* unsigned_int: IDL_UINT16  */
+#line 3033 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_ushort;
         }
-#line 5825 "fe/idl.tab.cpp"
+#line 5831 "fe/idl.tab.cpp"
     break;
 
-  case 281: /* unsigned_int: IDL_UINT32  */
-#line 3031 "fe/idl.ypp"
+  case 282: /* unsigned_int: IDL_UINT32  */
+#line 3037 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_ulong;
         }
-#line 5833 "fe/idl.tab.cpp"
+#line 5839 "fe/idl.tab.cpp"
     break;
 
-  case 282: /* unsigned_int: IDL_UINT64  */
-#line 3035 "fe/idl.ypp"
+  case 283: /* unsigned_int: IDL_UINT64  */
+#line 3041 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_ulonglong;
         }
-#line 5841 "fe/idl.tab.cpp"
+#line 5847 "fe/idl.tab.cpp"
     break;
 
-  case 283: /* floating_pt_type: IDL_DOUBLE  */
-#line 3042 "fe/idl.ypp"
+  case 284: /* floating_pt_type: IDL_DOUBLE  */
+#line 3048 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_double;
         }
-#line 5849 "fe/idl.tab.cpp"
+#line 5855 "fe/idl.tab.cpp"
     break;
 
-  case 284: /* floating_pt_type: IDL_FLOAT  */
-#line 3046 "fe/idl.ypp"
+  case 285: /* floating_pt_type: IDL_FLOAT  */
+#line 3052 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_float;
         }
-#line 5857 "fe/idl.tab.cpp"
+#line 5863 "fe/idl.tab.cpp"
     break;
 
-  case 285: /* floating_pt_type: IDL_LONG IDL_DOUBLE  */
-#line 3050 "fe/idl.ypp"
+  case 286: /* floating_pt_type: IDL_LONG IDL_DOUBLE  */
+#line 3056 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_longdouble;
         }
-#line 5865 "fe/idl.tab.cpp"
+#line 5871 "fe/idl.tab.cpp"
     break;
 
-  case 286: /* fixed_type: IDL_FIXED  */
-#line 3057 "fe/idl.ypp"
+  case 287: /* fixed_type: IDL_FIXED  */
+#line 3063 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_fixed;
         }
-#line 5873 "fe/idl.tab.cpp"
+#line 5879 "fe/idl.tab.cpp"
     break;
 
-  case 287: /* char_type: IDL_CHAR  */
-#line 3064 "fe/idl.ypp"
+  case 288: /* char_type: IDL_CHAR  */
+#line 3070 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_char;
         }
-#line 5881 "fe/idl.tab.cpp"
+#line 5887 "fe/idl.tab.cpp"
     break;
 
-  case 288: /* char_type: IDL_WCHAR  */
-#line 3068 "fe/idl.ypp"
+  case 289: /* char_type: IDL_WCHAR  */
+#line 3074 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_wchar;
         }
-#line 5889 "fe/idl.tab.cpp"
+#line 5895 "fe/idl.tab.cpp"
     break;
 
-  case 289: /* octet_type: IDL_OCTET  */
-#line 3075 "fe/idl.ypp"
+  case 290: /* octet_type: IDL_OCTET  */
+#line 3081 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_octet;
         }
-#line 5897 "fe/idl.tab.cpp"
+#line 5903 "fe/idl.tab.cpp"
     break;
 
-  case 290: /* boolean_type: IDL_BOOLEAN  */
-#line 3082 "fe/idl.ypp"
+  case 291: /* boolean_type: IDL_BOOLEAN  */
+#line 3088 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_bool;
         }
-#line 5905 "fe/idl.tab.cpp"
+#line 5911 "fe/idl.tab.cpp"
     break;
 
-  case 291: /* any_type: IDL_ANY  */
-#line 3089 "fe/idl.ypp"
+  case 292: /* any_type: IDL_ANY  */
+#line 3095 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_any;
         }
-#line 5913 "fe/idl.tab.cpp"
+#line 5919 "fe/idl.tab.cpp"
     break;
 
-  case 292: /* object_type: IDL_OBJECT  */
-#line 3096 "fe/idl.ypp"
+  case 293: /* object_type: IDL_OBJECT  */
+#line 3102 "fe/idl.ypp"
         {
           (yyval.etval) = AST_Expression::EV_object;
         }
-#line 5921 "fe/idl.tab.cpp"
+#line 5927 "fe/idl.tab.cpp"
     break;
 
-  case 293: /* $@65: %empty  */
-#line 3103 "fe/idl.ypp"
+  case 294: /* $@65: %empty  */
+#line 3109 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_StructSeen);
         }
-#line 5929 "fe/idl.tab.cpp"
+#line 5935 "fe/idl.tab.cpp"
     break;
 
-  case 294: /* struct_decl: IDL_STRUCT $@65 defining_id  */
-#line 3107 "fe/idl.ypp"
+  case 295: /* struct_decl: IDL_STRUCT $@65 defining_id  */
+#line 3113 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_StructIDSeen);
           (yyval.idval) = (yyvsp[0].idval);
         }
-#line 5938 "fe/idl.tab.cpp"
+#line 5944 "fe/idl.tab.cpp"
     break;
 
-  case 295: /* $@66: %empty  */
-#line 3116 "fe/idl.ypp"
+  case 296: /* $@66: %empty  */
+#line 3122 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval), 0);
@@ -5953,27 +5963,27 @@ yyparse ()
           delete (yyvsp[0].idval);
           (yyvsp[0].idval) = 0;
         }
-#line 5973 "fe/idl.tab.cpp"
+#line 5979 "fe/idl.tab.cpp"
     break;
 
-  case 296: /* $@67: %empty  */
-#line 3147 "fe/idl.ypp"
+  case 297: /* $@67: %empty  */
+#line 3153 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_StructSqSeen);
         }
-#line 5981 "fe/idl.tab.cpp"
+#line 5987 "fe/idl.tab.cpp"
     break;
 
-  case 297: /* $@68: %empty  */
-#line 3151 "fe/idl.ypp"
+  case 298: /* $@68: %empty  */
+#line 3157 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_StructBodySeen);
         }
-#line 5989 "fe/idl.tab.cpp"
+#line 5995 "fe/idl.tab.cpp"
     break;
 
-  case 298: /* struct_type: struct_decl $@66 '{' $@67 at_least_one_member $@68 '}'  */
-#line 3155 "fe/idl.ypp"
+  case 299: /* struct_type: struct_decl $@66 '{' $@67 at_least_one_member $@68 '}'  */
+#line 3161 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_StructQsSeen);
 
@@ -5985,11 +5995,11 @@ yyparse ()
                  );
           idl_global->scopes ().pop ();
         }
-#line 6005 "fe/idl.tab.cpp"
+#line 6011 "fe/idl.tab.cpp"
     break;
 
-  case 302: /* member: annotations_maybe member_i  */
-#line 3177 "fe/idl.ypp"
+  case 303: /* member: annotations_maybe member_i  */
+#line 3183 "fe/idl.ypp"
         {
           AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val);
           AST_Decls *members = (yyvsp[0].decls_val);
@@ -6003,27 +6013,27 @@ yyparse ()
           delete annotations;
           delete members;
         }
-#line 6023 "fe/idl.tab.cpp"
+#line 6029 "fe/idl.tab.cpp"
     break;
 
-  case 303: /* $@69: %empty  */
-#line 3194 "fe/idl.ypp"
+  case 304: /* $@69: %empty  */
+#line 3200 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_MemberTypeSeen);
         }
-#line 6031 "fe/idl.tab.cpp"
+#line 6037 "fe/idl.tab.cpp"
     break;
 
-  case 304: /* $@70: %empty  */
-#line 3198 "fe/idl.ypp"
+  case 305: /* $@70: %empty  */
+#line 3204 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_MemberDeclsSeen);
         }
-#line 6039 "fe/idl.tab.cpp"
+#line 6045 "fe/idl.tab.cpp"
     break;
 
-  case 305: /* member_i: type_spec $@69 at_least_one_declarator $@70 ';'  */
-#line 3202 "fe/idl.ypp"
+  case 306: /* member_i: type_spec $@69 at_least_one_declarator $@70 ';'  */
+#line 3208 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           FE_Declarator *d = 0;
@@ -6077,53 +6087,53 @@ yyparse ()
 
           (yyval.decls_val) = members;
         }
-#line 6097 "fe/idl.tab.cpp"
+#line 6103 "fe/idl.tab.cpp"
     break;
 
-  case 306: /* $@71: %empty  */
-#line 3256 "fe/idl.ypp"
+  case 307: /* $@71: %empty  */
+#line 3262 "fe/idl.ypp"
         {
           idl_global->err ()->syntax_error (idl_global->parse_state ());
         }
-#line 6105 "fe/idl.tab.cpp"
+#line 6111 "fe/idl.tab.cpp"
     break;
 
-  case 307: /* member_i: error $@71 ';'  */
-#line 3260 "fe/idl.ypp"
+  case 308: /* member_i: error $@71 ';'  */
+#line 3266 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
           yyerrok;
         }
-#line 6114 "fe/idl.tab.cpp"
+#line 6120 "fe/idl.tab.cpp"
     break;
 
-  case 308: /* $@72: %empty  */
-#line 3268 "fe/idl.ypp"
+  case 309: /* $@72: %empty  */
+#line 3274 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_UnionSeen);
         }
-#line 6122 "fe/idl.tab.cpp"
+#line 6128 "fe/idl.tab.cpp"
     break;
 
-  case 309: /* union_decl: IDL_UNION $@72 defining_id  */
-#line 3272 "fe/idl.ypp"
+  case 310: /* union_decl: IDL_UNION $@72 defining_id  */
+#line 3278 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_UnionIDSeen);
           (yyval.idval) = (yyvsp[0].idval);
         }
-#line 6131 "fe/idl.tab.cpp"
+#line 6137 "fe/idl.tab.cpp"
     break;
 
-  case 310: /* $@73: %empty  */
-#line 3280 "fe/idl.ypp"
+  case 311: /* $@73: %empty  */
+#line 3286 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SwitchSeen);
         }
-#line 6139 "fe/idl.tab.cpp"
+#line 6145 "fe/idl.tab.cpp"
     break;
 
-  case 311: /* $@74: %empty  */
-#line 3284 "fe/idl.ypp"
+  case 312: /* $@74: %empty  */
+#line 3290 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[-3].idval), 0);
@@ -6156,19 +6166,19 @@ yyparse ()
            * Don't delete $1 yet; we'll need it a bit later.
            */
         }
-#line 6176 "fe/idl.tab.cpp"
+#line 6182 "fe/idl.tab.cpp"
     break;
 
-  case 312: /* $@75: %empty  */
-#line 3317 "fe/idl.ypp"
+  case 313: /* $@75: %empty  */
+#line 3323 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SwitchTypeSeen);
         }
-#line 6184 "fe/idl.tab.cpp"
+#line 6190 "fe/idl.tab.cpp"
     break;
 
-  case 313: /* $@76: %empty  */
-#line 3321 "fe/idl.ypp"
+  case 314: /* $@76: %empty  */
+#line 3327 "fe/idl.ypp"
         {
           /*
            * The top of the scopes must be an empty union we added after we
@@ -6227,27 +6237,27 @@ yyparse ()
 
           delete disc_annotations;
         }
-#line 6247 "fe/idl.tab.cpp"
+#line 6253 "fe/idl.tab.cpp"
     break;
 
-  case 314: /* $@77: %empty  */
-#line 3380 "fe/idl.ypp"
+  case 315: /* $@77: %empty  */
+#line 3386 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_UnionSqSeen);
         }
-#line 6255 "fe/idl.tab.cpp"
+#line 6261 "fe/idl.tab.cpp"
     break;
 
-  case 315: /* $@78: %empty  */
-#line 3384 "fe/idl.ypp"
+  case 316: /* $@78: %empty  */
+#line 3390 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_UnionBodySeen);
         }
-#line 6263 "fe/idl.tab.cpp"
+#line 6269 "fe/idl.tab.cpp"
     break;
 
-  case 316: /* union_type: union_decl IDL_SWITCH $@73 '(' $@74 annotations_maybe switch_type_spec $@75 ')' $@76 '{' $@77 at_least_one_case_branch $@78 '}'  */
-#line 3388 "fe/idl.ypp"
+  case 317: /* union_type: union_decl IDL_SWITCH $@73 '(' $@74 annotations_maybe switch_type_spec $@75 ')' $@76 '{' $@77 at_least_one_case_branch $@78 '}'  */
+#line 3394 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_UnionQsSeen);
 
@@ -6263,22 +6273,22 @@ yyparse ()
               idl_global->scopes ().pop ();
             }
         }
-#line 6283 "fe/idl.tab.cpp"
+#line 6289 "fe/idl.tab.cpp"
     break;
 
-  case 317: /* switch_type_spec: integer_type  */
-#line 3407 "fe/idl.ypp"
+  case 318: /* switch_type_spec: integer_type  */
+#line 3413 "fe/idl.ypp"
         {
           (yyval.dcval) =
             idl_global->scopes ().bottom ()->lookup_primitive_type (
                                                  (yyvsp[0].etval)
                                                );
         }
-#line 6294 "fe/idl.tab.cpp"
+#line 6300 "fe/idl.tab.cpp"
     break;
 
-  case 318: /* switch_type_spec: char_type  */
-#line 3414 "fe/idl.ypp"
+  case 319: /* switch_type_spec: char_type  */
+#line 3420 "fe/idl.ypp"
         {
           /* wchars are not allowed. */
           if ((yyvsp[0].etval) == AST_Expression::EV_wchar)
@@ -6291,11 +6301,11 @@ yyparse ()
                                                  (yyvsp[0].etval)
                                                );
         }
-#line 6311 "fe/idl.tab.cpp"
+#line 6317 "fe/idl.tab.cpp"
     break;
 
-  case 319: /* switch_type_spec: octet_type  */
-#line 3427 "fe/idl.ypp"
+  case 320: /* switch_type_spec: octet_type  */
+#line 3433 "fe/idl.ypp"
         {
           /* octets are not allowed. */
           idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE);
@@ -6304,22 +6314,22 @@ yyparse ()
                                                  (yyvsp[0].etval)
                                                );
         }
-#line 6324 "fe/idl.tab.cpp"
+#line 6330 "fe/idl.tab.cpp"
     break;
 
-  case 320: /* switch_type_spec: boolean_type  */
-#line 3436 "fe/idl.ypp"
+  case 321: /* switch_type_spec: boolean_type  */
+#line 3442 "fe/idl.ypp"
         {
           (yyval.dcval) =
             idl_global->scopes ().bottom ()->lookup_primitive_type (
                                                  (yyvsp[0].etval)
                                                );
         }
-#line 6335 "fe/idl.tab.cpp"
+#line 6341 "fe/idl.tab.cpp"
     break;
 
-  case 322: /* switch_type_spec: scoped_name  */
-#line 3444 "fe/idl.ypp"
+  case 323: /* switch_type_spec: scoped_name  */
+#line 3450 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Decl *d = 0;
@@ -6426,27 +6436,27 @@ yyparse ()
           delete (yyvsp[0].idlist);
           (yyvsp[0].idlist) = 0;
         }
-#line 6446 "fe/idl.tab.cpp"
+#line 6452 "fe/idl.tab.cpp"
     break;
 
-  case 326: /* $@79: %empty  */
-#line 3561 "fe/idl.ypp"
+  case 327: /* $@79: %empty  */
+#line 3567 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_UnionLabelSeen);
         }
-#line 6454 "fe/idl.tab.cpp"
+#line 6460 "fe/idl.tab.cpp"
     break;
 
-  case 327: /* $@80: %empty  */
-#line 3565 "fe/idl.ypp"
+  case 328: /* $@80: %empty  */
+#line 3571 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemSeen);
         }
-#line 6462 "fe/idl.tab.cpp"
+#line 6468 "fe/idl.tab.cpp"
     break;
 
-  case 328: /* case_branch: at_least_one_case_label $@79 annotations_maybe element_spec $@80 ';'  */
-#line 3569 "fe/idl.ypp"
+  case 329: /* case_branch: at_least_one_case_label $@79 annotations_maybe element_spec $@80 ';'  */
+#line 3575 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_UnionBranch *b = 0;
@@ -6478,39 +6488,39 @@ yyparse ()
 
           delete annotations;
         }
-#line 6498 "fe/idl.tab.cpp"
+#line 6504 "fe/idl.tab.cpp"
     break;
 
-  case 329: /* $@81: %empty  */
-#line 3601 "fe/idl.ypp"
+  case 330: /* $@81: %empty  */
+#line 3607 "fe/idl.ypp"
         {
           idl_global->err ()->syntax_error (idl_global->parse_state ());
         }
-#line 6506 "fe/idl.tab.cpp"
+#line 6512 "fe/idl.tab.cpp"
     break;
 
-  case 330: /* case_branch: error $@81 ';'  */
-#line 3605 "fe/idl.ypp"
+  case 331: /* case_branch: error $@81 ';'  */
+#line 3611 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
           yyerrok;
         }
-#line 6515 "fe/idl.tab.cpp"
+#line 6521 "fe/idl.tab.cpp"
     break;
 
-  case 331: /* at_least_one_case_label: case_label case_labels  */
-#line 3613 "fe/idl.ypp"
+  case 332: /* at_least_one_case_label: case_label case_labels  */
+#line 3619 "fe/idl.ypp"
         {
           ACE_NEW_RETURN ((yyval.llval),
                           UTL_LabelList ((yyvsp[-1].ulval),
                                          (yyvsp[0].llval)),
                           1);
         }
-#line 6526 "fe/idl.tab.cpp"
+#line 6532 "fe/idl.tab.cpp"
     break;
 
-  case 332: /* case_labels: case_labels case_label  */
-#line 3623 "fe/idl.ypp"
+  case 333: /* case_labels: case_labels case_label  */
+#line 3629 "fe/idl.ypp"
         {
           UTL_LabelList *ll = 0;
           ACE_NEW_RETURN (ll,
@@ -6528,27 +6538,27 @@ yyparse ()
               (yyval.llval) = (yyvsp[-1].llval);
             }
         }
-#line 6548 "fe/idl.tab.cpp"
+#line 6554 "fe/idl.tab.cpp"
     break;
 
-  case 333: /* case_labels: %empty  */
-#line 3641 "fe/idl.ypp"
+  case 334: /* case_labels: %empty  */
+#line 3647 "fe/idl.ypp"
         {
           (yyval.llval) = 0;
         }
-#line 6556 "fe/idl.tab.cpp"
+#line 6562 "fe/idl.tab.cpp"
     break;
 
-  case 334: /* $@82: %empty  */
-#line 3648 "fe/idl.ypp"
+  case 335: /* $@82: %empty  */
+#line 3654 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_DefaultSeen);
         }
-#line 6564 "fe/idl.tab.cpp"
+#line 6570 "fe/idl.tab.cpp"
     break;
 
-  case 335: /* case_label: IDL_DEFAULT $@82 ':'  */
-#line 3652 "fe/idl.ypp"
+  case 336: /* case_label: IDL_DEFAULT $@82 ':'  */
+#line 3658 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen);
 
@@ -6557,27 +6567,27 @@ yyparse ()
                                        0
                                      );
         }
-#line 6577 "fe/idl.tab.cpp"
+#line 6583 "fe/idl.tab.cpp"
     break;
 
-  case 336: /* $@83: %empty  */
-#line 3661 "fe/idl.ypp"
+  case 337: /* $@83: %empty  */
+#line 3667 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_CaseSeen);
         }
-#line 6585 "fe/idl.tab.cpp"
+#line 6591 "fe/idl.tab.cpp"
     break;
 
-  case 337: /* $@84: %empty  */
-#line 3665 "fe/idl.ypp"
+  case 338: /* $@84: %empty  */
+#line 3671 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_LabelExprSeen);
         }
-#line 6593 "fe/idl.tab.cpp"
+#line 6599 "fe/idl.tab.cpp"
     break;
 
-  case 338: /* case_label: IDL_CASE $@83 const_expr $@84 ':'  */
-#line 3669 "fe/idl.ypp"
+  case 339: /* case_label: IDL_CASE $@83 const_expr $@84 ':'  */
+#line 3675 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen);
 
@@ -6586,19 +6596,19 @@ yyparse ()
                                       (yyvsp[-2].exval)
                                     );
         }
-#line 6606 "fe/idl.tab.cpp"
+#line 6612 "fe/idl.tab.cpp"
     break;
 
-  case 339: /* $@85: %empty  */
-#line 3681 "fe/idl.ypp"
+  case 340: /* $@85: %empty  */
+#line 3687 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemTypeSeen);
         }
-#line 6614 "fe/idl.tab.cpp"
+#line 6620 "fe/idl.tab.cpp"
     break;
 
-  case 340: /* element_spec: type_spec $@85 declarator  */
-#line 3685 "fe/idl.ypp"
+  case 341: /* element_spec: type_spec $@85 declarator  */
+#line 3691 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemDeclSeen);
 
@@ -6641,11 +6651,11 @@ yyparse ()
               (yyvsp[0].deval) = 0;
             }
         }
-#line 6661 "fe/idl.tab.cpp"
+#line 6667 "fe/idl.tab.cpp"
     break;
 
-  case 341: /* struct_forward_type: struct_decl  */
-#line 3731 "fe/idl.ypp"
+  case 342: /* struct_forward_type: struct_decl  */
+#line 3737 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
@@ -6667,11 +6677,11 @@ yyparse ()
 
           (yyval.dcval) = d;
         }
-#line 6687 "fe/idl.tab.cpp"
+#line 6693 "fe/idl.tab.cpp"
     break;
 
-  case 342: /* union_forward_type: union_decl  */
-#line 3756 "fe/idl.ypp"
+  case 343: /* union_forward_type: union_decl  */
+#line 3762 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
@@ -6691,19 +6701,19 @@ yyparse ()
           delete (yyvsp[0].idval);
           (yyvsp[0].idval) = 0;
         }
-#line 6711 "fe/idl.tab.cpp"
+#line 6717 "fe/idl.tab.cpp"
     break;
 
-  case 343: /* $@86: %empty  */
-#line 3779 "fe/idl.ypp"
+  case 344: /* $@86: %empty  */
+#line 3785 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_EnumSeen);
         }
-#line 6719 "fe/idl.tab.cpp"
+#line 6725 "fe/idl.tab.cpp"
     break;
 
-  case 344: /* $@87: %empty  */
-#line 3783 "fe/idl.ypp"
+  case 345: /* $@87: %empty  */
+#line 3789 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval), 0);
@@ -6734,27 +6744,27 @@ yyparse ()
           delete (yyvsp[0].idval);
           (yyvsp[0].idval) = 0;
         }
-#line 6754 "fe/idl.tab.cpp"
+#line 6760 "fe/idl.tab.cpp"
     break;
 
-  case 345: /* $@88: %empty  */
-#line 3814 "fe/idl.ypp"
+  case 346: /* $@88: %empty  */
+#line 3820 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_EnumSqSeen);
         }
-#line 6762 "fe/idl.tab.cpp"
+#line 6768 "fe/idl.tab.cpp"
     break;
 
-  case 346: /* $@89: %empty  */
-#line 3818 "fe/idl.ypp"
+  case 347: /* $@89: %empty  */
+#line 3824 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_EnumBodySeen);
         }
-#line 6770 "fe/idl.tab.cpp"
+#line 6776 "fe/idl.tab.cpp"
     break;
 
-  case 347: /* enum_type: IDL_ENUM $@86 defining_id $@87 '{' $@88 at_least_one_enumerator $@89 '}'  */
-#line 3822 "fe/idl.ypp"
+  case 348: /* enum_type: IDL_ENUM $@86 defining_id $@87 '{' $@88 at_least_one_enumerator $@89 '}'  */
+#line 3828 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_EnumQsSeen);
 
@@ -6773,19 +6783,19 @@ yyparse ()
               idl_global->scopes ().pop ();
             }
         }
-#line 6793 "fe/idl.tab.cpp"
+#line 6799 "fe/idl.tab.cpp"
     break;
 
-  case 349: /* $@90: %empty  */
-#line 3847 "fe/idl.ypp"
+  case 350: /* $@90: %empty  */
+#line 3853 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_EnumCommaSeen);
         }
-#line 6801 "fe/idl.tab.cpp"
+#line 6807 "fe/idl.tab.cpp"
     break;
 
-  case 352: /* enumerator: annotations_maybe IDENTIFIER  */
-#line 3856 "fe/idl.ypp"
+  case 353: /* enumerator: annotations_maybe IDENTIFIER  */
+#line 3862 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val);
@@ -6820,27 +6830,131 @@ yyparse ()
 
           delete annotations;
         }
-#line 6840 "fe/idl.tab.cpp"
+#line 6846 "fe/idl.tab.cpp"
     break;
 
-  case 353: /* $@91: %empty  */
-#line 3895 "fe/idl.ypp"
+  case 354: /* map_type_spec: map_head '>'  */
+#line 3901 "fe/idl.ypp"
+        {
+          AST_Map *map = 0;
+          Decl_Annotations_Pair_Pair* type_pair = (yyvsp[-1].decl_annotations_pair_val_pair);
+          Decl_Annotations_Pair *key_type = type_pair->first;
+          Decl_Annotations_Pair *val_type = type_pair->second;
+
+          /*
+           * Remove map marker from scopes stack.
+           */
+          if (idl_global->scopes ().top () == 0)
+            {
+             idl_global->scopes ().pop ();
+            }
+
+          UTL_Scope *s = idl_global->scopes ().top_non_null ();
+
+          /*
+           * Create a node representing a map.
+           */
+          if (key_type && val_type)
+            {
+              AST_Type *ktp = dynamic_cast<AST_Type*> (key_type->decl);
+              AST_Type *vtp = dynamic_cast<AST_Type*> (val_type->decl);
+
+              if (ktp == 0 || vtp == 0)
+                {
+                  ; // Error will be caught in FE_Declarator.
+                }
+              else
+                {
+                  Identifier id ("map");
+                  UTL_ScopedName sn (&id, 0);
+                  ACE_CDR::ULong bound = 0UL;
+
+                  map =
+                    idl_global->gen ()->create_map (
+                        idl_global->gen ()->create_expr (
+                                                bound,
+                                                AST_Expression::EV_ulong
+                                              ),
+                        ktp,
+                        vtp,
+                        &sn,
+                        s->is_local (),
+                        s->is_abstract ()
+                      );
+                  map->key_type_annotations (*key_type->annotations);
+                  map->value_type_annotations (*val_type->annotations);
+
+                  idl_global->err ()->anonymous_type_diagnostic ();
+                }
+            }
+
+          delete key_type->annotations;
+          delete val_type->annotations;
+          delete type_pair;
+          (yyval.dcval) = map;
+        }
+#line 6909 "fe/idl.tab.cpp"
+    break;
+
+  case 355: /* $@91: %empty  */
+#line 3963 "fe/idl.ypp"
+        {
+          idl_global->set_parse_state (IDL_GlobalData::PS_MapSeen);
+
+          /*
+           * Push a map marker on scopes stack.
+           */
+          idl_global->scopes ().push (0);
+        }
+#line 6922 "fe/idl.tab.cpp"
+    break;
+
+  case 356: /* $@92: %empty  */
+#line 3973 "fe/idl.ypp"
+        {
+          idl_global->set_parse_state(IDL_GlobalData::PS_MapKeyTypeSeen);
+        }
+#line 6930 "fe/idl.tab.cpp"
+    break;
+
+  case 357: /* map_head: IDL_MAP $@91 '<' annotations_maybe simple_type_spec $@92 ',' annotations_maybe simple_type_spec  */
+#line 3978 "fe/idl.ypp"
+        {
+          idl_global->set_parse_state(IDL_GlobalData::PS_MapValueTypeSeen);
+          Decl_Annotations_Pair *key = new Decl_Annotations_Pair;
+          key->decl = (yyvsp[-4].dcval);
+          key->annotations = (yyvsp[-5].annotations_val);
+
+          Decl_Annotations_Pair *value = new Decl_Annotations_Pair;
+          value->decl = (yyvsp[0].dcval);
+          value->annotations = (yyvsp[-1].annotations_val);
+
+          Decl_Annotations_Pair_Pair* pairs = new Decl_Annotations_Pair_Pair;
+          pairs->first = key;
+          pairs->second = value;
+          (yyval.decl_annotations_pair_val_pair) = pairs;
+        }
+#line 6950 "fe/idl.tab.cpp"
+    break;
+
+  case 358: /* $@93: %empty  */
+#line 3998 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SequenceCommaSeen);
         }
-#line 6848 "fe/idl.tab.cpp"
+#line 6958 "fe/idl.tab.cpp"
     break;
 
-  case 354: /* $@92: %empty  */
-#line 3899 "fe/idl.ypp"
+  case 359: /* $@94: %empty  */
+#line 4002 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SequenceExprSeen);
         }
-#line 6856 "fe/idl.tab.cpp"
+#line 6966 "fe/idl.tab.cpp"
     break;
 
-  case 355: /* sequence_type_spec: seq_head ',' $@91 positive_int_expr $@92 '>'  */
-#line 3903 "fe/idl.ypp"
+  case 360: /* sequence_type_spec: seq_head ',' $@93 positive_int_expr $@94 '>'  */
+#line 4006 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen);
 
@@ -6921,11 +7035,11 @@ yyparse ()
           ev = 0;
           (yyval.dcval) = seq;
         }
-#line 6941 "fe/idl.tab.cpp"
+#line 7051 "fe/idl.tab.cpp"
     break;
 
-  case 356: /* sequence_type_spec: seq_head '>'  */
-#line 3985 "fe/idl.ypp"
+  case 361: /* sequence_type_spec: seq_head '>'  */
+#line 4088 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen);
 
@@ -6987,11 +7101,11 @@ yyparse ()
           delete type_annotations;
           (yyval.dcval) = seq;
         }
-#line 7007 "fe/idl.tab.cpp"
+#line 7117 "fe/idl.tab.cpp"
     break;
 
-  case 357: /* $@93: %empty  */
-#line 4050 "fe/idl.ypp"
+  case 362: /* $@95: %empty  */
+#line 4153 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSeen);
 
@@ -7000,19 +7114,19 @@ yyparse ()
            */
           idl_global->scopes ().push (0);
         }
-#line 7020 "fe/idl.tab.cpp"
+#line 7130 "fe/idl.tab.cpp"
     break;
 
-  case 358: /* $@94: %empty  */
-#line 4059 "fe/idl.ypp"
+  case 363: /* $@96: %empty  */
+#line 4162 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSqSeen);
         }
-#line 7028 "fe/idl.tab.cpp"
+#line 7138 "fe/idl.tab.cpp"
     break;
 
-  case 359: /* seq_head: IDL_SEQUENCE $@93 '<' $@94 annotations_maybe simple_type_spec  */
-#line 4063 "fe/idl.ypp"
+  case 364: /* seq_head: IDL_SEQUENCE $@95 '<' $@96 annotations_maybe simple_type_spec  */
+#line 4166 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SequenceTypeSeen);
           Decl_Annotations_Pair *seq_head = new Decl_Annotations_Pair;
@@ -7020,36 +7134,36 @@ yyparse ()
           seq_head->annotations = (yyvsp[-1].annotations_val);
           (yyval.decl_annotations_pair_val) = seq_head;
         }
-#line 7040 "fe/idl.tab.cpp"
+#line 7150 "fe/idl.tab.cpp"
     break;
 
-  case 360: /* fixed_type_spec: IDL_FIXED '<' positive_int_expr ',' const_expr '>'  */
-#line 4074 "fe/idl.ypp"
+  case 365: /* fixed_type_spec: IDL_FIXED '<' positive_int_expr ',' const_expr '>'  */
+#line 4177 "fe/idl.ypp"
         {
           (yyvsp[-1].exval)->evaluate (AST_Expression::EK_positive_int);
           (yyval.dcval) = idl_global->gen ()->create_fixed ((yyvsp[-3].exval), (yyvsp[-1].exval));
         }
-#line 7049 "fe/idl.tab.cpp"
+#line 7159 "fe/idl.tab.cpp"
     break;
 
-  case 361: /* $@95: %empty  */
-#line 4083 "fe/idl.ypp"
+  case 366: /* $@97: %empty  */
+#line 4186 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen);
         }
-#line 7057 "fe/idl.tab.cpp"
+#line 7167 "fe/idl.tab.cpp"
     break;
 
-  case 362: /* $@96: %empty  */
-#line 4087 "fe/idl.ypp"
+  case 367: /* $@98: %empty  */
+#line 4190 "fe/idl.ypp"
         {
            idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen);
         }
-#line 7065 "fe/idl.tab.cpp"
+#line 7175 "fe/idl.tab.cpp"
     break;
 
-  case 363: /* string_type_spec: string_head '<' $@95 positive_int_expr $@96 '>'  */
-#line 4091 "fe/idl.ypp"
+  case 368: /* string_type_spec: string_head '<' $@97 positive_int_expr $@98 '>'  */
+#line 4194 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen);
 
@@ -7088,11 +7202,11 @@ yyparse ()
           delete ev;
           ev = 0;
         }
-#line 7108 "fe/idl.tab.cpp"
+#line 7218 "fe/idl.tab.cpp"
     break;
 
-  case 364: /* string_type_spec: string_head  */
-#line 4130 "fe/idl.ypp"
+  case 369: /* string_type_spec: string_head  */
+#line 4233 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted);
 
@@ -7115,35 +7229,35 @@ yyparse ()
 
           (yyval.dcval) = tao_string_decl;
         }
-#line 7135 "fe/idl.tab.cpp"
+#line 7245 "fe/idl.tab.cpp"
     break;
 
-  case 365: /* string_head: IDL_STRING  */
-#line 4156 "fe/idl.ypp"
+  case 370: /* string_head: IDL_STRING  */
+#line 4259 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen);
         }
-#line 7143 "fe/idl.tab.cpp"
+#line 7253 "fe/idl.tab.cpp"
     break;
 
-  case 366: /* $@97: %empty  */
-#line 4164 "fe/idl.ypp"
+  case 371: /* $@99: %empty  */
+#line 4267 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen);
         }
-#line 7151 "fe/idl.tab.cpp"
+#line 7261 "fe/idl.tab.cpp"
     break;
 
-  case 367: /* $@98: %empty  */
-#line 4168 "fe/idl.ypp"
+  case 372: /* $@100: %empty  */
+#line 4271 "fe/idl.ypp"
         {
            idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen);
         }
-#line 7159 "fe/idl.tab.cpp"
+#line 7269 "fe/idl.tab.cpp"
     break;
 
-  case 368: /* wstring_type_spec: wstring_head '<' $@97 positive_int_expr $@98 '>'  */
-#line 4172 "fe/idl.ypp"
+  case 373: /* wstring_type_spec: wstring_head '<' $@99 positive_int_expr $@100 '>'  */
+#line 4275 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen);
 
@@ -7182,11 +7296,11 @@ yyparse ()
           delete ev;
           ev = 0;
         }
-#line 7202 "fe/idl.tab.cpp"
+#line 7312 "fe/idl.tab.cpp"
     break;
 
-  case 369: /* wstring_type_spec: wstring_head  */
-#line 4211 "fe/idl.ypp"
+  case 374: /* wstring_type_spec: wstring_head  */
+#line 4314 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted);
 
@@ -7209,27 +7323,27 @@ yyparse ()
 
           (yyval.dcval) = string;
         }
-#line 7229 "fe/idl.tab.cpp"
+#line 7339 "fe/idl.tab.cpp"
     break;
 
-  case 370: /* wstring_head: IDL_WSTRING  */
-#line 4237 "fe/idl.ypp"
+  case 375: /* wstring_head: IDL_WSTRING  */
+#line 4340 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen);
         }
-#line 7237 "fe/idl.tab.cpp"
+#line 7347 "fe/idl.tab.cpp"
     break;
 
-  case 371: /* $@99: %empty  */
-#line 4244 "fe/idl.ypp"
+  case 376: /* $@101: %empty  */
+#line 4347 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ArrayIDSeen);
         }
-#line 7245 "fe/idl.tab.cpp"
+#line 7355 "fe/idl.tab.cpp"
     break;
 
-  case 372: /* array_declarator: defining_id $@99 annotations_maybe at_least_one_array_dim  */
-#line 4248 "fe/idl.ypp"
+  case 377: /* array_declarator: defining_id $@101 annotations_maybe at_least_one_array_dim  */
+#line 4351 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ArrayCompleted);
 
@@ -7265,22 +7379,22 @@ yyparse ()
 
           (yyval.dcval) = array;
         }
-#line 7285 "fe/idl.tab.cpp"
+#line 7395 "fe/idl.tab.cpp"
     break;
 
-  case 373: /* at_least_one_array_dim: array_dim array_dims  */
-#line 4287 "fe/idl.ypp"
+  case 378: /* at_least_one_array_dim: array_dim array_dims  */
+#line 4390 "fe/idl.ypp"
         {
           ACE_NEW_RETURN ((yyval.elval),
                           UTL_ExprList ((yyvsp[-1].exval),
                                         (yyvsp[0].elval)),
                           1);
         }
-#line 7296 "fe/idl.tab.cpp"
+#line 7406 "fe/idl.tab.cpp"
     break;
 
-  case 374: /* array_dims: array_dims array_dim  */
-#line 4297 "fe/idl.ypp"
+  case 379: /* array_dims: array_dims array_dim  */
+#line 4400 "fe/idl.ypp"
         {
           UTL_ExprList *el = 0;
           ACE_NEW_RETURN (el,
@@ -7298,35 +7412,35 @@ yyparse ()
               (yyval.elval) = (yyvsp[-1].elval);
             }
         }
-#line 7318 "fe/idl.tab.cpp"
+#line 7428 "fe/idl.tab.cpp"
     break;
 
-  case 375: /* array_dims: %empty  */
-#line 4315 "fe/idl.ypp"
+  case 380: /* array_dims: %empty  */
+#line 4418 "fe/idl.ypp"
         {
           (yyval.elval) = 0;
         }
-#line 7326 "fe/idl.tab.cpp"
+#line 7436 "fe/idl.tab.cpp"
     break;
 
-  case 376: /* $@100: %empty  */
-#line 4322 "fe/idl.ypp"
+  case 381: /* $@102: %empty  */
+#line 4425 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_DimSqSeen);
         }
-#line 7334 "fe/idl.tab.cpp"
+#line 7444 "fe/idl.tab.cpp"
     break;
 
-  case 377: /* $@101: %empty  */
-#line 4326 "fe/idl.ypp"
+  case 382: /* $@103: %empty  */
+#line 4429 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_DimExprSeen);
         }
-#line 7342 "fe/idl.tab.cpp"
+#line 7452 "fe/idl.tab.cpp"
     break;
 
-  case 378: /* array_dim: '[' $@100 positive_int_expr $@101 ']'  */
-#line 4330 "fe/idl.ypp"
+  case 383: /* array_dim: '[' $@102 positive_int_expr $@103 ']'  */
+#line 4433 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_DimQsSeen);
 
@@ -7380,43 +7494,43 @@ yyparse ()
           delete ev;
           ev = 0;
         }
-#line 7400 "fe/idl.tab.cpp"
+#line 7510 "fe/idl.tab.cpp"
     break;
 
-  case 381: /* $@102: %empty  */
-#line 4392 "fe/idl.ypp"
+  case 386: /* $@104: %empty  */
+#line 4495 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_AttrROSeen);
         }
-#line 7408 "fe/idl.tab.cpp"
+#line 7518 "fe/idl.tab.cpp"
     break;
 
-  case 382: /* $@103: %empty  */
-#line 4396 "fe/idl.ypp"
+  case 387: /* $@105: %empty  */
+#line 4499 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen);
         }
-#line 7416 "fe/idl.tab.cpp"
+#line 7526 "fe/idl.tab.cpp"
     break;
 
-  case 383: /* $@104: %empty  */
-#line 4400 "fe/idl.ypp"
+  case 388: /* $@106: %empty  */
+#line 4503 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen);
         }
-#line 7424 "fe/idl.tab.cpp"
+#line 7534 "fe/idl.tab.cpp"
     break;
 
-  case 384: /* $@105: %empty  */
-#line 4404 "fe/idl.ypp"
+  case 389: /* $@107: %empty  */
+#line 4507 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen);
         }
-#line 7432 "fe/idl.tab.cpp"
+#line 7542 "fe/idl.tab.cpp"
     break;
 
-  case 385: /* attribute_readonly: IDL_READONLY $@102 IDL_ATTRIBUTE $@103 param_type_spec $@104 at_least_one_simple_declarator $@105 opt_raises  */
-#line 4408 "fe/idl.ypp"
+  case 390: /* attribute_readonly: IDL_READONLY $@104 IDL_ATTRIBUTE $@105 param_type_spec $@106 at_least_one_simple_declarator $@107 opt_raises  */
+#line 4511 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Attribute *a = 0;
@@ -7468,43 +7582,43 @@ yyparse ()
 
           (yyval.dcval) = a;
         }
-#line 7488 "fe/idl.tab.cpp"
+#line 7598 "fe/idl.tab.cpp"
     break;
 
-  case 386: /* $@106: %empty  */
-#line 4463 "fe/idl.ypp"
+  case 391: /* $@108: %empty  */
+#line 4566 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen);
         }
-#line 7496 "fe/idl.tab.cpp"
+#line 7606 "fe/idl.tab.cpp"
     break;
 
-  case 387: /* $@107: %empty  */
-#line 4467 "fe/idl.ypp"
+  case 392: /* $@109: %empty  */
+#line 4570 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen);
         }
-#line 7504 "fe/idl.tab.cpp"
+#line 7614 "fe/idl.tab.cpp"
     break;
 
-  case 388: /* $@108: %empty  */
-#line 4471 "fe/idl.ypp"
+  case 393: /* $@110: %empty  */
+#line 4574 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen);
         }
-#line 7512 "fe/idl.tab.cpp"
+#line 7622 "fe/idl.tab.cpp"
     break;
 
-  case 389: /* $@109: %empty  */
-#line 4475 "fe/idl.ypp"
+  case 394: /* $@111: %empty  */
+#line 4578 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseCompleted);
         }
-#line 7520 "fe/idl.tab.cpp"
+#line 7630 "fe/idl.tab.cpp"
     break;
 
-  case 390: /* attribute_readwrite: IDL_ATTRIBUTE $@106 param_type_spec $@107 at_least_one_simple_declarator $@108 opt_getraises $@109 opt_setraises  */
-#line 4479 "fe/idl.ypp"
+  case 395: /* attribute_readwrite: IDL_ATTRIBUTE $@108 param_type_spec $@109 at_least_one_simple_declarator $@110 opt_getraises $@111 opt_setraises  */
+#line 4582 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Attribute *a = 0;
@@ -7565,19 +7679,19 @@ yyparse ()
 
           (yyval.dcval) = a;
         }
-#line 7585 "fe/idl.tab.cpp"
+#line 7695 "fe/idl.tab.cpp"
     break;
 
-  case 391: /* $@110: %empty  */
-#line 4543 "fe/idl.ypp"
+  case 396: /* $@112: %empty  */
+#line 4646 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSeen);
         }
-#line 7593 "fe/idl.tab.cpp"
+#line 7703 "fe/idl.tab.cpp"
     break;
 
-  case 392: /* @111: %empty  */
-#line 4547 "fe/idl.ypp"
+  case 397: /* @113: %empty  */
+#line 4650 "fe/idl.ypp"
         {
           Identifier *&id = (yyvsp[0].idval);
           UTL_Scope *scope = idl_global->scopes ().top_non_null ();
@@ -7609,27 +7723,27 @@ yyparse ()
 
           (yyval.dcval) = exception;
         }
-#line 7629 "fe/idl.tab.cpp"
+#line 7739 "fe/idl.tab.cpp"
     break;
 
-  case 393: /* $@112: %empty  */
-#line 4579 "fe/idl.ypp"
+  case 398: /* $@114: %empty  */
+#line 4682 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSqSeen);
         }
-#line 7637 "fe/idl.tab.cpp"
+#line 7747 "fe/idl.tab.cpp"
     break;
 
-  case 394: /* $@113: %empty  */
-#line 4583 "fe/idl.ypp"
+  case 399: /* $@115: %empty  */
+#line 4686 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ExceptBodySeen);
         }
-#line 7645 "fe/idl.tab.cpp"
+#line 7755 "fe/idl.tab.cpp"
     break;
 
-  case 395: /* exception: IDL_EXCEPTION $@110 defining_id @111 '{' $@112 members $@113 '}'  */
-#line 4587 "fe/idl.ypp"
+  case 400: /* exception: IDL_EXCEPTION $@112 defining_id @113 '{' $@114 members $@115 '}'  */
+#line 4690 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ExceptQsSeen);
           /*
@@ -7639,19 +7753,19 @@ yyparse ()
 
           (yyval.dcval) = (yyvsp[-5].dcval);
         }
-#line 7659 "fe/idl.tab.cpp"
+#line 7769 "fe/idl.tab.cpp"
     break;
 
-  case 396: /* $@114: %empty  */
-#line 4600 "fe/idl.ypp"
+  case 401: /* $@116: %empty  */
+#line 4703 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen);
         }
-#line 7667 "fe/idl.tab.cpp"
+#line 7777 "fe/idl.tab.cpp"
     break;
 
-  case 397: /* $@115: %empty  */
-#line 4604 "fe/idl.ypp"
+  case 402: /* $@117: %empty  */
+#line 4707 "fe/idl.ypp"
         {
           AST_Operation *op = 0;
           UTL_Scope *scope = idl_global->scopes ().top_non_null ();
@@ -7712,27 +7826,27 @@ yyparse ()
            */
           idl_global->scopes ().push (op);
         }
-#line 7732 "fe/idl.tab.cpp"
+#line 7842 "fe/idl.tab.cpp"
     break;
 
-  case 398: /* $@116: %empty  */
-#line 4665 "fe/idl.ypp"
+  case 403: /* $@118: %empty  */
+#line 4768 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted);
         }
-#line 7740 "fe/idl.tab.cpp"
+#line 7850 "fe/idl.tab.cpp"
     break;
 
-  case 399: /* $@117: %empty  */
-#line 4669 "fe/idl.ypp"
+  case 404: /* $@119: %empty  */
+#line 4772 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
         }
-#line 7748 "fe/idl.tab.cpp"
+#line 7858 "fe/idl.tab.cpp"
     break;
 
-  case 400: /* operation: opt_op_attribute op_type_spec $@114 IDENTIFIER $@115 parameter_list $@116 opt_raises $@117 opt_context  */
-#line 4673 "fe/idl.ypp"
+  case 405: /* operation: opt_op_attribute op_type_spec $@116 IDENTIFIER $@117 parameter_list $@118 opt_raises $@119 opt_context  */
+#line 4776 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Operation *o = 0;
@@ -7763,57 +7877,57 @@ yyparse ()
 
           (yyval.dcval) = o;
         }
-#line 7783 "fe/idl.tab.cpp"
+#line 7893 "fe/idl.tab.cpp"
     break;
 
-  case 401: /* opt_op_attribute: IDL_ONEWAY  */
-#line 4707 "fe/idl.ypp"
+  case 406: /* opt_op_attribute: IDL_ONEWAY  */
+#line 4810 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen);
           (yyval.ofval) = AST_Operation::OP_oneway;
         }
-#line 7792 "fe/idl.tab.cpp"
+#line 7902 "fe/idl.tab.cpp"
     break;
 
-  case 402: /* opt_op_attribute: IDL_IDEMPOTENT  */
-#line 4712 "fe/idl.ypp"
+  case 407: /* opt_op_attribute: IDL_IDEMPOTENT  */
+#line 4815 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen);
           (yyval.ofval) = AST_Operation::OP_idempotent;
         }
-#line 7801 "fe/idl.tab.cpp"
+#line 7911 "fe/idl.tab.cpp"
     break;
 
-  case 403: /* opt_op_attribute: %empty  */
-#line 4717 "fe/idl.ypp"
+  case 408: /* opt_op_attribute: %empty  */
+#line 4820 "fe/idl.ypp"
         {
           (yyval.ofval) = AST_Operation::OP_noflags;
         }
-#line 7809 "fe/idl.tab.cpp"
+#line 7919 "fe/idl.tab.cpp"
     break;
 
-  case 405: /* op_type_spec: IDL_VOID  */
-#line 4725 "fe/idl.ypp"
+  case 410: /* op_type_spec: IDL_VOID  */
+#line 4828 "fe/idl.ypp"
         {
           (yyval.dcval) =
             idl_global->scopes ().bottom ()->lookup_primitive_type (
                                                   AST_Expression::EV_void
                                                 );
         }
-#line 7820 "fe/idl.tab.cpp"
+#line 7930 "fe/idl.tab.cpp"
     break;
 
-  case 406: /* $@118: %empty  */
-#line 4735 "fe/idl.ypp"
+  case 411: /* $@120: %empty  */
+#line 4838 "fe/idl.ypp"
         {
           //@@ PS_FactorySeen?
           idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen);
         }
-#line 7829 "fe/idl.tab.cpp"
+#line 7939 "fe/idl.tab.cpp"
     break;
 
-  case 407: /* @119: %empty  */
-#line 4740 "fe/idl.ypp"
+  case 412: /* @121: %empty  */
+#line 4843 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
 
@@ -7856,19 +7970,19 @@ yyparse ()
 
           (yyval.dcval) = factory;
         }
-#line 7876 "fe/idl.tab.cpp"
+#line 7986 "fe/idl.tab.cpp"
     break;
 
-  case 408: /* $@120: %empty  */
-#line 4783 "fe/idl.ypp"
+  case 413: /* $@122: %empty  */
+#line 4886 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted);
         }
-#line 7884 "fe/idl.tab.cpp"
+#line 7994 "fe/idl.tab.cpp"
     break;
 
-  case 409: /* init_decl: IDL_FACTORY $@118 IDENTIFIER @119 init_parameter_list $@120 opt_raises  */
-#line 4787 "fe/idl.ypp"
+  case 414: /* init_decl: IDL_FACTORY $@120 IDENTIFIER @121 init_parameter_list $@122 opt_raises  */
+#line 4890 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
 
@@ -7883,67 +7997,67 @@ yyparse ()
 
           (yyval.dcval) = (yyvsp[-3].dcval);
         }
-#line 7903 "fe/idl.tab.cpp"
+#line 8013 "fe/idl.tab.cpp"
     break;
 
-  case 410: /* $@121: %empty  */
-#line 4805 "fe/idl.ypp"
+  case 415: /* $@123: %empty  */
+#line 4908 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen);
         }
-#line 7911 "fe/idl.tab.cpp"
+#line 8021 "fe/idl.tab.cpp"
     break;
 
-  case 411: /* init_parameter_list: '(' $@121 ')'  */
-#line 4809 "fe/idl.ypp"
+  case 416: /* init_parameter_list: '(' $@123 ')'  */
+#line 4912 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen);
         }
-#line 7919 "fe/idl.tab.cpp"
+#line 8029 "fe/idl.tab.cpp"
     break;
 
-  case 412: /* $@122: %empty  */
-#line 4813 "fe/idl.ypp"
+  case 417: /* $@124: %empty  */
+#line 4916 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen);
         }
-#line 7927 "fe/idl.tab.cpp"
+#line 8037 "fe/idl.tab.cpp"
     break;
 
-  case 413: /* init_parameter_list: '(' $@122 at_least_one_in_parameter ')'  */
-#line 4818 "fe/idl.ypp"
+  case 418: /* init_parameter_list: '(' $@124 at_least_one_in_parameter ')'  */
+#line 4921 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen);
         }
-#line 7935 "fe/idl.tab.cpp"
+#line 8045 "fe/idl.tab.cpp"
     break;
 
-  case 415: /* $@123: %empty  */
-#line 4828 "fe/idl.ypp"
+  case 420: /* $@125: %empty  */
+#line 4931 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen);
         }
-#line 7943 "fe/idl.tab.cpp"
+#line 8053 "fe/idl.tab.cpp"
     break;
 
-  case 418: /* $@124: %empty  */
-#line 4837 "fe/idl.ypp"
+  case 423: /* $@126: %empty  */
+#line 4940 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen);
         }
-#line 7951 "fe/idl.tab.cpp"
+#line 8061 "fe/idl.tab.cpp"
     break;
 
-  case 419: /* $@125: %empty  */
-#line 4841 "fe/idl.ypp"
+  case 424: /* $@127: %empty  */
+#line 4944 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen);
         }
-#line 7959 "fe/idl.tab.cpp"
+#line 8069 "fe/idl.tab.cpp"
     break;
 
-  case 420: /* in_parameter: IDL_IN $@124 param_type_spec $@125 declarator  */
-#line 4845 "fe/idl.ypp"
+  case 425: /* in_parameter: IDL_IN $@126 param_type_spec $@127 declarator  */
+#line 4948 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Argument *a = 0;
@@ -7975,67 +8089,67 @@ yyparse ()
           delete (yyvsp[0].deval);
           (yyvsp[0].deval) = 0;
         }
-#line 7995 "fe/idl.tab.cpp"
+#line 8105 "fe/idl.tab.cpp"
     break;
 
-  case 421: /* $@126: %empty  */
-#line 4880 "fe/idl.ypp"
+  case 426: /* $@128: %empty  */
+#line 4983 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen);
         }
-#line 8003 "fe/idl.tab.cpp"
+#line 8113 "fe/idl.tab.cpp"
     break;
 
-  case 422: /* parameter_list: '(' $@126 ')'  */
-#line 4884 "fe/idl.ypp"
+  case 427: /* parameter_list: '(' $@128 ')'  */
+#line 4987 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen);
         }
-#line 8011 "fe/idl.tab.cpp"
+#line 8121 "fe/idl.tab.cpp"
     break;
 
-  case 423: /* $@127: %empty  */
-#line 4888 "fe/idl.ypp"
+  case 428: /* $@129: %empty  */
+#line 4991 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen);
         }
-#line 8019 "fe/idl.tab.cpp"
+#line 8129 "fe/idl.tab.cpp"
     break;
 
-  case 424: /* parameter_list: '(' $@127 at_least_one_parameter ')'  */
-#line 4893 "fe/idl.ypp"
+  case 429: /* parameter_list: '(' $@129 at_least_one_parameter ')'  */
+#line 4996 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen);
         }
-#line 8027 "fe/idl.tab.cpp"
+#line 8137 "fe/idl.tab.cpp"
     break;
 
-  case 426: /* $@128: %empty  */
-#line 4903 "fe/idl.ypp"
+  case 431: /* $@130: %empty  */
+#line 5006 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen);
         }
-#line 8035 "fe/idl.tab.cpp"
+#line 8145 "fe/idl.tab.cpp"
     break;
 
-  case 429: /* $@129: %empty  */
-#line 4912 "fe/idl.ypp"
+  case 434: /* $@131: %empty  */
+#line 5015 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen);
         }
-#line 8043 "fe/idl.tab.cpp"
+#line 8153 "fe/idl.tab.cpp"
     break;
 
-  case 430: /* $@130: %empty  */
-#line 4916 "fe/idl.ypp"
+  case 435: /* $@132: %empty  */
+#line 5019 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen);
         }
-#line 8051 "fe/idl.tab.cpp"
+#line 8161 "fe/idl.tab.cpp"
     break;
 
-  case 431: /* parameter: direction $@129 param_type_spec $@130 declarator  */
-#line 4920 "fe/idl.ypp"
+  case 436: /* parameter: direction $@131 param_type_spec $@132 declarator  */
+#line 5023 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Argument *a = 0;
@@ -8074,22 +8188,22 @@ yyparse ()
           delete (yyvsp[0].deval);
           (yyvsp[0].deval) = 0;
         }
-#line 8094 "fe/idl.tab.cpp"
+#line 8204 "fe/idl.tab.cpp"
     break;
 
-  case 432: /* param_type_spec: base_type_spec  */
-#line 4962 "fe/idl.ypp"
+  case 437: /* param_type_spec: base_type_spec  */
+#line 5065 "fe/idl.ypp"
         {
           (yyval.dcval) =
             idl_global->scopes ().bottom ()->lookup_primitive_type (
                                                  (yyvsp[0].etval)
                                                );
         }
-#line 8105 "fe/idl.tab.cpp"
+#line 8215 "fe/idl.tab.cpp"
     break;
 
-  case 435: /* param_type_spec: scoped_name  */
-#line 4971 "fe/idl.ypp"
+  case 440: /* param_type_spec: scoped_name  */
+#line 5074 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Decl *d = 0;
@@ -8154,6 +8268,54 @@ yyparse ()
                         }
                     }
 
+                  if (pbt->node_type() == AST_Decl::NT_map)
+                    {
+                      t = pbt;
+                      AST_Map *map_type =
+                        dynamic_cast<AST_Map*> (pbt);
+                      AST_Type *key_type =
+                        map_type->key_type ();
+                      AST_Type *val_type =
+                        map_type->value_type ();
+
+                      AST_Decl::NodeType key_nt =
+                        key_type->node_type ();
+                      AST_Decl::NodeType val_nt =
+                        val_type->node_type ();
+
+                      if (key_nt == AST_Decl::NT_typedef)
+                        {
+                          AST_Typedef *key_td =
+                            dynamic_cast<AST_Typedef*> (key_type);
+                          key_type = key_td->primitive_base_type ();
+                          key_nt = key_type->node_type ();
+                        }
+
+                      if (val_nt == AST_Decl::NT_typedef)
+                        {
+                          AST_Typedef *val_td =
+                            dynamic_cast<AST_Typedef*> (val_type);
+                          val_type = val_td->primitive_base_type ();
+                          val_nt = val_type->node_type ();
+                        }
+
+                      if (key_nt == AST_Decl::NT_interface
+                          || key_nt == AST_Decl::NT_interface_fwd
+                          || key_nt == AST_Decl::NT_valuetype
+                          || key_nt == AST_Decl::NT_valuetype_fwd
+                          || key_nt == AST_Decl::NT_component
+                          || key_nt == AST_Decl::NT_component_fwd
+                          || val_nt == AST_Decl::NT_interface
+                          || val_nt == AST_Decl::NT_interface_fwd
+                          || val_nt == AST_Decl::NT_valuetype
+                          || val_nt == AST_Decl::NT_valuetype_fwd
+                          || val_nt == AST_Decl::NT_component
+                          || val_nt == AST_Decl::NT_component_fwd)
+                        {
+                          can_be_undefined = true;
+                        }
+                    }
+
                   if (! t->is_defined () && ! can_be_undefined)
                     {
                       idl_global->err ()->error1 (
@@ -8193,186 +8355,186 @@ yyparse ()
 
           (yyval.dcval) = d;
         }
-#line 8213 "fe/idl.tab.cpp"
+#line 8371 "fe/idl.tab.cpp"
     break;
 
-  case 436: /* direction: IDL_IN  */
-#line 5078 "fe/idl.ypp"
+  case 441: /* direction: IDL_IN  */
+#line 5229 "fe/idl.ypp"
         {
           (yyval.dival) = AST_Argument::dir_IN;
         }
-#line 8221 "fe/idl.tab.cpp"
+#line 8379 "fe/idl.tab.cpp"
     break;
 
-  case 437: /* direction: IDL_OUT  */
-#line 5082 "fe/idl.ypp"
+  case 442: /* direction: IDL_OUT  */
+#line 5233 "fe/idl.ypp"
         {
           (yyval.dival) = AST_Argument::dir_OUT;
         }
-#line 8229 "fe/idl.tab.cpp"
+#line 8387 "fe/idl.tab.cpp"
     break;
 
-  case 438: /* direction: IDL_INOUT  */
-#line 5086 "fe/idl.ypp"
+  case 443: /* direction: IDL_INOUT  */
+#line 5237 "fe/idl.ypp"
         {
           (yyval.dival) = AST_Argument::dir_INOUT;
         }
-#line 8237 "fe/idl.tab.cpp"
+#line 8395 "fe/idl.tab.cpp"
     break;
 
-  case 439: /* $@131: %empty  */
-#line 5093 "fe/idl.ypp"
+  case 444: /* $@133: %empty  */
+#line 5244 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSeen);
         }
-#line 8245 "fe/idl.tab.cpp"
+#line 8403 "fe/idl.tab.cpp"
     break;
 
-  case 440: /* $@132: %empty  */
-#line 5097 "fe/idl.ypp"
+  case 445: /* $@134: %empty  */
+#line 5248 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSqSeen);
         }
-#line 8253 "fe/idl.tab.cpp"
+#line 8411 "fe/idl.tab.cpp"
     break;
 
-  case 441: /* opt_raises: IDL_RAISES $@131 '(' $@132 at_least_one_scoped_name ')'  */
-#line 5102 "fe/idl.ypp"
+  case 446: /* opt_raises: IDL_RAISES $@133 '(' $@134 at_least_one_scoped_name ')'  */
+#line 5253 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseQsSeen);
           (yyval.nlval) = (yyvsp[-1].nlval);
         }
-#line 8262 "fe/idl.tab.cpp"
+#line 8420 "fe/idl.tab.cpp"
     break;
 
-  case 442: /* opt_raises: %empty  */
-#line 5107 "fe/idl.ypp"
+  case 447: /* opt_raises: %empty  */
+#line 5258 "fe/idl.ypp"
         {
           (yyval.nlval) = 0;
         }
-#line 8270 "fe/idl.tab.cpp"
+#line 8428 "fe/idl.tab.cpp"
     break;
 
-  case 443: /* $@133: %empty  */
-#line 5114 "fe/idl.ypp"
+  case 448: /* $@135: %empty  */
+#line 5265 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSeen);
         }
-#line 8278 "fe/idl.tab.cpp"
+#line 8436 "fe/idl.tab.cpp"
     break;
 
-  case 444: /* $@134: %empty  */
-#line 5118 "fe/idl.ypp"
+  case 449: /* $@136: %empty  */
+#line 5269 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSqSeen);
         }
-#line 8286 "fe/idl.tab.cpp"
+#line 8444 "fe/idl.tab.cpp"
     break;
 
-  case 445: /* opt_getraises: IDL_GETRAISES $@133 '(' $@134 at_least_one_scoped_name ')'  */
-#line 5123 "fe/idl.ypp"
+  case 450: /* opt_getraises: IDL_GETRAISES $@135 '(' $@136 at_least_one_scoped_name ')'  */
+#line 5274 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseQsSeen);
           (yyval.nlval) = (yyvsp[-1].nlval);
         }
-#line 8295 "fe/idl.tab.cpp"
+#line 8453 "fe/idl.tab.cpp"
     break;
 
-  case 446: /* opt_getraises: %empty  */
-#line 5128 "fe/idl.ypp"
+  case 451: /* opt_getraises: %empty  */
+#line 5279 "fe/idl.ypp"
         {
           (yyval.nlval) = 0;
         }
-#line 8303 "fe/idl.tab.cpp"
+#line 8461 "fe/idl.tab.cpp"
     break;
 
-  case 447: /* $@135: %empty  */
-#line 5135 "fe/idl.ypp"
+  case 452: /* $@137: %empty  */
+#line 5286 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSeen);
         }
-#line 8311 "fe/idl.tab.cpp"
+#line 8469 "fe/idl.tab.cpp"
     break;
 
-  case 448: /* $@136: %empty  */
-#line 5139 "fe/idl.ypp"
+  case 453: /* $@138: %empty  */
+#line 5290 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSqSeen);
         }
-#line 8319 "fe/idl.tab.cpp"
+#line 8477 "fe/idl.tab.cpp"
     break;
 
-  case 449: /* opt_setraises: IDL_SETRAISES $@135 '(' $@136 at_least_one_scoped_name ')'  */
-#line 5144 "fe/idl.ypp"
+  case 454: /* opt_setraises: IDL_SETRAISES $@137 '(' $@138 at_least_one_scoped_name ')'  */
+#line 5295 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseQsSeen);
           (yyval.nlval) = (yyvsp[-1].nlval);
         }
-#line 8328 "fe/idl.tab.cpp"
+#line 8486 "fe/idl.tab.cpp"
     break;
 
-  case 450: /* opt_setraises: %empty  */
-#line 5149 "fe/idl.ypp"
+  case 455: /* opt_setraises: %empty  */
+#line 5300 "fe/idl.ypp"
         {
           (yyval.nlval) = 0;
         }
-#line 8336 "fe/idl.tab.cpp"
+#line 8494 "fe/idl.tab.cpp"
     break;
 
-  case 451: /* $@137: %empty  */
-#line 5156 "fe/idl.ypp"
+  case 456: /* $@139: %empty  */
+#line 5307 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSeen);
         }
-#line 8344 "fe/idl.tab.cpp"
+#line 8502 "fe/idl.tab.cpp"
     break;
 
-  case 452: /* $@138: %empty  */
-#line 5160 "fe/idl.ypp"
+  case 457: /* $@140: %empty  */
+#line 5311 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSqSeen);
         }
-#line 8352 "fe/idl.tab.cpp"
+#line 8510 "fe/idl.tab.cpp"
     break;
 
-  case 453: /* opt_context: IDL_CONTEXT $@137 '(' $@138 at_least_one_string_literal ')'  */
-#line 5165 "fe/idl.ypp"
+  case 458: /* opt_context: IDL_CONTEXT $@139 '(' $@140 at_least_one_string_literal ')'  */
+#line 5316 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpContextQsSeen);
           (yyval.slval) = (yyvsp[-1].slval);
         }
-#line 8361 "fe/idl.tab.cpp"
+#line 8519 "fe/idl.tab.cpp"
     break;
 
-  case 454: /* opt_context: %empty  */
-#line 5170 "fe/idl.ypp"
+  case 459: /* opt_context: %empty  */
+#line 5321 "fe/idl.ypp"
         {
           (yyval.slval) = 0;
         }
-#line 8369 "fe/idl.tab.cpp"
+#line 8527 "fe/idl.tab.cpp"
     break;
 
-  case 455: /* at_least_one_string_literal: IDL_STRING_LITERAL string_literals  */
-#line 5177 "fe/idl.ypp"
+  case 460: /* at_least_one_string_literal: IDL_STRING_LITERAL string_literals  */
+#line 5328 "fe/idl.ypp"
         {
           ACE_NEW_RETURN ((yyval.slval),
                           UTL_StrList ((yyvsp[-1].sval),
                                        (yyvsp[0].slval)),
                           1);
         }
-#line 8380 "fe/idl.tab.cpp"
+#line 8538 "fe/idl.tab.cpp"
     break;
 
-  case 456: /* $@139: %empty  */
-#line 5188 "fe/idl.ypp"
+  case 461: /* $@141: %empty  */
+#line 5339 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpContextCommaSeen);
         }
-#line 8388 "fe/idl.tab.cpp"
+#line 8546 "fe/idl.tab.cpp"
     break;
 
-  case 457: /* string_literals: string_literals ',' $@139 IDL_STRING_LITERAL  */
-#line 5192 "fe/idl.ypp"
+  case 462: /* string_literals: string_literals ',' $@141 IDL_STRING_LITERAL  */
+#line 5343 "fe/idl.ypp"
         {
           UTL_StrList *sl = 0;
           ACE_NEW_RETURN (sl,
@@ -8390,19 +8552,19 @@ yyparse ()
               (yyval.slval) = (yyvsp[-3].slval);
             }
         }
-#line 8410 "fe/idl.tab.cpp"
+#line 8568 "fe/idl.tab.cpp"
     break;
 
-  case 458: /* string_literals: %empty  */
-#line 5210 "fe/idl.ypp"
+  case 463: /* string_literals: %empty  */
+#line 5361 "fe/idl.ypp"
         {
           (yyval.slval) = 0;
         }
-#line 8418 "fe/idl.tab.cpp"
+#line 8576 "fe/idl.tab.cpp"
     break;
 
-  case 459: /* typeid_dcl: IDL_TYPEID scoped_name IDL_STRING_LITERAL  */
-#line 5217 "fe/idl.ypp"
+  case 464: /* typeid_dcl: IDL_TYPEID scoped_name IDL_STRING_LITERAL  */
+#line 5368 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Decl *d =
@@ -8429,11 +8591,11 @@ yyparse ()
 
           (yyval.dcval) = 0;
         }
-#line 8449 "fe/idl.tab.cpp"
+#line 8607 "fe/idl.tab.cpp"
     break;
 
-  case 460: /* typeprefix_dcl: IDL_TYPEPREFIX scoped_name IDL_STRING_LITERAL  */
-#line 5247 "fe/idl.ypp"
+  case 465: /* typeprefix_dcl: IDL_TYPEPREFIX scoped_name IDL_STRING_LITERAL  */
+#line 5398 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Decl *d = ScopeAsDecl (s);
@@ -8469,11 +8631,11 @@ yyparse ()
 
           (yyval.dcval) = 0;
         }
-#line 8489 "fe/idl.tab.cpp"
+#line 8647 "fe/idl.tab.cpp"
     break;
 
-  case 463: /* component_forward_decl: IDL_COMPONENT defining_id  */
-#line 5292 "fe/idl.ypp"
+  case 468: /* component_forward_decl: IDL_COMPONENT defining_id  */
+#line 5443 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
@@ -8499,11 +8661,11 @@ yyparse ()
 
           (yyval.dcval) = 0;
         }
-#line 8519 "fe/idl.tab.cpp"
+#line 8677 "fe/idl.tab.cpp"
     break;
 
-  case 464: /* @140: %empty  */
-#line 5321 "fe/idl.ypp"
+  case 469: /* @142: %empty  */
+#line 5472 "fe/idl.ypp"
         {
           FE_ComponentHeader *&component_header = (yyvsp[0].chval);
           UTL_Scope *scope = idl_global->scopes ().top_non_null ();
@@ -8545,27 +8707,27 @@ yyparse ()
 
           (yyval.dcval) = component;
         }
-#line 8565 "fe/idl.tab.cpp"
+#line 8723 "fe/idl.tab.cpp"
     break;
 
-  case 465: /* $@141: %empty  */
-#line 5363 "fe/idl.ypp"
+  case 470: /* $@143: %empty  */
+#line 5514 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ComponentSqSeen);
         }
-#line 8573 "fe/idl.tab.cpp"
+#line 8731 "fe/idl.tab.cpp"
     break;
 
-  case 466: /* $@142: %empty  */
-#line 5367 "fe/idl.ypp"
+  case 471: /* $@144: %empty  */
+#line 5518 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ComponentBodySeen);
         }
-#line 8581 "fe/idl.tab.cpp"
+#line 8739 "fe/idl.tab.cpp"
     break;
 
-  case 467: /* component_decl: component_header @140 '{' $@141 component_exports $@142 '}'  */
-#line 5371 "fe/idl.ypp"
+  case 472: /* component_decl: component_header @142 '{' $@143 component_exports $@144 '}'  */
+#line 5522 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ComponentQsSeen);
 
@@ -8576,27 +8738,27 @@ yyparse ()
 
           (yyval.dcval) = (yyvsp[-5].dcval);
         }
-#line 8596 "fe/idl.tab.cpp"
+#line 8754 "fe/idl.tab.cpp"
     break;
 
-  case 468: /* $@143: %empty  */
-#line 5386 "fe/idl.ypp"
+  case 473: /* $@145: %empty  */
+#line 5537 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ComponentIDSeen);
         }
-#line 8604 "fe/idl.tab.cpp"
+#line 8762 "fe/idl.tab.cpp"
     break;
 
-  case 469: /* $@144: %empty  */
-#line 5390 "fe/idl.ypp"
+  case 474: /* $@146: %empty  */
+#line 5541 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
         }
-#line 8612 "fe/idl.tab.cpp"
+#line 8770 "fe/idl.tab.cpp"
     break;
 
-  case 470: /* component_header: IDL_COMPONENT defining_id $@143 component_inheritance_spec $@144 supports_spec  */
-#line 5394 "fe/idl.ypp"
+  case 475: /* component_header: IDL_COMPONENT defining_id $@145 component_inheritance_spec $@146 supports_spec  */
+#line 5545 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);
 
@@ -8630,35 +8792,35 @@ yyparse ()
               (yyvsp[-2].idlist) = 0;
             }
         }
-#line 8650 "fe/idl.tab.cpp"
+#line 8808 "fe/idl.tab.cpp"
     break;
 
-  case 471: /* $@145: %empty  */
-#line 5431 "fe/idl.ypp"
+  case 476: /* $@147: %empty  */
+#line 5582 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen);
         }
-#line 8658 "fe/idl.tab.cpp"
+#line 8816 "fe/idl.tab.cpp"
     break;
 
-  case 472: /* component_inheritance_spec: ':' $@145 scoped_name  */
-#line 5435 "fe/idl.ypp"
+  case 477: /* component_inheritance_spec: ':' $@147 scoped_name  */
+#line 5586 "fe/idl.ypp"
         {
           (yyval.idlist) = (yyvsp[0].idlist);
         }
-#line 8666 "fe/idl.tab.cpp"
+#line 8824 "fe/idl.tab.cpp"
     break;
 
-  case 473: /* component_inheritance_spec: %empty  */
-#line 5439 "fe/idl.ypp"
+  case 478: /* component_inheritance_spec: %empty  */
+#line 5590 "fe/idl.ypp"
         {
           (yyval.idlist) = 0;
         }
-#line 8674 "fe/idl.tab.cpp"
+#line 8832 "fe/idl.tab.cpp"
     break;
 
-  case 474: /* component_exports: component_exports at_least_one_annotation component_export  */
-#line 5446 "fe/idl.ypp"
+  case 479: /* component_exports: component_exports at_least_one_annotation component_export  */
+#line 5597 "fe/idl.ypp"
         {
           AST_Annotation_Appls *&annotations = (yyvsp[-1].annotations_val);
           AST_Decl *&node = (yyvsp[0].dcval);
@@ -8673,130 +8835,130 @@ yyparse ()
             }
           delete annotations;
         }
-#line 8693 "fe/idl.tab.cpp"
+#line 8851 "fe/idl.tab.cpp"
     break;
 
-  case 477: /* $@146: %empty  */
-#line 5466 "fe/idl.ypp"
+  case 482: /* $@148: %empty  */
+#line 5617 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen);
         }
-#line 8701 "fe/idl.tab.cpp"
+#line 8859 "fe/idl.tab.cpp"
     break;
 
-  case 478: /* component_export: provides_decl $@146 ';'  */
-#line 5470 "fe/idl.ypp"
+  case 483: /* component_export: provides_decl $@148 ';'  */
+#line 5621 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
           (yyval.dcval) = (yyvsp[-2].dcval);
         }
-#line 8710 "fe/idl.tab.cpp"
+#line 8868 "fe/idl.tab.cpp"
     break;
 
-  case 479: /* $@147: %empty  */
-#line 5475 "fe/idl.ypp"
+  case 484: /* $@149: %empty  */
+#line 5626 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen);
         }
-#line 8718 "fe/idl.tab.cpp"
+#line 8876 "fe/idl.tab.cpp"
     break;
 
-  case 480: /* component_export: uses_decl $@147 ';'  */
-#line 5479 "fe/idl.ypp"
+  case 485: /* component_export: uses_decl $@149 ';'  */
+#line 5630 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
           (yyval.dcval) = (yyvsp[-2].dcval);
         }
-#line 8727 "fe/idl.tab.cpp"
+#line 8885 "fe/idl.tab.cpp"
     break;
 
-  case 481: /* $@148: %empty  */
-#line 5484 "fe/idl.ypp"
+  case 486: /* $@150: %empty  */
+#line 5635 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_EmitsDeclSeen);
         }
-#line 8735 "fe/idl.tab.cpp"
+#line 8893 "fe/idl.tab.cpp"
     break;
 
-  case 482: /* component_export: emits_decl $@148 ';'  */
-#line 5488 "fe/idl.ypp"
+  case 487: /* component_export: emits_decl $@150 ';'  */
+#line 5639 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
           (yyval.dcval) = (yyvsp[-2].dcval);
         }
-#line 8744 "fe/idl.tab.cpp"
+#line 8902 "fe/idl.tab.cpp"
     break;
 
-  case 483: /* $@149: %empty  */
-#line 5493 "fe/idl.ypp"
+  case 488: /* $@151: %empty  */
+#line 5644 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_PublishesDeclSeen);
         }
-#line 8752 "fe/idl.tab.cpp"
+#line 8910 "fe/idl.tab.cpp"
     break;
 
-  case 484: /* component_export: publishes_decl $@149 ';'  */
-#line 5497 "fe/idl.ypp"
+  case 489: /* component_export: publishes_decl $@151 ';'  */
+#line 5648 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
           (yyval.dcval) = (yyvsp[-2].dcval);
         }
-#line 8761 "fe/idl.tab.cpp"
+#line 8919 "fe/idl.tab.cpp"
     break;
 
-  case 485: /* $@150: %empty  */
-#line 5502 "fe/idl.ypp"
+  case 490: /* $@152: %empty  */
+#line 5653 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ConsumesDeclSeen);
         }
-#line 8769 "fe/idl.tab.cpp"
+#line 8927 "fe/idl.tab.cpp"
     break;
 
-  case 486: /* component_export: consumes_decl $@150 ';'  */
-#line 5506 "fe/idl.ypp"
+  case 491: /* component_export: consumes_decl $@152 ';'  */
+#line 5657 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
           (yyval.dcval) = (yyvsp[-2].dcval);
         }
-#line 8778 "fe/idl.tab.cpp"
+#line 8936 "fe/idl.tab.cpp"
     break;
 
-  case 487: /* $@151: %empty  */
-#line 5511 "fe/idl.ypp"
+  case 492: /* $@153: %empty  */
+#line 5662 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen);
         }
-#line 8786 "fe/idl.tab.cpp"
+#line 8944 "fe/idl.tab.cpp"
     break;
 
-  case 488: /* component_export: attribute $@151 ';'  */
-#line 5515 "fe/idl.ypp"
+  case 493: /* component_export: attribute $@153 ';'  */
+#line 5666 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
           (yyval.dcval) = (yyvsp[-2].dcval);
         }
-#line 8795 "fe/idl.tab.cpp"
+#line 8953 "fe/idl.tab.cpp"
     break;
 
-  case 489: /* $@152: %empty  */
-#line 5520 "fe/idl.ypp"
+  case 494: /* $@154: %empty  */
+#line 5671 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen);
         }
-#line 8803 "fe/idl.tab.cpp"
+#line 8961 "fe/idl.tab.cpp"
     break;
 
-  case 490: /* component_export: extended_port_decl $@152 ';'  */
-#line 5524 "fe/idl.ypp"
+  case 495: /* component_export: extended_port_decl $@154 ';'  */
+#line 5675 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
           (yyval.dcval) = (yyvsp[-2].dcval);
         }
-#line 8812 "fe/idl.tab.cpp"
+#line 8970 "fe/idl.tab.cpp"
     break;
 
-  case 491: /* provides_decl: IDL_PROVIDES interface_type id  */
-#line 5531 "fe/idl.ypp"
+  case 496: /* provides_decl: IDL_PROVIDES interface_type id  */
+#line 5682 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           bool so_far_so_good = true;
@@ -8886,21 +9048,21 @@ yyparse ()
 
           (yyval.dcval) = dynamic_cast<AST_Decl *> (provides);
         }
-#line 8906 "fe/idl.tab.cpp"
+#line 9064 "fe/idl.tab.cpp"
     break;
 
-  case 492: /* interface_type: scoped_name  */
-#line 5624 "fe/idl.ypp"
+  case 497: /* interface_type: scoped_name  */
+#line 5775 "fe/idl.ypp"
         {
           // Lookups and checking are done where the 'interface_type'
           // token is used, in 'provides_decl' and 'uses_decl'.
           (yyval.idlist) = (yyvsp[0].idlist);
         }
-#line 8916 "fe/idl.tab.cpp"
+#line 9074 "fe/idl.tab.cpp"
     break;
 
-  case 493: /* interface_type: IDL_OBJECT  */
-#line 5630 "fe/idl.ypp"
+  case 498: /* interface_type: IDL_OBJECT  */
+#line 5781 "fe/idl.ypp"
         {
           Identifier *corba_id = 0;
 
@@ -8923,11 +9085,11 @@ yyparse ()
                                       conc_name),
                           1);
         }
-#line 8943 "fe/idl.tab.cpp"
+#line 9101 "fe/idl.tab.cpp"
     break;
 
-  case 494: /* uses_decl: uses_opt_multiple interface_type id  */
-#line 5655 "fe/idl.ypp"
+  case 499: /* uses_decl: uses_opt_multiple interface_type id  */
+#line 5806 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           bool so_far_so_good = true;
@@ -9031,37 +9193,37 @@ yyparse ()
 
           (yyval.dcval) = uses;
         }
-#line 9051 "fe/idl.tab.cpp"
+#line 9209 "fe/idl.tab.cpp"
     break;
 
-  case 495: /* uses_opt_multiple: IDL_USES opt_multiple  */
-#line 5762 "fe/idl.ypp"
+  case 500: /* uses_opt_multiple: IDL_USES opt_multiple  */
+#line 5913 "fe/idl.ypp"
         {
           // We use this extra rule here to use in both uses_decl and
           // extended_uses_decl, so the LALR(1) parser can avoid conflicts.
           (yyval.bval) = (yyvsp[0].bval);
         }
-#line 9061 "fe/idl.tab.cpp"
+#line 9219 "fe/idl.tab.cpp"
     break;
 
-  case 496: /* opt_multiple: IDL_MULTIPLE  */
-#line 5771 "fe/idl.ypp"
+  case 501: /* opt_multiple: IDL_MULTIPLE  */
+#line 5922 "fe/idl.ypp"
         {
           (yyval.bval) = true;
         }
-#line 9069 "fe/idl.tab.cpp"
+#line 9227 "fe/idl.tab.cpp"
     break;
 
-  case 497: /* opt_multiple: %empty  */
-#line 5775 "fe/idl.ypp"
+  case 502: /* opt_multiple: %empty  */
+#line 5926 "fe/idl.ypp"
         {
           (yyval.bval) = false;
         }
-#line 9077 "fe/idl.tab.cpp"
+#line 9235 "fe/idl.tab.cpp"
     break;
 
-  case 498: /* emits_decl: IDL_EMITS scoped_name id  */
-#line 5782 "fe/idl.ypp"
+  case 503: /* emits_decl: IDL_EMITS scoped_name id  */
+#line 5933 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           bool so_far_so_good = true;
@@ -9133,11 +9295,11 @@ yyparse ()
 
           (yyval.dcval) = e;
         }
-#line 9153 "fe/idl.tab.cpp"
+#line 9311 "fe/idl.tab.cpp"
     break;
 
-  case 499: /* publishes_decl: IDL_PUBLISHES scoped_name id  */
-#line 5857 "fe/idl.ypp"
+  case 504: /* publishes_decl: IDL_PUBLISHES scoped_name id  */
+#line 6008 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           bool so_far_so_good = true;
@@ -9206,11 +9368,11 @@ yyparse ()
 
           (yyval.dcval) = p;
         }
-#line 9226 "fe/idl.tab.cpp"
+#line 9384 "fe/idl.tab.cpp"
     break;
 
-  case 500: /* consumes_decl: IDL_CONSUMES scoped_name id  */
-#line 5929 "fe/idl.ypp"
+  case 505: /* consumes_decl: IDL_CONSUMES scoped_name id  */
+#line 6080 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           bool so_far_so_good = true;
@@ -9282,11 +9444,11 @@ yyparse ()
 
           (yyval.dcval) = c;
        }
-#line 9302 "fe/idl.tab.cpp"
+#line 9460 "fe/idl.tab.cpp"
     break;
 
-  case 501: /* $@153: %empty  */
-#line 6004 "fe/idl.ypp"
+  case 506: /* $@155: %empty  */
+#line 6155 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Home *h = 0;
@@ -9323,11 +9485,11 @@ yyparse ()
            */
           idl_global->scopes ().push (h);
         }
-#line 9343 "fe/idl.tab.cpp"
+#line 9501 "fe/idl.tab.cpp"
     break;
 
-  case 502: /* home_decl: home_header $@153 home_body  */
-#line 6041 "fe/idl.ypp"
+  case 507: /* home_decl: home_header $@155 home_body  */
+#line 6192 "fe/idl.ypp"
         {
           /*
            * Done with this component - pop it off the scopes stack.
@@ -9336,59 +9498,59 @@ yyparse ()
 
           (yyval.dcval) = 0;
         }
-#line 9356 "fe/idl.tab.cpp"
+#line 9514 "fe/idl.tab.cpp"
     break;
 
-  case 503: /* $@154: %empty  */
-#line 6053 "fe/idl.ypp"
+  case 508: /* $@156: %empty  */
+#line 6204 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_HomeSeen);
         }
-#line 9364 "fe/idl.tab.cpp"
+#line 9522 "fe/idl.tab.cpp"
     break;
 
-  case 504: /* $@155: %empty  */
-#line 6057 "fe/idl.ypp"
+  case 509: /* $@157: %empty  */
+#line 6208 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_HomeIDSeen);
         }
-#line 9372 "fe/idl.tab.cpp"
+#line 9530 "fe/idl.tab.cpp"
     break;
 
-  case 505: /* $@156: %empty  */
-#line 6061 "fe/idl.ypp"
+  case 510: /* $@158: %empty  */
+#line 6212 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
         }
-#line 9380 "fe/idl.tab.cpp"
+#line 9538 "fe/idl.tab.cpp"
     break;
 
-  case 506: /* $@157: %empty  */
-#line 6065 "fe/idl.ypp"
+  case 511: /* $@159: %empty  */
+#line 6216 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);
         }
-#line 9388 "fe/idl.tab.cpp"
+#line 9546 "fe/idl.tab.cpp"
     break;
 
-  case 507: /* $@158: %empty  */
-#line 6069 "fe/idl.ypp"
+  case 512: /* $@160: %empty  */
+#line 6220 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ManagesSeen);
         }
-#line 9396 "fe/idl.tab.cpp"
+#line 9554 "fe/idl.tab.cpp"
     break;
 
-  case 508: /* $@159: %empty  */
-#line 6073 "fe/idl.ypp"
+  case 513: /* $@161: %empty  */
+#line 6224 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ManagesIDSeen);
         }
-#line 9404 "fe/idl.tab.cpp"
+#line 9562 "fe/idl.tab.cpp"
     break;
 
-  case 509: /* home_header: IDL_HOME $@154 defining_id $@155 home_inheritance_spec $@156 supports_spec $@157 IDL_MANAGES $@158 scoped_name $@159 primary_key_spec  */
-#line 6077 "fe/idl.ypp"
+  case 514: /* home_header: IDL_HOME $@156 defining_id $@157 home_inheritance_spec $@158 supports_spec $@159 IDL_MANAGES $@160 scoped_name $@161 primary_key_spec  */
+#line 6228 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_PrimaryKeySpecSeen);
 
@@ -9434,107 +9596,107 @@ yyparse ()
               (yyvsp[-6].nlval) = 0;
             }
         }
-#line 9454 "fe/idl.tab.cpp"
+#line 9612 "fe/idl.tab.cpp"
     break;
 
-  case 510: /* $@160: %empty  */
-#line 6126 "fe/idl.ypp"
+  case 515: /* $@162: %empty  */
+#line 6277 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen);
         }
-#line 9462 "fe/idl.tab.cpp"
+#line 9620 "fe/idl.tab.cpp"
     break;
 
-  case 511: /* home_inheritance_spec: ':' $@160 scoped_name  */
-#line 6130 "fe/idl.ypp"
+  case 516: /* home_inheritance_spec: ':' $@162 scoped_name  */
+#line 6281 "fe/idl.ypp"
         {
           (yyval.idlist) = (yyvsp[0].idlist);
         }
-#line 9470 "fe/idl.tab.cpp"
+#line 9628 "fe/idl.tab.cpp"
     break;
 
-  case 512: /* home_inheritance_spec: %empty  */
-#line 6134 "fe/idl.ypp"
+  case 517: /* home_inheritance_spec: %empty  */
+#line 6285 "fe/idl.ypp"
         {
           (yyval.idlist) = 0;
         }
-#line 9478 "fe/idl.tab.cpp"
+#line 9636 "fe/idl.tab.cpp"
     break;
 
-  case 513: /* primary_key_spec: IDL_PRIMARYKEY scoped_name  */
-#line 6142 "fe/idl.ypp"
+  case 518: /* primary_key_spec: IDL_PRIMARYKEY scoped_name  */
+#line 6293 "fe/idl.ypp"
         {
           (yyval.idlist) = (yyvsp[0].idlist);
         }
-#line 9486 "fe/idl.tab.cpp"
+#line 9644 "fe/idl.tab.cpp"
     break;
 
-  case 514: /* primary_key_spec: %empty  */
-#line 6146 "fe/idl.ypp"
+  case 519: /* primary_key_spec: %empty  */
+#line 6297 "fe/idl.ypp"
         {
           (yyval.idlist) = 0;
         }
-#line 9494 "fe/idl.tab.cpp"
+#line 9652 "fe/idl.tab.cpp"
     break;
 
-  case 515: /* $@161: %empty  */
-#line 6153 "fe/idl.ypp"
+  case 520: /* $@163: %empty  */
+#line 6304 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_HomeSqSeen);
         }
-#line 9502 "fe/idl.tab.cpp"
+#line 9660 "fe/idl.tab.cpp"
     break;
 
-  case 516: /* $@162: %empty  */
-#line 6157 "fe/idl.ypp"
+  case 521: /* $@164: %empty  */
+#line 6308 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_HomeBodySeen);
         }
-#line 9510 "fe/idl.tab.cpp"
+#line 9668 "fe/idl.tab.cpp"
     break;
 
-  case 517: /* home_body: '{' $@161 home_exports $@162 '}'  */
-#line 6161 "fe/idl.ypp"
+  case 522: /* home_body: '{' $@163 home_exports $@164 '}'  */
+#line 6312 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_HomeQsSeen);
         }
-#line 9518 "fe/idl.tab.cpp"
+#line 9676 "fe/idl.tab.cpp"
     break;
 
-  case 521: /* $@163: %empty  */
-#line 6174 "fe/idl.ypp"
+  case 526: /* $@165: %empty  */
+#line 6325 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_FactoryDeclSeen);
         }
-#line 9526 "fe/idl.tab.cpp"
+#line 9684 "fe/idl.tab.cpp"
     break;
 
-  case 522: /* home_export: factory_decl $@163 ';'  */
-#line 6178 "fe/idl.ypp"
+  case 527: /* home_export: factory_decl $@165 ';'  */
+#line 6329 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 9534 "fe/idl.tab.cpp"
+#line 9692 "fe/idl.tab.cpp"
     break;
 
-  case 523: /* $@164: %empty  */
-#line 6182 "fe/idl.ypp"
+  case 528: /* $@166: %empty  */
+#line 6333 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_FinderDeclSeen);
         }
-#line 9542 "fe/idl.tab.cpp"
+#line 9700 "fe/idl.tab.cpp"
     break;
 
-  case 524: /* home_export: finder_decl $@164 ';'  */
-#line 6186 "fe/idl.ypp"
+  case 529: /* home_export: finder_decl $@166 ';'  */
+#line 6337 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 9550 "fe/idl.tab.cpp"
+#line 9708 "fe/idl.tab.cpp"
     break;
 
-  case 525: /* $@165: %empty  */
-#line 6194 "fe/idl.ypp"
+  case 530: /* $@167: %empty  */
+#line 6345 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
@@ -9557,19 +9719,19 @@ yyparse ()
            */
           idl_global->scopes ().push (f);
         }
-#line 9577 "fe/idl.tab.cpp"
+#line 9735 "fe/idl.tab.cpp"
     break;
 
-  case 526: /* $@166: %empty  */
-#line 6217 "fe/idl.ypp"
+  case 531: /* $@168: %empty  */
+#line 6368 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted);
         }
-#line 9585 "fe/idl.tab.cpp"
+#line 9743 "fe/idl.tab.cpp"
     break;
 
-  case 527: /* factory_decl: IDL_FACTORY defining_id $@165 init_parameter_list $@166 opt_raises  */
-#line 6221 "fe/idl.ypp"
+  case 532: /* factory_decl: IDL_FACTORY defining_id $@167 init_parameter_list $@168 opt_raises  */
+#line 6372 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
@@ -9587,11 +9749,11 @@ yyparse ()
            */
           idl_global->scopes ().pop ();
         }
-#line 9607 "fe/idl.tab.cpp"
+#line 9765 "fe/idl.tab.cpp"
     break;
 
-  case 528: /* $@167: %empty  */
-#line 6243 "fe/idl.ypp"
+  case 533: /* $@169: %empty  */
+#line 6394 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
@@ -9618,19 +9780,19 @@ yyparse ()
            */
           idl_global->scopes ().push (f);
         }
-#line 9638 "fe/idl.tab.cpp"
+#line 9796 "fe/idl.tab.cpp"
     break;
 
-  case 529: /* $@168: %empty  */
-#line 6270 "fe/idl.ypp"
+  case 534: /* $@170: %empty  */
+#line 6421 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted);
         }
-#line 9646 "fe/idl.tab.cpp"
+#line 9804 "fe/idl.tab.cpp"
     break;
 
-  case 530: /* finder_decl: IDL_FINDER defining_id $@167 init_parameter_list $@168 opt_raises  */
-#line 6274 "fe/idl.ypp"
+  case 535: /* finder_decl: IDL_FINDER defining_id $@169 init_parameter_list $@170 opt_raises  */
+#line 6425 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
@@ -9648,11 +9810,11 @@ yyparse ()
            */
           idl_global->scopes ().pop ();
         }
-#line 9668 "fe/idl.tab.cpp"
+#line 9826 "fe/idl.tab.cpp"
     break;
 
-  case 536: /* event_concrete_forward_decl: IDL_EVENTTYPE defining_id  */
-#line 6307 "fe/idl.ypp"
+  case 541: /* event_concrete_forward_decl: IDL_EVENTTYPE defining_id  */
+#line 6458 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
@@ -9677,11 +9839,11 @@ yyparse ()
 
           (yyval.dcval) = 0;
         }
-#line 9697 "fe/idl.tab.cpp"
+#line 9855 "fe/idl.tab.cpp"
     break;
 
-  case 537: /* event_abs_forward_decl: IDL_ABSTRACT IDL_EVENTTYPE defining_id  */
-#line 6337 "fe/idl.ypp"
+  case 542: /* event_abs_forward_decl: IDL_ABSTRACT IDL_EVENTTYPE defining_id  */
+#line 6488 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
@@ -9706,11 +9868,11 @@ yyparse ()
 
           (yyval.dcval) = 0;
         }
-#line 9726 "fe/idl.tab.cpp"
+#line 9884 "fe/idl.tab.cpp"
     break;
 
-  case 538: /* $@169: %empty  */
-#line 6366 "fe/idl.ypp"
+  case 543: /* $@171: %empty  */
+#line 6517 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_EventType *e = 0;
@@ -9754,27 +9916,27 @@ yyparse ()
           delete (yyvsp[-1].idval);
           (yyvsp[-1].idval) = 0;
         }
-#line 9774 "fe/idl.tab.cpp"
+#line 9932 "fe/idl.tab.cpp"
     break;
 
-  case 539: /* $@170: %empty  */
-#line 6410 "fe/idl.ypp"
+  case 544: /* $@172: %empty  */
+#line 6561 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen);
         }
-#line 9782 "fe/idl.tab.cpp"
+#line 9940 "fe/idl.tab.cpp"
     break;
 
-  case 540: /* $@171: %empty  */
-#line 6414 "fe/idl.ypp"
+  case 545: /* $@173: %empty  */
+#line 6565 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen);
         }
-#line 9790 "fe/idl.tab.cpp"
+#line 9948 "fe/idl.tab.cpp"
     break;
 
-  case 541: /* event_abs_decl: event_abs_header event_rest_of_header $@169 '{' $@170 exports $@171 '}'  */
-#line 6418 "fe/idl.ypp"
+  case 546: /* event_abs_decl: event_abs_header event_rest_of_header $@171 '{' $@172 exports $@173 '}'  */
+#line 6569 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen);
 
@@ -9785,19 +9947,19 @@ yyparse ()
 
           (yyval.dcval) = 0;
         }
-#line 9805 "fe/idl.tab.cpp"
+#line 9963 "fe/idl.tab.cpp"
     break;
 
-  case 542: /* event_abs_header: IDL_ABSTRACT IDL_EVENTTYPE defining_id  */
-#line 6434 "fe/idl.ypp"
+  case 547: /* event_abs_header: IDL_ABSTRACT IDL_EVENTTYPE defining_id  */
+#line 6585 "fe/idl.ypp"
         {
           (yyval.idval) = (yyvsp[0].idval);
         }
-#line 9813 "fe/idl.tab.cpp"
+#line 9971 "fe/idl.tab.cpp"
     break;
 
-  case 543: /* event_custom_header: IDL_CUSTOM IDL_EVENTTYPE defining_id  */
-#line 6443 "fe/idl.ypp"
+  case 548: /* event_custom_header: IDL_CUSTOM IDL_EVENTTYPE defining_id  */
+#line 6594 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen);
 
@@ -9810,29 +9972,29 @@ yyparse ()
                       ACE_TEXT (" custom yet\n")));
           (yyval.idval) = 0;
         }
-#line 9830 "fe/idl.tab.cpp"
+#line 9988 "fe/idl.tab.cpp"
     break;
 
-  case 544: /* event_plain_header: IDL_EVENTTYPE defining_id  */
-#line 6460 "fe/idl.ypp"
+  case 549: /* event_plain_header: IDL_EVENTTYPE defining_id  */
+#line 6611 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen);
 
           (yyval.idval) = (yyvsp[0].idval);
         }
-#line 9840 "fe/idl.tab.cpp"
+#line 9998 "fe/idl.tab.cpp"
     break;
 
-  case 545: /* $@172: %empty  */
-#line 6469 "fe/idl.ypp"
+  case 550: /* $@174: %empty  */
+#line 6620 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
         }
-#line 9848 "fe/idl.tab.cpp"
+#line 10006 "fe/idl.tab.cpp"
     break;
 
-  case 546: /* event_rest_of_header: inheritance_spec $@172 supports_spec  */
-#line 6473 "fe/idl.ypp"
+  case 551: /* event_rest_of_header: inheritance_spec $@174 supports_spec  */
+#line 6624 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);
 
@@ -9861,11 +10023,11 @@ yyparse ()
               (yyvsp[-2].nlval) = 0;
             }
         }
-#line 9881 "fe/idl.tab.cpp"
+#line 10039 "fe/idl.tab.cpp"
     break;
 
-  case 547: /* @173: %empty  */
-#line 6506 "fe/idl.ypp"
+  case 552: /* @175: %empty  */
+#line 6657 "fe/idl.ypp"
         {
           UTL_Scope *scope = idl_global->scopes ().top_non_null ();
           Identifier *&event_id = (yyvsp[-1].idval);
@@ -9916,27 +10078,27 @@ yyparse ()
 
           (yyval.dcval) = eventtype;
         }
-#line 9936 "fe/idl.tab.cpp"
+#line 10094 "fe/idl.tab.cpp"
     break;
 
-  case 548: /* $@174: %empty  */
-#line 6557 "fe/idl.ypp"
+  case 553: /* $@176: %empty  */
+#line 6708 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen);
         }
-#line 9944 "fe/idl.tab.cpp"
+#line 10102 "fe/idl.tab.cpp"
     break;
 
-  case 549: /* $@175: %empty  */
-#line 6561 "fe/idl.ypp"
+  case 554: /* $@177: %empty  */
+#line 6712 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen);
         }
-#line 9952 "fe/idl.tab.cpp"
+#line 10110 "fe/idl.tab.cpp"
     break;
 
-  case 550: /* event_decl: event_header event_rest_of_header @173 '{' $@174 value_elements $@175 '}'  */
-#line 6565 "fe/idl.ypp"
+  case 555: /* event_decl: event_header event_rest_of_header @175 '{' $@176 value_elements $@177 '}'  */
+#line 6716 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen);
 
@@ -9947,108 +10109,116 @@ yyparse ()
 
           (yyval.dcval) = (yyvsp[-5].dcval);
         }
-#line 9967 "fe/idl.tab.cpp"
+#line 10125 "fe/idl.tab.cpp"
     break;
 
-  case 551: /* event_header: event_custom_header  */
-#line 6579 "fe/idl.ypp"
+  case 556: /* event_header: event_custom_header  */
+#line 6730 "fe/idl.ypp"
         {
           (yyval.idval) = (yyvsp[0].idval);
         }
-#line 9975 "fe/idl.tab.cpp"
+#line 10133 "fe/idl.tab.cpp"
     break;
 
-  case 552: /* event_header: event_plain_header  */
-#line 6583 "fe/idl.ypp"
+  case 557: /* event_header: event_plain_header  */
+#line 6734 "fe/idl.ypp"
         {
           (yyval.idval) = (yyvsp[0].idval);
         }
-#line 9983 "fe/idl.tab.cpp"
+#line 10141 "fe/idl.tab.cpp"
     break;
 
-  case 553: /* formal_parameter_type: IDL_TYPENAME  */
-#line 6590 "fe/idl.ypp"
+  case 558: /* formal_parameter_type: IDL_TYPENAME  */
+#line 6741 "fe/idl.ypp"
         {
           (yyval.ntval) = AST_Decl::NT_type;
         }
-#line 9991 "fe/idl.tab.cpp"
+#line 10149 "fe/idl.tab.cpp"
     break;
 
-  case 554: /* formal_parameter_type: IDL_STRUCT  */
-#line 6594 "fe/idl.ypp"
+  case 559: /* formal_parameter_type: IDL_STRUCT  */
+#line 6745 "fe/idl.ypp"
         {
           (yyval.ntval) = AST_Decl::NT_struct;
         }
-#line 9999 "fe/idl.tab.cpp"
+#line 10157 "fe/idl.tab.cpp"
     break;
 
-  case 555: /* formal_parameter_type: IDL_UNION  */
-#line 6598 "fe/idl.ypp"
+  case 560: /* formal_parameter_type: IDL_UNION  */
+#line 6749 "fe/idl.ypp"
         {
           (yyval.ntval) = AST_Decl::NT_union;
         }
-#line 10007 "fe/idl.tab.cpp"
+#line 10165 "fe/idl.tab.cpp"
     break;
 
-  case 556: /* formal_parameter_type: IDL_EVENTTYPE  */
-#line 6602 "fe/idl.ypp"
+  case 561: /* formal_parameter_type: IDL_EVENTTYPE  */
+#line 6753 "fe/idl.ypp"
         {
           (yyval.ntval) = AST_Decl::NT_eventtype;
         }
-#line 10015 "fe/idl.tab.cpp"
+#line 10173 "fe/idl.tab.cpp"
     break;
 
-  case 557: /* formal_parameter_type: IDL_SEQUENCE  */
-#line 6606 "fe/idl.ypp"
+  case 562: /* formal_parameter_type: IDL_SEQUENCE  */
+#line 6757 "fe/idl.ypp"
         {
           (yyval.ntval) = AST_Decl::NT_sequence;
         }
-#line 10023 "fe/idl.tab.cpp"
+#line 10181 "fe/idl.tab.cpp"
+    break;
+
+  case 563: /* formal_parameter_type: IDL_MAP  */
+#line 6761 "fe/idl.ypp"
+        {
+          (yyval.ntval) = AST_Decl::NT_map;
+        }
+#line 10189 "fe/idl.tab.cpp"
     break;
 
-  case 558: /* formal_parameter_type: IDL_INTERFACE  */
-#line 6610 "fe/idl.ypp"
+  case 564: /* formal_parameter_type: IDL_INTERFACE  */
+#line 6765 "fe/idl.ypp"
         {
           (yyval.ntval) = AST_Decl::NT_interface;
         }
-#line 10031 "fe/idl.tab.cpp"
+#line 10197 "fe/idl.tab.cpp"
     break;
 
-  case 559: /* formal_parameter_type: IDL_VALUETYPE  */
-#line 6614 "fe/idl.ypp"
+  case 565: /* formal_parameter_type: IDL_VALUETYPE  */
+#line 6769 "fe/idl.ypp"
         {
           (yyval.ntval) = AST_Decl::NT_valuetype;
         }
-#line 10039 "fe/idl.tab.cpp"
+#line 10205 "fe/idl.tab.cpp"
     break;
 
-  case 560: /* formal_parameter_type: IDL_ENUM  */
-#line 6618 "fe/idl.ypp"
+  case 566: /* formal_parameter_type: IDL_ENUM  */
+#line 6773 "fe/idl.ypp"
         {
           (yyval.ntval) = AST_Decl::NT_enum;
         }
-#line 10047 "fe/idl.tab.cpp"
+#line 10213 "fe/idl.tab.cpp"
     break;
 
-  case 561: /* formal_parameter_type: IDL_EXCEPTION  */
-#line 6622 "fe/idl.ypp"
+  case 567: /* formal_parameter_type: IDL_EXCEPTION  */
+#line 6777 "fe/idl.ypp"
         {
           (yyval.ntval) = AST_Decl::NT_except;
         }
-#line 10055 "fe/idl.tab.cpp"
+#line 10221 "fe/idl.tab.cpp"
     break;
 
-  case 562: /* formal_parameter_type: IDL_CONST const_type  */
-#line 6626 "fe/idl.ypp"
+  case 568: /* formal_parameter_type: IDL_CONST const_type  */
+#line 6781 "fe/idl.ypp"
         {
           (yyval.ntval) = AST_Decl::NT_const;
           t_param_const_type = (yyvsp[0].etval);
         }
-#line 10064 "fe/idl.tab.cpp"
+#line 10230 "fe/idl.tab.cpp"
     break;
 
-  case 563: /* at_least_one_formal_parameter: formal_parameter formal_parameters  */
-#line 6634 "fe/idl.ypp"
+  case 569: /* at_least_one_formal_parameter: formal_parameter formal_parameters  */
+#line 6789 "fe/idl.ypp"
         {
           if ((yyvsp[0].plval) == 0)
             {
@@ -10076,11 +10246,11 @@ yyparse ()
 
           (yyval.plval) = (yyvsp[0].plval);
         }
-#line 10096 "fe/idl.tab.cpp"
+#line 10262 "fe/idl.tab.cpp"
     break;
 
-  case 564: /* formal_parameters: formal_parameters ',' formal_parameter  */
-#line 6665 "fe/idl.ypp"
+  case 570: /* formal_parameters: formal_parameters ',' formal_parameter  */
+#line 6820 "fe/idl.ypp"
         {
           if ((yyvsp[-2].plval) == 0)
             {
@@ -10093,20 +10263,21 @@ yyparse ()
           delete (yyvsp[0].pival);
           (yyvsp[0].pival) = 0;
         }
-#line 10113 "fe/idl.tab.cpp"
+#line 10279 "fe/idl.tab.cpp"
     break;
 
-  case 565: /* formal_parameters: %empty  */
-#line 6678 "fe/idl.ypp"
+  case 571: /* formal_parameters: %empty  */
+#line 6833 "fe/idl.ypp"
         {
           (yyval.plval) = 0;
         }
-#line 10121 "fe/idl.tab.cpp"
+#line 10287 "fe/idl.tab.cpp"
     break;
 
-  case 566: /* formal_parameter: formal_parameter_type IDENTIFIER  */
-#line 6685 "fe/idl.ypp"
+  case 572: /* formal_parameter: formal_parameter_type IDENTIFIER  */
+#line 6840 "fe/idl.ypp"
         {
+
           ACE_NEW_RETURN ((yyval.pival),
                           FE_Utils::T_Param_Info,
                           1);
@@ -10129,11 +10300,11 @@ yyparse ()
               tao_enum_constant_decl = 0;
             }
         }
-#line 10150 "fe/idl.tab.cpp"
+#line 10316 "fe/idl.tab.cpp"
     break;
 
-  case 567: /* formal_parameter: IDL_SEQUENCE '<' IDENTIFIER '>' IDENTIFIER  */
-#line 6710 "fe/idl.ypp"
+  case 573: /* formal_parameter: IDL_SEQUENCE '<' IDENTIFIER '>' IDENTIFIER  */
+#line 6865 "fe/idl.ypp"
         {
           ACE_NEW_RETURN ((yyval.pival),
                           FE_Utils::T_Param_Info,
@@ -10148,19 +10319,19 @@ yyparse ()
           ACE::strdelete ((yyvsp[0].strval));
           (yyvsp[0].strval) = 0;
         }
-#line 10169 "fe/idl.tab.cpp"
+#line 10335 "fe/idl.tab.cpp"
     break;
 
-  case 568: /* at_least_one_formal_parameter_name: formal_parameter_name formal_parameter_names  */
-#line 6728 "fe/idl.ypp"
+  case 574: /* at_least_one_formal_parameter_name: formal_parameter_name formal_parameter_names  */
+#line 6883 "fe/idl.ypp"
         {
           ACE_NEW_RETURN ((yyval.slval), UTL_StrList ((yyvsp[-1].sval), (yyvsp[0].slval)), 1);
         }
-#line 10177 "fe/idl.tab.cpp"
+#line 10343 "fe/idl.tab.cpp"
     break;
 
-  case 569: /* formal_parameter_names: formal_parameter_names ',' formal_parameter_name  */
-#line 6735 "fe/idl.ypp"
+  case 575: /* formal_parameter_names: formal_parameter_names ',' formal_parameter_name  */
+#line 6890 "fe/idl.ypp"
         {
           UTL_StrList *sl = 0;
           ACE_NEW_RETURN (sl, UTL_StrList ((yyvsp[0].sval), 0), 1);
@@ -10175,37 +10346,37 @@ yyparse ()
               (yyval.slval) = (yyvsp[-2].slval);
             }
         }
-#line 10196 "fe/idl.tab.cpp"
+#line 10362 "fe/idl.tab.cpp"
     break;
 
-  case 570: /* formal_parameter_names: %empty  */
-#line 6750 "fe/idl.ypp"
+  case 576: /* formal_parameter_names: %empty  */
+#line 6905 "fe/idl.ypp"
         {
           (yyval.slval) = 0;
         }
-#line 10204 "fe/idl.tab.cpp"
+#line 10370 "fe/idl.tab.cpp"
     break;
 
-  case 571: /* formal_parameter_name: IDENTIFIER  */
-#line 6757 "fe/idl.ypp"
+  case 577: /* formal_parameter_name: IDENTIFIER  */
+#line 6912 "fe/idl.ypp"
         {
           ACE_NEW_RETURN ((yyval.sval),
                           UTL_String ((yyvsp[0].strval), true),
                           1);
         }
-#line 10214 "fe/idl.tab.cpp"
+#line 10380 "fe/idl.tab.cpp"
     break;
 
-  case 572: /* $@176: %empty  */
-#line 6766 "fe/idl.ypp"
+  case 578: /* $@178: %empty  */
+#line 6921 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSeen);
         }
-#line 10222 "fe/idl.tab.cpp"
+#line 10388 "fe/idl.tab.cpp"
     break;
 
-  case 573: /* @177: %empty  */
-#line 6770 "fe/idl.ypp"
+  case 579: /* @179: %empty  */
+#line 6925 "fe/idl.ypp"
         {
           char *&id_value = (yyvsp[0].strval);
           idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeIDSeen);
@@ -10224,27 +10395,27 @@ yyparse ()
           // Push it on the scopes stack.
           idl_global->scopes ().push (porttype);
         }
-#line 10245 "fe/idl.tab.cpp"
+#line 10411 "fe/idl.tab.cpp"
     break;
 
-  case 574: /* $@178: %empty  */
-#line 6789 "fe/idl.ypp"
+  case 580: /* $@180: %empty  */
+#line 6944 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSqSeen);
         }
-#line 10253 "fe/idl.tab.cpp"
+#line 10419 "fe/idl.tab.cpp"
     break;
 
-  case 575: /* $@179: %empty  */
-#line 6797 "fe/idl.ypp"
+  case 581: /* $@181: %empty  */
+#line 6952 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeBodySeen);
         }
-#line 10261 "fe/idl.tab.cpp"
+#line 10427 "fe/idl.tab.cpp"
     break;
 
-  case 576: /* porttype_decl: IDL_PORTTYPE $@176 IDENTIFIER @177 '{' $@178 at_least_one_port_export $@179 '}'  */
-#line 6801 "fe/idl.ypp"
+  case 582: /* porttype_decl: IDL_PORTTYPE $@178 IDENTIFIER @179 '{' $@180 at_least_one_port_export $@181 '}'  */
+#line 6956 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeQsSeen);
 
@@ -10253,11 +10424,11 @@ yyparse ()
 
           (yyval.dcval) = (yyvsp[-5].dcval);
         }
-#line 10274 "fe/idl.tab.cpp"
+#line 10440 "fe/idl.tab.cpp"
     break;
 
-  case 577: /* at_least_one_port_export: port_exports at_least_one_annotation port_export  */
-#line 6813 "fe/idl.ypp"
+  case 583: /* at_least_one_port_export: port_exports at_least_one_annotation port_export  */
+#line 6968 "fe/idl.ypp"
         {
           AST_Annotation_Appls *&annotations = (yyvsp[-1].annotations_val);
           AST_Decl *&node = (yyvsp[0].dcval);
@@ -10272,27 +10443,27 @@ yyparse ()
             }
           delete annotations;
         }
-#line 10293 "fe/idl.tab.cpp"
+#line 10459 "fe/idl.tab.cpp"
     break;
 
-  case 583: /* $@180: %empty  */
-#line 6839 "fe/idl.ypp"
+  case 589: /* $@182: %empty  */
+#line 6994 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen);
         }
-#line 10301 "fe/idl.tab.cpp"
+#line 10467 "fe/idl.tab.cpp"
     break;
 
-  case 584: /* port_export: attribute $@180 ';'  */
-#line 6843 "fe/idl.ypp"
+  case 590: /* port_export: attribute $@182 ';'  */
+#line 6998 "fe/idl.ypp"
         {
           (yyval.dcval) = (yyvsp[-2].dcval);
         }
-#line 10309 "fe/idl.tab.cpp"
+#line 10475 "fe/idl.tab.cpp"
     break;
 
-  case 585: /* extended_port_decl: IDL_PORT scoped_name IDENTIFIER  */
-#line 6850 "fe/idl.ypp"
+  case 591: /* extended_port_decl: IDL_PORT scoped_name IDENTIFIER  */
+#line 7005 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen);
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
@@ -10359,11 +10530,11 @@ yyparse ()
 
           (yyval.dcval) = ep;
         }
-#line 10380 "fe/idl.tab.cpp"
+#line 10546 "fe/idl.tab.cpp"
     break;
 
-  case 586: /* extended_port_decl: IDL_MIRRORPORT scoped_name IDENTIFIER  */
-#line 6917 "fe/idl.ypp"
+  case 592: /* extended_port_decl: IDL_MIRRORPORT scoped_name IDENTIFIER  */
+#line 7072 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_MirrorPortDeclSeen);
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
@@ -10408,11 +10579,11 @@ yyparse ()
 
           (yyval.dcval) = mp;
         }
-#line 10429 "fe/idl.tab.cpp"
+#line 10595 "fe/idl.tab.cpp"
     break;
 
-  case 587: /* at_least_one_actual_parameter: annotations_maybe actual_parameter actual_parameters  */
-#line 6965 "fe/idl.ypp"
+  case 593: /* at_least_one_actual_parameter: annotations_maybe actual_parameter actual_parameters  */
+#line 7120 "fe/idl.ypp"
         {
           if ((yyvsp[0].alval) == 0)
             {
@@ -10425,11 +10596,11 @@ yyparse ()
           (yyvsp[0].alval)->enqueue_head ((yyvsp[-1].dcval));
           (yyval.alval) = (yyvsp[0].alval);
         }
-#line 10446 "fe/idl.tab.cpp"
+#line 10612 "fe/idl.tab.cpp"
     break;
 
-  case 588: /* actual_parameters: actual_parameters ',' annotations_maybe actual_parameter  */
-#line 6981 "fe/idl.ypp"
+  case 594: /* actual_parameters: actual_parameters ',' annotations_maybe actual_parameter  */
+#line 7136 "fe/idl.ypp"
         {
           if ((yyvsp[-3].alval) == 0)
             {
@@ -10442,19 +10613,19 @@ yyparse ()
           (yyvsp[-3].alval)->enqueue_tail ((yyvsp[0].dcval));
           (yyval.alval) = (yyvsp[-3].alval);
         }
-#line 10463 "fe/idl.tab.cpp"
+#line 10629 "fe/idl.tab.cpp"
     break;
 
-  case 589: /* actual_parameters: %empty  */
-#line 6994 "fe/idl.ypp"
+  case 595: /* actual_parameters: %empty  */
+#line 7149 "fe/idl.ypp"
         {
           (yyval.alval) = 0;
         }
-#line 10471 "fe/idl.tab.cpp"
+#line 10637 "fe/idl.tab.cpp"
     break;
 
-  case 590: /* actual_parameter: expression  */
-#line 7001 "fe/idl.ypp"
+  case 596: /* actual_parameter: expression  */
+#line 7156 "fe/idl.ypp"
         {
           // To avoid grammar conflicts with this LALR(1) parser,
           // we take advantage of the fact that an expression can
@@ -10510,35 +10681,35 @@ yyparse ()
                   0);
             }
         }
-#line 10531 "fe/idl.tab.cpp"
+#line 10697 "fe/idl.tab.cpp"
     break;
 
-  case 591: /* connector_decl: connector_header connector_body  */
-#line 7060 "fe/idl.ypp"
+  case 597: /* connector_decl: connector_header connector_body  */
+#line 7215 "fe/idl.ypp"
         {
           (yyval.dcval) = 0;
         }
-#line 10539 "fe/idl.tab.cpp"
+#line 10705 "fe/idl.tab.cpp"
     break;
 
-  case 592: /* $@181: %empty  */
-#line 7067 "fe/idl.ypp"
+  case 598: /* $@183: %empty  */
+#line 7222 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSeen);
         }
-#line 10547 "fe/idl.tab.cpp"
+#line 10713 "fe/idl.tab.cpp"
     break;
 
-  case 593: /* $@182: %empty  */
-#line 7071 "fe/idl.ypp"
+  case 599: /* $@184: %empty  */
+#line 7226 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorIDSeen);
         }
-#line 10555 "fe/idl.tab.cpp"
+#line 10721 "fe/idl.tab.cpp"
     break;
 
-  case 594: /* connector_header: IDL_CONNECTOR $@181 annotations_maybe IDENTIFIER $@182 component_inheritance_spec  */
-#line 7075 "fe/idl.ypp"
+  case 600: /* connector_header: IDL_CONNECTOR $@183 annotations_maybe IDENTIFIER $@184 component_inheritance_spec  */
+#line 7230 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Connector *parent = 0;
@@ -10592,102 +10763,102 @@ yyparse ()
 
           delete (yyvsp[-3].annotations_val);
         }
-#line 10613 "fe/idl.tab.cpp"
+#line 10779 "fe/idl.tab.cpp"
     break;
 
-  case 595: /* $@183: %empty  */
-#line 7132 "fe/idl.ypp"
+  case 601: /* $@185: %empty  */
+#line 7287 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSqSeen);
         }
-#line 10621 "fe/idl.tab.cpp"
+#line 10787 "fe/idl.tab.cpp"
     break;
 
-  case 596: /* $@184: %empty  */
-#line 7136 "fe/idl.ypp"
+  case 602: /* $@186: %empty  */
+#line 7291 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorBodySeen);
         }
-#line 10629 "fe/idl.tab.cpp"
+#line 10795 "fe/idl.tab.cpp"
     break;
 
-  case 597: /* connector_body: '{' $@183 connector_exports $@184 '}'  */
-#line 7140 "fe/idl.ypp"
+  case 603: /* connector_body: '{' $@185 connector_exports $@186 '}'  */
+#line 7295 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorQsSeen);
 
           // Done with this connector - pop it off the scope stack.
           idl_global->scopes ().pop ();
         }
-#line 10640 "fe/idl.tab.cpp"
+#line 10806 "fe/idl.tab.cpp"
     break;
 
-  case 600: /* $@185: %empty  */
-#line 7155 "fe/idl.ypp"
+  case 606: /* $@187: %empty  */
+#line 7310 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen);
         }
-#line 10648 "fe/idl.tab.cpp"
+#line 10814 "fe/idl.tab.cpp"
     break;
 
-  case 601: /* connector_export: provides_decl $@185 ';'  */
-#line 7159 "fe/idl.ypp"
+  case 607: /* connector_export: provides_decl $@187 ';'  */
+#line 7314 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 10656 "fe/idl.tab.cpp"
+#line 10822 "fe/idl.tab.cpp"
     break;
 
-  case 602: /* $@186: %empty  */
-#line 7163 "fe/idl.ypp"
+  case 608: /* $@188: %empty  */
+#line 7318 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen);
         }
-#line 10664 "fe/idl.tab.cpp"
+#line 10830 "fe/idl.tab.cpp"
     break;
 
-  case 603: /* connector_export: uses_decl $@186 ';'  */
-#line 7167 "fe/idl.ypp"
+  case 609: /* connector_export: uses_decl $@188 ';'  */
+#line 7322 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 10672 "fe/idl.tab.cpp"
+#line 10838 "fe/idl.tab.cpp"
     break;
 
-  case 604: /* $@187: %empty  */
-#line 7171 "fe/idl.ypp"
+  case 610: /* $@189: %empty  */
+#line 7326 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen);
         }
-#line 10680 "fe/idl.tab.cpp"
+#line 10846 "fe/idl.tab.cpp"
     break;
 
-  case 605: /* connector_export: attribute $@187 ';'  */
-#line 7175 "fe/idl.ypp"
+  case 611: /* connector_export: attribute $@189 ';'  */
+#line 7330 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 10688 "fe/idl.tab.cpp"
+#line 10854 "fe/idl.tab.cpp"
     break;
 
-  case 606: /* $@188: %empty  */
-#line 7179 "fe/idl.ypp"
+  case 612: /* $@190: %empty  */
+#line 7334 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen);
         }
-#line 10696 "fe/idl.tab.cpp"
+#line 10862 "fe/idl.tab.cpp"
     break;
 
-  case 607: /* connector_export: extended_port_decl $@188 ';'  */
-#line 7183 "fe/idl.ypp"
+  case 613: /* connector_export: extended_port_decl $@190 ';'  */
+#line 7338 "fe/idl.ypp"
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
         }
-#line 10704 "fe/idl.tab.cpp"
+#line 10870 "fe/idl.tab.cpp"
     break;
 
 
-#line 10708 "fe/idl.tab.cpp"
+#line 10874 "fe/idl.tab.cpp"
 
       default: break;
     }
@@ -10769,6 +10940,7 @@ yyparse ()
      label yyerrorlab therefore never appears in user code.  */
   if (0)
     YYERROR;
+  ++yynerrs;
 
   /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
@@ -10829,7 +11001,7 @@ yyparse ()
 `-------------------------------------*/
 yyacceptlab:
   yyresult = 0;
-  goto yyreturn;
+  goto yyreturnlab;
 
 
 /*-----------------------------------.
@@ -10837,24 +11009,22 @@ yyparse ()
 `-----------------------------------*/
 yyabortlab:
   yyresult = 1;
-  goto yyreturn;
+  goto yyreturnlab;
 
 
-#if !defined yyoverflow
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
+/*-----------------------------------------------------------.
+| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here.  |
+`-----------------------------------------------------------*/
 yyexhaustedlab:
   yyerror (YY_("memory exhausted"));
   yyresult = 2;
-  goto yyreturn;
-#endif
+  goto yyreturnlab;
 
 
-/*-------------------------------------------------------.
-| yyreturn -- parsing is finished, clean up and return.  |
-`-------------------------------------------------------*/
-yyreturn:
+/*----------------------------------------------------------.
+| yyreturnlab -- parsing is finished, clean up and return.  |
+`----------------------------------------------------------*/
+yyreturnlab:
   if (yychar != YYEMPTY)
     {
       /* Make sure we have latest lookahead translation.  See comments at
@@ -10881,7 +11051,7 @@ yyparse ()
   return yyresult;
 }
 
-#line 7188 "fe/idl.ypp"
+#line 7343 "fe/idl.ypp"
 
 /* programs */
 
@@ -10889,7 +11059,7 @@ yyparse ()
  * ???
  */
 int
-tao_yywrap ()
+tao_yywrap (void)
 {
   return 1;
 }
diff --git a/TAO/TAO_IDL/fe/idl.tab.hpp b/TAO/TAO_IDL/fe/idl.tab.hpp
index 000f4c974d252..512f86809f647 100644
--- a/TAO/TAO_IDL/fe/idl.tab.hpp
+++ b/TAO/TAO_IDL/fe/idl.tab.hpp
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.7.6.  */
+/* A Bison parser, made by GNU Bison 3.8.2.  */
 
 /* Bison interface for Yacc-like parsers in C
 
@@ -76,77 +76,78 @@ extern int tao_yydebug;
     IDL_SWITCH = 277,              /* IDL_SWITCH  */
     IDL_ENUM = 278,                /* IDL_ENUM  */
     IDL_SEQUENCE = 279,            /* IDL_SEQUENCE  */
-    IDL_STRING = 280,              /* IDL_STRING  */
-    IDL_WSTRING = 281,             /* IDL_WSTRING  */
-    IDL_EXCEPTION = 282,           /* IDL_EXCEPTION  */
-    IDL_CASE = 283,                /* IDL_CASE  */
-    IDL_DEFAULT = 284,             /* IDL_DEFAULT  */
-    IDL_READONLY = 285,            /* IDL_READONLY  */
-    IDL_ATTRIBUTE = 286,           /* IDL_ATTRIBUTE  */
-    IDL_ONEWAY = 287,              /* IDL_ONEWAY  */
-    IDL_IDEMPOTENT = 288,          /* IDL_IDEMPOTENT  */
-    IDL_VOID = 289,                /* IDL_VOID  */
-    IDL_IN = 290,                  /* IDL_IN  */
-    IDL_OUT = 291,                 /* IDL_OUT  */
-    IDL_INOUT = 292,               /* IDL_INOUT  */
-    IDL_RAISES = 293,              /* IDL_RAISES  */
-    IDL_CONTEXT = 294,             /* IDL_CONTEXT  */
-    IDL_NATIVE = 295,              /* IDL_NATIVE  */
-    IDL_LOCAL = 296,               /* IDL_LOCAL  */
-    IDL_ABSTRACT = 297,            /* IDL_ABSTRACT  */
-    IDL_CUSTOM = 298,              /* IDL_CUSTOM  */
-    IDL_FACTORY = 299,             /* IDL_FACTORY  */
-    IDL_PRIVATE = 300,             /* IDL_PRIVATE  */
-    IDL_PUBLIC = 301,              /* IDL_PUBLIC  */
-    IDL_SUPPORTS = 302,            /* IDL_SUPPORTS  */
-    IDL_TRUNCATABLE = 303,         /* IDL_TRUNCATABLE  */
-    IDL_VALUETYPE = 304,           /* IDL_VALUETYPE  */
-    IDL_COMPONENT = 305,           /* IDL_COMPONENT  */
-    IDL_CONSUMES = 306,            /* IDL_CONSUMES  */
-    IDL_EMITS = 307,               /* IDL_EMITS  */
-    IDL_EVENTTYPE = 308,           /* IDL_EVENTTYPE  */
-    IDL_FINDER = 309,              /* IDL_FINDER  */
-    IDL_GETRAISES = 310,           /* IDL_GETRAISES  */
-    IDL_HOME = 311,                /* IDL_HOME  */
-    IDL_IMPORT = 312,              /* IDL_IMPORT  */
-    IDL_MULTIPLE = 313,            /* IDL_MULTIPLE  */
-    IDL_PRIMARYKEY = 314,          /* IDL_PRIMARYKEY  */
-    IDL_PROVIDES = 315,            /* IDL_PROVIDES  */
-    IDL_PUBLISHES = 316,           /* IDL_PUBLISHES  */
-    IDL_SETRAISES = 317,           /* IDL_SETRAISES  */
-    IDL_TYPEID = 318,              /* IDL_TYPEID  */
-    IDL_TYPEPREFIX = 319,          /* IDL_TYPEPREFIX  */
-    IDL_USES = 320,                /* IDL_USES  */
-    IDL_MANAGES = 321,             /* IDL_MANAGES  */
-    IDL_TYPENAME = 322,            /* IDL_TYPENAME  */
-    IDL_PORT = 323,                /* IDL_PORT  */
-    IDL_MIRRORPORT = 324,          /* IDL_MIRRORPORT  */
-    IDL_PORTTYPE = 325,            /* IDL_PORTTYPE  */
-    IDL_CONNECTOR = 326,           /* IDL_CONNECTOR  */
-    IDL_ALIAS = 327,               /* IDL_ALIAS  */
-    IDL_INTEGER_LITERAL = 328,     /* IDL_INTEGER_LITERAL  */
-    IDL_UINTEGER_LITERAL = 329,    /* IDL_UINTEGER_LITERAL  */
-    IDL_STRING_LITERAL = 330,      /* IDL_STRING_LITERAL  */
-    IDL_CHARACTER_LITERAL = 331,   /* IDL_CHARACTER_LITERAL  */
-    IDL_FLOATING_PT_LITERAL = 332, /* IDL_FLOATING_PT_LITERAL  */
-    IDL_FIXED_PT_LITERAL = 333,    /* IDL_FIXED_PT_LITERAL  */
-    IDL_TRUETOK = 334,             /* IDL_TRUETOK  */
-    IDL_FALSETOK = 335,            /* IDL_FALSETOK  */
-    IDL_INT8 = 336,                /* IDL_INT8  */
-    IDL_UINT8 = 337,               /* IDL_UINT8  */
-    IDL_INT16 = 338,               /* IDL_INT16  */
-    IDL_UINT16 = 339,              /* IDL_UINT16  */
-    IDL_INT32 = 340,               /* IDL_INT32  */
-    IDL_UINT32 = 341,              /* IDL_UINT32  */
-    IDL_INT64 = 342,               /* IDL_INT64  */
-    IDL_UINT64 = 343,              /* IDL_UINT64  */
-    IDL_SCOPE_DELIMITOR = 344,     /* IDL_SCOPE_DELIMITOR  */
-    IDL_LEFT_SHIFT = 345,          /* IDL_LEFT_SHIFT  */
-    IDL_RIGHT_SHIFT = 346,         /* IDL_RIGHT_SHIFT  */
-    IDL_WCHAR_LITERAL = 347,       /* IDL_WCHAR_LITERAL  */
-    IDL_WSTRING_LITERAL = 348,     /* IDL_WSTRING_LITERAL  */
-    IDL_ANNOTATION_DECL = 349,     /* IDL_ANNOTATION_DECL  */
-    IDL_ANNOTATION_SYMBOL = 350    /* IDL_ANNOTATION_SYMBOL  */
+    IDL_MAP = 280,                 /* IDL_MAP  */
+    IDL_STRING = 281,              /* IDL_STRING  */
+    IDL_WSTRING = 282,             /* IDL_WSTRING  */
+    IDL_EXCEPTION = 283,           /* IDL_EXCEPTION  */
+    IDL_CASE = 284,                /* IDL_CASE  */
+    IDL_DEFAULT = 285,             /* IDL_DEFAULT  */
+    IDL_READONLY = 286,            /* IDL_READONLY  */
+    IDL_ATTRIBUTE = 287,           /* IDL_ATTRIBUTE  */
+    IDL_ONEWAY = 288,              /* IDL_ONEWAY  */
+    IDL_IDEMPOTENT = 289,          /* IDL_IDEMPOTENT  */
+    IDL_VOID = 290,                /* IDL_VOID  */
+    IDL_IN = 291,                  /* IDL_IN  */
+    IDL_OUT = 292,                 /* IDL_OUT  */
+    IDL_INOUT = 293,               /* IDL_INOUT  */
+    IDL_RAISES = 294,              /* IDL_RAISES  */
+    IDL_CONTEXT = 295,             /* IDL_CONTEXT  */
+    IDL_NATIVE = 296,              /* IDL_NATIVE  */
+    IDL_LOCAL = 297,               /* IDL_LOCAL  */
+    IDL_ABSTRACT = 298,            /* IDL_ABSTRACT  */
+    IDL_CUSTOM = 299,              /* IDL_CUSTOM  */
+    IDL_FACTORY = 300,             /* IDL_FACTORY  */
+    IDL_PRIVATE = 301,             /* IDL_PRIVATE  */
+    IDL_PUBLIC = 302,              /* IDL_PUBLIC  */
+    IDL_SUPPORTS = 303,            /* IDL_SUPPORTS  */
+    IDL_TRUNCATABLE = 304,         /* IDL_TRUNCATABLE  */
+    IDL_VALUETYPE = 305,           /* IDL_VALUETYPE  */
+    IDL_COMPONENT = 306,           /* IDL_COMPONENT  */
+    IDL_CONSUMES = 307,            /* IDL_CONSUMES  */
+    IDL_EMITS = 308,               /* IDL_EMITS  */
+    IDL_EVENTTYPE = 309,           /* IDL_EVENTTYPE  */
+    IDL_FINDER = 310,              /* IDL_FINDER  */
+    IDL_GETRAISES = 311,           /* IDL_GETRAISES  */
+    IDL_HOME = 312,                /* IDL_HOME  */
+    IDL_IMPORT = 313,              /* IDL_IMPORT  */
+    IDL_MULTIPLE = 314,            /* IDL_MULTIPLE  */
+    IDL_PRIMARYKEY = 315,          /* IDL_PRIMARYKEY  */
+    IDL_PROVIDES = 316,            /* IDL_PROVIDES  */
+    IDL_PUBLISHES = 317,           /* IDL_PUBLISHES  */
+    IDL_SETRAISES = 318,           /* IDL_SETRAISES  */
+    IDL_TYPEID = 319,              /* IDL_TYPEID  */
+    IDL_TYPEPREFIX = 320,          /* IDL_TYPEPREFIX  */
+    IDL_USES = 321,                /* IDL_USES  */
+    IDL_MANAGES = 322,             /* IDL_MANAGES  */
+    IDL_TYPENAME = 323,            /* IDL_TYPENAME  */
+    IDL_PORT = 324,                /* IDL_PORT  */
+    IDL_MIRRORPORT = 325,          /* IDL_MIRRORPORT  */
+    IDL_PORTTYPE = 326,            /* IDL_PORTTYPE  */
+    IDL_CONNECTOR = 327,           /* IDL_CONNECTOR  */
+    IDL_ALIAS = 328,               /* IDL_ALIAS  */
+    IDL_INTEGER_LITERAL = 329,     /* IDL_INTEGER_LITERAL  */
+    IDL_UINTEGER_LITERAL = 330,    /* IDL_UINTEGER_LITERAL  */
+    IDL_STRING_LITERAL = 331,      /* IDL_STRING_LITERAL  */
+    IDL_CHARACTER_LITERAL = 332,   /* IDL_CHARACTER_LITERAL  */
+    IDL_FLOATING_PT_LITERAL = 333, /* IDL_FLOATING_PT_LITERAL  */
+    IDL_FIXED_PT_LITERAL = 334,    /* IDL_FIXED_PT_LITERAL  */
+    IDL_TRUETOK = 335,             /* IDL_TRUETOK  */
+    IDL_FALSETOK = 336,            /* IDL_FALSETOK  */
+    IDL_INT8 = 337,                /* IDL_INT8  */
+    IDL_UINT8 = 338,               /* IDL_UINT8  */
+    IDL_INT16 = 339,               /* IDL_INT16  */
+    IDL_UINT16 = 340,              /* IDL_UINT16  */
+    IDL_INT32 = 341,               /* IDL_INT32  */
+    IDL_UINT32 = 342,              /* IDL_UINT32  */
+    IDL_INT64 = 343,               /* IDL_INT64  */
+    IDL_UINT64 = 344,              /* IDL_UINT64  */
+    IDL_SCOPE_DELIMITOR = 345,     /* IDL_SCOPE_DELIMITOR  */
+    IDL_LEFT_SHIFT = 346,          /* IDL_LEFT_SHIFT  */
+    IDL_RIGHT_SHIFT = 347,         /* IDL_RIGHT_SHIFT  */
+    IDL_WCHAR_LITERAL = 348,       /* IDL_WCHAR_LITERAL  */
+    IDL_WSTRING_LITERAL = 349,     /* IDL_WSTRING_LITERAL  */
+    IDL_ANNOTATION_DECL = 350,     /* IDL_ANNOTATION_DECL  */
+    IDL_ANNOTATION_SYMBOL = 351    /* IDL_ANNOTATION_SYMBOL  */
   };
   typedef enum yytokentype yytoken_kind_t;
 #endif
@@ -155,7 +156,7 @@ extern int tao_yydebug;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 union YYSTYPE
 {
-#line 163 "fe/idl.ypp"
+#line 164 "fe/idl.ypp"
 
   AST_Decl                      *dcval;         /* Decl value           */
   UTL_StrList                   *slval;         /* String list          */
@@ -199,8 +200,9 @@ union YYSTYPE
   AST_Annotation_Decl *annotation_decl_val;
   AST_Decls *decls_val;
   Decl_Annotations_Pair *decl_annotations_pair_val;
+  Decl_Annotations_Pair_Pair* decl_annotations_pair_val_pair;
 
-#line 204 "fe/idl.tab.hpp"
+#line 206 "fe/idl.tab.hpp"
 
 };
 typedef union YYSTYPE YYSTYPE;
@@ -211,6 +213,8 @@ typedef union YYSTYPE YYSTYPE;
 
 extern YYSTYPE tao_yylval;
 
+
 int tao_yyparse (void);
 
+
 #endif /* !YY_TAO_YY_FE_IDL_TAB_HPP_INCLUDED  */
diff --git a/TAO/TAO_IDL/fe/idl.ypp b/TAO/TAO_IDL/fe/idl.ypp
index 81fc6a05dd019..ff2d5b6677310 100644
--- a/TAO/TAO_IDL/fe/idl.ypp
+++ b/TAO/TAO_IDL/fe/idl.ypp
@@ -131,6 +131,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include <ast_consumes.h>
 #include <ast_extended_port.h>
 #include <ast_mirror_port.h>
+#include <ast_map.h>
 
 #include <fe_declarator.h>
 #include <fe_interface_header.h>
@@ -203,6 +204,7 @@ bool stack_based_lookup_for_primary_expr = false;
   AST_Annotation_Decl *annotation_decl_val;
   AST_Decls *decls_val;
   Decl_Annotations_Pair *decl_annotations_pair_val;
+  Decl_Annotations_Pair_Pair* decl_annotations_pair_val_pair;
 }
 
 /*
@@ -232,6 +234,7 @@ bool stack_based_lookup_for_primary_expr = false;
 %token          IDL_SWITCH
 %token          IDL_ENUM
 %token          IDL_SEQUENCE
+%token          IDL_MAP
 %token          IDL_STRING
 %token          IDL_WSTRING
 %token          IDL_EXCEPTION
@@ -317,7 +320,7 @@ bool stack_based_lookup_for_primary_expr = false;
  */
 
 %type <dcval>   type_spec simple_type_spec constructed_type_spec
-%type <dcval>   template_type_spec sequence_type_spec string_type_spec
+%type <dcval>   template_type_spec sequence_type_spec string_type_spec map_type_spec
 %type <dcval>   struct_type enum_type switch_type_spec union_type
 %type <dcval>   array_declarator op_type_spec wstring_type_spec
 %type <dcval>   param_type_spec type_dcl type_declarator actual_parameter
@@ -404,6 +407,8 @@ bool stack_based_lookup_for_primary_expr = false;
 %type <annotation_param_val> named_annotation_appl_param
 %type <decl_annotations_pair_val> seq_head
 
+%type <decl_annotations_pair_val_pair> map_head
+
 %type <decls_val> member_i state_member value_element
 %type <vival> visibility
 %%
@@ -2834,6 +2839,7 @@ template_type_spec
         | string_type_spec
         | wstring_type_spec
         | fixed_type_spec
+        | map_type_spec
         ;
 
 constructed_type_spec
@@ -3889,6 +3895,103 @@ enumerator :
         }
         ;
 
+map_type_spec 
+        : map_head
+        '>'
+        {
+          AST_Map *map = 0;
+          Decl_Annotations_Pair_Pair* type_pair = $1;
+          Decl_Annotations_Pair *key_type = type_pair->first;
+          Decl_Annotations_Pair *val_type = type_pair->second;
+
+          /*
+           * Remove map marker from scopes stack.
+           */
+          if (idl_global->scopes ().top () == 0)
+            {
+             idl_global->scopes ().pop ();
+            }
+
+          UTL_Scope *s = idl_global->scopes ().top_non_null ();
+
+          /*
+           * Create a node representing a map.
+           */
+          if (key_type && val_type)
+            {
+              AST_Type *ktp = dynamic_cast<AST_Type*> (key_type->decl);
+              AST_Type *vtp = dynamic_cast<AST_Type*> (val_type->decl);
+
+              if (ktp == 0 || vtp == 0)
+                {
+                  ; // Error will be caught in FE_Declarator.
+                }
+              else
+                {
+                  Identifier id ("map");
+                  UTL_ScopedName sn (&id, 0);
+                  ACE_CDR::ULong bound = 0UL;
+
+                  map =
+                    idl_global->gen ()->create_map (
+                        idl_global->gen ()->create_expr (
+                                                bound,
+                                                AST_Expression::EV_ulong
+                                              ),
+                        ktp,
+                        vtp,
+                        &sn,
+                        s->is_local (),
+                        s->is_abstract ()
+                      );
+                  map->key_type_annotations (*key_type->annotations);
+                  map->value_type_annotations (*val_type->annotations);
+
+                  idl_global->err ()->anonymous_type_diagnostic ();
+                }
+            }
+
+          delete key_type->annotations;
+          delete val_type->annotations;
+          delete type_pair;
+          $$ = map;
+        }
+        ;
+
+map_head :
+        IDL_MAP
+        {
+          idl_global->set_parse_state (IDL_GlobalData::PS_MapSeen);
+
+          /*
+           * Push a map marker on scopes stack.
+           */
+          idl_global->scopes ().push (0);
+        }
+        '<'
+        annotations_maybe simple_type_spec
+        {
+          idl_global->set_parse_state(IDL_GlobalData::PS_MapKeyTypeSeen);
+        }
+        ','
+        annotations_maybe simple_type_spec
+        {
+          idl_global->set_parse_state(IDL_GlobalData::PS_MapValueTypeSeen);
+          Decl_Annotations_Pair *key = new Decl_Annotations_Pair;
+          key->decl = $5;
+          key->annotations = $4;
+
+          Decl_Annotations_Pair *value = new Decl_Annotations_Pair;
+          value->decl = $9;
+          value->annotations = $8;
+
+          Decl_Annotations_Pair_Pair* pairs = new Decl_Annotations_Pair_Pair;
+          pairs->first = key;
+          pairs->second = value;
+          $$ = pairs;
+        }
+        ;
+
 sequence_type_spec
         : seq_head
           ','
@@ -5032,6 +5135,54 @@ param_type_spec
                         }
                     }
 
+                  if (pbt->node_type() == AST_Decl::NT_map)
+                    {
+                      t = pbt;
+                      AST_Map *map_type =
+                        dynamic_cast<AST_Map*> (pbt);
+                      AST_Type *key_type =
+                        map_type->key_type ();
+                      AST_Type *val_type =
+                        map_type->value_type ();
+
+                      AST_Decl::NodeType key_nt =
+                        key_type->node_type ();
+                      AST_Decl::NodeType val_nt =
+                        val_type->node_type ();
+
+                      if (key_nt == AST_Decl::NT_typedef)
+                        {
+                          AST_Typedef *key_td =
+                            dynamic_cast<AST_Typedef*> (key_type);
+                          key_type = key_td->primitive_base_type ();
+                          key_nt = key_type->node_type ();
+                        }
+
+                      if (val_nt == AST_Decl::NT_typedef)
+                        {
+                          AST_Typedef *val_td =
+                            dynamic_cast<AST_Typedef*> (val_type);
+                          val_type = val_td->primitive_base_type ();
+                          val_nt = val_type->node_type ();
+                        }
+
+                      if (key_nt == AST_Decl::NT_interface
+                          || key_nt == AST_Decl::NT_interface_fwd
+                          || key_nt == AST_Decl::NT_valuetype
+                          || key_nt == AST_Decl::NT_valuetype_fwd
+                          || key_nt == AST_Decl::NT_component
+                          || key_nt == AST_Decl::NT_component_fwd
+                          || val_nt == AST_Decl::NT_interface
+                          || val_nt == AST_Decl::NT_interface_fwd
+                          || val_nt == AST_Decl::NT_valuetype
+                          || val_nt == AST_Decl::NT_valuetype_fwd
+                          || val_nt == AST_Decl::NT_component
+                          || val_nt == AST_Decl::NT_component_fwd)
+                        {
+                          can_be_undefined = true;
+                        }
+                    }
+
                   if (! t->is_defined () && ! can_be_undefined)
                     {
                       idl_global->err ()->error1 (
@@ -6606,6 +6757,10 @@ formal_parameter_type
         {
           $<ntval>$ = AST_Decl::NT_sequence;
         }
+        | IDL_MAP
+        {
+          $<ntval>$ = AST_Decl::NT_map;
+        }
         | IDL_INTERFACE
         {
           $<ntval>$ = AST_Decl::NT_interface;
diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp
index e5546389c916c..98ab312d85c80 100644
--- a/TAO/TAO_IDL/fe/idl.yy.cpp
+++ b/TAO/TAO_IDL/fe/idl.yy.cpp
@@ -1,6 +1,6 @@
-#line 2 "fe/idl.yy.cpp"
+#line 1 "fe/idl.yy.cpp"
 
-#line 4 "fe/idl.yy.cpp"
+#line 3 "fe/idl.yy.cpp"
 
 #define  YY_INT_ALIGNED short int
 
@@ -543,10 +543,10 @@ YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size  );
 void yy_delete_buffer ( YY_BUFFER_STATE b  );
 void yy_flush_buffer ( YY_BUFFER_STATE b  );
 void yypush_buffer_state ( YY_BUFFER_STATE new_buffer  );
-void yypop_buffer_state ();
+void yypop_buffer_state ( void );
 
-static void yyensure_buffer_stack ();
-static void yy_load_buffer_state ();
+static void yyensure_buffer_stack ( void );
+static void yy_load_buffer_state ( void );
 static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file  );
 #define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER )
 
@@ -591,9 +591,9 @@ int yylineno = 1;
 
 extern char yytext[];
 
-static yy_state_type yy_get_previous_state ();
+static yy_state_type yy_get_previous_state ( void );
 static yy_state_type yy_try_NUL_trans ( yy_state_type current_state  );
-static int yy_get_next_buffer ();
+static int yy_get_next_buffer ( void );
 static void yynoreturn yy_fatal_error ( const char* msg  );
 
 /* Done after the current pattern has been matched and before the
@@ -608,8 +608,8 @@ static void yynoreturn yy_fatal_error ( const char* msg  );
         YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \
     yy_flex_strncpy( yytext, (yytext_ptr), yyleng + 1 ); \
     (yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 121
-#define YY_END_OF_BUFFER 122
+#define YY_NUM_RULES 123
+#define YY_END_OF_BUFFER 124
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -617,80 +617,80 @@ struct yy_trans_info
     flex_int32_t yy_verify;
     flex_int32_t yy_nxt;
     };
-static const flex_int16_t yy_acclist[626] =
+static const flex_int16_t yy_acclist[629] =
     {   0,
-      118,  118,  122,  120,  121,  118,  120,  121,  119,  121,
-      119,  120,  121,  120,  121,  120,  121,  120,  121,  120,
-      121,  120,  121,   93,  120,  121,   89,  120,  121,  120,
-      121,  120,  121,  120,  121,   83,  120,  121,   84,  120,
-      121,   84,  120,  121,   84,  120,  121,   84,  120,  121,
-       84,  120,  121,   84,  120,  121,   84,  120,  121,   84,
-      120,  121,   84,  120,  121,   84,  120,  121,   84,  120,
-      121,   84,  120,  121,   84,  120,  121,   84,  120,  121,
-       84,  120,  121,   84,  120,  121,   84,  120,  121,   84,
-      120,  121,   84,  120,  121,   84,  120,  121,   84,  120,
-
-      121,   84,  120,  121,   84,  120,  121,   84,  120,  121,
-       84,  120,  121,  118,  120,  121,  120,  121,  119,  120,
-      121,  118,   94,   92,   88,   85,  117,   85,   93,   87,
-       89,   81,   79,   80,   84,   84,   84,   84,   84,   84,
-       84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
-       84,   84,   84,   84,   84,   84,   84,   84,   84,   76,
-       84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
-       84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
-       84,   84,   84,   84,   84,   84,   84,   84,   84,  118,
-      112,   94,   96,   96,   92,   88,   85,  116,  116,   85,
-
-       86,   91,   84,   95,   84,   84,   84,   84,    1,   84,
-       84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
-       84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
-       84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
-       84,   77,   84,   84,   84,   84,   84,   84,   84,   84,
-       84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
-       84,   84,   84,   84,   84,   99,   97,   99,   90,   85,
-       86,   84,   95,  100,   84,   73,   84,   84,   84,   84,
-       84,   20,   84,   27,   84,   84,   84,   84,   84,   84,
-       84,   84,   84,   13,   84,   84,   84,   84,   84,   84,
-
-       84,   84,   56,   84,   84,   84,   84,   84,   84,   35,
-       84,   84,   84,   24,   84,   84,   84,   84,   84,   84,
-       84,   84,   68,   84,   84,   84,   84,   84,   84,   84,
-       84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
-       84,   84,   65,   84,   84,   31,   84,   84,   84,  113,
-       97,   98,   74,   84,   84,   84,   72,   84,   84,   84,
-       84,   84,   10,   84,   84,   84,   84,   84,   84,   52,
-       84,   84,   84,   84,   84,   18,   84,   22,   84,   84,
-       84,   75,   84,   37,   84,   39,   84,   41,   84,   84,
-       33,   84,   84,   84,   84,   84,   84,   30,   84,   84,
-
-       84,   84,   84,   84,   84,   84,   84,   84,   84,   25,
-       84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
-       84,   84,   84,   36,   84,   17,   84,   84,   84,   28,
-       84,   84,  108,  101,    2,   84,   84,   84,   84,   84,
-       84,   84,   84,   43,   84,   84,   23,   84,   84,   84,
-       84,   54,   84,   84,   57,   84,   84,   84,   84,    3,
-       84,   84,   32,   84,   78,   84,   84,   84,   84,   84,
-       46,   84,   84,    4,   84,   84,   84,   84,   14,   84,
-       12,   84,   84,   19,   84,   84,   84,   63,   84,   84,
-       84,   38,   84,   40,   84,   42,   84,   84,   84,   84,
-
-      106,   84,   84,   29,   84,   84,   84,   84,    8,   84,
-       21,   84,   84,   84,   44,   84,   84,   84,   66,   84,
-       84,   84,   84,   84,   45,   84,   84,   84,   84,   84,
-       84,   84,   84,   11,   84,   84,   84,   84,   84,   15,
-       84,  104,  104,  110,  109,   34,   84,   84,   84,   84,
-       51,   84,   84,   84,   84,   84,   84,   58,   84,   70,
-       84,   84,   60,   84,   84,    5,   84,   16,   84,   84,
-       47,   84,   84,   67,   84,   84,   26,   84,   84,  114,
-      114,  107,    6,   84,   50,   84,   71,   84,   53,   84,
-        7,   84,   55,   84,    9,   84,   84,   84,   61,   84,
-
-       62,   84,   84,   84,   49,   84,  102,  102,  105,  105,
-       69,   84,   59,   84,   84,   64,   84,  115,  115,   48,
-       84,  111,  103,  103,   82
+      120,  120,  124,  122,  123,  120,  122,  123,  121,  123,
+      121,  122,  123,  122,  123,  122,  123,  122,  123,  122,
+      123,  122,  123,   95,  122,  123,   91,  122,  123,  122,
+      123,  122,  123,  122,  123,   85,  122,  123,   86,  122,
+      123,   86,  122,  123,   86,  122,  123,   86,  122,  123,
+       86,  122,  123,   86,  122,  123,   86,  122,  123,   86,
+      122,  123,   86,  122,  123,   86,  122,  123,   86,  122,
+      123,   86,  122,  123,   86,  122,  123,   86,  122,  123,
+       86,  122,  123,   86,  122,  123,   86,  122,  123,   86,
+      122,  123,   86,  122,  123,   86,  122,  123,   86,  122,
+
+      123,   86,  122,  123,   86,  122,  123,   86,  122,  123,
+       86,  122,  123,  120,  122,  123,  122,  123,  121,  122,
+      123,  120,   96,   94,   90,   87,  119,   87,   95,   89,
+       91,   83,   81,   82,   86,   86,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   86,   86,   86,   86,   78,
+       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   86,   86,   86,   86,  120,
+      114,   96,   98,   98,   94,   90,   87,  118,  118,   87,
+
+       88,   93,   86,   97,   86,   86,   86,   86,    1,   86,
+       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   17,   44,   86,   86,   86,
+       86,   86,   86,   86,   79,   86,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   86,   86,   86,  101,   99,
+      101,   92,   87,   88,   86,   97,  102,   86,   75,   86,
+       86,   86,   86,   86,   21,   86,   28,   86,   86,   86,
+       86,   86,   86,   86,   86,   86,   13,   86,   86,   86,
+
+       86,   86,   86,   86,   86,   58,   86,   86,   86,   86,
+       86,   86,   36,   86,   86,   86,   25,   86,   86,   86,
+       86,   86,   86,   86,   86,   70,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   67,   86,   86,   32,   86,
+       86,   86,  115,   99,  100,   76,   86,   86,   86,   74,
+       86,   86,   86,   86,   86,   10,   86,   86,   86,   86,
+       86,   86,   54,   86,   86,   86,   86,   86,   19,   86,
+       23,   86,   86,   86,   77,   86,   38,   86,   40,   86,
+       42,   86,   86,   34,   86,   86,   86,   86,   86,   86,
+
+       31,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+       86,   86,   26,   86,   86,   86,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   86,   37,   86,   18,   86,
+       86,   86,   29,   86,   86,  110,  103,    2,   86,   86,
+       86,   86,   86,   86,   86,   86,   45,   86,   86,   24,
+       86,   86,   86,   86,   56,   86,   86,   59,   86,   86,
+       86,   86,    3,   86,   86,   33,   86,   80,   86,   86,
+       86,   86,   86,   48,   86,   86,    4,   86,   86,   86,
+       86,   14,   86,   12,   86,   86,   20,   86,   86,   86,
+       65,   86,   86,   86,   39,   86,   41,   86,   43,   86,
+
+       86,   86,   86,  108,   86,   86,   30,   86,   86,   86,
+       86,    8,   86,   22,   86,   86,   86,   46,   86,   86,
+       86,   68,   86,   86,   86,   86,   86,   47,   86,   86,
+       86,   86,   86,   86,   86,   86,   11,   86,   86,   86,
+       86,   86,   15,   86,  106,  106,  112,  111,   35,   86,
+       86,   86,   86,   53,   86,   86,   86,   86,   86,   86,
+       60,   86,   72,   86,   86,   62,   86,   86,    5,   86,
+       16,   86,   86,   49,   86,   86,   69,   86,   86,   27,
+       86,   86,  116,  116,  109,    6,   86,   52,   86,   73,
+       86,   55,   86,    7,   86,   57,   86,    9,   86,   86,
+
+       86,   63,   86,   64,   86,   86,   86,   51,   86,  104,
+      104,  107,  107,   71,   86,   61,   86,   86,   66,   86,
+      117,  117,   50,   86,  113,  105,  105,   84
     } ;
 
-static const flex_int16_t yy_accept[623] =
+static const flex_int16_t yy_accept[624] =
     {   0,
         1,    2,    3,    4,    6,    9,   11,   14,   16,   18,
        20,   22,   24,   27,   30,   32,   34,   36,   39,   42,
@@ -712,55 +712,55 @@ static const flex_int16_t yy_accept[623] =
       204,  205,  205,  205,  205,  206,  207,  208,  209,  211,
       212,  213,  214,  215,  216,  217,  218,  219,  220,  221,
       222,  223,  224,  225,  226,  227,  228,  229,  230,  231,
-      232,  233,  234,  235,  236,  237,  238,  239,  240,  241,
-
-      242,  244,  245,  246,  247,  248,  249,  250,  251,  252,
-      253,  254,  255,  256,  257,  258,  259,  260,  261,  262,
-      263,  264,  265,  266,  266,  266,  266,  266,  266,  266,
-      266,  266,  267,  269,  269,  269,  270,  270,  271,  272,
-      272,  273,  274,  274,  274,  274,  274,  275,  275,  276,
-      278,  279,  280,  281,  282,  284,  286,  287,  288,  289,
-      290,  291,  292,  293,  294,  296,  297,  298,  299,  300,
-      301,  302,  303,  305,  306,  307,  308,  309,  310,  312,
-      313,  314,  316,  317,  318,  319,  320,  321,  322,  323,
-      325,  326,  327,  328,  329,  330,  331,  332,  333,  334,
-
-      335,  336,  337,  338,  339,  340,  341,  342,  343,  345,
-      346,  348,  349,  350,  350,  350,  350,  350,  350,  350,
-      350,  351,  351,  351,  351,  351,  351,  351,  351,  352,
-      352,  353,  353,  353,  355,  355,  355,  355,  356,  357,
-      359,  360,  361,  362,  363,  365,  366,  367,  368,  369,
-      370,  372,  373,  374,  375,  376,  378,  380,  381,  382,
-      384,  386,  388,  390,  391,  393,  394,  395,  396,  397,
-      398,  400,  401,  402,  403,  404,  405,  406,  407,  408,
-      409,  410,  412,  413,  414,  415,  416,  417,  418,  419,
-      420,  421,  422,  423,  424,  426,  428,  429,  430,  432,
-
-      433,  434,  434,  434,  434,  434,  434,  434,  434,  434,
-      434,  434,  434,  434,  434,  434,  435,  435,  437,  438,
-      439,  440,  441,  442,  443,  444,  446,  447,  449,  450,
-      451,  452,  454,  455,  457,  458,  459,  460,  462,  463,
-      465,  467,  468,  469,  470,  471,  473,  474,  476,  477,
-      478,  479,  481,  483,  484,  486,  487,  488,  490,  491,
-      492,  494,  496,  498,  499,  500,  501,  501,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  503,  504,  506,  507,  508,  509,
-      511,  513,  514,  515,  517,  518,  519,  521,  522,  523,
-
-      524,  525,  527,  528,  529,  530,  531,  532,  533,  534,
-      536,  537,  538,  539,  540,  542,  542,  542,  543,  544,
-      544,  544,  545,  545,  545,  546,  546,  546,  546,  546,
-      546,  546,  546,  546,  548,  549,  550,  551,  553,  554,
-      555,  556,  557,  558,  560,  562,  563,  565,  566,  568,
-      570,  571,  573,  574,  576,  577,  579,  580,  580,  581,
-      582,  582,  582,  582,  582,  583,  583,  583,  583,  583,
-      583,  583,  583,  583,  585,  587,  589,  591,  593,  595,
-      597,  598,  599,  601,  603,  604,  605,  607,  607,  607,
-      607,  608,  609,  609,  609,  610,  611,  611,  611,  611,
-
-      611,  611,  613,  615,  616,  618,  618,  618,  619,  620,
-      620,  620,  620,  620,  622,  622,  623,  623,  624,  625,
-      626,  626
+      232,  233,  234,  235,  236,  239,  240,  241,  242,  243,
+
+      244,  245,  247,  248,  249,  250,  251,  252,  253,  254,
+      255,  256,  257,  258,  259,  260,  261,  262,  263,  264,
+      265,  266,  267,  268,  269,  269,  269,  269,  269,  269,
+      269,  269,  269,  270,  272,  272,  272,  273,  273,  274,
+      275,  275,  276,  277,  277,  277,  277,  277,  278,  278,
+      279,  281,  282,  283,  284,  285,  287,  289,  290,  291,
+      292,  293,  294,  295,  296,  297,  299,  300,  301,  302,
+      303,  304,  305,  306,  308,  309,  310,  311,  312,  313,
+      315,  316,  317,  319,  320,  321,  322,  323,  324,  325,
+      326,  328,  329,  330,  331,  332,  333,  334,  335,  336,
+
+      337,  338,  339,  340,  341,  342,  343,  344,  345,  346,
+      348,  349,  351,  352,  353,  353,  353,  353,  353,  353,
+      353,  353,  354,  354,  354,  354,  354,  354,  354,  354,
+      355,  355,  356,  356,  356,  358,  358,  358,  358,  359,
+      360,  362,  363,  364,  365,  366,  368,  369,  370,  371,
+      372,  373,  375,  376,  377,  378,  379,  381,  383,  384,
+      385,  387,  389,  391,  393,  394,  396,  397,  398,  399,
+      400,  401,  403,  404,  405,  406,  407,  408,  409,  410,
+      411,  412,  413,  415,  416,  417,  418,  419,  420,  421,
+      422,  423,  424,  425,  426,  427,  429,  431,  432,  433,
+
+      435,  436,  437,  437,  437,  437,  437,  437,  437,  437,
+      437,  437,  437,  437,  437,  437,  437,  438,  438,  440,
+      441,  442,  443,  444,  445,  446,  447,  449,  450,  452,
+      453,  454,  455,  457,  458,  460,  461,  462,  463,  465,
+      466,  468,  470,  471,  472,  473,  474,  476,  477,  479,
+      480,  481,  482,  484,  486,  487,  489,  490,  491,  493,
+      494,  495,  497,  499,  501,  502,  503,  504,  504,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  506,  507,  509,  510,  511,
+      512,  514,  516,  517,  518,  520,  521,  522,  524,  525,
+
+      526,  527,  528,  530,  531,  532,  533,  534,  535,  536,
+      537,  539,  540,  541,  542,  543,  545,  545,  545,  546,
+      547,  547,  547,  548,  548,  548,  549,  549,  549,  549,
+      549,  549,  549,  549,  549,  551,  552,  553,  554,  556,
+      557,  558,  559,  560,  561,  563,  565,  566,  568,  569,
+      571,  573,  574,  576,  577,  579,  580,  582,  583,  583,
+      584,  585,  585,  585,  585,  585,  586,  586,  586,  586,
+      586,  586,  586,  586,  586,  588,  590,  592,  594,  596,
+      598,  600,  601,  602,  604,  606,  607,  608,  610,  610,
+      610,  610,  611,  612,  612,  612,  613,  614,  614,  614,
+
+      614,  614,  614,  616,  618,  619,  621,  621,  621,  622,
+      623,  623,  623,  623,  623,  625,  625,  626,  626,  627,
+      628,  629,  629
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -806,161 +806,161 @@ static const YY_CHAR yy_meta[68] =
        14,   16,   17,   16,   14,   16,   14
     } ;
 
-static const flex_int16_t yy_base[664] =
+static const flex_int16_t yy_base[665] =
     {   0,
-        0,   66, 1500, 1501,   67, 1501, 1501,   64, 1457,   62,
-       80,   76,   95,   91, 1475, 1473, 1470, 1452,    0, 1465,
-       80, 1449, 1455,   77, 1434,   97,   61,   64,   81, 1443,
-     1432,   35, 1431,  100, 1444,   89,   93,   82,  108,   99,
-      111,  121,  104,  172,  178, 1459,  182,  162,  183,  192,
-     1477,  205,  223,  260,  202,  313, 1501,  224,  354,  103,
-      223, 1501,   94,    0,  252, 1501, 1501, 1501, 1428,    0,
-     1448,  210, 1440, 1429, 1440, 1418, 1427, 1410, 1414, 1418,
-     1413, 1430,  120, 1411, 1423, 1407, 1418, 1405, 1420, 1421,
-     1420,  135, 1407, 1401, 1407, 1403,   30,  202, 1404, 1399,
-
-     1412, 1403, 1394, 1393, 1407, 1391, 1392,  199, 1407, 1399,
-     1406,  156, 1391, 1387, 1388, 1394, 1381, 1385, 1386,  202,
-     1394, 1386, 1388, 1388, 1375,  255,    0,  211, 1501,  255,
-      345, 1385, 1389, 1383, 1373, 1407,  283,  224,  225,  296,
-     1501, 1423, 1422,  396, 1421,  227,    0,  293,  192, 1501,
-      291, 1501,  293,    0,  403,  344,    0, 1372, 1389,  280,
-      347,  412, 1418,  279, 1378, 1392, 1361, 1379,    0, 1361,
-     1366, 1372, 1358, 1359,  295, 1354, 1372, 1370, 1351, 1357,
-     1355, 1363, 1347, 1362, 1360, 1363, 1345, 1357, 1346, 1339,
-      418, 1358, 1351, 1356, 1338, 1334, 1334, 1344, 1347, 1328,
-
-        0, 1330,  253, 1327, 1336, 1328, 1342, 1324, 1326, 1325,
-      290, 1326, 1321, 1326, 1334, 1318, 1322, 1327, 1316, 1313,
-     1329, 1331, 1313, 1366, 1365, 1316, 1322, 1312, 1324,  474,
-      428, 1501, 1501,  441, 1358,    0,  488,  488, 1501, 1308,
-     1332,  360, 1357,  294,  529,    0, 1501,    0, 1317,    0,
-     1301, 1299, 1308, 1311,    0,    0, 1300, 1309,  301, 1308,
-     1297, 1290, 1298, 1290,    0, 1288, 1291, 1291, 1300, 1300,
-     1283, 1301,    0, 1283, 1280, 1321, 1324, 1321,    0, 1278,
-     1283,    0, 1287, 1278, 1280, 1282, 1268, 1269, 1287, 1267,
-     1285, 1284, 1275, 1274, 1277, 1266, 1275, 1278, 1258, 1263,
-
-     1273, 1260, 1271, 1270,  332,  447, 1258, 1264,    0, 1264,
-        0, 1250, 1230, 1274,  447, 1232, 1222, 1173, 1170, 1164,
-     1501,  267,  479, 1166, 1147, 1141, 1131,  352, 1501, 1182,
-     1501, 1176, 1121,    0,  544,  581, 1174, 1119, 1137,    0,
-     1135, 1131, 1117, 1127,    0, 1116, 1066, 1074, 1072, 1078,
-        0, 1041, 1040, 1041, 1040,    0,    0, 1044, 1030,    0,
-        0,    0,    0, 1041,    0, 1041, 1007, 1019, 1007, 1017,
-        0,  996,  995,  997,  994, 1009,  336,  993,  993,  990,
-      992,    0,  993,  977,  976,  982,  986,  978,  976,  976,
-      958,  976,  979,  976,    0,    0,  936,  928,    0,  933,
-
-     1501,  511,  404,  922,  435,  926,  972,  968,  917,  921,
-      911,  908,  887,  399,  616, 1501,  919,    0,  877,  856,
-      862,  849,  833,  830,  810,    0,  809,    0,  803,  817,
-      799,    0,  804,    0,  813,  791,  793,    0,  779,    0,
-        0,  754,  744,  763,  762,    0,  758,    0,  753,  760,
-      743,    0,    0,  740,    0,  738,  750,    0,  741,  747,
-        0,    0,    0,  746,  719,  736,  549, 1501,  563,  514,
-      461,  467,  577,  722,  738,  588,  693,  680,  687,  680,
-      665,  651,  718,  663,  652,    0,  653,  651,  646,    0,
-        0,  635,  619,    0,  628,  613,    0,  600,  596,  595,
-
-      587,    0,  578,  575,  542,  560,  559,  544,  551,    0,
-      542,  540,  524,  499,    0,  614,  581, 1501,  617,  647,
-      650, 1501,  550,  478, 1501,  683,  480,  478,  495,  484,
-      473,  513,  512,    0,  465,  449,  427,    0,  439,  417,
-      410,  407,  393,    0,    0,  389,    0,  346,    0,    0,
-      330,    0,  340,    0,  329,    0,  319,  675, 1501,  686,
-      337,  701,  688,  714, 1501,  718,  697,  524,  529,  567,
-      732,  294,  266,    0,    0,    0,    0,    0,    0,    0,
-      257,  237,    0,    0,  236,  151,    0,  728,  572,  708,
-     1501,  735,  754,  739, 1501,  757,  760,  184,  180,  573,
-
-       92,    0,    0,   99,    0,  765,  768, 1501,  770,   69,
-      772,  774,    0,    0,  786, 1501,  776, 1501,  779, 1501,
-     1501,  813,  830,  840,  845,  858,  874,  884,  897,  907,
-      914,  916,  931,  948,  960,  967,  976,  982,  999, 1011,
-     1018, 1025, 1035, 1049, 1059, 1069, 1081, 1095, 1106, 1118,
-     1133, 1150, 1166, 1176, 1185, 1196, 1212, 1223, 1240, 1257,
-     1273, 1284, 1301
+        0,   66, 1501, 1502,   67, 1502, 1502,   64, 1458,   62,
+       80,   76,   95,   91, 1476, 1474, 1471, 1453,    0, 1466,
+       80, 1450, 1456,   77, 1435,   97,   61,   64,   81, 1444,
+     1433,   35, 1432,  100, 1445,   89,   93,   82,  108,   99,
+      111,  121,  104,  172,  178, 1460,  182,  162,  183,  192,
+     1478,  205,  223,  260,  202,  313, 1502,  224,  354,  103,
+      223, 1502,   94,    0,  252, 1502, 1502, 1502, 1429,    0,
+     1449,  210, 1441, 1430, 1441, 1419, 1428, 1411, 1415, 1419,
+     1414, 1431,  120, 1412, 1424, 1408, 1419, 1406, 1421, 1422,
+     1421,  135, 1408, 1402, 1408, 1404,   30,  202,   90, 1401,
+
+     1414, 1405, 1396, 1395, 1409, 1393, 1394,  199, 1409, 1401,
+     1408,  156, 1393, 1389, 1390, 1396, 1383, 1387, 1388,  202,
+     1396, 1388, 1390, 1390, 1377,  255,    0,  211, 1502,  255,
+      345, 1387, 1391, 1385, 1375, 1409,  283,  224,  225,  296,
+     1502, 1425, 1424,  396, 1423,  227,    0,  293,  192, 1502,
+      291, 1502,  293,    0,  403,  344,    0, 1374, 1391,  280,
+      347,  412, 1420,  279, 1380, 1394, 1363, 1381,    0, 1363,
+     1368, 1374, 1360, 1361,  295, 1356, 1374, 1372, 1353, 1359,
+     1357, 1365, 1349, 1364, 1362, 1365, 1347, 1359, 1348, 1341,
+      418, 1360, 1353, 1358,    0, 1340, 1336, 1336, 1346, 1349,
+
+     1330,    0, 1332,  253, 1329, 1338, 1330, 1344, 1326, 1328,
+     1327,  290, 1328, 1323, 1328, 1336, 1320, 1324, 1329, 1318,
+     1315, 1331, 1333, 1315, 1368, 1367, 1318, 1324, 1314, 1326,
+      474,  428, 1502, 1502,  441, 1360,    0,  488,  488, 1502,
+     1310, 1334,  360, 1359,  294,  529,    0, 1502,    0, 1319,
+        0, 1303, 1301, 1310, 1313,    0,    0, 1302, 1311,  301,
+     1310, 1299, 1292, 1300, 1292,    0, 1290, 1293, 1293, 1302,
+     1302, 1285, 1303,    0, 1285, 1282, 1323, 1326, 1323,    0,
+     1280, 1285,    0, 1289, 1280, 1282, 1284, 1270, 1271, 1289,
+     1269, 1287, 1286, 1277, 1276, 1279, 1268, 1277, 1280, 1260,
+
+     1265, 1275, 1262, 1273, 1272,  332,  447, 1260, 1266,    0,
+     1267,    0, 1253, 1260, 1304,  447, 1234, 1224, 1232, 1229,
+     1166, 1502,  267,  479, 1168, 1172, 1166, 1133,  352, 1502,
+     1184, 1502, 1183, 1128,    0,  544,  581, 1176, 1121, 1139,
+        0, 1137, 1137, 1123, 1129,    0, 1118, 1106, 1116, 1078,
+     1082,    0, 1064, 1063, 1043, 1042,    0,    0, 1050, 1038,
+        0,    0,    0,    0, 1047,    0, 1045, 1029, 1041, 1009,
+     1019,    0,  998,  997, 1003, 1000, 1011,  336,  995,  999,
+      998,  998,    0,  997,  981,  982,  989,  993,  985,  983,
+      982,  962,  999, 1002,  978,    0,    0,  939,  932,    0,
+
+      936, 1502,  511,  404,  928,  435,  934,  978,  975,  924,
+      927,  915,  925,  924,  399,  616, 1502,  943,    0,  885,
+      864,  866,  872,  856,  849,  833,    0,  815,    0,  805,
+      820,  803,    0,  807,    0,  823,  804,  798,    0,  798,
+        0,    0,  793,  766,  765,  764,    0,  760,    0,  755,
+      763,  746,    0,    0,  743,    0,  742,  754,    0,  745,
+      751,    0,    0,    0,  749,  727,  744,  549, 1502,  563,
+      514,  461,  467,  577,  743,  779,  588,  718,  688,  693,
+      687,  672,  651,  721,  665,  664,    0,  669,  657,  648,
+        0,    0,  650,  650,    0,  646,  631,    0,  618,  611,
+
+      610,  590,    0,  581,  593,  572,  575,  562,  546,  563,
+        0,  558,  546,  543,  530,    0,  614,  581, 1502,  617,
+      647,  650, 1502,  564,  478, 1502,  683,  480,  495,  495,
+      501,  489,  513,  531,    0,  477,  458,  452,    0,  464,
+      431,  425,  426,  411,    0,    0,  407,    0,  392,    0,
+        0,  375,    0,  363,    0,  340,    0,  337,  675, 1502,
+      686,  374,  701,  688,  714, 1502,  718,  697,  524,  529,
+      567,  732,  323,  286,    0,    0,    0,    0,    0,    0,
+        0,  275,  256,    0,    0,  265,  238,    0,  728,  572,
+      708, 1502,  735,  754,  739, 1502,  757,  760,  284,  211,
+
+      573,  134,    0,    0,  139,    0,  765,  768, 1502,  770,
+       69,  772,  774,    0,    0,  786, 1502,  776, 1502,  779,
+     1502, 1502,  813,  830,  840,  845,  858,  874,  884,  897,
+      907,  914,  916,  931,  948,  960,  967,  976,  982,  999,
+     1011, 1018, 1025, 1035, 1049, 1059, 1069, 1081, 1095, 1106,
+     1118, 1133, 1150, 1166, 1176, 1185, 1196, 1212, 1223, 1240,
+     1257, 1273, 1284, 1301
     } ;
 
-static const flex_int16_t yy_def[664] =
+static const flex_int16_t yy_def[665] =
     {   0,
-      621,    1,  621,  621,  621,  621,  621,  622,  623,  621,
-      621,  621,  621,  624,  621,  621,  621,  621,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  621,  621,  621,  621,  622,  621,  626,
-      621,  627,  621,  621,  628,  621,  621,  629,  621,   13,
-      630,  621,  631,  632,  624,  621,  621,  621,  621,  625,
-      625,  633,  634,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  621,   45,   45,  621,   45,
-       45,  621,  621,  621,  621,  621,  621,  622,  622,  622,
-      621,  621,  621,  621,  635,   54,  636,  628,  637,  621,
-      629,  621,  629,   59,  621,  631,  632,  621,  625,  633,
-      621,  638,  621,  621,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  639,  621,  621,  621,  621,  621,  621,
-      622,  621,  621,  621,  640,  636,  621,  637,  621,  621,
-      625,  621,  621,  633,  633,  641,  621,  642,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  639,  621,  621,  621,  621,  621,  230,
-      621,  230,  230,  621,  621,  621,  621,  622,  621,  621,
-      621,  621,  621,  625,  633,  633,  643,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-
-      621,  644,  621,  621,  645,  621,  646,  621,  621,  621,
-      621,  621,  621,  633,  336,  621,  647,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  648,  621,  644,  649,
-      621,  645,  645,  621,  646,  621,  621,  621,  621,  621,
-      621,  336,  650,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  648,  649,  621,  649,  651,
-      621,  621,  652,  621,  621,  653,  621,  621,  654,  621,
-      621,  633,  621,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  651,  621,  651,
-      652,  655,  656,  657,  621,  653,  658,  621,  654,  654,
-      621,  621,  621,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  655,  588,  656,
-      621,  656,  657,  658,  621,  658,  659,  660,  621,  621,
-
-      621,  625,  625,  625,  625,  661,  659,  621,  659,  660,
-      621,  662,  663,  625,  661,  621,  662,  621,  662,  621,
-        0,  621,  621,  621,  621,  621,  621,  621,  621,  621,
-      621,  621,  621,  621,  621,  621,  621,  621,  621,  621,
-      621,  621,  621,  621,  621,  621,  621,  621,  621,  621,
-      621,  621,  621,  621,  621,  621,  621,  621,  621,  621,
-      621,  621,  621
+      622,    1,  622,  622,  622,  622,  622,  623,  624,  622,
+      622,  622,  622,  625,  622,  622,  622,  622,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  622,  622,  622,  622,  623,  622,  627,
+      622,  628,  622,  622,  629,  622,  622,  630,  622,   13,
+      631,  622,  632,  633,  625,  622,  622,  622,  622,  626,
+      626,  634,  635,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  622,   45,   45,  622,   45,
+       45,  622,  622,  622,  622,  622,  622,  623,  623,  623,
+      622,  622,  622,  622,  636,   54,  637,  629,  638,  622,
+      630,  622,  630,   59,  622,  632,  633,  622,  626,  634,
+      622,  639,  622,  622,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  640,  622,  622,  622,  622,  622,
+      622,  623,  622,  622,  622,  641,  637,  622,  638,  622,
+      622,  626,  622,  622,  634,  634,  642,  622,  643,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  640,  622,  622,  622,  622,  622,
+      231,  622,  231,  231,  622,  622,  622,  622,  623,  622,
+      622,  622,  622,  622,  626,  634,  634,  644,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+
+      626,  622,  645,  622,  622,  646,  622,  647,  622,  622,
+      622,  622,  622,  622,  634,  337,  622,  648,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  649,  622,  645,
+      650,  622,  646,  646,  622,  647,  622,  622,  622,  622,
+      622,  622,  337,  651,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  649,  650,  622,  650,
+      652,  622,  622,  653,  622,  622,  654,  622,  622,  655,
+      622,  622,  634,  622,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  652,  622,
+      652,  653,  656,  657,  658,  622,  654,  659,  622,  655,
+      655,  622,  622,  622,  626,  626,  626,  626,  626,  626,
+      626,  626,  626,  626,  626,  626,  626,  626,  656,  589,
+      657,  622,  657,  658,  659,  622,  659,  660,  661,  622,
+
+      622,  622,  626,  626,  626,  626,  662,  660,  622,  660,
+      661,  622,  663,  664,  626,  662,  622,  663,  622,  663,
+      622,    0,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622
     } ;
 
-static const flex_int16_t yy_nxt[1569] =
+static const flex_int16_t yy_nxt[1570] =
     {   0,
         4,    5,    6,    7,    5,    8,    4,    9,    4,    4,
        10,   11,   12,   13,   14,   14,   14,   14,   14,   14,
@@ -969,7 +969,7 @@ static const flex_int16_t yy_nxt[1569] =
        19,    4,   24,   25,   26,   27,   28,   29,   30,   31,
        32,   19,   19,   33,   34,   35,   36,   37,   19,   38,
        39,   40,   41,   42,   43,   19,   19,   44,   47,   49,
-       44,   47,   45,   53,  611,   54,   55,   55,   55,   55,
+       44,   47,   45,   53,  612,   54,   55,   55,   55,   55,
        55,   55,   55,   55,   57,   72,  190,   73,   58,   96,
        97,  191,   46,   56,   56,   56,   56,   56,   56,   56,
 
@@ -977,166 +977,166 @@ static const flex_int16_t yy_nxt[1569] =
        60,   60,   60,   60,   60,   61,   61,   86,   87,   88,
        76,   62,   63,   91,  110,   62,   63,   89,  111,   90,
        77,   92,   78,  104,   93,   64,   62,   63,   79,   81,
-       62,   63,   99,  621,  105,  614,   82,  613,  124,  107,
+       62,   63,   99,  622,  105,  194,   82,  195,  124,  107,
       100,  106,  108,   83,  112,  109,  101,  113,  117,   84,
-       64,  119,  102,  122,  125,  118,  120,   49,  621,  114,
+       64,  119,  102,  122,  125,  118,  120,   49,  622,  114,
       115,  121,  116,  126,  174,  175,  126,  123,  127,  128,
-      129,  129,  130,   47,  137,  598,   47,  137,  138,  611,
+      129,  129,  130,   47,  137,  615,   47,  137,  138,  614,
       184,  131,  131,  131,  131,  131,  131,  131,  131,  131,
 
-      185,  237,  237,   50,  129,  140,  140,  140,  140,  140,
-      140,  140,  143,   59,  208,  161,  605,  209,  144,  144,
+      185,  238,  238,   50,  129,  140,  140,  140,  140,  140,
+      140,  140,  143,   59,  209,  161,  599,  210,  144,  144,
       144,  144,  144,  144,  144,  132,  152,  153,  133,   49,
        49,  134,   62,   63,   59,  135,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,  145,  192,   62,   63,  203,
-      153,  162,  217,   62,   63,  204,  126,  193,  621,  126,
-      224,  127,  218,   59,  621,   50,   50,  621,   62,   63,
-      145,   59,  407,  146,  146,  146,  146,  146,  146,  146,
-       61,   61,   62,   63,  137,  161,  247,  137,  138,  604,
-       62,   63,  621,  152,  153,  152,  153,   62,   63,  161,
-
-      147,   49,  621,  603,   59,   62,   63,  291,  621,  231,
-      231,  231,  231,  231,  231,  231,  292,  153,  602,  153,
-      621,  162,  601,   62,   63,  147,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,  162,  600,   50,   62,   63,
-      300,  248,  562,   62,  149,  150,  621,  150,  242,  225,
-      258,  242,  301,  621,  621,  259,  260,   49,   62,  149,
-      150,  242,  345,  346,  242,  587,  150,  154,  154,  154,
-      154,  154,  154,  154,  154,  154,  239,  388,  239,  586,
-      446,  243,  389,  585,   62,  149,  150,  390,  150,  391,
-      584,  239,  621,   50,  243,  621,  447,  239,  621,   62,
-
-      149,  150,  621,  233,  161,  470,  583,  150,  470,  234,
-      234,  234,  234,  234,  234,  234,  156,  156,  156,  156,
-      156,  156,  156,  156,  156,  245,  245,  245,  245,  245,
-      245,  245,  276,   49,  277,  582,  472,  278,  279,  472,
-      162,  328,  328,  328,  328,  328,  328,  328,  329,  401,
-      401,  402,  581,  580,  330,  330,  330,  330,  330,  330,
-      330,  392,  520,  393,  280,  520,  394,  395,  472,   50,
-      579,  472,  578,  401,  246,  320,  321,  321,  322,  563,
-      621,  567,  563,  408,  567,  577,  576,  323,  323,  323,
-      323,  323,  323,  323,  323,  323,  569,  621,  621,  570,
-
-      321,  238,  238,  238,  238,  238,  238,  238,  238,  238,
-      575,  574,  467,  468,  468,  467,  518,  519,  161,  416,
-      150,  324,  150,  573,  325,  597,  621,  326,  597,  621,
-      569,  327,  621,  570,  161,  150,  621,  468,  572,  568,
-      519,  150,  335,  335,  335,  335,  335,  335,  335,  161,
-      467,  468,  468,  467,  162,  562,  557,  414,  414,  414,
-      414,  414,  414,  414,  467,  468,  468,  467,  569,  556,
-      162,  570,  598,  606,  612,  468,  606,  612,  521,  522,
-      522,  521,  523,  518,  519,  162,  161,  555,  554,  468,
-      525,  525,  526,  553,  415,  415,  415,  415,  415,  415,
-
-      415,  415,  415,  522,  552,  551,  550,  519,  549,  415,
-      415,  415,  415,  415,  525,  467,  468,  468,  467,  518,
-      519,  548,  162,  415,  415,  415,  415,  415,  415,  482,
-      482,  482,  482,  482,  482,  482,  482,  482,  547,  546,
-      468,  545,  544,  519,  482,  482,  482,  482,  482,  559,
-      560,  521,  522,  522,  521,  523,  543,  542,  482,  482,
-      482,  482,  482,  482,  532,  532,  532,  532,  532,  532,
-      532,  532,  532,  560,  541,  540,  522,  559,  560,  532,
-      532,  532,  532,  532,  564,  565,  565,  564,  559,  560,
-      591,  592,  539,  532,  532,  532,  532,  532,  532,  595,
-
-      596,  560,  588,  522,  522,  588,  538,  537,  536,  565,
-      591,  592,  560,  535,  592,  564,  565,  565,  564,  564,
-      565,  565,  564,  596,  534,  416,  531,  522,  530,  588,
-      522,  522,  588,  529,  592,  528,  599,  591,  592,  527,
-      565,  595,  596,  476,  565,  571,  571,  571,  571,  571,
-      571,  571,  571,  571,  522,  621,  565,  565,  621,  595,
-      596,  592,  608,  609,  524,  596,  606,  522,  522,  606,
-      608,  609,  608,  609,  616,  616,  618,  619,  618,  619,
-      565,  618,  619,  596,  515,  514,  609,  621,  522,  522,
-      621,  522,  513,  512,  609,  511,  609,  510,  616,  509,
-
-      619,  508,  619,  507,  506,  619,  505,  504,  503,  502,
-      501,  500,  522,   48,   48,   48,   48,   48,   48,   48,
+       56,   56,   56,   56,   56,  145,  192,   62,   63,  204,
+      153,  162,  218,   62,   63,  205,  126,  193,  622,  126,
+      225,  127,  219,   59,  622,   50,   50,  622,   62,   63,
+      145,   59,  408,  146,  146,  146,  146,  146,  146,  146,
+       61,   61,   62,   63,  137,  161,  248,  137,  138,  612,
+       62,   63,  622,  152,  153,  152,  153,   62,   63,  161,
+
+      147,   49,  622,  606,   59,   62,   63,  292,  622,  232,
+      232,  232,  232,  232,  232,  232,  293,  153,  605,  153,
+      622,  162,  604,   62,   63,  147,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,  162,  603,   50,   62,   63,
+      301,  249,  602,   62,  149,  150,  622,  150,  243,  226,
+      259,  243,  302,  622,  622,  260,  261,   49,   62,  149,
+      150,  243,  346,  347,  243,  601,  150,  154,  154,  154,
+      154,  154,  154,  154,  154,  154,  240,  389,  240,  563,
+      447,  244,  390,  588,   62,  149,  150,  391,  150,  392,
+      587,  240,  622,   50,  244,  622,  448,  240,  622,   62,
+
+      149,  150,  622,  234,  161,  471,  586,  150,  471,  235,
+      235,  235,  235,  235,  235,  235,  156,  156,  156,  156,
+      156,  156,  156,  156,  156,  246,  246,  246,  246,  246,
+      246,  246,  277,   49,  278,  585,  473,  279,  280,  473,
+      162,  329,  329,  329,  329,  329,  329,  329,  330,  402,
+      402,  403,  584,  583,  331,  331,  331,  331,  331,  331,
+      331,  393,  521,  394,  281,  521,  395,  396,  473,   50,
+      582,  473,  581,  402,  247,  321,  322,  322,  323,  564,
+      622,  568,  564,  409,  568,  580,  579,  324,  324,  324,
+      324,  324,  324,  324,  324,  324,  570,  622,  622,  571,
+
+      322,  239,  239,  239,  239,  239,  239,  239,  239,  239,
+      578,  577,  468,  469,  469,  468,  519,  520,  161,  576,
+      150,  325,  150,  575,  326,  598,  622,  327,  598,  622,
+      570,  328,  622,  571,  161,  150,  622,  469,  417,  574,
+      520,  150,  336,  336,  336,  336,  336,  336,  336,  161,
+      468,  469,  469,  468,  162,  573,  569,  415,  415,  415,
+      415,  415,  415,  415,  468,  469,  469,  468,  570,  563,
+      162,  571,  599,  607,  613,  469,  607,  613,  522,  523,
+      523,  522,  524,  519,  520,  162,  161,  558,  557,  469,
+      526,  526,  527,  556,  416,  416,  416,  416,  416,  416,
+
+      416,  416,  416,  523,  555,  554,  553,  520,  552,  416,
+      416,  416,  416,  416,  526,  468,  469,  469,  468,  519,
+      520,  551,  162,  416,  416,  416,  416,  416,  416,  483,
+      483,  483,  483,  483,  483,  483,  483,  483,  550,  549,
+      469,  548,  547,  520,  483,  483,  483,  483,  483,  560,
+      561,  522,  523,  523,  522,  524,  546,  545,  483,  483,
+      483,  483,  483,  483,  533,  533,  533,  533,  533,  533,
+      533,  533,  533,  561,  544,  543,  523,  560,  561,  533,
+      533,  533,  533,  533,  565,  566,  566,  565,  560,  561,
+      592,  593,  542,  533,  533,  533,  533,  533,  533,  596,
+
+      597,  561,  589,  523,  523,  589,  541,  540,  539,  566,
+      592,  593,  561,  538,  593,  565,  566,  566,  565,  565,
+      566,  566,  565,  597,  537,  536,  535,  523,  417,  589,
+      523,  523,  589,  532,  593,  531,  600,  592,  593,  530,
+      566,  596,  597,  529,  566,  572,  572,  572,  572,  572,
+      572,  572,  572,  572,  523,  622,  566,  566,  622,  596,
+      597,  593,  609,  610,  528,  597,  607,  523,  523,  607,
+      609,  610,  609,  610,  617,  617,  619,  620,  619,  620,
+      566,  619,  620,  597,  477,  525,  610,  622,  523,  523,
+      622,  523,  516,  515,  610,  514,  610,  513,  617,  512,
+
+      620,  511,  620,  510,  509,  620,  508,  507,  506,  505,
+      504,  503,  523,   48,   48,   48,   48,   48,   48,   48,
        48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
-       51,   51,  499,   51,   51,   51,   51,   51,   51,   51,
+       51,   51,  502,   51,   51,   51,   51,   51,   51,   51,
        51,   51,   51,   51,   51,   51,   51,   65,   65,   65,
-      498,  497,   65,   70,   70,  496,   70,   70,   70,   70,
-       70,   70,  139,  139,  495,  494,  139,  493,  139,  492,
-      491,  490,  139,  139,  142,  142,  489,  142,  142,  142,
+      501,  500,   65,   70,   70,  499,   70,   70,   70,   70,
+       70,   70,  139,  139,  498,  497,  139,  496,  139,  495,
+      494,  493,  139,  139,  142,  142,  492,  142,  142,  142,
       142,  142,  142,  142,  142,  142,  142,  142,  142,  142,
-      142,  148,  148,  148,  488,  487,  148,  151,  151,  151,
+      142,  148,  148,  148,  491,  490,  148,  151,  151,  151,
 
       151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
-      151,  151,  151,  151,   61,   61,   61,  486,  485,   61,
-      156,  484,  156,  156,  157,  157,  416,  157,  157,  481,
+      151,  151,  151,  151,   61,   61,   61,  489,  488,   61,
+      156,  487,  156,  156,  157,  157,  486,  157,  157,  485,
       157,  160,  160,  160,  160,  160,  160,  160,  160,  160,
       160,  160,  160,  160,  160,  160,  160,  160,  163,  163,
-      480,  163,  163,  163,  163,  163,  163,  163,  163,  163,
-      163,  163,  163,  163,  163,  235,  479,  478,  235,  235,
-      477,  235,  235,  407,  235,  236,  236,  476,  236,  236,
-      474,  236,  238,  471,  238,  238,  244,  244,  466,  465,
-      244,  464,  244,  463,  462,  461,  244,  244,  244,  314,
-
-      314,  314,  314,  314,  314,  314,  314,  314,  314,  314,
-      314,  314,  314,  314,  314,  314,  332,  460,  459,  332,
-      332,  458,  332,  332,  457,  332,  336,  336,  456,  336,
-      336,  455,  336,  337,  337,  454,  337,  337,  453,  337,
-      417,  452,  451,  417,  417,  450,  417,  417,  449,  417,
-      469,  469,  469,  448,  445,  444,  443,  469,  469,  469,
-      473,  442,  441,  440,  439,  438,  437,  473,  473,  475,
-      475,  475,  475,  475,  475,  475,  475,  475,  475,  475,
-      475,  475,  475,  475,  475,  475,  483,  436,  435,  483,
-      483,  434,  483,  483,  433,  483,  516,  516,  516,  432,
-
-      431,  430,  429,  516,  516,  516,  517,  517,  517,  517,
-      517,  517,  517,  517,  517,  517,  517,  517,  517,  517,
-      517,  517,  517,  533,  428,  427,  533,  533,  426,  533,
-      533,  425,  533,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-      561,  561,  561,  561,  561,  561,  561,  566,  566,  566,
-      424,  423,  422,  421,  566,  566,  566,  571,  420,  419,
-      418,  416,  413,  331,  571,  571,  589,  589,  589,  329,
-      412,  411,  410,  589,  589,  589,  590,  590,  590,  590,
-
-      590,  590,  590,  590,  590,  590,  590,  590,  590,  590,
-      590,  590,  590,  593,  593,  593,  409,  621,  406,  405,
-      593,  593,  593,  594,  594,  594,  594,  594,  594,  594,
-      594,  594,  594,  594,  594,  594,  594,  594,  594,  594,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  610,  610,  610,
-      610,  610,  610,  610,  610,  610,  610,  610,  610,  610,
-      610,  610,  610,  610,  615,  615,  615,  404,  403,  315,
-      400,  615,  615,  615,  617,  617,  617,  617,  617,  617,
-      617,  617,  617,  617,  617,  617,  617,  617,  617,  617,
-
-      617,  620,  620,  620,  620,  620,  620,  620,  620,  399,
-      398,  620,  397,  396,  387,  386,  385,  384,  383,  382,
-      381,  380,  379,  378,  377,  376,  375,  374,  373,  372,
-      371,  370,  369,  368,  367,  366,  365,  364,  363,  362,
-      361,  360,  359,  358,  357,  356,  355,  354,  353,  352,
-      351,  350,  349,  348,  347,  344,  343,  342,  341,  340,
-      339,  338,   72,  334,  333,  331,  319,  318,  317,  316,
-      224,  315,  313,  312,  311,  310,  309,  308,  307,  306,
-      305,  304,  303,  302,  299,  298,  297,  296,  295,  294,
-      293,  290,  289,  288,  287,  286,  285,  284,  283,  282,
-
-      281,  275,  274,  273,  272,  271,  270,  269,  268,  267,
-      266,  265,  264,  263,  262,  261,  257,  256,  255,  254,
-      253,  252,  251,  250,  249,  247,  241,  240,  232,  232,
-      232,  230,  229,  228,  227,  226,  223,  222,  221,  220,
-      219,  216,  215,  214,  213,  212,  211,  210,  207,  206,
-      205,  202,  201,  200,  199,  198,  197,  196,  195,  194,
-      189,  188,  187,  186,  183,  182,  181,  180,  179,  178,
-      177,  176,  173,  172,  171,  170,  169,  168,  167,  166,
-      165,  164,  159,  158,  141,  136,  103,   98,   95,   94,
-       80,   75,   74,   71,   69,   68,   67,   66,   52,  621,
-
-        3,  621,  621,  621,  621,  621,  621,  621,  621,  621,
-      621,  621,  621,  621,  621,  621,  621,  621,  621,  621,
-      621,  621,  621,  621,  621,  621,  621,  621,  621,  621,
-      621,  621,  621,  621,  621,  621,  621,  621,  621,  621,
-      621,  621,  621,  621,  621,  621,  621,  621,  621,  621,
-      621,  621,  621,  621,  621,  621,  621,  621,  621,  621,
-      621,  621,  621,  621,  621,  621,  621,  621
+      417,  163,  163,  163,  163,  163,  163,  163,  163,  163,
+      163,  163,  163,  163,  163,  236,  482,  481,  236,  236,
+      480,  236,  236,  479,  236,  237,  237,  478,  237,  237,
+      408,  237,  239,  477,  239,  239,  245,  245,  475,  472,
+      245,  467,  245,  466,  465,  464,  245,  245,  245,  315,
+
+      315,  315,  315,  315,  315,  315,  315,  315,  315,  315,
+      315,  315,  315,  315,  315,  315,  333,  463,  462,  333,
+      333,  461,  333,  333,  460,  333,  337,  337,  459,  337,
+      337,  458,  337,  338,  338,  457,  338,  338,  456,  338,
+      418,  455,  454,  418,  418,  453,  418,  418,  452,  418,
+      470,  470,  470,  451,  450,  449,  446,  470,  470,  470,
+      474,  445,  444,  443,  442,  441,  440,  474,  474,  476,
+      476,  476,  476,  476,  476,  476,  476,  476,  476,  476,
+      476,  476,  476,  476,  476,  476,  484,  439,  438,  484,
+      484,  437,  484,  484,  436,  484,  517,  517,  517,  435,
+
+      434,  433,  432,  517,  517,  517,  518,  518,  518,  518,
+      518,  518,  518,  518,  518,  518,  518,  518,  518,  518,
+      518,  518,  518,  534,  431,  430,  534,  534,  429,  534,
+      534,  428,  534,  559,  559,  559,  559,  559,  559,  559,
+      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
+      562,  562,  562,  562,  562,  562,  562,  562,  562,  562,
+      562,  562,  562,  562,  562,  562,  562,  567,  567,  567,
+      427,  426,  425,  424,  567,  567,  567,  572,  423,  422,
+      421,  420,  419,  417,  572,  572,  590,  590,  590,  414,
+      332,  330,  413,  590,  590,  590,  591,  591,  591,  591,
+
+      591,  591,  591,  591,  591,  591,  591,  591,  591,  591,
+      591,  591,  591,  594,  594,  594,  412,  411,  410,  622,
+      594,  594,  594,  595,  595,  595,  595,  595,  595,  595,
+      595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
+      608,  608,  608,  608,  608,  608,  608,  608,  608,  608,
+      608,  608,  608,  608,  608,  608,  608,  611,  611,  611,
+      611,  611,  611,  611,  611,  611,  611,  611,  611,  611,
+      611,  611,  611,  611,  616,  616,  616,  407,  406,  405,
+      404,  616,  616,  616,  618,  618,  618,  618,  618,  618,
+      618,  618,  618,  618,  618,  618,  618,  618,  618,  618,
+
+      618,  621,  621,  621,  621,  621,  621,  621,  621,  316,
+      401,  621,  400,  399,  398,  397,  388,  387,  386,  385,
+      384,  383,  382,  381,  380,  379,  378,  377,  376,  375,
+      374,  373,  372,  371,  370,  369,  368,  367,  366,  365,
+      364,  363,  362,  361,  360,  359,  358,  357,  356,  355,
+      354,  353,  352,  351,  350,  349,  348,  345,  344,  343,
+      342,  341,  340,  339,   72,  335,  334,  332,  320,  319,
+      318,  317,  225,  316,  314,  313,  312,  311,  310,  309,
+      308,  307,  306,  305,  304,  303,  300,  299,  298,  297,
+      296,  295,  294,  291,  290,  289,  288,  287,  286,  285,
+
+      284,  283,  282,  276,  275,  274,  273,  272,  271,  270,
+      269,  268,  267,  266,  265,  264,  263,  262,  258,  257,
+      256,  255,  254,  253,  252,  251,  250,  248,  242,  241,
+      233,  233,  233,  231,  230,  229,  228,  227,  224,  223,
+      222,  221,  220,  217,  216,  215,  214,  213,  212,  211,
+      208,  207,  206,  203,  202,  201,  200,  199,  198,  197,
+      196,  189,  188,  187,  186,  183,  182,  181,  180,  179,
+      178,  177,  176,  173,  172,  171,  170,  169,  168,  167,
+      166,  165,  164,  159,  158,  141,  136,  103,   98,   95,
+       94,   80,   75,   74,   71,   69,   68,   67,   66,   52,
+
+      622,    3,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622
     } ;
 
-static const flex_int16_t yy_chk[1569] =
+static const flex_int16_t yy_chk[1570] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -1145,7 +1145,7 @@ static const flex_int16_t yy_chk[1569] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    2,    5,    8,
-        2,    5,    2,   10,  610,   10,   10,   10,   10,   10,
+        2,    5,    2,   10,  611,   10,   10,   10,   10,   10,
        10,   10,   10,   10,   12,   21,   97,   21,   12,   32,
        32,   97,    2,   11,   11,   11,   11,   11,   11,   11,
 
@@ -1153,163 +1153,163 @@ static const flex_int16_t yy_chk[1569] =
        13,   13,   13,   13,   13,   13,   13,   27,   28,   28,
        24,   14,   14,   29,   38,   13,   13,   28,   38,   28,
        24,   29,   24,   36,   29,   13,   14,   14,   24,   26,
-       13,   13,   34,   60,   36,  604,   26,  601,   43,   37,
+       13,   13,   34,   60,   36,   99,   26,   99,   43,   37,
        34,   36,   37,   26,   39,   37,   34,   39,   40,   26,
        13,   41,   34,   42,   43,   40,   41,   48,   60,   39,
        39,   41,   39,   44,   83,   83,   44,   42,   44,   45,
-       45,   45,   45,   47,   49,  599,   47,   49,   49,  598,
+       45,   45,   45,   47,   49,  605,   47,   49,   49,  602,
        92,   45,   45,   45,   45,   45,   45,   45,   45,   45,
 
        92,  149,  149,   48,   45,   50,   50,   50,   50,   50,
-       50,   50,   52,   55,  112,   72,  586,  112,   52,   52,
+       50,   50,   52,   55,  112,   72,  600,  112,   52,   52,
        52,   52,   52,   52,   52,   45,   58,   58,   45,  138,
       139,   45,   55,   55,   61,   45,   53,   53,   53,   53,
        53,   53,   53,   53,   53,   52,   98,   55,   55,  108,
        58,   72,  120,   61,   61,  108,  126,   98,  128,  126,
       130,  126,  120,   65,  128,  138,  139,  146,   61,   61,
-       52,   54,  322,   54,   54,   54,   54,   54,   54,   54,
-       54,   54,   65,   65,  137,  160,  164,  137,  137,  585,
-       54,   54,  146,  151,  151,  153,  153,   65,   65,  244,
-
-       54,  140,  130,  582,  148,   54,   54,  203,  130,  140,
-      140,  140,  140,  140,  140,  140,  203,  151,  581,  153,
-      322,  160,  573,  148,  148,   54,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,  244,  572,  140,  148,  148,
-      211,  164,  561,   56,   56,   56,  131,   56,  161,  131,
-      175,  161,  211,  156,  156,  175,  175,  328,   56,   56,
-       56,  242,  259,  259,  242,  557,   56,   59,   59,   59,
-       59,   59,   59,   59,   59,   59,  156,  305,  156,  555,
-      377,  161,  305,  553,   59,   59,   59,  305,   59,  305,
-      551,  156,  131,  328,  242,  131,  377,  156,  131,   59,
-
-       59,   59,  131,  144,  414,  403,  548,   59,  403,  144,
+       52,   54,  323,   54,   54,   54,   54,   54,   54,   54,
+       54,   54,   65,   65,  137,  160,  164,  137,  137,  599,
+       54,   54,  146,  151,  151,  153,  153,   65,   65,  245,
+
+       54,  140,  130,  587,  148,   54,   54,  204,  130,  140,
+      140,  140,  140,  140,  140,  140,  204,  151,  586,  153,
+      323,  160,  583,  148,  148,   54,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,  245,  582,  140,  148,  148,
+      212,  164,  574,   56,   56,   56,  131,   56,  161,  131,
+      175,  161,  212,  156,  156,  175,  175,  329,   56,   56,
+       56,  243,  260,  260,  243,  573,   56,   59,   59,   59,
+       59,   59,   59,   59,   59,   59,  156,  306,  156,  562,
+      378,  161,  306,  558,   59,   59,   59,  306,   59,  306,
+      556,  156,  131,  329,  243,  131,  378,  156,  131,   59,
+
+       59,   59,  131,  144,  415,  404,  554,   59,  404,  144,
       144,  144,  144,  144,  144,  144,  155,  155,  155,  155,
       155,  155,  155,  155,  155,  162,  162,  162,  162,  162,
-      162,  162,  191,  231,  191,  546,  405,  191,  191,  405,
-      414,  231,  231,  231,  231,  231,  231,  231,  234,  315,
-      315,  315,  543,  542,  234,  234,  234,  234,  234,  234,
-      234,  306,  471,  306,  191,  471,  306,  306,  472,  231,
-      541,  472,  540,  315,  162,  230,  230,  230,  230,  524,
-      323,  527,  524,  323,  527,  539,  537,  230,  230,  230,
-      230,  230,  230,  230,  230,  230,  529,  238,  238,  529,
-
-      230,  237,  237,  237,  237,  237,  237,  237,  237,  237,
-      536,  535,  402,  402,  402,  402,  470,  470,  532,  533,
-      238,  230,  238,  531,  230,  568,  323,  230,  568,  323,
-      569,  230,  323,  569,  245,  238,  323,  402,  530,  528,
-      470,  238,  245,  245,  245,  245,  245,  245,  245,  335,
-      467,  467,  467,  467,  532,  523,  514,  335,  335,  335,
-      335,  335,  335,  335,  469,  469,  469,  469,  570,  513,
-      245,  570,  570,  589,  600,  467,  589,  600,  473,  473,
-      473,  473,  473,  517,  517,  335,  336,  512,  511,  469,
-      476,  476,  476,  509,  336,  336,  336,  336,  336,  336,
-
-      336,  336,  336,  473,  508,  507,  506,  517,  505,  336,
-      336,  336,  336,  336,  476,  516,  516,  516,  516,  519,
-      519,  504,  336,  336,  336,  336,  336,  336,  336,  415,
-      415,  415,  415,  415,  415,  415,  415,  415,  503,  501,
-      516,  500,  499,  519,  415,  415,  415,  415,  415,  520,
-      520,  521,  521,  521,  521,  521,  498,  496,  415,  415,
-      415,  415,  415,  415,  482,  482,  482,  482,  482,  482,
-      482,  482,  482,  520,  495,  493,  521,  558,  558,  482,
-      482,  482,  482,  482,  526,  526,  526,  526,  560,  560,
-      563,  563,  492,  482,  482,  482,  482,  482,  482,  567,
-
-      567,  558,  562,  562,  562,  562,  489,  488,  487,  526,
-      590,  590,  560,  485,  563,  564,  564,  564,  564,  566,
-      566,  566,  566,  567,  484,  483,  481,  562,  480,  588,
-      588,  588,  588,  479,  590,  478,  571,  592,  592,  477,
-      564,  594,  594,  475,  566,  571,  571,  571,  571,  571,
-      571,  571,  571,  571,  588,  593,  593,  593,  593,  596,
-      596,  592,  597,  597,  474,  594,  606,  606,  606,  606,
-      607,  607,  609,  609,  611,  611,  612,  612,  617,  617,
-      593,  619,  619,  596,  466,  465,  597,  615,  615,  615,
-      615,  606,  464,  460,  607,  459,  609,  457,  611,  456,
-
-      612,  454,  617,  451,  450,  619,  449,  447,  445,  444,
-      443,  442,  615,  622,  622,  622,  622,  622,  622,  622,
-      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
-      623,  623,  439,  623,  623,  623,  623,  623,  623,  623,
-      623,  623,  623,  623,  623,  623,  623,  624,  624,  624,
-      437,  436,  624,  625,  625,  435,  625,  625,  625,  625,
-      625,  625,  626,  626,  433,  431,  626,  430,  626,  429,
-      427,  425,  626,  626,  627,  627,  424,  627,  627,  627,
-      627,  627,  627,  627,  627,  627,  627,  627,  627,  627,
-      627,  628,  628,  628,  423,  422,  628,  629,  629,  629,
-
-      629,  629,  629,  629,  629,  629,  629,  629,  629,  629,
-      629,  629,  629,  629,  630,  630,  630,  421,  420,  630,
-      631,  419,  631,  631,  632,  632,  417,  632,  632,  413,
-      632,  633,  633,  633,  633,  633,  633,  633,  633,  633,
-      633,  633,  633,  633,  633,  633,  633,  633,  634,  634,
-      412,  634,  634,  634,  634,  634,  634,  634,  634,  634,
-      634,  634,  634,  634,  634,  635,  411,  410,  635,  635,
-      409,  635,  635,  408,  635,  636,  636,  407,  636,  636,
-      406,  636,  637,  404,  637,  637,  638,  638,  400,  398,
-      638,  397,  638,  394,  393,  392,  638,  638,  638,  639,
-
-      639,  639,  639,  639,  639,  639,  639,  639,  639,  639,
-      639,  639,  639,  639,  639,  639,  640,  391,  390,  640,
-      640,  389,  640,  640,  388,  640,  641,  641,  387,  641,
-      641,  386,  641,  642,  642,  385,  642,  642,  384,  642,
-      643,  383,  381,  643,  643,  380,  643,  643,  379,  643,
-      644,  644,  644,  378,  376,  375,  374,  644,  644,  644,
-      645,  373,  372,  370,  369,  368,  367,  645,  645,  646,
-      646,  646,  646,  646,  646,  646,  646,  646,  646,  646,
-      646,  646,  646,  646,  646,  646,  647,  366,  364,  647,
-      647,  359,  647,  647,  358,  647,  648,  648,  648,  355,
-
-      354,  353,  352,  648,  648,  648,  649,  649,  649,  649,
-      649,  649,  649,  649,  649,  649,  649,  649,  649,  649,
-      649,  649,  649,  650,  350,  349,  650,  650,  348,  650,
-      650,  347,  650,  651,  651,  651,  651,  651,  651,  651,
-      651,  651,  651,  651,  651,  651,  651,  651,  651,  651,
+      162,  162,  191,  232,  191,  552,  406,  191,  191,  406,
+      415,  232,  232,  232,  232,  232,  232,  232,  235,  316,
+      316,  316,  549,  547,  235,  235,  235,  235,  235,  235,
+      235,  307,  472,  307,  191,  472,  307,  307,  473,  232,
+      544,  473,  543,  316,  162,  231,  231,  231,  231,  525,
+      324,  528,  525,  324,  528,  542,  541,  231,  231,  231,
+      231,  231,  231,  231,  231,  231,  530,  239,  239,  530,
+
+      231,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+      540,  538,  403,  403,  403,  403,  471,  471,  533,  537,
+      239,  231,  239,  536,  231,  569,  324,  231,  569,  324,
+      570,  231,  324,  570,  246,  239,  324,  403,  534,  532,
+      471,  239,  246,  246,  246,  246,  246,  246,  246,  336,
+      468,  468,  468,  468,  533,  531,  529,  336,  336,  336,
+      336,  336,  336,  336,  470,  470,  470,  470,  571,  524,
+      246,  571,  571,  590,  601,  468,  590,  601,  474,  474,
+      474,  474,  474,  518,  518,  336,  337,  515,  514,  470,
+      477,  477,  477,  513,  337,  337,  337,  337,  337,  337,
+
+      337,  337,  337,  474,  512,  510,  509,  518,  508,  337,
+      337,  337,  337,  337,  477,  517,  517,  517,  517,  520,
+      520,  507,  337,  337,  337,  337,  337,  337,  337,  416,
+      416,  416,  416,  416,  416,  416,  416,  416,  506,  505,
+      517,  504,  502,  520,  416,  416,  416,  416,  416,  521,
+      521,  522,  522,  522,  522,  522,  501,  500,  416,  416,
+      416,  416,  416,  416,  483,  483,  483,  483,  483,  483,
+      483,  483,  483,  521,  499,  497,  522,  559,  559,  483,
+      483,  483,  483,  483,  527,  527,  527,  527,  561,  561,
+      564,  564,  496,  483,  483,  483,  483,  483,  483,  568,
+
+      568,  559,  563,  563,  563,  563,  494,  493,  490,  527,
+      591,  591,  561,  489,  564,  565,  565,  565,  565,  567,
+      567,  567,  567,  568,  488,  486,  485,  563,  484,  589,
+      589,  589,  589,  482,  591,  481,  572,  593,  593,  480,
+      565,  595,  595,  479,  567,  572,  572,  572,  572,  572,
+      572,  572,  572,  572,  589,  594,  594,  594,  594,  597,
+      597,  593,  598,  598,  478,  595,  607,  607,  607,  607,
+      608,  608,  610,  610,  612,  612,  613,  613,  618,  618,
+      594,  620,  620,  597,  476,  475,  598,  616,  616,  616,
+      616,  607,  467,  466,  608,  465,  610,  461,  612,  460,
+
+      613,  458,  618,  457,  455,  620,  452,  451,  450,  448,
+      446,  445,  616,  623,  623,  623,  623,  623,  623,  623,
+      623,  623,  623,  623,  623,  623,  623,  623,  623,  623,
+      624,  624,  444,  624,  624,  624,  624,  624,  624,  624,
+      624,  624,  624,  624,  624,  624,  624,  625,  625,  625,
+      443,  440,  625,  626,  626,  438,  626,  626,  626,  626,
+      626,  626,  627,  627,  437,  436,  627,  434,  627,  432,
+      431,  430,  627,  627,  628,  628,  428,  628,  628,  628,
+      628,  628,  628,  628,  628,  628,  628,  628,  628,  628,
+      628,  629,  629,  629,  426,  425,  629,  630,  630,  630,
+
+      630,  630,  630,  630,  630,  630,  630,  630,  630,  630,
+      630,  630,  630,  630,  631,  631,  631,  424,  423,  631,
+      632,  422,  632,  632,  633,  633,  421,  633,  633,  420,
+      633,  634,  634,  634,  634,  634,  634,  634,  634,  634,
+      634,  634,  634,  634,  634,  634,  634,  634,  635,  635,
+      418,  635,  635,  635,  635,  635,  635,  635,  635,  635,
+      635,  635,  635,  635,  635,  636,  414,  413,  636,  636,
+      412,  636,  636,  411,  636,  637,  637,  410,  637,  637,
+      409,  637,  638,  408,  638,  638,  639,  639,  407,  405,
+      639,  401,  639,  399,  398,  395,  639,  639,  639,  640,
+
+      640,  640,  640,  640,  640,  640,  640,  640,  640,  640,
+      640,  640,  640,  640,  640,  640,  641,  394,  393,  641,
+      641,  392,  641,  641,  391,  641,  642,  642,  390,  642,
+      642,  389,  642,  643,  643,  388,  643,  643,  387,  643,
+      644,  386,  385,  644,  644,  384,  644,  644,  382,  644,
+      645,  645,  645,  381,  380,  379,  377,  645,  645,  645,
+      646,  376,  375,  374,  373,  371,  370,  646,  646,  647,
+      647,  647,  647,  647,  647,  647,  647,  647,  647,  647,
+      647,  647,  647,  647,  647,  647,  648,  369,  368,  648,
+      648,  367,  648,  648,  365,  648,  649,  649,  649,  360,
+
+      359,  356,  355,  649,  649,  649,  650,  650,  650,  650,
+      650,  650,  650,  650,  650,  650,  650,  650,  650,  650,
+      650,  650,  650,  651,  354,  353,  651,  651,  351,  651,
+      651,  350,  651,  652,  652,  652,  652,  652,  652,  652,
       652,  652,  652,  652,  652,  652,  652,  652,  652,  652,
-      652,  652,  652,  652,  652,  652,  652,  653,  653,  653,
-      346,  344,  343,  342,  653,  653,  653,  654,  341,  339,
-      338,  337,  333,  332,  654,  654,  655,  655,  655,  330,
-      327,  326,  325,  655,  655,  655,  656,  656,  656,  656,
-
-      656,  656,  656,  656,  656,  656,  656,  656,  656,  656,
-      656,  656,  656,  657,  657,  657,  324,  320,  319,  318,
-      657,  657,  657,  658,  658,  658,  658,  658,  658,  658,
-      658,  658,  658,  658,  658,  658,  658,  658,  658,  658,
+      653,  653,  653,  653,  653,  653,  653,  653,  653,  653,
+      653,  653,  653,  653,  653,  653,  653,  654,  654,  654,
+      349,  348,  347,  345,  654,  654,  654,  655,  344,  343,
+      342,  340,  339,  338,  655,  655,  656,  656,  656,  334,
+      333,  331,  328,  656,  656,  656,  657,  657,  657,  657,
+
+      657,  657,  657,  657,  657,  657,  657,  657,  657,  657,
+      657,  657,  657,  658,  658,  658,  327,  326,  325,  321,
+      658,  658,  658,  659,  659,  659,  659,  659,  659,  659,
       659,  659,  659,  659,  659,  659,  659,  659,  659,  659,
-      659,  659,  659,  659,  659,  659,  659,  660,  660,  660,
       660,  660,  660,  660,  660,  660,  660,  660,  660,  660,
-      660,  660,  660,  660,  661,  661,  661,  317,  316,  314,
-      313,  661,  661,  661,  662,  662,  662,  662,  662,  662,
-      662,  662,  662,  662,  662,  662,  662,  662,  662,  662,
-
-      662,  663,  663,  663,  663,  663,  663,  663,  663,  312,
-      310,  663,  308,  307,  304,  303,  302,  301,  300,  299,
-      298,  297,  296,  295,  294,  293,  292,  291,  290,  289,
-      288,  287,  286,  285,  284,  283,  281,  280,  278,  277,
-      276,  275,  274,  272,  271,  270,  269,  268,  267,  266,
-      264,  263,  262,  261,  260,  258,  257,  254,  253,  252,
-      251,  249,  243,  241,  240,  235,  229,  228,  227,  226,
-      225,  224,  223,  222,  221,  220,  219,  218,  217,  216,
-      215,  214,  213,  212,  210,  209,  208,  207,  206,  205,
-      204,  202,  200,  199,  198,  197,  196,  195,  194,  193,
-
-      192,  190,  189,  188,  187,  186,  185,  184,  183,  182,
-      181,  180,  179,  178,  177,  176,  174,  173,  172,  171,
-      170,  168,  167,  166,  165,  163,  159,  158,  145,  143,
-      142,  136,  135,  134,  133,  132,  125,  124,  123,  122,
-      121,  119,  118,  117,  116,  115,  114,  113,  111,  110,
-      109,  107,  106,  105,  104,  103,  102,  101,  100,   99,
-       96,   95,   94,   93,   91,   90,   89,   88,   87,   86,
-       85,   84,   82,   81,   80,   79,   78,   77,   76,   75,
-       74,   73,   71,   69,   51,   46,   35,   33,   31,   30,
-       25,   23,   22,   20,   18,   17,   16,   15,    9,    3,
-
-      621,  621,  621,  621,  621,  621,  621,  621,  621,  621,
-      621,  621,  621,  621,  621,  621,  621,  621,  621,  621,
-      621,  621,  621,  621,  621,  621,  621,  621,  621,  621,
-      621,  621,  621,  621,  621,  621,  621,  621,  621,  621,
-      621,  621,  621,  621,  621,  621,  621,  621,  621,  621,
-      621,  621,  621,  621,  621,  621,  621,  621,  621,  621,
-      621,  621,  621,  621,  621,  621,  621,  621
+      660,  660,  660,  660,  660,  660,  660,  661,  661,  661,
+      661,  661,  661,  661,  661,  661,  661,  661,  661,  661,
+      661,  661,  661,  661,  662,  662,  662,  320,  319,  318,
+      317,  662,  662,  662,  663,  663,  663,  663,  663,  663,
+      663,  663,  663,  663,  663,  663,  663,  663,  663,  663,
+
+      663,  664,  664,  664,  664,  664,  664,  664,  664,  315,
+      314,  664,  313,  311,  309,  308,  305,  304,  303,  302,
+      301,  300,  299,  298,  297,  296,  295,  294,  293,  292,
+      291,  290,  289,  288,  287,  286,  285,  284,  282,  281,
+      279,  278,  277,  276,  275,  273,  272,  271,  270,  269,
+      268,  267,  265,  264,  263,  262,  261,  259,  258,  255,
+      254,  253,  252,  250,  244,  242,  241,  236,  230,  229,
+      228,  227,  226,  225,  224,  223,  222,  221,  220,  219,
+      218,  217,  216,  215,  214,  213,  211,  210,  209,  208,
+      207,  206,  205,  203,  201,  200,  199,  198,  197,  196,
+
+      194,  193,  192,  190,  189,  188,  187,  186,  185,  184,
+      183,  182,  181,  180,  179,  178,  177,  176,  174,  173,
+      172,  171,  170,  168,  167,  166,  165,  163,  159,  158,
+      145,  143,  142,  136,  135,  134,  133,  132,  125,  124,
+      123,  122,  121,  119,  118,  117,  116,  115,  114,  113,
+      111,  110,  109,  107,  106,  105,  104,  103,  102,  101,
+      100,   96,   95,   94,   93,   91,   90,   89,   88,   87,
+       86,   85,   84,   82,   81,   80,   79,   78,   77,   76,
+       75,   74,   73,   71,   69,   51,   46,   35,   33,   31,
+       30,   25,   23,   22,   20,   18,   17,   16,   15,    9,
+
+        3,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622
     } ;
 
 extern int yy_flex_debug;
@@ -1450,9 +1450,9 @@ static AST_Decl *           idl_find_node (const char *);
 #undef ECHO
 #endif
 
-#line 1456 "fe/idl.yy.cpp"
+#line 1455 "fe/idl.yy.cpp"
 /* SO we don't choke on files that use \r\n */
-#line 1458 "fe/idl.yy.cpp"
+#line 1457 "fe/idl.yy.cpp"
 
 #define INITIAL 0
 
@@ -1468,34 +1468,34 @@ static AST_Decl *           idl_find_node (const char *);
 #define YY_EXTRA_TYPE void *
 #endif
 
-static int yy_init_globals ();
+static int yy_init_globals ( void );
 
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
-int yylex_destroy ();
+int yylex_destroy ( void );
 
-int yyget_debug ();
+int yyget_debug ( void );
 
 void yyset_debug ( int debug_flag  );
 
-YY_EXTRA_TYPE yyget_extra ();
+YY_EXTRA_TYPE yyget_extra ( void );
 
 void yyset_extra ( YY_EXTRA_TYPE user_defined  );
 
-FILE *yyget_in ();
+FILE *yyget_in ( void );
 
 void yyset_in  ( FILE * _in_str  );
 
-FILE *yyget_out ();
+FILE *yyget_out ( void );
 
 void yyset_out  ( FILE * _out_str  );
 
-            int yyget_leng ();
+            int yyget_leng ( void );
 
-char *yyget_text ();
+char *yyget_text ( void );
 
-int yyget_lineno ();
+int yyget_lineno ( void );
 
 void yyset_lineno ( int _line_number  );
 
@@ -1505,9 +1505,9 @@ void yyset_lineno ( int _line_number  );
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap ();
+extern "C" int yywrap ( void );
 #else
-extern int yywrap ();
+extern int yywrap ( void );
 #endif
 #endif
 
@@ -1527,9 +1527,9 @@ static int yy_flex_strlen ( const char * );
 
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
-static int yyinput ();
+static int yyinput ( void );
 #else
-static int input ();
+static int input ( void );
 #endif
 
 #endif
@@ -1614,9 +1614,9 @@ static int input ();
 #ifndef YY_DECL
 #define YY_DECL_IS_OURS 1
 
-extern int yylex ();
+extern int yylex (void);
 
-#define YY_DECL int yylex ()
+#define YY_DECL int yylex (void)
 #endif /* !YY_DECL */
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
@@ -1681,7 +1681,7 @@ YY_DECL
 #line 123 "fe/idl.ll"
 
 
-#line 1687 "fe/idl.yy.cpp"
+#line 1686 "fe/idl.yy.cpp"
 
     while ( /*CONSTCOND*/1 )        /* loops until end-of-file is reached */
         {
@@ -1708,14 +1708,14 @@ YY_DECL
             while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                 {
                 yy_current_state = (int) yy_def[yy_current_state];
-                if ( yy_current_state >= 622 )
+                if ( yy_current_state >= 623 )
                     yy_c = yy_meta[yy_c];
                 }
             yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
             *(yy_state_ptr)++ = yy_current_state;
             ++yy_cp;
             }
-        while ( yy_current_state != 621 );
+        while ( yy_current_state != 622 );
 
 yy_find_action:
         yy_current_state = *--(yy_state_ptr);
@@ -1827,96 +1827,101 @@ return IDL_SEQUENCE;
 case 17:
 YY_RULE_SETUP
 #line 141 "fe/idl.ll"
-return IDL_UNION;
+return IDL_MAP;
     YY_BREAK
 case 18:
 YY_RULE_SETUP
 #line 142 "fe/idl.ll"
-return IDL_FIXED;
+return IDL_UNION;
     YY_BREAK
 case 19:
 YY_RULE_SETUP
 #line 143 "fe/idl.ll"
-return IDL_SWITCH;
+return IDL_FIXED;
     YY_BREAK
 case 20:
 YY_RULE_SETUP
 #line 144 "fe/idl.ll"
-return IDL_CASE;
+return IDL_SWITCH;
     YY_BREAK
 case 21:
 YY_RULE_SETUP
 #line 145 "fe/idl.ll"
-return IDL_DEFAULT;
+return IDL_CASE;
     YY_BREAK
 case 22:
 YY_RULE_SETUP
 #line 146 "fe/idl.ll"
-return IDL_FLOAT;
+return IDL_DEFAULT;
     YY_BREAK
 case 23:
 YY_RULE_SETUP
 #line 147 "fe/idl.ll"
-return IDL_DOUBLE;
+return IDL_FLOAT;
     YY_BREAK
 case 24:
 YY_RULE_SETUP
 #line 148 "fe/idl.ll"
-return IDL_LONG;
+return IDL_DOUBLE;
     YY_BREAK
 case 25:
 YY_RULE_SETUP
 #line 149 "fe/idl.ll"
-return IDL_SHORT;
+return IDL_LONG;
     YY_BREAK
 case 26:
 YY_RULE_SETUP
 #line 150 "fe/idl.ll"
-return IDL_UNSIGNED;
+return IDL_SHORT;
     YY_BREAK
 case 27:
 YY_RULE_SETUP
 #line 151 "fe/idl.ll"
-return IDL_CHAR;
+return IDL_UNSIGNED;
     YY_BREAK
 case 28:
 YY_RULE_SETUP
 #line 152 "fe/idl.ll"
-return IDL_WCHAR;
+return IDL_CHAR;
     YY_BREAK
 case 29:
 YY_RULE_SETUP
 #line 153 "fe/idl.ll"
-return IDL_BOOLEAN;
+return IDL_WCHAR;
     YY_BREAK
 case 30:
 YY_RULE_SETUP
 #line 154 "fe/idl.ll"
-return IDL_OCTET;
+return IDL_BOOLEAN;
     YY_BREAK
 case 31:
 YY_RULE_SETUP
 #line 155 "fe/idl.ll"
-return IDL_VOID;
+return IDL_OCTET;
     YY_BREAK
 case 32:
 YY_RULE_SETUP
 #line 156 "fe/idl.ll"
-return IDL_NATIVE;
+return IDL_VOID;
     YY_BREAK
 case 33:
 YY_RULE_SETUP
 #line 157 "fe/idl.ll"
-return IDL_LOCAL;
+return IDL_NATIVE;
     YY_BREAK
 case 34:
 YY_RULE_SETUP
 #line 158 "fe/idl.ll"
-return IDL_ABSTRACT;
+return IDL_LOCAL;
     YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 160 "fe/idl.ll"
+#line 159 "fe/idl.ll"
+return IDL_ABSTRACT;
+    YY_BREAK
+case 36:
+YY_RULE_SETUP
+#line 161 "fe/idl.ll"
 {
   if (idl_global->idl_version_ >= IDL_VERSION_4)
     return IDL_INT8;
@@ -1926,9 +1931,9 @@ YY_RULE_SETUP
     }
 }
     YY_BREAK
-case 36:
+case 37:
 YY_RULE_SETUP
-#line 168 "fe/idl.ll"
+#line 169 "fe/idl.ll"
 {
   if (idl_global->idl_version_ >= IDL_VERSION_4)
     return IDL_UINT8;
@@ -1938,9 +1943,9 @@ YY_RULE_SETUP
     }
 }
     YY_BREAK
-case 37:
+case 38:
 YY_RULE_SETUP
-#line 176 "fe/idl.ll"
+#line 177 "fe/idl.ll"
 {
   if (idl_global->idl_version_ >= IDL_VERSION_4)
     return IDL_INT16;
@@ -1950,9 +1955,9 @@ YY_RULE_SETUP
     }
 }
     YY_BREAK
-case 38:
+case 39:
 YY_RULE_SETUP
-#line 184 "fe/idl.ll"
+#line 185 "fe/idl.ll"
 {
   if (idl_global->idl_version_ >= IDL_VERSION_4)
     return IDL_UINT16;
@@ -1962,9 +1967,9 @@ YY_RULE_SETUP
     }
 }
     YY_BREAK
-case 39:
+case 40:
 YY_RULE_SETUP
-#line 192 "fe/idl.ll"
+#line 193 "fe/idl.ll"
 {
   if (idl_global->idl_version_ >= IDL_VERSION_4)
     return IDL_INT32;
@@ -1974,9 +1979,9 @@ YY_RULE_SETUP
     }
 }
     YY_BREAK
-case 40:
+case 41:
 YY_RULE_SETUP
-#line 200 "fe/idl.ll"
+#line 201 "fe/idl.ll"
 {
   if (idl_global->idl_version_ >= IDL_VERSION_4)
     return IDL_UINT32;
@@ -1986,9 +1991,9 @@ YY_RULE_SETUP
     }
 }
     YY_BREAK
-case 41:
+case 42:
 YY_RULE_SETUP
-#line 208 "fe/idl.ll"
+#line 209 "fe/idl.ll"
 {
   if (idl_global->idl_version_ >= IDL_VERSION_4)
     return IDL_INT64;
@@ -1998,9 +2003,9 @@ YY_RULE_SETUP
     }
 }
     YY_BREAK
-case 42:
+case 43:
 YY_RULE_SETUP
-#line 216 "fe/idl.ll"
+#line 217 "fe/idl.ll"
 {
   if (idl_global->idl_version_ >= IDL_VERSION_4)
     return IDL_UINT64;
@@ -2010,218 +2015,230 @@ YY_RULE_SETUP
     }
 }
     YY_BREAK
-case 43:
+case 44:
 YY_RULE_SETUP
 #line 225 "fe/idl.ll"
+{
+  if (idl_global->idl_version_ >= IDL_VERSION_4)
+    return IDL_MAP;
+  else
+    {
+      REJECT;
+    }
+}
+    YY_BREAK
+case 45:
+YY_RULE_SETUP
+#line 234 "fe/idl.ll"
 return IDL_CUSTOM;
     YY_BREAK
-case 44:
+case 46:
 YY_RULE_SETUP
-#line 226 "fe/idl.ll"
+#line 235 "fe/idl.ll"
 return IDL_FACTORY;
     YY_BREAK
-case 45:
+case 47:
 YY_RULE_SETUP
-#line 227 "fe/idl.ll"
+#line 236 "fe/idl.ll"
 return IDL_PRIVATE;
     YY_BREAK
-case 46:
+case 48:
 YY_RULE_SETUP
-#line 228 "fe/idl.ll"
+#line 237 "fe/idl.ll"
 return IDL_PUBLIC;
     YY_BREAK
-case 47:
+case 49:
 YY_RULE_SETUP
-#line 229 "fe/idl.ll"
+#line 238 "fe/idl.ll"
 return IDL_SUPPORTS;
     YY_BREAK
-case 48:
+case 50:
 YY_RULE_SETUP
-#line 230 "fe/idl.ll"
+#line 239 "fe/idl.ll"
 return IDL_TRUNCATABLE;
     YY_BREAK
-case 49:
+case 51:
 YY_RULE_SETUP
-#line 231 "fe/idl.ll"
+#line 240 "fe/idl.ll"
 return IDL_VALUETYPE;
     YY_BREAK
-case 50:
+case 52:
 YY_RULE_SETUP
-#line 233 "fe/idl.ll"
+#line 242 "fe/idl.ll"
 return IDL_COMPONENT;
     YY_BREAK
-case 51:
+case 53:
 YY_RULE_SETUP
-#line 234 "fe/idl.ll"
+#line 243 "fe/idl.ll"
 return IDL_CONSUMES;
     YY_BREAK
-case 52:
+case 54:
 YY_RULE_SETUP
-#line 235 "fe/idl.ll"
+#line 244 "fe/idl.ll"
 return IDL_EMITS;
     YY_BREAK
-case 53:
+case 55:
 YY_RULE_SETUP
-#line 236 "fe/idl.ll"
+#line 245 "fe/idl.ll"
 return IDL_EVENTTYPE;
     YY_BREAK
-case 54:
+case 56:
 YY_RULE_SETUP
-#line 237 "fe/idl.ll"
+#line 246 "fe/idl.ll"
 return IDL_FINDER;
     YY_BREAK
-case 55:
+case 57:
 YY_RULE_SETUP
-#line 238 "fe/idl.ll"
+#line 247 "fe/idl.ll"
 return IDL_GETRAISES;
     YY_BREAK
-case 56:
+case 58:
 YY_RULE_SETUP
-#line 239 "fe/idl.ll"
+#line 248 "fe/idl.ll"
 return IDL_HOME;
     YY_BREAK
-case 57:
+case 59:
 YY_RULE_SETUP
-#line 240 "fe/idl.ll"
+#line 249 "fe/idl.ll"
 return IDL_IMPORT;
     YY_BREAK
-case 58:
+case 60:
 YY_RULE_SETUP
-#line 241 "fe/idl.ll"
+#line 250 "fe/idl.ll"
 return IDL_MULTIPLE;
     YY_BREAK
-case 59:
+case 61:
 YY_RULE_SETUP
-#line 242 "fe/idl.ll"
+#line 251 "fe/idl.ll"
 return IDL_PRIMARYKEY;
     YY_BREAK
-case 60:
+case 62:
 YY_RULE_SETUP
-#line 243 "fe/idl.ll"
+#line 252 "fe/idl.ll"
 return IDL_PROVIDES;
     YY_BREAK
-case 61:
+case 63:
 YY_RULE_SETUP
-#line 244 "fe/idl.ll"
+#line 253 "fe/idl.ll"
 return IDL_PUBLISHES;
     YY_BREAK
-case 62:
+case 64:
 YY_RULE_SETUP
-#line 245 "fe/idl.ll"
+#line 254 "fe/idl.ll"
 return IDL_SETRAISES;
     YY_BREAK
-case 63:
+case 65:
 YY_RULE_SETUP
-#line 246 "fe/idl.ll"
+#line 255 "fe/idl.ll"
 return IDL_TYPEID;
     YY_BREAK
-case 64:
+case 66:
 YY_RULE_SETUP
-#line 247 "fe/idl.ll"
+#line 256 "fe/idl.ll"
 return IDL_TYPEPREFIX;
     YY_BREAK
-case 65:
+case 67:
 YY_RULE_SETUP
-#line 248 "fe/idl.ll"
+#line 257 "fe/idl.ll"
 return IDL_USES;
     YY_BREAK
-case 66:
+case 68:
 YY_RULE_SETUP
-#line 249 "fe/idl.ll"
+#line 258 "fe/idl.ll"
 return IDL_MANAGES;
     YY_BREAK
-case 67:
+case 69:
 YY_RULE_SETUP
-#line 251 "fe/idl.ll"
+#line 260 "fe/idl.ll"
 return IDL_TYPENAME;
     YY_BREAK
-case 68:
+case 70:
 YY_RULE_SETUP
-#line 252 "fe/idl.ll"
+#line 261 "fe/idl.ll"
 return IDL_PORT;
     YY_BREAK
-case 69:
+case 71:
 YY_RULE_SETUP
-#line 253 "fe/idl.ll"
+#line 262 "fe/idl.ll"
 return IDL_MIRRORPORT;
     YY_BREAK
-case 70:
+case 72:
 YY_RULE_SETUP
-#line 254 "fe/idl.ll"
+#line 263 "fe/idl.ll"
 return IDL_PORTTYPE;
     YY_BREAK
-case 71:
+case 73:
 YY_RULE_SETUP
-#line 255 "fe/idl.ll"
+#line 264 "fe/idl.ll"
 return IDL_CONNECTOR;
     YY_BREAK
-case 72:
+case 74:
 YY_RULE_SETUP
-#line 256 "fe/idl.ll"
+#line 265 "fe/idl.ll"
 return IDL_ALIAS;
     YY_BREAK
-case 73:
+case 75:
 YY_RULE_SETUP
-#line 258 "fe/idl.ll"
+#line 267 "fe/idl.ll"
 return IDL_TRUETOK;
     YY_BREAK
-case 74:
+case 76:
 YY_RULE_SETUP
-#line 259 "fe/idl.ll"
+#line 268 "fe/idl.ll"
 return IDL_FALSETOK;
     YY_BREAK
-case 75:
+case 77:
 YY_RULE_SETUP
-#line 261 "fe/idl.ll"
+#line 270 "fe/idl.ll"
 return IDL_INOUT;
     YY_BREAK
-case 76:
+case 78:
 YY_RULE_SETUP
-#line 262 "fe/idl.ll"
+#line 271 "fe/idl.ll"
 return IDL_IN;
     YY_BREAK
-case 77:
+case 79:
 YY_RULE_SETUP
-#line 263 "fe/idl.ll"
+#line 272 "fe/idl.ll"
 return IDL_OUT;
     YY_BREAK
-case 78:
+case 80:
 YY_RULE_SETUP
-#line 264 "fe/idl.ll"
+#line 273 "fe/idl.ll"
 return IDL_ONEWAY;
     YY_BREAK
-case 79:
+case 81:
 YY_RULE_SETUP
-#line 266 "fe/idl.ll"
+#line 275 "fe/idl.ll"
 return IDL_LEFT_SHIFT;
     YY_BREAK
-case 80:
+case 82:
 YY_RULE_SETUP
-#line 267 "fe/idl.ll"
+#line 276 "fe/idl.ll"
 return IDL_RIGHT_SHIFT;
     YY_BREAK
-case 81:
+case 83:
 YY_RULE_SETUP
-#line 268 "fe/idl.ll"
+#line 277 "fe/idl.ll"
 {
                   tao_yylval.strval = ACE::strnew ("::");
                   return IDL_SCOPE_DELIMITOR;
                 }
     YY_BREAK
-case 82:
-/* rule 82 can match eol */
+case 84:
+/* rule 84 can match eol */
 YY_RULE_SETUP
-#line 273 "fe/idl.ll"
+#line 282 "fe/idl.ll"
 return IDL_ANNOTATION_DECL; // Allow annotation names that start with "annotation"
     YY_BREAK
-case 83:
+case 85:
 YY_RULE_SETUP
-#line 274 "fe/idl.ll"
+#line 283 "fe/idl.ll"
 return IDL_ANNOTATION_SYMBOL;
     YY_BREAK
-case 84:
+case 86:
 YY_RULE_SETUP
-#line 276 "fe/idl.ll"
+#line 285 "fe/idl.ll"
 {
   // Make sure that this identifier is not a C++ keyword. If it is,
   // prepend it with a _cxx_. Lookup in the perfect hash table for C++
@@ -2255,82 +2272,82 @@ YY_RULE_SETUP
   return IDENTIFIER;
 }
     YY_BREAK
-case 85:
+case 87:
 YY_RULE_SETUP
-#line 309 "fe/idl.ll"
+#line 318 "fe/idl.ll"
 {
                   tao_yylval.dval = idl_atof (ace_yytext);
                   return IDL_FLOATING_PT_LITERAL;
                 }
     YY_BREAK
-case 86:
+case 88:
 YY_RULE_SETUP
-#line 313 "fe/idl.ll"
+#line 322 "fe/idl.ll"
 {
                   tao_yylval.dval = idl_atof (ace_yytext);
                   return IDL_FLOATING_PT_LITERAL;
                 }
     YY_BREAK
-case 87:
+case 89:
 YY_RULE_SETUP
-#line 318 "fe/idl.ll"
+#line 327 "fe/idl.ll"
 {
                   tao_yylval.fixval = ACE_CDR::Fixed::from_string (ace_yytext);
                   return IDL_FIXED_PT_LITERAL;
                 }
     YY_BREAK
-case 88:
+case 90:
 YY_RULE_SETUP
-#line 323 "fe/idl.ll"
+#line 332 "fe/idl.ll"
 {
                   tao_yylval.ival = idl_atoi (ace_yytext, 10);
                   return IDL_INTEGER_LITERAL;
                 }
     YY_BREAK
-case 89:
+case 91:
 YY_RULE_SETUP
-#line 327 "fe/idl.ll"
+#line 336 "fe/idl.ll"
 {
                   tao_yylval.uival = idl_atoui (ace_yytext, 10);
                   return IDL_UINTEGER_LITERAL;
                 }
     YY_BREAK
-case 90:
+case 92:
 YY_RULE_SETUP
-#line 331 "fe/idl.ll"
+#line 340 "fe/idl.ll"
 {
                   tao_yylval.ival = idl_atoi (ace_yytext, 16);
                   return IDL_INTEGER_LITERAL;
                 }
     YY_BREAK
-case 91:
+case 93:
 YY_RULE_SETUP
-#line 335 "fe/idl.ll"
+#line 344 "fe/idl.ll"
 {
                   tao_yylval.uival = idl_atoui (ace_yytext, 16);
                   return IDL_UINTEGER_LITERAL;
                 }
     YY_BREAK
-case 92:
+case 94:
 YY_RULE_SETUP
-#line 339 "fe/idl.ll"
+#line 348 "fe/idl.ll"
 {
                   tao_yylval.ival = idl_atoi (ace_yytext, 8);
                   return IDL_INTEGER_LITERAL;
                 }
     YY_BREAK
-case 93:
+case 95:
 YY_RULE_SETUP
-#line 343 "fe/idl.ll"
+#line 352 "fe/idl.ll"
 {
                   tao_yylval.uival = idl_atoui (ace_yytext, 8);
                   return IDL_UINTEGER_LITERAL;
                 }
     YY_BREAK
-case 94:
-/* rule 94 can match eol */
+case 96:
+/* rule 96 can match eol */
 YY_RULE_SETUP
-#line 348 "fe/idl.ll"
+#line 357 "fe/idl.ll"
 {
                   /* Skip the quotes */
                   char * const tmp = ace_yytext;
@@ -2352,10 +2369,10 @@ YY_RULE_SETUP
                   return IDL_STRING_LITERAL;
                 }
     YY_BREAK
-case 95:
-/* rule 95 can match eol */
+case 97:
+/* rule 97 can match eol */
 YY_RULE_SETUP
-#line 368 "fe/idl.ll"
+#line 377 "fe/idl.ll"
 {
                   /* Skip the bookends */
                   char * const tmp = ACE_OS::strdup (ace_yytext);
@@ -2376,102 +2393,90 @@ YY_RULE_SETUP
                   return IDL_WSTRING_LITERAL;
                 }
     YY_BREAK
-case 96:
+case 98:
 YY_RULE_SETUP
-#line 387 "fe/idl.ll"
+#line 396 "fe/idl.ll"
 {
                   tao_yylval.cval = ace_yytext[1];
                   return IDL_CHARACTER_LITERAL;
                 }
     YY_BREAK
-case 97:
+case 99:
 YY_RULE_SETUP
-#line 391 "fe/idl.ll"
+#line 400 "fe/idl.ll"
 {
                   // octal character constant
                   tao_yylval.cval = idl_escape_reader (ace_yytext + 1);
                   return IDL_CHARACTER_LITERAL;
                 }
     YY_BREAK
-case 98:
+case 100:
 YY_RULE_SETUP
-#line 396 "fe/idl.ll"
+#line 405 "fe/idl.ll"
 {
                   // hexadecimal character constant
                   tao_yylval.cval = idl_escape_reader (ace_yytext + 1);
                   return IDL_CHARACTER_LITERAL;
                 }
     YY_BREAK
-case 99:
+case 101:
 YY_RULE_SETUP
-#line 401 "fe/idl.ll"
+#line 410 "fe/idl.ll"
 {
                   tao_yylval.cval = idl_escape_reader (ace_yytext + 1);
                   return IDL_CHARACTER_LITERAL;
                 }
     YY_BREAK
-case 100:
+case 102:
 YY_RULE_SETUP
-#line 405 "fe/idl.ll"
+#line 414 "fe/idl.ll"
 {
                   // wide character constant
                   tao_yylval.wcval = ace_yytext[2];
                   return IDL_WCHAR_LITERAL;
                 }
     YY_BREAK
-case 101:
+case 103:
 YY_RULE_SETUP
-#line 410 "fe/idl.ll"
+#line 419 "fe/idl.ll"
 {
                   // hexadecimal wide character constant
                   tao_yylval.wcval = idl_wchar_escape_reader (ace_yytext + 2);
                   return IDL_WCHAR_LITERAL;
                 }
     YY_BREAK
-case 102:
-/* rule 102 can match eol */
-#line 416 "fe/idl.ll"
-case 103:
-/* rule 103 can match eol */
-YY_RULE_SETUP
-#line 416 "fe/idl.ll"
-{/* remember pragma */
-                  idl_global->set_lineno (idl_global->lineno () + 1);
-                  idl_store_pragma (ace_yytext);
-                  break;
-                }
-    YY_BREAK
 case 104:
 /* rule 104 can match eol */
-#line 422 "fe/idl.ll"
+#line 425 "fe/idl.ll"
 case 105:
 /* rule 105 can match eol */
 YY_RULE_SETUP
-#line 422 "fe/idl.ll"
-{/* ignore file */
-                  idl_global->set_lineno(idl_global->lineno () + 1);
+#line 425 "fe/idl.ll"
+{/* remember pragma */
+                  idl_global->set_lineno (idl_global->lineno () + 1);
+                  idl_store_pragma (ace_yytext);
                   break;
                 }
     YY_BREAK
 case 106:
 /* rule 106 can match eol */
-#line 427 "fe/idl.ll"
+#line 431 "fe/idl.ll"
 case 107:
 /* rule 107 can match eol */
 YY_RULE_SETUP
-#line 427 "fe/idl.ll"
-{
-                  idl_parse_line_and_file (ace_yytext);
+#line 431 "fe/idl.ll"
+{/* ignore file */
+                  idl_global->set_lineno(idl_global->lineno () + 1);
                   break;
                 }
     YY_BREAK
 case 108:
 /* rule 108 can match eol */
-#line 432 "fe/idl.ll"
+#line 436 "fe/idl.ll"
 case 109:
 /* rule 109 can match eol */
 YY_RULE_SETUP
-#line 432 "fe/idl.ll"
+#line 436 "fe/idl.ll"
 {
                   idl_parse_line_and_file (ace_yytext);
                   break;
@@ -2479,11 +2484,11 @@ YY_RULE_SETUP
     YY_BREAK
 case 110:
 /* rule 110 can match eol */
-#line 437 "fe/idl.ll"
+#line 441 "fe/idl.ll"
 case 111:
 /* rule 111 can match eol */
 YY_RULE_SETUP
-#line 437 "fe/idl.ll"
+#line 441 "fe/idl.ll"
 {
                   idl_parse_line_and_file (ace_yytext);
                   break;
@@ -2491,11 +2496,11 @@ YY_RULE_SETUP
     YY_BREAK
 case 112:
 /* rule 112 can match eol */
-#line 442 "fe/idl.ll"
+#line 446 "fe/idl.ll"
 case 113:
 /* rule 113 can match eol */
 YY_RULE_SETUP
-#line 442 "fe/idl.ll"
+#line 446 "fe/idl.ll"
 {
                   idl_parse_line_and_file (ace_yytext);
                   break;
@@ -2503,30 +2508,42 @@ YY_RULE_SETUP
     YY_BREAK
 case 114:
 /* rule 114 can match eol */
-#line 447 "fe/idl.ll"
+#line 451 "fe/idl.ll"
 case 115:
 /* rule 115 can match eol */
 YY_RULE_SETUP
-#line 447 "fe/idl.ll"
+#line 451 "fe/idl.ll"
 {
-                  /* ignore cpp ident */
-                  idl_global->set_lineno (idl_global->lineno () + 1);
+                  idl_parse_line_and_file (ace_yytext);
                   break;
                 }
     YY_BREAK
 case 116:
 /* rule 116 can match eol */
+#line 456 "fe/idl.ll"
+case 117:
+/* rule 117 can match eol */
 YY_RULE_SETUP
-#line 452 "fe/idl.ll"
+#line 456 "fe/idl.ll"
+{
+                  /* ignore cpp ident */
+                  idl_global->set_lineno (idl_global->lineno () + 1);
+                  break;
+                }
+    YY_BREAK
+case 118:
+/* rule 118 can match eol */
+YY_RULE_SETUP
+#line 461 "fe/idl.ll"
 {
                   /* ignore comments */
                   idl_global->set_lineno(idl_global->lineno () + 1);
                   break;
                 }
     YY_BREAK
-case 117:
+case 119:
 YY_RULE_SETUP
-#line 457 "fe/idl.ll"
+#line 466 "fe/idl.ll"
 {
                   for (;;)
                     {
@@ -2547,31 +2564,31 @@ YY_RULE_SETUP
                   break;
                 }
     YY_BREAK
-case 118:
+case 120:
 YY_RULE_SETUP
-#line 476 "fe/idl.ll"
+#line 485 "fe/idl.ll"
 break;
     YY_BREAK
-case 119:
-/* rule 119 can match eol */
+case 121:
+/* rule 121 can match eol */
 YY_RULE_SETUP
-#line 477 "fe/idl.ll"
+#line 486 "fe/idl.ll"
 {
                   idl_global->set_lineno (idl_global->lineno () + 1);
                   break;
                 }
     YY_BREAK
-case 120:
+case 122:
 YY_RULE_SETUP
-#line 481 "fe/idl.ll"
+#line 490 "fe/idl.ll"
 return ace_yytext[0];
     YY_BREAK
-case 121:
+case 123:
 YY_RULE_SETUP
-#line 483 "fe/idl.ll"
+#line 492 "fe/idl.ll"
 ECHO;
     YY_BREAK
-#line 2577 "fe/idl.yy.cpp"
+#line 2593 "fe/idl.yy.cpp"
             case YY_STATE_EOF(INITIAL):
                 yyterminate();
 
@@ -2712,7 +2729,7 @@ ECHO;
  *    EOB_ACT_CONTINUE_SCAN - continue scanning from current position
  *    EOB_ACT_END_OF_FILE - end of file
  */
-static int yy_get_next_buffer ()
+static int yy_get_next_buffer (void)
 {
         char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
     char *source = (yytext_ptr);
@@ -2766,6 +2783,7 @@ static int yy_get_next_buffer ()
 
             YY_FATAL_ERROR(
 "input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
+
             }
 
         if ( num_to_read > YY_READ_BUF_SIZE )
@@ -2819,7 +2837,7 @@ static int yy_get_next_buffer ()
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
-    static yy_state_type yy_get_previous_state ()
+    static yy_state_type yy_get_previous_state (void)
 {
     yy_state_type yy_current_state;
     char *yy_cp;
@@ -2836,7 +2854,7 @@ static int yy_get_next_buffer ()
         while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
             {
             yy_current_state = (int) yy_def[yy_current_state];
-            if ( yy_current_state >= 622 )
+            if ( yy_current_state >= 623 )
                 yy_c = yy_meta[yy_c];
             }
         yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -2859,11 +2877,11 @@ static int yy_get_next_buffer ()
     while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
         {
         yy_current_state = (int) yy_def[yy_current_state];
-        if ( yy_current_state >= 622 )
+        if ( yy_current_state >= 623 )
             yy_c = yy_meta[yy_c];
         }
     yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-    yy_is_jam = (yy_current_state == 621);
+    yy_is_jam = (yy_current_state == 622);
     if ( ! yy_is_jam )
         *(yy_state_ptr)++ = yy_current_state;
 
@@ -2913,9 +2931,9 @@ static int yy_get_next_buffer ()
 
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
-    static int yyinput ()
+    static int yyinput (void)
 #else
-    static int input  ()
+    static int input  (void)
 #endif
 
 {
@@ -2994,6 +3012,7 @@ static int yy_get_next_buffer ()
  */
     void yyrestart  (FILE * input_file )
 {
+
     if ( ! YY_CURRENT_BUFFER ){
         yyensure_buffer_stack ();
         YY_CURRENT_BUFFER_LVALUE =
@@ -3010,6 +3029,7 @@ static int yy_get_next_buffer ()
  */
     void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
+
     /* TODO. We should be able to replace this entire function body
      * with
      *        yypop_buffer_state();
@@ -3038,7 +3058,7 @@ static int yy_get_next_buffer ()
     (yy_did_buffer_switch_on_eof) = 1;
 }
 
-static void yy_load_buffer_state  ()
+static void yy_load_buffer_state  (void)
 {
         (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
     (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
@@ -3082,6 +3102,7 @@ static void yy_load_buffer_state  ()
  */
     void yy_delete_buffer (YY_BUFFER_STATE  b )
 {
+
     if ( ! b )
         return;
 
@@ -3185,7 +3206,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
  *  The next element becomes the new top.
  *
  */
-void yypop_buffer_state ()
+void yypop_buffer_state (void)
 {
         if (!YY_CURRENT_BUFFER)
         return;
@@ -3204,11 +3225,12 @@ void yypop_buffer_state ()
 /* Allocates the stack if it does not exist.
  *  Guarantees space for at least one push.
  */
-static void yyensure_buffer_stack ()
+static void yyensure_buffer_stack (void)
 {
     yy_size_t num_to_alloc;
 
     if (!(yy_buffer_stack)) {
+
         /* First allocation is just for 2 elements, since we don't know if this
          * scanner will even need a stack. We use 2 instead of 1 to avoid an
          * immediate realloc on the next call.
@@ -3228,6 +3250,7 @@ static void yyensure_buffer_stack ()
     }
 
     if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
         /* Increase the buffer to prepare for a possible push. */
         yy_size_t grow_size = 8 /* arbitrary grow size */;
 
@@ -3290,6 +3313,7 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
  */
 YY_BUFFER_STATE yy_scan_string (const char * yystr )
 {
+
     return yy_scan_bytes( yystr, (int) strlen(yystr) );
 }
 
@@ -3362,15 +3386,16 @@ static void yynoreturn yy_fatal_error (const char* msg )
 /** Get the current line number.
  *
  */
-int yyget_lineno  ()
+int yyget_lineno  (void)
 {
+
     return yylineno;
 }
 
 /** Get the input stream.
  *
  */
-FILE *yyget_in  ()
+FILE *yyget_in  (void)
 {
         return yyin;
 }
@@ -3378,7 +3403,7 @@ FILE *yyget_in  ()
 /** Get the output stream.
  *
  */
-FILE *yyget_out  ()
+FILE *yyget_out  (void)
 {
         return yyout;
 }
@@ -3386,7 +3411,7 @@ FILE *yyget_out  ()
 /** Get the length of the current token.
  *
  */
-int yyget_leng  ()
+int yyget_leng  (void)
 {
         return yyleng;
 }
@@ -3395,7 +3420,7 @@ int yyget_leng  ()
  *
  */
 
-char *yyget_text  ()
+char *yyget_text  (void)
 {
         return yytext;
 }
@@ -3406,6 +3431,7 @@ char *yyget_text  ()
  */
 void yyset_lineno (int  _line_number )
 {
+
     yylineno = _line_number;
 }
 
@@ -3425,7 +3451,7 @@ void yyset_out (FILE *  _out_str )
         yyout = _out_str ;
 }
 
-int yyget_debug  ()
+int yyget_debug  (void)
 {
         return yy_flex_debug;
 }
@@ -3435,7 +3461,7 @@ void yyset_debug (int  _bdebug )
         yy_flex_debug = _bdebug ;
 }
 
-static int yy_init_globals ()
+static int yy_init_globals (void)
 {
         /* Initialization is the same as for the non-reentrant scanner.
      * This function is called from yylex_destroy(), so don't allocate here.
@@ -3469,8 +3495,9 @@ static int yy_init_globals ()
 }
 
 /* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy  ()
+int yylex_destroy  (void)
 {
+
     /* Pop the buffer stack, destroying each element. */
     while(YY_CURRENT_BUFFER){
         yy_delete_buffer( YY_CURRENT_BUFFER  );
@@ -3499,6 +3526,7 @@ int yylex_destroy  ()
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char* s1, const char * s2, int n )
 {
+
     int i;
     for ( i = 0; i < n; ++i )
         s1[i] = s2[i];
@@ -3523,6 +3551,7 @@ void *yyalloc (yy_size_t  size )
 
 void *yyrealloc  (void * ptr, yy_size_t  size )
 {
+
     /* The cast to (char *) in the following accommodates both
      * implementations that use char* generic pointers, and those
      * that use void* generic pointers.  It works with the latter
@@ -3540,7 +3569,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 483 "fe/idl.ll"
+#line 492 "fe/idl.ll"
 
         /* subroutines */
 
@@ -4364,7 +4393,7 @@ idl_get_pragma_string (char *pragma)
 
   if (!end)
     {
-      idl_global->err ()->syntax_error ( IDL_GlobalData::PS_PragmaPrefixSyntax);
+      idl_global->err ()->syntax_error (IDL_GlobalData::PS_PragmaPrefixSyntax);
 
       return nullptr;
     }
diff --git a/TAO/TAO_IDL/include/ast.h b/TAO/TAO_IDL/include/ast.h
index 10360ac0c5361..685462c907e3c 100644
--- a/TAO/TAO_IDL/include/ast.h
+++ b/TAO/TAO_IDL/include/ast.h
@@ -114,6 +114,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include        "ast_enum_val.h"        // class AST_EnumVal
 #include        "ast_array.h"           // class AST_Array
 #include        "ast_sequence.h"        // class AST_Sequence
+#include        "ast_map.h"             // class AST_Map
 #include        "ast_string.h"          // class AST_String
 #include        "ast_typedef.h"         // class AST_Typedef
 #include        "ast_native.h"          // class AST_Native
diff --git a/TAO/TAO_IDL/include/ast_annotation_appl.h b/TAO/TAO_IDL/include/ast_annotation_appl.h
index 941a8ab088349..ce160a1c7d8db 100644
--- a/TAO/TAO_IDL/include/ast_annotation_appl.h
+++ b/TAO/TAO_IDL/include/ast_annotation_appl.h
@@ -107,4 +107,9 @@ struct Decl_Annotations_Pair {
   AST_Annotation_Appls *annotations;
 };
 
+struct Decl_Annotations_Pair_Pair {
+  Decl_Annotations_Pair *first;
+  Decl_Annotations_Pair *second;
+};
+
 #endif
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index 295b8906ba273..7ab1eb1348075 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -149,6 +149,7 @@ class TAO_IDL_FE_Export AST_Decl : public virtual COMMON_Base
       , NT_wstring                  // Denotes an IDL wstring
       , NT_array                    // Denotes an IDL array
       , NT_sequence                 // Denotes an IDL sequence
+      , NT_map                      // Denotes an IDL map
       , NT_typedef                  // Denotes a typedef
       , NT_pre_defined              // Denotes a predefined type
       , NT_native                   // Denotes a native type
diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h
index 61f78e6c27ad6..ea310c22b79de 100644
--- a/TAO/TAO_IDL/include/ast_generator.h
+++ b/TAO/TAO_IDL/include/ast_generator.h
@@ -87,6 +87,7 @@ class AST_Publishes;
 class AST_Emits;
 class AST_Consumes;
 class AST_Template_Module;
+class AST_Map;
 class AST_Template_Module_Inst;
 class AST_Template_Module_Ref;
 class AST_Param_Holder;
@@ -328,6 +329,14 @@ class TAO_IDL_FE_Export AST_Generator
                                          bool is_local,
                                          bool is_abstract);
 
+  // Create a node representing a map type.
+  virtual AST_Map *create_map (AST_Expression *v,
+                              AST_Type *key_bt,
+                              AST_Type *val_bt,
+                              UTL_ScopedName *n,
+                              bool is_local,
+                              bool is_abstract);
+
   // Create a node representing a string type.
   virtual AST_String *create_string (AST_Expression *v);
 
diff --git a/TAO/TAO_IDL/include/ast_map.h b/TAO/TAO_IDL/include/ast_map.h
new file mode 100644
index 0000000000000..c7791eea23268
--- /dev/null
+++ b/TAO/TAO_IDL/include/ast_map.h
@@ -0,0 +1,182 @@
+/*
+
+COPYRIGHT
+
+Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
+States of America.  All Rights Reserved.
+
+This product is protected by copyright and distributed under the following
+license restricting its use.
+
+The Interface Definition Language Compiler Front End (CFE) is made
+available for your use provided that you include this license and copyright
+notice on all media and documentation and the software program in which
+this product is incorporated in whole or part. You may copy and extend
+functionality (but may not remove functionality) of the Interface
+Definition Language CFE without charge, but you are not authorized to
+license or distribute it to anyone else except as part of a product or
+program developed by you or with the express written consent of Sun
+Microsystems, Inc. ("Sun").
+
+The names of Sun Microsystems, Inc. and any of its subsidiaries or
+affiliates may not be used in advertising or publicity pertaining to
+distribution of Interface Definition Language CFE as permitted herein.
+
+This license is effective until terminated by Sun for failure to comply
+with this license.  Upon termination, you shall destroy or return all code
+and documentation for the Interface Definition Language CFE.
+
+INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
+ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
+FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
+DEALING, USAGE OR TRADE PRACTICE.
+
+INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
+ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
+TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
+
+SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
+RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
+INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
+
+IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
+ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
+DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+Use, duplication, or disclosure by the government is subject to
+restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
+Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
+52.227-19.
+
+Sun, Sun Microsystems and the Sun logo are trademarks or registered
+trademarks of Sun Microsystems, Inc.
+
+SunSoft, Inc.
+2550 Garcia Avenue
+Mountain View, California  94043
+
+NOTE:
+
+SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
+trademarks or registered trademarks of Sun Microsystems, Inc.
+
+*/
+
+#ifndef _AST_MAP_AST_MAP_HH
+#define _AST_MAP_AST_MAP_HH
+
+#include "ast_concrete_type.h"
+
+
+class AST_Expression;
+class AST_Type;
+
+class TAO_IDL_FE_Export AST_Map : public virtual AST_ConcreteType
+{
+public:
+  AST_Map (AST_Expression *max_size,
+           AST_Type *key_bt,
+           AST_Type *val_bt,
+           UTL_ScopedName *n,
+           bool local,
+           bool abstract);
+
+  virtual ~AST_Map () = default;
+
+  virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
+  // Are we or the node represented by node involved in recursion.
+
+  // Data Accessors.
+  AST_Expression *max_size () const;
+
+  AST_Type *key_type () const;
+  AST_Type *value_type () const;
+
+  /**
+   * Returns the fully dealiased base type if it's a typedef. If it's not a
+   * typedef, the it returns the same value as as key_type().
+   */
+  AST_Type *primitive_key_type () const;
+
+  /**
+   * Returns the fully dealiased base type if it's a typedef. If it's not a
+   * typedef, the it returns the same value as as value_type().
+   */
+  AST_Type *primitive_value_type () const;
+
+  virtual bool unbounded () const;
+  // Is this map bounded or not.
+
+  // Recursively called on valuetype to check for legal use as
+  // a primary key. Overridden for valuetype, struct, map,
+  // union, array, typedef, and interface.
+  virtual bool legal_for_primary_key () const;
+
+  // Is the element type a forward declared struct or union
+  // that hasn't yet been fully defined?
+  virtual bool is_defined ();
+
+  // Cleanup method.
+  virtual void destroy ();
+
+  // AST Dumping.
+  virtual void dump (ACE_OSTREAM_TYPE &o);
+
+  // Visiting.
+  virtual int ast_accept (ast_visitor *visitor);
+
+  static AST_Decl::NodeType const NT;
+
+  /**
+   * Get and Set Annotations on the key type
+   */
+  ///{
+  AST_Annotation_Appls &key_type_annotations ();
+  void key_type_annotations (const AST_Annotation_Appls &annotations);
+  ///}
+
+  /**
+   * Get and Set Annotations on the value type
+   */
+  ///{
+  AST_Annotation_Appls &value_type_annotations ();
+  void value_type_annotations (const AST_Annotation_Appls &annotations);
+  ///}
+
+private:
+  // Data.
+  AST_Expression *pd_max_size;
+  // Maximum map size.
+
+  /**
+  * Key type for map
+  **/
+  AST_Type *key_pd_type;
+
+  /**
+  * Value type for map
+  **/
+  AST_Type *value_pd_type;
+
+  bool unbounded_;
+  // Whether we are bounded or unbounded.
+
+  bool owns_key_type_;
+  // If our key type is anonymous array or map, we're
+  // responsible for destroying it.
+  bool owns_value_type_;
+  // If our value type is anonymous array or map, we're
+  // responsible for destroying it.
+
+  /**
+   * Annotations on the key type
+   */
+  AST_Annotation_Appls key_type_annotations_;
+
+  /**
+   * Annotations on the value type
+   */
+  AST_Annotation_Appls value_type_annotations_;
+};
+
+#endif           // _AST_MAP_AST_MAP_HH
diff --git a/TAO/TAO_IDL/include/ast_visitor.h b/TAO/TAO_IDL/include/ast_visitor.h
index 70c4fc73f7e67..e3e3beef1848d 100644
--- a/TAO/TAO_IDL/include/ast_visitor.h
+++ b/TAO/TAO_IDL/include/ast_visitor.h
@@ -62,6 +62,7 @@ class AST_Constant;
 class AST_EnumVal;
 class AST_Array;
 class AST_Sequence;
+class AST_Map;
 class AST_String;
 class AST_Typedef;
 class AST_Root;
@@ -133,6 +134,7 @@ class TAO_IDL_FE_Export ast_visitor
   virtual int visit_enum_val (AST_EnumVal *node) = 0;
   virtual int visit_array (AST_Array *node) = 0;
   virtual int visit_sequence (AST_Sequence *node) = 0;
+  virtual int visit_map (AST_Map *node) = 0;
   virtual int visit_string (AST_String *node) = 0;
   virtual int visit_typedef (AST_Typedef *node) = 0;
   virtual int visit_root (AST_Root *node) = 0;
diff --git a/TAO/TAO_IDL/include/ast_visitor_reifying.h b/TAO/TAO_IDL/include/ast_visitor_reifying.h
index 6c7c5ef298157..fddd783693d5e 100644
--- a/TAO/TAO_IDL/include/ast_visitor_reifying.h
+++ b/TAO/TAO_IDL/include/ast_visitor_reifying.h
@@ -93,6 +93,7 @@ class ast_visitor_reifying : public ast_visitor
   virtual int visit_typedef (AST_Typedef *node);
   virtual int visit_array (AST_Array *node);
   virtual int visit_sequence (AST_Sequence *node);
+  virtual int visit_map (AST_Map *node);
   virtual int visit_predefined_type (AST_PredefinedType *node);
   virtual int visit_string (AST_String *node);
   virtual int visit_constant (AST_Constant *node);
diff --git a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h
index 1a0dafdd24109..59b24c2287606 100644
--- a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h
+++ b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h
@@ -71,6 +71,7 @@ class ast_visitor_tmpl_module_inst : public ast_visitor
   virtual int visit_enum_val (AST_EnumVal *node);
   virtual int visit_array (AST_Array *node);
   virtual int visit_sequence (AST_Sequence *node);
+  virtual int visit_map (AST_Map *node);
   virtual int visit_string (AST_String *node);
   virtual int visit_native (AST_Native *node);
   virtual int visit_valuebox (AST_ValueBox *node);
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index b59dec8c417c2..aa3182566dac5 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -234,6 +234,13 @@ class TAO_IDL_FE_Export IDL_GlobalData
     , PS_EnumQsSeen             // Seen '}' for enum
     , PS_EnumBodySeen           // Seen complete enum body
     , PS_EnumCommaSeen          // Seen ',' in list of enumerators
+    , PS_MapSeen                // Seen a MAP keyword
+    , PS_MapSqSeen              // Seen a '<' for map
+    , PS_MapQsSeen              // Seen a '>' for map
+    , PS_MapKeyTypeSeen         // Seen a key type decl for map
+    , PS_MapValueTypeSeen       // Seen a value type decl for map
+    , PS_MapCommaSeen           // Seen comma for map
+    , PS_MapExprSeen            // Seen a size expression for map
     , PS_SequenceSeen           // Seen a SEQUENCE keyword
     , PS_SequenceSqSeen         // Seen '<' for sequence
     , PS_SequenceQsSeen         // Seen '>' for sequence
@@ -779,9 +786,11 @@ class TAO_IDL_FE_Export IDL_GlobalData
   bool non_local_op_seen_;
   bool object_arg_seen_;
   bool octet_seq_seen_;
+  bool octet_map_seen_;
   bool operation_seen_;
   bool pseudo_seq_seen_;
   bool recursive_type_seen_;
+  bool map_seen_;
   bool seq_seen_;
   bool short_seq_seen_;
   bool special_basic_decl_seen_;
diff --git a/TAO/TAO_IDL/tao_idl_be.mpc b/TAO/TAO_IDL/tao_idl_be.mpc
index 91757abcc57bb..e7a69847fc8f1 100644
--- a/TAO/TAO_IDL/tao_idl_be.mpc
+++ b/TAO/TAO_IDL/tao_idl_be.mpc
@@ -35,6 +35,7 @@ project(TAO_IDL_BE) : acelib, install_lib, tao_rules, tao_output, tao_vc8warning
       be/be_visitor_operation
       be/be_visitor_root
       be/be_visitor_sequence
+      be/be_visitor_map
       be/be_visitor_structure
       be/be_visitor_structure_fwd
       be/be_visitor_typecode
@@ -219,6 +220,7 @@ project(TAO_IDL_BE_VIS_S) : acelib, install_lib, tao_rules, tao_output, tao_vc8w
   Source_Files {
     conditional(prop:static) {
       be/be_visitor_sequence
+      be/be_visitor_map
       be/be_visitor_structure
       be/be_visitor_structure_fwd
       be/be_visitor_typecode
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index 0eaf4f08f27a2..87c7640f211c7 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -272,6 +272,7 @@ IDL_GlobalData::reset_flag_seen ()
   seq_seen_ = false;
   short_seq_seen_ = false;
   special_basic_decl_seen_ = false;
+  map_seen_ = false;
   string_seen_ = false;
   string_member_seen_ = false;
   string_seq_seen_ = false;
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index 826c5536758ec..82757cb9f15b7 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -2301,6 +2301,18 @@ ifr_adding_visitor::visit_sequence (AST_Sequence *node)
   return 0;
 }
 
+int
+ifr_adding_visitor::visit_map (AST_Map *)
+{
+  ORBSVCS_ERROR_RETURN ((
+            LM_ERROR,
+            ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_map -")
+            ACE_TEXT (" maps are not supported\n")
+          ),
+          -1
+        );
+}
+
 int
 ifr_adding_visitor::visit_string (AST_String *node)
 {
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
index 61cc748ff5d33..ec06cf59ad2d3 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
@@ -70,6 +70,7 @@ class ifr_adding_visitor : public ifr_visitor
   virtual int visit_constant (AST_Constant *node);
   virtual int visit_array (AST_Array *node);
   virtual int visit_sequence (AST_Sequence *node);
+  virtual int visit_map (AST_Map *node);
   virtual int visit_string (AST_String *node);
   virtual int visit_typedef (AST_Typedef *node);
   virtual int visit_root (AST_Root *node);
diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
index b440b04541933..fb7b33e2bb245 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
@@ -314,6 +314,12 @@ ifr_visitor::visit_sequence (AST_Sequence *)
   return 0;
 }
 
+int
+ifr_visitor::visit_map (AST_Map *)
+{
+  return 0;
+}
+
 int
 ifr_visitor::visit_string (AST_String *)
 {
diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_visitor.h
index 9c43d0348a7ff..cf817101b09b0 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_visitor.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.h
@@ -82,6 +82,7 @@ class ifr_visitor : public ast_visitor
   virtual int visit_enum_val (AST_EnumVal *node);
   virtual int visit_array (AST_Array *node);
   virtual int visit_sequence (AST_Sequence *node);
+  virtual int visit_map (AST_Map *node);
   virtual int visit_string (AST_String *node);
   virtual int visit_typedef (AST_Typedef *node);
   virtual int visit_root (AST_Root *node);
diff --git a/TAO/tao/idl_features.h b/TAO/tao/idl_features.h
index c9453aede18ba..5c58231ee8463 100644
--- a/TAO/tao/idl_features.h
+++ b/TAO/tao/idl_features.h
@@ -65,7 +65,7 @@
 #endif
 
 #ifndef TAO_IDL_HAS_MAP
-#  define TAO_IDL_HAS_MAP 0
+#  define TAO_IDL_HAS_MAP TAO_IDL_IDL_VERSION >= 0x40000
 #endif
 
 #ifndef TAO_IDL_HAS_BITSET
diff --git a/TAO/tests/IDLv4/maps/.gitignore b/TAO/tests/IDLv4/maps/.gitignore
new file mode 100644
index 0000000000000..3091aa5100dcb
--- /dev/null
+++ b/TAO/tests/IDLv4/maps/.gitignore
@@ -0,0 +1,6 @@
+/testC.cpp
+/testC.h
+/testC.inl
+/testS.cpp
+/testS.h
+/maps
diff --git a/TAO/tests/IDLv4/maps/IDLv4_maps.mpc b/TAO/tests/IDLv4/maps/IDLv4_maps.mpc
new file mode 100644
index 0000000000000..fe9869df8d8f1
--- /dev/null
+++ b/TAO/tests/IDLv4/maps/IDLv4_maps.mpc
@@ -0,0 +1,10 @@
+project: taoexe {
+  exename = maps
+  idlflags += --idl-version 4
+  IDL_Files {
+    test.idl
+  }
+  Source_Files {
+    main.cpp
+  }
+}
diff --git a/TAO/tests/IDLv4/maps/main.cpp b/TAO/tests/IDLv4/maps/main.cpp
new file mode 100644
index 0000000000000..baf07e4060c63
--- /dev/null
+++ b/TAO/tests/IDLv4/maps/main.cpp
@@ -0,0 +1,36 @@
+#include "testC.h"
+
+#include "ace/OS_NS_stdlib.h"
+#include "ace/OS_main.h"
+#include <string>
+
+int ACE_TMAIN(int, ACE_TCHAR *[])
+{
+  // No need to test the actual map works as it's just a typedef to std::map
+  DataStruct testData;
+
+  RecurseStruct rStruct;
+  rStruct.iMapR[10] = rStruct;
+  // rStruct.rMapI[rStruct] = 10; // Structs as keys aren't really valid, as they fail to compile when generated via tao_idl
+
+  TestStruct testStruct;
+  testStruct.id = 42;
+  testStruct.msg = "Hello World!";
+
+  TestStructMap testStructMap;
+  testStructMap[42] = testStruct;
+
+  TestIntStringMap testIntStringMap;
+  testIntStringMap[42] = "Hello World!";
+
+  TestStructSeq testStructSeq(1, 1, TestStructSeq::allocbuf(1));
+  testStructSeq[0] = testStruct;
+
+  testData.intIntMap[4] = 100;
+  testData.stringStructsMap["test"] = testStruct;
+  testData.stringSequenceMap["test"] = testStructSeq;
+  testData.stringMapMap["test"] = testStructMap;
+  testData.mapStringMap[testIntStringMap] = "Hello World";
+
+  return EXIT_SUCCESS;
+}
diff --git a/TAO/tests/IDLv4/maps/run_test.pl b/TAO/tests/IDLv4/maps/run_test.pl
new file mode 100755
index 0000000000000..017390556b5b2
--- /dev/null
+++ b/TAO/tests/IDLv4/maps/run_test.pl
@@ -0,0 +1,24 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+use strict;
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+
+my $tao_idl = "$ENV{ACE_ROOT}/bin/tao_idl";
+if (exists $ENV{HOST_ROOT}) {
+    $tao_idl = "$ENV{HOST_ROOT}/bin/tao_idl";
+}
+
+my $target = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+my $proc = $target->CreateProcess ("maps");
+
+my $test = $proc->SpawnWaitKill ($target->ProcessStartWaitInterval ());
+
+if ($test != 0) {
+    print STDERR "ERROR: test returned $test\n";
+    exit 1;
+}
+
+exit 0;
diff --git a/TAO/tests/IDLv4/maps/test.idl b/TAO/tests/IDLv4/maps/test.idl
new file mode 100644
index 0000000000000..ed3165c833cb1
--- /dev/null
+++ b/TAO/tests/IDLv4/maps/test.idl
@@ -0,0 +1,32 @@
+struct RecurseStruct;
+typedef map<int32, RecurseStruct> IntRecursedMap;
+struct RecurseStruct {
+    IntRecursedMap iMapR;
+};
+
+struct TestStruct {
+    int32 id;
+    string msg;
+};
+
+typedef sequence<TestStruct> TestStructSeq;
+typedef map<int32, TestStruct> TestStructMap;
+typedef map<int32, string> TestIntStringMap;
+
+struct DataStruct {
+    // Bounded maps are not actually bounded as std::map doesn't support that
+
+    map<int32, int32> intIntMap;
+    // map<int32, int32, 4> intIntMapBounded;
+
+    map<string, TestStruct> stringStructsMap;
+    // map<string, TestStruct, 4> stringStructsMapBounded;
+
+    map<string, TestStructSeq> stringSequenceMap;
+    // map<string, TestStructSeq, 2> stringSequenceMapBounded;
+
+    map<string, TestStructMap> stringMapMap;
+    // map<string, TestStructMap, 2> stringMapMapBounded;
+
+    map<TestIntStringMap, string> mapStringMap;
+};