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=57f94556bb594a17bee0a493c64c88731ab98704;hp=cfdb16b82ff03cd475fb8ce6a2bb63ff54688190;hb=b024710fe2b60cd4a42a8993b61333d6cdb56ca3;hpb=7da27a216a7f4bb3331fe315cdbec69bfcf2c762 diff --git a/idlcomp/languages/c++/main.cc b/idlcomp/languages/c++/main.cc index cfdb16b..57f9455 100644 --- a/idlcomp/languages/c++/main.cc +++ b/idlcomp/languages/c++/main.cc @@ -2,31 +2,15 @@ // // 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 conditions: +// 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. // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. -// -// 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 @@ -401,10 +385,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++) { @@ -421,7 +403,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) @@ -431,10 +413,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; @@ -445,7 +427,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"; @@ -454,6 +439,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) { @@ -463,21 +455,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; @@ -497,9 +480,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"; @@ -535,7 +519,7 @@ void CPPFile::output_vstruct_main(Struct *sym) if (super) file << '\n' - << indent << "static " << name << " *downcast(::System::VStruct *base)\n" + << indent << "static __attribute__((weak)) " << name << " *downcast(::System::VStruct *base)\n" << indent << "{\n" << indent << "\tif (!base)\n" << indent << "\t\treturn NULL;\n\n" @@ -653,9 +637,16 @@ void CPPFile::output(Struct *sym, int pass, void *arg2) switch (pass) { case trav_nsdecl: 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(sym, trav_nsdecl); + output_nsdecl_end(sym); } else { - output_nsdecl(sym); + output_nsdecl_begin(sym); + output_nsdecl_children(sym); + output_marshall(sym, trav_nsdecl); + output_nsdecl_end(sym); } break; @@ -749,19 +740,17 @@ void CPPFile::output(Struct *sym, int pass, void *arg2) } } -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: {