diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2010-12-22 14:58:37 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:12:50 -0300 |
| commit | bda44c2851c04183e1e92dccf9a43b949d0b2b0b (patch) | |
| tree | c653238f1d006320a6579f6e086c71663158bdad /generator/headergenerator.cpp | |
| parent | 2e4e0d4e91c561986a96a08b0dbee53984811155 (diff) | |
Added support for promoting enums from removed namespaces to upper scope.
Classes in namespaces marked not to be generated are always moved to
upper scopes, the current modification add this same behaviour to enums.
Tests were also added.
Reviewed by Lauro Moura <lauro.neto@openbossa.org>
Reviewed by Renato Araújo <renato.filho@openbossa.org>
Diffstat (limited to 'generator/headergenerator.cpp')
| -rw-r--r-- | generator/headergenerator.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/generator/headergenerator.cpp b/generator/headergenerator.cpp index 7a49a8c41..9a28cdb94 100644 --- a/generator/headergenerator.cpp +++ b/generator/headergenerator.cpp @@ -311,9 +311,12 @@ void HeaderGenerator::finishGeneration() macrosStream << "// Type indices" << endl; int idx = 0; - foreach (const AbstractMetaClass* metaClass, classes()) + AbstractMetaEnumList globalEnums = this->globalEnums(); + foreach (const AbstractMetaClass* metaClass, classes()) { writeTypeIndexDefine(macrosStream, metaClass, idx); - foreach (const AbstractMetaEnum* metaEnum, globalEnums()) + lookForEnumsInClassesNotToBeGenerated(globalEnums, metaClass); + } + foreach (const AbstractMetaEnum* metaEnum, globalEnums) writeTypeIndexDefineLine(macrosStream, metaEnum->typeEntry(), idx); macrosStream << "#define "; macrosStream.setFieldWidth(60); @@ -324,7 +327,7 @@ void HeaderGenerator::finishGeneration() macrosStream << "extern PyTypeObject** " << cppApiVariableName() << ';' << endl << endl; macrosStream << "// Macros for type check" << endl; - foreach (const AbstractMetaEnum* cppEnum, globalEnums()) { + foreach (const AbstractMetaEnum* cppEnum, globalEnums) { if (cppEnum->isAnonymous() || cppEnum->isPrivate()) continue; includes << cppEnum->typeEntry()->include(); |