From c73c68d7f0cd522ea4b8ecf9e2de4ed040909346 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Wed, 9 Feb 2011 14:22:12 -0300 Subject: Implemented support to iterator function generation. Reviewer: Marcelo Lira Hugo Parente Lima --- generator/cppgenerator.cpp | 4 ++-- generator/shibokengenerator.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp index a2b9aadd7..bc68f6000 100644 --- a/generator/cppgenerator.cpp +++ b/generator/cppgenerator.cpp @@ -2536,8 +2536,8 @@ void CppGenerator::writeClassDefinition(QTextStream& s, const AbstractMetaClass* s << INDENT << "/*tp_clear*/ 0," << endl; s << INDENT << "/*tp_richcompare*/ " << tp_richcompare << ',' << endl; s << INDENT << "/*tp_weaklistoffset*/ 0," << endl; - s << INDENT << "/*tp_iter*/ 0," << endl; - s << INDENT << "/*tp_iternext*/ 0," << endl; + s << INDENT << "/*tp_iter*/ " << m_tpFuncs["__iter__"] << ',' << endl; + s << INDENT << "/*tp_iternext*/ " << m_tpFuncs["__next__"] << ',' << endl; s << INDENT << "/*tp_methods*/ " << className << "_methods," << endl; s << INDENT << "/*tp_members*/ 0," << endl; s << INDENT << "/*tp_getset*/ " << tp_getset << ',' << endl; diff --git a/generator/shibokengenerator.cpp b/generator/shibokengenerator.cpp index 387a87690..381e99e04 100644 --- a/generator/shibokengenerator.cpp +++ b/generator/shibokengenerator.cpp @@ -75,6 +75,8 @@ void ShibokenGenerator::clearTpFuncs() { m_tpFuncs["__str__"] = QString("0"); m_tpFuncs["__repr__"] = QString("0"); + m_tpFuncs["__iter__"] = QString("0"); + m_tpFuncs["__next__"] = QString("0"); } void ShibokenGenerator::initPrimitiveTypesCorrespondences() -- cgit v1.2.3