Try to handle symbols with matching names from different addons, fixing

#60.
charto · Jan 14, 2017 · 6454816 · 6454816
1 parent 5ec27df
commit 6454816
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/include/nbind/BindClass.h b/include/nbind/BindClass.h
@@ -143,6 +143,9 @@ class BindClassBase {
 	void visit() { visited = true; }
 	void unvisit() { visited = false; }
 
+	bool isReady() { return(ready); }
+	void setReady() { ready = true; }
+
 protected:
 
 	TYPEID idList[2];
@@ -170,7 +173,8 @@ class BindClassBase {
 
 	cbFunction *valueConstructorJS = nullptr;
 
-	bool visited;
+	bool visited = false;
+	bool ready = false;
 
 };
 

diff --git a/src/v8/Binding.cc b/src/v8/Binding.cc
@@ -283,6 +283,8 @@ static void initModule(Handle<Object> exports) {
 		bindClass->visit();
 		++posPrev;
 
+		if(bindClass->isReady()) continue;
+
 		param = new SignatureParam();
 		param->overloadNum = bindClass->wrapperConstructorNum;
 
@@ -309,6 +311,8 @@ static void initModule(Handle<Object> exports) {
 	// Define inheritance between class constructor templates and add methods.
 
 	for(auto *bindClass : classList) {
+		if(bindClass->isReady()) continue;
+
 		Local<FunctionTemplate> constructorTemplate = Nan::New(bindClass->constructorTemplate);
 
 		auto superClassList = bindClass->getSuperClassList();
@@ -349,6 +353,8 @@ static void initModule(Handle<Object> exports) {
 			Nan::New<String>(bindClass->getName()).ToLocalChecked(),
 			jsConstructor
 		);
+
+		bindClass->setReady();
 	}
 }