Initial struct marshalling.

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

diff --git a/idlcomp/languages/c++/main.cc b/idlcomp/languages/c++/main.cc
index 4368bca4d95bbddb9e56ced6a98dad3c490bfbcd..3e921e5eb94f9a236381ca76535380faed9fa9b2 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.
@@ -258,8 +261,13 @@ void cpp_output_type(ostream &file, Type *t, bool array, bool is_mutable)
 
        cpp_output_name(file, t);
 
-       if (array)
+       if (array) {
+               Struct *str = dynamic_cast<Struct *>(t);
+               if (str)
+                       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,
@@ -636,6 +644,10 @@ 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_begin(sym);
                                output_nsdecl_children(sym);
@@ -720,12 +732,14 @@ void CPPFile::output(Struct *sym, int pass, void *arg2)
                                        output_struct_ctor(sym, true);
                        }
                        
-                       output_marshall_pass(sym, trav_full);
-
                        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);
                        
@@ -1011,7 +1025,6 @@ void CPPFile::output(BitField *sym, int pass, void *arg2)
        }
 }
 
-
 void CPPFile::output(Enum *sym, int pass, void *arg2)
 {
        switch (pass) {