// 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.
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";
cpp_output_name(file, t);
- if (array)
- file << ">";
+ if (array) {
+ Struct *str = dynamic_cast<Struct *>(t);
+ if (str)
+ file << " *";
+
+ file << ", ::System::RunTime::ORBMM>";
+ }
file << ' ';
}
}
if (is_array(t))
- file << '>';
+ file << ", ::System::RunTime::ORBMM>";
file << ' ';
}
!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,
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"
{
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);
}
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);
break;
}
+
+ case trav_marshall:
+ output_marshall(sym, static_cast<Datum *>(arg2));
+ break;
default:
BUG();
}
break;
+
+ case trav_marshall:
+ output_marshall(sym, static_cast<Datum *>(arg2));
+ break;
default:
BUG();
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) {
output_pass(sym, trav_forward);
break;
+ case trav_marshall:
+ output_marshall(sym, static_cast<Datum *>(arg2));
+ break;
+
default:
BUG();
}
output_pass(sym, trav_forward);
break;
+ case trav_marshall:
+ output_marshall(sym, static_cast<Datum *>(arg2));
+ break;
+
default:
BUG();
}