GIT_REPOSITORIES/LPP/PythonQt Commit - r29:fa33440a60c5

- upgraded generator to generate polymorphic handlers for downcasting...

florianlink -

r29:fa33440a60c5

parent child

Context file:

r29:fa33440a60c5

Collapse all files

generator/abstractmetalang.h +2 0

                 FunctionType functionType() const { return m_function_type; }
                 void setFunctionType(FunctionType type) { m_function_type = type; }
+                bool isVirtual() { return !(isFinal() || isSignal() || isStatic()); }
                 QStringList introspectionCompatibleSignatures(const QStringList &resolvedArguments = QStringList()) const;
                 QString signature() const;
                 QString targetLangSignature(bool minimal = false) const;

generator/generatorsetqtscript.cpp +1 0

                 SetupGenerator setupGenerator;
                 setupGenerator.setOutputDirectory(outDir);
                 setupGenerator.setQtMetaTypeDeclaredTypeNames(declaredTypeNames);
+                setupGenerator.setClasses(classes);
                 /*
                 ClassGenerator classGenerator(&priGenerator, &setupGenerator);

generator/setupgenerator.cpp +92 0

@@ -41,6 +41,20 bool hasDefaultConstructor(const AbstractMetaClass *meta_class);
41		41
42	void SetupGenerator::generate()	42	void SetupGenerator::generate()
43	{	43	{
		44	AbstractMetaClassList classes_with_polymorphic_id;
		45	{
		46	QHashIterator<QString, QList<const AbstractMetaClass*> > pack(packHash);
		47	while (pack.hasNext()) {
		48	pack.next();
		49	QList<const AbstractMetaClass*> list = pack.value();
		50	foreach (const AbstractMetaClass *cls, list) {
		51	if (cls->typeEntry()->isPolymorphicBase()) {
		52	classes_with_polymorphic_id.append((AbstractMetaClass*)cls);
		53	}
		54	}
		55	}
		56	}
		57
44	QHashIterator<QString, QList<const AbstractMetaClass*> > pack(packHash);	58	QHashIterator<QString, QList<const AbstractMetaClass*> > pack(packHash);
45	while (pack.hasNext()) {	59	while (pack.hasNext()) {
46	pack.next();	60	pack.next();
@@ -91,6 +105,9 void SetupGenerator::generate()
91	}	105	}
92	s << endl;	106	s << endl;
93		107
		108	QStringList polymorphicHandlers = writePolymorphicHandler(s, list.at(0)->package(), classes_with_polymorphic_id);
		109	s << endl;
		110
94	// declare individual class creation functions	111	// declare individual class creation functions
95	s << "void PythonQt_init_" << shortPackName << "() {" << endl;	112	s << "void PythonQt_init_" << shortPackName << "() {" << endl;
96	QStringList cppClassNames;	113	QStringList cppClassNames;
@@ -115,9 +132,84 void SetupGenerator::generate()
115	}	132	}
116	}	133	}
117	s << endl;	134	s << endl;
		135	foreach (QString handler, polymorphicHandlers) {
		136	s << "PythonQt::self()->addPolymorphicHandler(\""<< handler << "\", polymorphichandler_" << handler << ");" << endl;
		137	}
118		138
119	s << "}";	139	s << "}";
120	s << endl;	140	s << endl;
121	}	141	}
122	}	142	}
123	}	143	}
		144
		145	QStringList SetupGenerator::writePolymorphicHandler(QTextStream &s, const QString &package,
		146	const AbstractMetaClassList &classes)
		147	{
		148	QStringList handlers;
		149	foreach (AbstractMetaClass *cls, classes) {
		150	const ComplexTypeEntry *centry = cls->typeEntry();
		151	if (!centry->isPolymorphicBase())
		152	continue;
		153	bool isGraphicsItem = (cls->qualifiedCppName()=="QGraphicsItem");
		154
		155	AbstractMetaClassList classList = this->classes();
		156	bool first = true;
		157	foreach (AbstractMetaClass *clazz, classList) {
		158	bool inherits = false;
		159	if (isGraphicsItem) {
		160	foreach(AbstractMetaClass* interfaze, clazz->interfaces()) {
		161	if (interfaze->qualifiedCppName()=="QGraphicsItem") {
		162	inherits = true;
		163	break;
		164	}
		165	}
		166	} else {
		167	inherits = clazz->inheritsFrom(cls);
		168	}
		169	if (clazz->package() == package && inherits) {
		170	if (!clazz->typeEntry()->polymorphicIdValue().isEmpty() \|\| isGraphicsItem) {
		171	// On first find, open the function
		172	if (first) {
		173	first = false;
		174
		175	QString handler = cls->name();
		176	handlers.append(handler);
		177
		178	s << "static void* polymorphichandler_" << handler
		179	<< "(const void ptr, char *class_name)" << endl
		180	<< "{" << endl
		181	<< " Q_ASSERT(ptr != 0);" << endl
		182	<< " " << cls->qualifiedCppName() << " *object = ("
		183	<< cls->qualifiedCppName() << " *)ptr;" << endl;
		184	}
		185
		186	// For each, add case label
		187	QString polyId = clazz->typeEntry()->polymorphicIdValue();
		188	if (isGraphicsItem) {
		189	polyId = "%1->type() == " + clazz->qualifiedCppName() + "::Type";
		190	}
		191	s << " if ("
		192	<< polyId.replace("%1", "object")
		193	<< ") {" << endl
		194	<< " *class_name = \"" << clazz->name() << "\";" << endl
		195	<< " return (" << clazz->qualifiedCppName() << "*)object;" << endl
		196	<< " }" << endl;
		197	} else {
		198	QString warning = QString("class '%1' inherits from polymorphic class '%2', but has no polymorphic id set")
		199	.arg(clazz->name())
		200	.arg(cls->name());
		201
		202	ReportHandler::warning(warning);
		203	}
		204	}
		205	}
		206
		207	// Close the function if it has been opened
		208	if (!first) {
		209	s << " return NULL;" << endl
		210	<< "}" << endl;
		211	}
		212	}
		213
		214	return handlers;
		215	}

generator/setupgenerator.h +3 0

                 void addClass(const AbstractMetaClass *cls);
              private:
+               QStringList writePolymorphicHandler(QTextStream &s, const QString &package,
+                 const AbstractMetaClassList &classes);
                QHash<QString, QList<const AbstractMetaClass*> > packHash;
             };
             #endif // SETUPGENERATOR_H

generator/shellgenerator.cpp +1 -1

               AbstractMetaFunctionList functions;
               AbstractMetaFunctionList functions1 = getFunctionsToWrap(meta_class);
               foreach(AbstractMetaFunction* func, functions1) {
-                if (!func->wasPublic()) {
+                if (!func->isPublic() || func->isVirtual()) {
                   functions << func;
                 }
               }

generator/shellheadergenerator.cpp +1 -1

                 foreach(AbstractMetaFunction* fun, promoteFunctions) {
                   s << "inline ";
-                  writeFunctionSignature(s, fun, 0, QString(),
+                  writeFunctionSignature(s, fun, 0, "promoted_",
                     Option(IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));
                   s << " { ";
                   QString scriptFunctionName = fun->originalName();

generator/shellimplgenerator.cpp +8 -7

                 }
               }
+              QString wrappedObject = " (*theWrappedObject)";
               // write member functions
               for (int i = 0; i < functions.size(); ++i) {
                 AbstractMetaFunction *fun = functions.at(i);
                   Option(FirstArgIsWrappedObject | OriginalName | ShowStatic | UnderscoreSpaces),
                   "PythonQtWrapper_");
                 s << endl << "{" << endl;
-                QString wrappedObject;
+                s << "  ";
-                if (fun->wasPublic()) {
-                  wrappedObject = " (*theWrappedObject)";
-                } else {
-                  wrappedObject = " (*((" + promoterClassName(meta_class) + "*)theWrappedObject))";
                 if (ShellGenerator::isSpecialStreamingOperator(fun)) {
                   s << fun->arguments().at(0)->argumentName();
                   if (fun->originalName().startsWith("operator>>")) {
                     if (fun->isStatic()) {
                       s << meta_class->qualifiedCppName() << "::";
                     } else {
-                      s << wrappedObject << ".";
+                      if (!fun->isPublic() || fun->isVirtual()) {
+                        s << " (("  << promoterClassName(meta_class) << "*)theWrappedObject)->promoted_";
+                      } else {
+                        s << " theWrappedObject->";
+                      }
                     }
                     s  << fun->originalName() << "(";
                     for (int i = 0; i < args.size(); ++i) {

generator/typesystem_gui.xml +1 -1

               <interface-type name="QLayoutItem"/>
               <interface-type name="QPaintDevice"/>
-              <interface-type name="QGraphicsItem" delete-in-main-thread="yes">
+              <interface-type name="QGraphicsItem" delete-in-main-thread="yes"  polymorphic-base="yes">
                 <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/>
                 <modify-function signature="paint(QPainter*,const QStyleOptionGraphicsItem*,QWidget*)">

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages