// 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,
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{ ";
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)
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;
output_pass(sym, trav_forward);
output_pass(sym, trav_nsdecl);
}
-
+}
+
+void CPPFile::output_nsdecl_end(NameSpace *ns)
+{
upscope();
file << indent << "}\n";
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) {
}
}
-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;
}
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";
{
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;
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();
}
}
-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: {
}
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();
}