Merge pull request #2379 from mitza-oci/tao2-idl-map

[TAO 2] Fixes for IDL maps

Author: mitza-oci

TAO/TAO_IDL/ast/ast_array.cpp

@@ -226,6 +226,7 @@ AST_Array::set_base_type (AST_Type *nbt)
   AST_Decl::NodeType bnt = nbt->node_type ();
 
   if (bnt == AST_Decl::NT_sequence
+      || bnt == AST_Decl::NT_map
       || bnt == AST_Decl::NT_param_holder)
     {
       this->owns_base_type_ = true;

TAO/TAO_IDL/ast/ast_decl.cpp

@@ -68,6 +68,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include <ast_field.h>
 #include <ast_structure.h>
 #include <ast_sequence.h>
+#include <ast_map.h>
 #include <ast_string.h>
 #include <ast_typedef.h>
 #include <ast_visitor.h>
@@ -857,6 +858,11 @@ AST_Decl::node_type_to_string (NodeType nt)
     }
 }
 
+const char *AST_Decl::node_type_name () const
+{
+  return node_type_to_string (pd_node_type);
+}
+
 // Return TRUE if one of my ancestor scopes is "s"
 // and FALSE otherwise.
 bool
@@ -1494,6 +1500,14 @@ AST_Decl::contains_wstring ()
             break;
           }
 
+        case AST_Decl::NT_map:
+          {
+            AST_Map *m = dynamic_cast<AST_Map *> (this);
+            this->contains_wstring_ = m->key_type ()->contains_wstring () ||
+              m->value_type ()->contains_wstring ();
+            break;
+          }
+
         case AST_Decl::NT_attr:
         case AST_Decl::NT_field:
         case AST_Decl::NT_union_branch:

TAO/TAO_IDL/ast/ast_field.cpp

@@ -103,6 +103,7 @@ AST_Field::AST_Field (AST_Type *ft,
   this->owns_base_type_ =
     fnt == AST_Decl::NT_array
     || fnt == AST_Decl::NT_sequence
+    || fnt == AST_Decl::NT_map
     || fnt == AST_Decl::NT_fixed
     || fnt == AST_Decl::NT_param_holder;
 
@@ -136,6 +137,7 @@ AST_Field::AST_Field (AST_Decl::NodeType nt,
   this->owns_base_type_ =
     fnt == AST_Decl::NT_array
     || fnt == AST_Decl::NT_sequence
+    || fnt == AST_Decl::NT_map
     || fnt == AST_Decl::NT_fixed
     || fnt == AST_Decl::NT_param_holder;
 

TAO/TAO_IDL/ast/ast_sequence.cpp

@@ -141,6 +141,7 @@ AST_Sequence::AST_Sequence (AST_Expression *ms,
   this->owns_base_type_ =
     nt == AST_Decl::NT_array
     || nt == AST_Decl::NT_sequence
+    || nt == AST_Decl::NT_map
     || nt == AST_Decl::NT_param_holder;
 }
 
@@ -180,7 +181,8 @@ AST_Sequence::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
   if (nt != AST_Decl::NT_struct
       && nt != AST_Decl::NT_union
       && nt != AST_Decl::NT_valuetype
-      && nt != AST_Decl::NT_sequence)
+      && nt != AST_Decl::NT_sequence
+      && nt != AST_Decl::NT_map)
     {
       return false;
     }

TAO/TAO_IDL/be/be_codegen.cpp

@@ -3772,7 +3772,7 @@ TAO_CodeGen::make_rand_extension (char * const t)
 
   // Factor out the constant coefficient.
   float const coefficient =
-    static_cast<float> (MAX_VAL / (RAND_MAX + 1.0f));
+    static_cast<float> (MAX_VAL / (static_cast<float> (RAND_MAX) + 1.0f));
 
   for (unsigned int n = 0; n < NUM_CHARS; ++n)
     {

TAO/TAO_IDL/be/be_visitor_array/array.h

@@ -23,6 +23,7 @@
 #include "be_structure.h"
 #include "be_union.h"
 #include "be_sequence.h"
+#include "be_map.h"
 #include "be_helper.h"
 #include "be_extern.h"
 #include "utl_identifier.h"

TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp

@@ -518,6 +518,12 @@ be_visitor_array_cdr_op_cs::visit_sequence (be_sequence *node)
   return this->visit_node (node);
 }
 
+int
+be_visitor_array_cdr_op_cs::visit_map (be_map *node)
+{
+  return this->visit_node (node);
+}
+
 int
 be_visitor_array_cdr_op_cs::visit_string (be_string *node)
 {

TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp

@@ -86,6 +86,12 @@ be_visitor_sequence_buffer_type::visit_sequence (be_sequence *node)
   return this->visit_node (node);
 }
 
+int
+be_visitor_sequence_buffer_type::visit_map (be_map *node)
+{
+  return this->visit_node (node);
+}
+
 int
 be_visitor_sequence_buffer_type::visit_interface (be_interface *node)
 {

TAO/TAO_IDL/be/be_visitor_sequence/sequence.h

@@ -23,6 +23,7 @@
 #include "be_home.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"

TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp

@@ -406,6 +406,18 @@ be_visitor_union_branch_private_ch::visit_predefined_type (
 
 int
 be_visitor_union_branch_private_ch::visit_sequence (be_sequence *node)
+{
+  return visit_seq_map_common (node);
+}
+
+int
+be_visitor_union_branch_private_ch::visit_map (be_map *node)
+{
+  return visit_seq_map_common (node);
+}
+
+int
+be_visitor_union_branch_private_ch::visit_seq_map_common (be_type *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
@@ -425,7 +437,7 @@ be_visitor_union_branch_private_ch::visit_sequence (be_sequence *node)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_private_ch::"
-                         "visit_sequence - "
+                         "visit_seq_map_common - "
                          "bad context information\n"),
                         -1);
     }