Python binding is compilable with new script bind engine, but didn't pass all test cases yet.

Author: wqking

benchmark/benchmarkmain.cpp

@@ -4,7 +4,7 @@ void doBenchmarkLuaBind();
 
 int main()
 {
-//	printf("Press any key..."); getchar();
+//	printf("Press any key to start..."); getchar();
 
 	doBenchmarkLuaBind();
 

src/scriptbind/gbindcontext.cpp

@@ -139,28 +139,15 @@ GObjectGlueDataPointer GBindingContext::newObjectGlueData(
 		const bool allowGC,
 		const GScriptInstanceCv cv
 	)
-{
-	return GObjectGlueDataPointer(new GObjectGlueData(this->shareFromThis(), classData, instance, allowGC, cv));
-}
-
-GObjectGlueDataPointer GBindingContext::newOrReuseObjectGlueData(
-		const GClassGlueDataPointer & classData,
-		const GVariant & instance,
-		const bool allowGC,
-		const GScriptInstanceCv cv
-	)
 {
 	GObjectInstancePointer objectInstance(this->classPool->findObjectData(instance));
 
-	GObjectGlueDataPointer data;
 	if(objectInstance) {
-		data.reset(new GObjectGlueData(this->shareFromThis(), classData, objectInstance, allowGC, cv));
+		return GObjectGlueDataPointer(new GObjectGlueData(this->shareFromThis(), classData, objectInstance, cv));
 	}
 	else {
-		data.reset(new GObjectGlueData(this->shareFromThis(), classData, instance, allowGC, cv));
+		return GObjectGlueDataPointer(new GObjectGlueData(this->shareFromThis(), classData, instance, allowGC, cv));
 	}
-
-	return data;
 }
 
 GMethodGlueDataPointer GBindingContext::newMethodGlueData(const GScriptValue & scriptValue)

src/scriptbind/gbindcontext.h

@@ -76,12 +76,6 @@ class GBindingContext : public GShareFromThis<GBindingContext>
 		const bool allowGC,
 		const GScriptInstanceCv cv
 	);
-	GObjectGlueDataPointer newOrReuseObjectGlueData(
-		const GClassGlueDataPointer & classData,
-		const GVariant & instance,
-		const bool allowGC,
-		const GScriptInstanceCv cv
-	);
 
 	GMethodGlueDataPointer newMethodGlueData(const GScriptValue & scriptValue);
 

src/scriptbind/gbindconverttoscript.h

@@ -328,7 +328,7 @@ typename Methods::ResultType namedMemberToScript(const GGlueDataPointer & glueDa
 
 		GObjectGlueDataPointer castedObjectData;
 		if(instance != nullptr && objectData) {
-			castedObjectData = context->newOrReuseObjectGlueData(context->getClassData(metaClass.get()), instance, false, objectData->getCV());
+			castedObjectData = context->newObjectGlueData(context->getClassData(metaClass.get()), instance, false, objectData->getCV());
 		}
 
 		return Methods::doScriptValueToScript(

src/scriptbind/gbindgluedata.cpp

@@ -210,7 +210,6 @@ GObjectGlueData::GObjectGlueData(
 		const GContextPointer & context,
 		const GClassGlueDataPointer & classGlueData,
 		const GObjectInstancePointer & objectInstance,
-		const bool allowGC,
 		const GScriptInstanceCv cv
 	)
 	:

src/scriptbind/gbindgluedata.h

@@ -244,7 +244,6 @@ class GObjectGlueData : public GGlueData, public GShareFromThis<GObjectGlueData>
 		const GContextPointer & context,
 		const GClassGlueDataPointer & classGlueData,
 		const GObjectInstancePointer & objectInstance,
-		const bool allowGC,
 		const GScriptInstanceCv cv
 	);
 

src/scriptbind/gluabind.cpp

@@ -237,7 +237,11 @@ void helperBindAllOperators(const GContextPointer & context, const GObjectGlueDa
 	IMetaClass * metaClass, bool bindingToObject);
 void helperBindClass(const GContextPointer & context, IMetaClass * metaClass);
 void helperBindEnum(const GContextPointer & context, IMetaEnum * metaEnum);
-void helperBindMethodList(const GContextPointer & context, const GObjectGlueDataPointer & objectData, const GMethodGlueDataPointer & methodData);
+void helperBindMethodList(
+	const GContextPointer & context,
+	const GObjectGlueDataPointer & objectData,
+	const GMethodGlueDataPointer & methodData
+);
 
 typedef GCallback<GLuaGlobalAccessor * ()> GlobalAccessorGetter;
 bool doValueToScript(const GContextPointer & context, GLuaScriptObject * scriptObject, const GScriptValue & value, const ScriptValueToScriptData & data, const char * name = nullptr);
@@ -344,7 +348,7 @@ void objectToLua(
 	}
 
 	void * userData = lua_newuserdata(L, getGlueDataWrapperSize<GObjectGlueData>());
-	GObjectGlueDataPointer objectData(context->newOrReuseObjectGlueData(classData, instance, allowGC, cv));
+	GObjectGlueDataPointer objectData(context->newObjectGlueData(classData, instance, allowGC, cv));
 	newGlueDataWrapper(userData, objectData);
 
 	if(outputGlueData != nullptr) {
@@ -855,7 +859,11 @@ void helperBindClass(const GContextPointer & context, IMetaClass * metaClass)
 	lua_setmetatable(L, -2);
 }
 
-void helperBindMethodList(const GContextPointer & context, const GObjectGlueDataPointer & objectData, const GMethodGlueDataPointer & methodData)
+void helperBindMethodList(
+		const GContextPointer & context,
+		const GObjectGlueDataPointer & objectData,
+		const GMethodGlueDataPointer & methodData
+	)
 {
 	lua_State * L = getLuaState(context);
 
@@ -908,13 +916,13 @@ bool doValueToScript(
 		}
 
 		case GScriptValue::typeMethod: {
-			GMethodGlueDataPointer methodData = context->newMethodGlueData(value);
+			const GMethodGlueDataPointer methodData = context->newMethodGlueData(value);
 			helperBindMethodList(context, data.objectData, methodData);
 			break;
 		}
 
 		case GScriptValue::typeOverloadedMethods: {
-			GMethodGlueDataPointer methodData = context->newMethodGlueData(value);
+			const GMethodGlueDataPointer methodData = context->newMethodGlueData(value);
 			helperBindMethodList(context, data.objectData, methodData);
 			break;
 		}