X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=idlcomp%2Flanguages%2Fc%2B%2B%2Fmain.cc;h=3157a5597e3b7369d510c2cc18e7dfa3fb93d640;hp=57f94556bb594a17bee0a493c64c88731ab98704;hb=d8f98c588391ede8a5e4bb721ad0e718c7aef6d6;hpb=b024710fe2b60cd4a42a8993b61333d6cdb56ca3

diff --git a/idlcomp/languages/c++/main.cc b/idlcomp/languages/c++/main.cc
index 57f9455..3157a55 100644
--- 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,
@@ -519,7 +527,7 @@ void CPPFile::output_vstruct_main(Struct *sym)
 
 	if (super)
 		file << '\n'
-		     << indent << "static __attribute__((weak)) " << name << " *downcast(::System::VStruct *base)\n"
+		     << indent << "static " << name << " *downcast(::System::VStruct *base)\n"
 		     << indent << "{\n"
 		     << indent << "\tif (!base)\n"
 		     << indent << "\t\treturn NULL;\n\n"
@@ -636,16 +644,20 @@ 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);
 				output_guid(sym->def.guid);
-				output_marshall(sym, trav_nsdecl);
+				output_marshall_pass(sym, trav_nsdecl);
 				output_nsdecl_end(sym);
 			} else {
 				output_nsdecl_begin(sym);
 				output_nsdecl_children(sym);
-				output_marshall(sym, trav_nsdecl);
+				output_marshall_pass(sym, trav_nsdecl);
 				output_nsdecl_end(sym);
 			}
 
@@ -719,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);
 			
@@ -734,6 +750,10 @@ void CPPFile::output(Struct *sym, int pass, void *arg2)
 
 			break;
 		}
+
+		case trav_marshall:
+			output_marshall(sym, static_cast<Datum *>(arg2));
+			break;
 		
 		default:
 			BUG();
@@ -842,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();
@@ -992,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) {
@@ -1062,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();
 	}
@@ -1099,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();
 	}