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=c634ceebf59bf674abe07f6a9ffde035233989ed;hb=d8f98c588391ede8a5e4bb721ad0e718c7aef6d6;hpb=2e0cf58da9949572c6e334a07bba6774fdb749f9 diff --git a/idlcomp/languages/c++/main.cc b/idlcomp/languages/c++/main.cc index c634cee..3157a55 100644 --- a/idlcomp/languages/c++/main.cc +++ b/idlcomp/languages/c++/main.cc @@ -1,24 +1,19 @@ // 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 . // -// Permission is hereby granted, free of charge, to any person obtaining a copy of -// this software and associated documentation files (the "Software"), to deal with -// the Software without restriction, including without limitation the rights to -// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -// of the Software, and to permit persons to whom the Software is furnished to do -// so, subject to the following condition: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. +// This software is provided 'as-is', without any express or implied warranty. +// In no event will the authors or contributors be held liable for any damages +// arising from the use of this software. // -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE -// SOFTWARE. +// Permission is hereby granted to everyone, free of charge, to use, copy, +// modify, prepare derivative works of, publish, distribute, perform, +// sublicense, and/or sell copies of the Software, provided that the above +// copyright notice and disclaimer of warranty be included in all copies or +// substantial portions of this software. // FIXME: escape C++ reserved words @@ -60,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"; @@ -266,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(t); + if (str) + file << " *"; + + file << ", ::System::RunTime::ORBMM>"; + } file << ' '; } @@ -301,7 +301,7 @@ void cpp_output_type(ostream &file, CompiledBasicType &t, bool is_mutable) } if (is_array(t)) - file << '>'; + file << ", ::System::RunTime::ORBMM>"; file << ' '; } @@ -314,7 +314,7 @@ int CPPFile::output_datum(Struct *ns, Datum *d, int offset) !d->def.flags.field.Immutable); Struct *dtype = dynamic_cast(*d->type); - if (dtype && !dtype->is_inline()) + if (dtype && !dtype->is_inline() && !d->is_array()) file << '*'; } else { cpp_output_type(file, d->def.basictype, @@ -393,10 +393,8 @@ void CPPFile::output_guid(const uint64_t *guid64) const unsigned char *guid = reinterpret_cast(guid64); char guidhex[7]; - file << indent << "static const __attribute__((unused)) union {\n" - << indent << "\tunsigned char c[16];\n" - << indent << "\tunsigned long l[];\n" - << indent << "} _guid = {\n" + file << indent << "__attribute__((weak))\n" + << indent << "::System::RunTime::GUID _guid = {\n" << indent << "\t{ "; for (int i = 0; i < 16; i++) { @@ -413,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) @@ -423,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; @@ -437,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"; @@ -446,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) { @@ -455,21 +463,12 @@ void CPPFile::output_aliases_and_types(NameSpace *ns) } } -void CPPFile::output_vstruct_ns(CPPFile *cpp, NameSpace *sym) -{ - Struct *str = dynamic_cast(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 supers; sym->chainlen = 0; @@ -489,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"; @@ -644,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; @@ -720,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); @@ -735,25 +750,27 @@ void CPPFile::output(Struct *sym, int pass, void *arg2) break; } + + case trav_marshall: + output_marshall(sym, static_cast(arg2)); + break; default: BUG(); } } -void CPPFile::output_iface_ns(CPPFile *file, NameSpace *sym) -{ - Interface *i = dynamic_cast(sym); - assert(i); - - file->output_guid(i->def.guid); -} - 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: { @@ -845,6 +862,10 @@ void CPPFile::output(Interface *sym, int pass, void *arg2) } break; + + case trav_marshall: + output_marshall(sym, static_cast(arg2)); + break; default: BUG(); @@ -995,12 +1016,15 @@ void CPPFile::output(BitField *sym, int pass, void *arg2) break; } + case trav_marshall: + output_marshall(sym, static_cast(arg2)); + break; + default: BUG(); } } - void CPPFile::output(Enum *sym, int pass, void *arg2) { switch (pass) { @@ -1065,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(arg2)); + break; + default: BUG(); } @@ -1102,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(arg2)); + break; + default: BUG(); }