Merge pull request #97 from NativeScript/plamen5kov/separators

Mihail Slavchev · Mihail Slavchev · commit bd3b48e3b35d · 2015-06-03T10:15:18.000+03:00
refactored: classNameSeparator
diff --git a/binding-generator/Generator/src/com/tns/bindings/Dump.java b/binding-generator/Generator/src/com/tns/bindings/Dump.java
@@ -12,6 +12,8 @@
 
 public class Dump
 {
+	public static final char CLASS_NAME_LOCATION_SEPARATOR = '_';
+	
 	private static final String callJsMethodSignatureCtor = "Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;Z[Ljava/lang/Object;";
 	private static final String callJsMethodSignatureMethod = "Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;";
 	private static final String LCOM_TNS = "Lcom/tns/gen/";
@@ -228,7 +230,7 @@ public void generateProxy(ApplicationWriter aw, String proxyName, Class<?> class
 		//String methodSignature = org.objectweb.asm.Type.getMethodDescriptor(Object.class.getMethods()[0]);
 		String tnsClassSignature = LCOM_TNS + 
 				classSignature.substring(1, classSignature.length() - 1).replace("$", "_")
-				+ "-" + proxyName + ";";
+				+ CLASS_NAME_LOCATION_SEPARATOR + proxyName + ";";
 		
 		ClassVisitor cv = generateClass(aw, classTo, classSignature, tnsClassSignature);
 		Method[] methods = getSupportedMethods(classTo, methodOverrides);
diff --git a/binding-generator/Generator/src/com/tns/bindings/ProxyGenerator.java b/binding-generator/Generator/src/com/tns/bindings/ProxyGenerator.java
@@ -53,7 +53,7 @@ public String generateProxy(String proxyName, Class<?> classToProxy, HashSet<Str
 		aw.visitEnd();
 		byte[] generatedBytes = aw.toByteArray();
 		
-		String proxyFileName = classToProxy.getName().replace('$', '_') + "-" + proxyName;
+		String proxyFileName = classToProxy.getName().replace('$', '_') + Dump.CLASS_NAME_LOCATION_SEPARATOR + proxyName;
 		if (proxyThumb != null)
 		{
 			proxyFileName += "-" + proxyThumb;
diff --git a/src/jni/Constants.h b/src/jni/Constants.h
@@ -8,6 +8,8 @@ class Constants
 
 	const static int PRIMITIVE_TYPE_OFFSET = 1;
 
+	const static char CLASS_NAME_LOCATION_SEPARATOR = '_';
+
 private:
 	Constants() {}
 };
diff --git a/src/jni/MetadataNode.cpp b/src/jni/MetadataNode.cpp
@@ -734,7 +734,7 @@ void MetadataNode::InterfaceConstructorCallback(const v8::FunctionCallbackInfo<v
 	SetInstanceMetadata(info.GetIsolate(), implementationObject, node);
 
 	//@@@ Refactor
-	auto fullName = className + "-" + extendNameAndLocation;
+	auto fullName = className + Constants::CLASS_NAME_LOCATION_SEPARATOR + extendNameAndLocation;
 	thiz->SetHiddenValue(ConvertToV8String("implClassName"), ConvertToV8String(fullName));
 	//
 
@@ -1073,7 +1073,7 @@ void MetadataNode::ExtendCallMethodHandler(const v8::FunctionCallbackInfo<v8::Va
 	DEBUG_WRITE("ExtendsCallMethodHandler: called with %s", ConvertToString(extendName).c_str());
 
 	auto extendNameAndLocation = extendLocation + ConvertToString(extendName);
-	auto fullClassName = node->m_name + '-' + extendNameAndLocation; //ConvertToString(extendName);
+	auto fullClassName = node->m_name + Constants::CLASS_NAME_LOCATION_SEPARATOR + extendNameAndLocation; //ConvertToString(extendName);
 	auto fullExtendedName = TNS_PREFIX + fullClassName;
 	DEBUG_WRITE("ExtendsCallMethodHandler: extend full name %s", fullClassName.c_str());
 
@@ -1162,8 +1162,8 @@ bool MetadataNode::GetExtendLocation(string& extendLocation)
 			}
 
 			string srcFileName = ConvertToString(scriptName);
-			std::replace(srcFileName.begin(), srcFileName.end(), '/', '-');
-			std::replace(srcFileName.begin(), srcFileName.end(), '.', '-');
+			std::replace(srcFileName.begin(), srcFileName.end(), '/', '_');
+			std::replace(srcFileName.begin(), srcFileName.end(), '.', '_');
 			int lineNumber = frame->GetLineNumber();
 			if (lineNumber < 0)
 			{
@@ -1186,7 +1186,7 @@ bool MetadataNode::GetExtendLocation(string& extendLocation)
 			}
 
 
-			extendLocationStream << "f" << srcFileName.c_str() << "-l" << lineNumber << "-c" << column << "--";
+			extendLocationStream << "f" << srcFileName.c_str() << "_l" << lineNumber << "_c" << column << "__";
 			//DEBUG_WRITE("EXTEND_LOCATION %s", extendLocationStream.str().c_str());
 		}
 	}
diff --git a/src/jni/NativeScriptRuntime.cpp b/src/jni/NativeScriptRuntime.cpp
@@ -565,7 +565,7 @@ jobject NativeScriptRuntime::CreateJavaInstance(int objectID, const std::string&
 int NativeScriptRuntime::GetCachedConstructorId(JEnv& env, const FunctionCallbackInfo<Value>& args, const string& name, const string& className, jobjectArray javaArgs, const Handle<Object>& implementationObject)
 {
 	int ctorId = -1;
-	string fullClassName = className + '-' + name;
+	string fullClassName = className + Constants::CLASS_NAME_LOCATION_SEPARATOR + name;
 	string encodedCtorArgs = MethodCache::EncodeSignature(fullClassName, "<init>", args, false);
 	auto itFound = s_constructorCache.find(encodedCtorArgs);
 
diff --git a/src/src/com/tns/DexFactory.java b/src/src/com/tns/DexFactory.java
@@ -27,6 +27,7 @@
 public class DexFactory
 {
 	private static final String SECONDARY_DEX_FOLDER_NAME = "code_cache" + File.separator + "secondary-dexes";
+	private static final char CLASS_NAME_LOCATION_SEPARATOR = '_';
 
 	private String dexPath;
 	private String odexPath;
@@ -75,15 +76,15 @@ public Class<?> resolveClass(String name, String className, String[] methodOverr
 			return NativeScriptActivity.class;
 		}
 		
-		String fullClassName = className.replace("$", "_") + "-" + name;
+		String fullClassName = className.replace("$", "_") + CLASS_NAME_LOCATION_SEPARATOR + name;
 		Class<?> existingClass = this.injectedDexClasses.get(fullClassName); 
 		if(existingClass != null)
 		{
 			return existingClass;
 		}
 
 		String classToProxy = this.getClassToProxyName(className);
-		String dexFilePath = classToProxy + "-" + name;
+		String dexFilePath = classToProxy + CLASS_NAME_LOCATION_SEPARATOR + name;
 		File dexFile = this.getDexFile(dexFilePath);
 		
 		if (dexFile == null)
@@ -136,6 +137,7 @@ public Class<?> resolveClass(String name, String className, String[] methodOverr
 	public Class<?> findClass(String className) throws ClassNotFoundException
 	{
 		String canonicalName = className.replace('/', '.');
+		Log.d("TNS_NATIVE", canonicalName);
 		Class<?> existingClass = this.injectedDexClasses.get(canonicalName);
 		if(existingClass != null)
 		{
diff --git a/test-app/assets/app/tests/tests.js b/test-app/assets/app/tests/tests.js
@@ -394,7 +394,7 @@ describe("Tests ", function () {
 		var button1 = new MyButton();
 		var button1Label = button1.toString();
 		
-		expect(button1Label.indexOf("com.tns.tests.Button1-")).not.toEqual(-1);
+		expect(button1Label.indexOf("com.tns.tests.Button1_")).not.toEqual(-1);
 		expect(button1Label.indexOf("MyButton")).not.toEqual(-1);
 		expect(button1Label.indexOf("success")).not.toEqual(-1);
 		
diff --git a/test-app/assets/app/tests/testsForTypescript.js b/test-app/assets/app/tests/testsForTypescript.js
@@ -112,8 +112,9 @@ describe("Tests typescript", function () {
 		
 	    var button = new MyButton2();
 	    var button1Label = button.superToString();
-	  	expect(button1Label.indexOf("com.tns.tests.Button1-")).not.toEqual(-1);
-	  	expect(button1Label.indexOf("-MyButton2")).not.toEqual(-1);
+	    
+	  	expect(button1Label.indexOf("com.tns.tests.Button1_")).not.toEqual(-1);
+	  	expect(button1Label.indexOf("_MyButton2")).not.toEqual(-1);
 	});
 	
 	it("When_creating_a_pure_typescript_inheritance_chain_it_should_work", function () {
@@ -289,8 +290,8 @@ describe("Tests typescript", function () {
 	      
 	    var button = new MyButton5();
 	    var button1Label = button.toString();
-	  	expect(button1Label.indexOf("com.tns.tests.Button1-")).not.toEqual(-1);
-		expect(button1Label.indexOf("-MyButton5")).not.toEqual(-1);
+	  	expect(button1Label.indexOf("com.tns.tests.Button1_")).not.toEqual(-1);
+		expect(button1Label.indexOf("_MyButton5")).not.toEqual(-1);
 	});
 	
 	it("When_extending_an_already_extended_object_it_should_throw_an_error", function () {

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public String generateProxy(String proxyName, Class<?> classToProxy, HashSet<Str`
`53`	`53`	`aw.visitEnd();`
`54`	`54`	`byte[] generatedBytes = aw.toByteArray();`
`55`	`55`
`56`		`- String proxyFileName = classToProxy.getName().replace('$', '_') + "-" + proxyName;`
	`56`	`+ String proxyFileName = classToProxy.getName().replace('$', '_') + Dump.CLASS_NAME_LOCATION_SEPARATOR + proxyName;`
`57`	`57`	`if (proxyThumb != null)`
`58`	`58`	`{`
`59`	`59`	`proxyFileName += "-" + proxyThumb;`
Original file line number	Diff line number	Diff line change
`@@ -734,7 +734,7 @@ void MetadataNode::InterfaceConstructorCallback(const v8::FunctionCallbackInfo<v`
`734`	`734`	`SetInstanceMetadata(info.GetIsolate(), implementationObject, node);`
`735`	`735`
`736`	`736`	`//@@@ Refactor`
`737`		`- auto fullName = className + "-" + extendNameAndLocation;`
	`737`	`+ auto fullName = className + Constants::CLASS_NAME_LOCATION_SEPARATOR + extendNameAndLocation;`
`738`	`738`	`thiz->SetHiddenValue(ConvertToV8String("implClassName"), ConvertToV8String(fullName));`
`739`	`739`	`//`
`740`	`740`
`@@ -1073,7 +1073,7 @@ void MetadataNode::ExtendCallMethodHandler(const v8::FunctionCallbackInfo<v8::Va`
`1073`	`1073`	`DEBUG_WRITE("ExtendsCallMethodHandler: called with %s", ConvertToString(extendName).c_str());`
`1074`	`1074`
`1075`	`1075`	`auto extendNameAndLocation = extendLocation + ConvertToString(extendName);`
`1076`		`- auto fullClassName = node->m_name + '-' + extendNameAndLocation; //ConvertToString(extendName);`
	`1076`	`+ auto fullClassName = node->m_name + Constants::CLASS_NAME_LOCATION_SEPARATOR + extendNameAndLocation; //ConvertToString(extendName);`
`1077`	`1077`	`auto fullExtendedName = TNS_PREFIX + fullClassName;`
`1078`	`1078`	`DEBUG_WRITE("ExtendsCallMethodHandler: extend full name %s", fullClassName.c_str());`
`1079`	`1079`
`@@ -1162,8 +1162,8 @@ bool MetadataNode::GetExtendLocation(string& extendLocation)`
`1162`	`1162`	`}`
`1163`	`1163`
`1164`	`1164`	`string srcFileName = ConvertToString(scriptName);`
`1165`		`- std::replace(srcFileName.begin(), srcFileName.end(), '/', '-');`
`1166`		`- std::replace(srcFileName.begin(), srcFileName.end(), '.', '-');`
	`1165`	`+ std::replace(srcFileName.begin(), srcFileName.end(), '/', '_');`
	`1166`	`+ std::replace(srcFileName.begin(), srcFileName.end(), '.', '_');`
`1167`	`1167`	`int lineNumber = frame->GetLineNumber();`
`1168`	`1168`	`if (lineNumber < 0)`
`1169`	`1169`	`{`
`@@ -1186,7 +1186,7 @@ bool MetadataNode::GetExtendLocation(string& extendLocation)`
`1186`	`1186`	`}`
`1187`	`1187`
`1188`	`1188`
`1189`		`- extendLocationStream << "f" << srcFileName.c_str() << "-l" << lineNumber << "-c" << column << "--";`
	`1189`	`+ extendLocationStream << "f" << srcFileName.c_str() << "_l" << lineNumber << "_c" << column << "__";`
`1190`	`1190`	`//DEBUG_WRITE("EXTEND_LOCATION %s", extendLocationStream.str().c_str());`
`1191`	`1191`	`}`
`1192`	`1192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,7 @@ jobject NativeScriptRuntime::CreateJavaInstance(int objectID, const std::string&`
`565`	`565`	`int NativeScriptRuntime::GetCachedConstructorId(JEnv& env, const FunctionCallbackInfo<Value>& args, const string& name, const string& className, jobjectArray javaArgs, const Handle<Object>& implementationObject)`
`566`	`566`	`{`
`567`	`567`	`int ctorId = -1;`
`568`		`- string fullClassName = className + '-' + name;`
	`568`	`+ string fullClassName = className + Constants::CLASS_NAME_LOCATION_SEPARATOR + name;`
`569`	`569`	`string encodedCtorArgs = MethodCache::EncodeSignature(fullClassName, "<init>", args, false);`
`570`	`570`	`auto itFound = s_constructorCache.find(encodedCtorArgs);`
`571`	`571`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`public class DexFactory`
`28`	`28`	`{`
`29`	`29`	`private static final String SECONDARY_DEX_FOLDER_NAME = "code_cache" + File.separator + "secondary-dexes";`
	`30`	`+ private static final char CLASS_NAME_LOCATION_SEPARATOR = '_';`
`30`	`31`
`31`	`32`	`private String dexPath;`
`32`	`33`	`private String odexPath;`
`@@ -75,15 +76,15 @@ public Class<?> resolveClass(String name, String className, String[] methodOverr`
`75`	`76`	`return NativeScriptActivity.class;`
`76`	`77`	`}`
`77`	`78`
`78`		`- String fullClassName = className.replace("$", "_") + "-" + name;`
	`79`	`+ String fullClassName = className.replace("$", "_") + CLASS_NAME_LOCATION_SEPARATOR + name;`
`79`	`80`	`Class<?> existingClass = this.injectedDexClasses.get(fullClassName);`
`80`	`81`	`if(existingClass != null)`
`81`	`82`	`{`
`82`	`83`	`return existingClass;`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`String classToProxy = this.getClassToProxyName(className);`
`86`		`- String dexFilePath = classToProxy + "-" + name;`
	`87`	`+ String dexFilePath = classToProxy + CLASS_NAME_LOCATION_SEPARATOR + name;`
`87`	`88`	`File dexFile = this.getDexFile(dexFilePath);`
`88`	`89`
`89`	`90`	`if (dexFile == null)`
`@@ -136,6 +137,7 @@ public Class<?> resolveClass(String name, String className, String[] methodOverr`
`136`	`137`	`public Class<?> findClass(String className) throws ClassNotFoundException`
`137`	`138`	`{`
`138`	`139`	`String canonicalName = className.replace('/', '.');`
	`140`	`+ Log.d("TNS_NATIVE", canonicalName);`
`139`	`141`	`Class<?> existingClass = this.injectedDexClasses.get(canonicalName);`
`140`	`142`	`if(existingClass != null)`
`141`	`143`	`{`