Remove weak from downcast method.

[polintos/scott/priv.git] / idlcomp / languages / c++ / main.cc

diff --git a/idlcomp/languages/c++/main.cc b/idlcomp/languages/c++/main.cc
index 7c6ebe8243e27fe00ab3d002b1f7348502402f35..3157a5597e3b7369d510c2cc18e7dfa3fb93d640 100644 (file)
--- a/idlcomp/languages/c++/main.cc
+++ b/idlcomp/languages/c++/main.cc
@@ -1,5 +1,8 @@
 // idlcomp/languages/c++/main.cc -- C++ IDL binding
 //
+// A lot of the complexity in here would just go away if C++ could handle
+// out-of-order declarations.
+//
 // This software is copyright (c) 2006 Scott Wood <scott@buserror.net>.
 // 
 // This software is provided 'as-is', without any express or implied warranty.
@@ -52,7 +55,7 @@ dirname(dir)
                throw UserError();
        }
        
-       file <<   "// " << *ns->get_fq_name()->flatten(".")
+       file <<   "// " << *ns->get_fq_name()->flatten()
             << "\n// This is a C++ language binding generated by idlc.\n"
             <<   "// Do not modify this file directly.\n\n";
 
@@ -258,8 +261,13 @@ void cpp_output_type(ostream &file, Type *t, bool array, bool is_mutable)
 
        cpp_output_name(file, t);
 
-       if (array)
-               file << ">";
+       if (array) {
+               Struct *str = dynamic_cast<Struct *>(t);
+               if (str)
+                       file << " *";
+               
+               file << ", ::System::RunTime::ORBMM>";
+       }
 
        file << ' ';
 }
@@ -293,7 +301,7 @@ void cpp_output_type(ostream &file, CompiledBasicType &t, bool is_mutable)
        }
        
        if (is_array(t))
-               file << '>';
+               file << ", ::System::RunTime::ORBMM>";
        
        file << ' ';
 }
@@ -306,7 +314,7 @@ int CPPFile::output_datum(Struct *ns, Datum *d, int offset)
                                !d->def.flags.field.Immutable);
 
                Struct *dtype = dynamic_cast<Struct *>(*d->type);
-               if (dtype && !dtype->is_inline())
+               if (dtype && !dtype->is_inline() && !d->is_array())
                        file << '*';
        } else {
                cpp_output_type(file, d->def.basictype,
@@ -385,7 +393,7 @@ void CPPFile::output_guid(const uint64_t *guid64)
        const unsigned char *guid = reinterpret_cast<const unsigned char *>(guid64);
        char guidhex[7];
        
-       file << indent << "static const __attribute__((unused))\n"
+       file << indent << "__attribute__((weak))\n"
             << indent << "::System::RunTime::GUID _guid = {\n"
             << indent << "\t{ ";
        
@@ -403,7 +411,7 @@ void CPPFile::output_guid(const uint64_t *guid64)
        do_extra_newline = true;
 }
 
-void CPPFile::output_nsdecl(NameSpace *ns, nsdecl_callback cb)
+void CPPFile::output_nsdecl_begin(NameSpace *ns)
 {
        // If indent level is not zero, this is a nested struct or interface.
        if (indent.indent_level == 0)
@@ -413,10 +421,10 @@ void CPPFile::output_nsdecl(NameSpace *ns, nsdecl_callback cb)
 
        file << indent << "namespace " << **ns->name << "_ns {\n";
        downscope();
+}      
        
-       if (cb)
-               cb(this, ns);
-       
+void CPPFile::output_nsdecl_children(NameSpace *ns)
+{      
        for (NameSpace::const_iterator i = ns->begin(); i != ns->end(); ++i) {
                Symbol *sym = (*i).second;
 
@@ -427,7 +435,10 @@ void CPPFile::output_nsdecl(NameSpace *ns, nsdecl_callback cb)
                output_pass(sym, trav_forward);
                output_pass(sym, trav_nsdecl);
        }
-       
+}
+
+void CPPFile::output_nsdecl_end(NameSpace *ns)
+{
        upscope();
        
        file << indent << "}\n";
@@ -436,6 +447,13 @@ void CPPFile::output_nsdecl(NameSpace *ns, nsdecl_callback cb)
                ns_out(ns);
 }
 
+void CPPFile::output_nsdecl(NameSpace *ns)
+{
+       output_nsdecl_begin(ns);
+       output_nsdecl_children(ns);
+       output_nsdecl_end(ns);
+}
+
 void CPPFile::output_aliases_and_types(NameSpace *ns)
 {
        for (NameSpace::const_iterator i = ns->begin(); i != ns->end(); ++i) {
@@ -445,21 +463,12 @@ void CPPFile::output_aliases_and_types(NameSpace *ns)
        }
 }              
 
-void CPPFile::output_vstruct_ns(CPPFile *cpp, NameSpace *sym)
-{
-       Struct *str = dynamic_cast<Struct *>(sym);
-       assert(str);
-       assert(str->is_virtual());
-       
-       cpp->output_guid(str->def.guid);
-}
-
 void CPPFile::output_vstruct_info(Struct *sym)
 {
        all_ns_in(sym, true, "VINFO_");
 
-       file << indent << "static const __attribute__((unused)) "
-                         "unsigned long *const _guids[] = {\n";
+       file << indent << "__attribute__((weak)) "
+                         "unsigned long * _guids[] = {\n";
        
        stack<StructRef> supers;
        sym->chainlen = 0;
@@ -479,9 +488,10 @@ void CPPFile::output_vstruct_info(Struct *sym)
        }
 
        file << indent << "};\n\n"
-            << indent << "static const __attribute__((unused)) "
+            << indent << "__attribute__((weak)) "
                          "::System::RunTime::VStructInfo _info = {\n"
-            << indent << "\t_guids, " << sym->chainlen << '\n'
+            << indent << "\t_guids, " << sym->chainlen << ",\n"
+//          << indent << "\t_marshall, _unmarshall,\n"
             << indent << "};\n";
 
        
@@ -634,10 +644,21 @@ void CPPFile::output(Struct *sym, int pass, void *arg2)
 {
        switch (pass) {
                case trav_nsdecl:
+                       // If indent level is not zero, this is a nested struct or interface.
+                       if (indent.indent_level == 0)
+                               output_pass(sym, trav_forward);
+
                        if (sym->is_virtual()) {
-                               output_nsdecl(sym, output_vstruct_ns);
+                               output_nsdecl_begin(sym);
+                               output_nsdecl_children(sym);
+                               output_guid(sym->def.guid);
+                               output_marshall_pass(sym, trav_nsdecl);
+                               output_nsdecl_end(sym);
                        } else {
-                               output_nsdecl(sym);
+                               output_nsdecl_begin(sym);
+                               output_nsdecl_children(sym);
+                               output_marshall_pass(sym, trav_nsdecl);
+                               output_nsdecl_end(sym);
                        }
 
                        break;
@@ -710,11 +731,15 @@ void CPPFile::output(Struct *sym, int pass, void *arg2)
                                if (sym->is_virtual())
                                        output_struct_ctor(sym, true);
                        }
-
+                       
                        upscope();
                        file << indent << "};\n";
-       
+
                        ns_out(sym);
+
+                       all_ns_in(sym, true, "MARSHALL_");
+                       output_marshall_pass(sym, trav_full);
+                       all_ns_out(sym, true);
                        
                        output_aliases_and_types(sym);
                        
@@ -725,26 +750,27 @@ void CPPFile::output(Struct *sym, int pass, void *arg2)
 
                        break;
                }
+
+               case trav_marshall:
+                       output_marshall(sym, static_cast<Datum *>(arg2));
+                       break;
                
                default:
                        BUG();
        }
 }
 
-void CPPFile::output_iface_ns(CPPFile *file, NameSpace *sym)
-{
-       Interface *i = dynamic_cast<Interface *>(sym);
-       assert(i);
-
-       file->output_guid(i->def.guid);
-       file->output_ifaceinfo(i);
-}
-
 void CPPFile::output(Interface *sym, int pass, void *arg2)
 {
        switch (pass) {
                case trav_nsdecl:
-                       output_nsdecl(sym, output_iface_ns);
+                       output_nsdecl_begin(sym);
+                       output_nsdecl_children(sym);
+
+                       output_guid(sym->def.guid);
+                       output_ifaceinfo(sym);
+
+                       output_nsdecl_end(sym);
                        break;
                
                case trav_forward: {
@@ -836,6 +862,10 @@ void CPPFile::output(Interface *sym, int pass, void *arg2)
                        }
        
                        break;
+
+               case trav_marshall:
+                       output_marshall(sym, static_cast<Datum *>(arg2));
+                       break;
                
                default:
                        BUG();
@@ -986,12 +1016,15 @@ void CPPFile::output(BitField *sym, int pass, void *arg2)
                        break;
                }
 
+               case trav_marshall:
+                       output_marshall(sym, static_cast<Datum *>(arg2));
+                       break;
+
                default:
                        BUG();
        }
 }
 
-
 void CPPFile::output(Enum *sym, int pass, void *arg2)
 {
        switch (pass) {
@@ -1056,6 +1089,10 @@ void CPPFile::output(Enum *sym, int pass, void *arg2)
                        output_pass(sym, trav_forward);
                        break;
 
+               case trav_marshall:
+                       output_marshall(sym, static_cast<Datum *>(arg2));
+                       break;
+
                default:
                        BUG();
        }
@@ -1093,6 +1130,10 @@ void CPPFile::output(BasicType *sym, int pass, void *arg2)
                        output_pass(sym, trav_forward);
                        break;
 
+               case trav_marshall:
+                       output_marshall(sym, static_cast<Datum *>(arg2));
+                       break;
+
                default:
                        BUG();
        }