transpiler code cleaning; fix for asGeneric $O[]

BobHanson · BobHanson · commit 0eade1d3666a · 2020-01-04T10:02:23.000-06:00
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
@@ -2476,21 +2476,23 @@ && checkAnnotations(element, CHECK_J2S_IGNORE_AND_ANNOTATIONS)) {
 //		}
 //	}
 
+	/**
+	 * for at_interfaces, build the 
+	 * @param node
+	 */
 	private void processAnnotationTypeMemberDeclaration(AnnotationTypeMemberDeclaration node) {
 
 		Expression def = node.getDefault();
 		SimpleName name = node.getName();
 		IMethodBinding mbinding = node.resolveBinding();
 		ITypeBinding ret = mbinding.getReturnType();
-//		buffer.append("\nClazz.newMeth(C$,'").append(name).append("',function(){});\n");
 		int pt = buffer.length();
-//		retName = j2sClassObject(ret, retName);
-//		if (ret.isPrimitive()) {
-//			retName = NameMapper.getPrimitiveTYPE(retName) + ".TYPE";
-//		} else {
-//			retName += ".class";
-//		}
-		buffer.append("a.push(['" + name + "'," + j2sClassObject(ret) + ",");
+		// note that annotations cannot be generic
+		boolean isArray = ret.isArray();
+		if (isArray)
+			ret = ret.getComponentType();
+		String retName = (ret.isPrimitive() ? ret.getName() : j2sNonPrimitiveName(ret, true));
+		buffer.append("a.push(['" + name + "','" + retName + (isArray ? "[]" : "") + "',");
 		if (def == null) {
 			if (ret.isPrimitive()) {
 				switch (ret.getName()) {
@@ -5465,17 +5467,17 @@ private String j2sGetParamCode(ITypeBinding binding, boolean addAAA, boolean asG
 			return (asGenericObject ? "O" : "T" + binding.getName());
 		}
 		String name = removeBrackets(getJavaClassNameQualified(binding));
-		if (binding.isArray() && binding.getComponentType().isTypeVariable()) {
+		if (isTypeOrArrayType(binding)) {
 			// TK[]
 			if (asGenericObject) {
-				name = "O" + name.substring(name.indexOf("["));
+				int pt = name.indexOf("[");
+				name = "O" + (pt < 0 ? "" : name.substring(pt));
 			} else {
 				name = "T" + name;				
 			}
 		} else if (!asGenericObject && !binding.isPrimitive()) {
 			name = NameMapper.fixPackageName(name);
-		}
-			
+		}	
 		String arrays = null;
 		int pt = name.indexOf("[");
 		if (pt >= 0) {
@@ -6721,19 +6723,15 @@ public static void addClassAnnotations(Java2ScriptVisitor visitor, int accessTyp
 					String className = (type == null ? null
 							: type.isTypeVariable() ? type.toString() // could be "<T>" 
 									: j2sNonPrimitiveName(type, false));
-					//stripJavaLang(NameMapper.fixPackageName(getJavaClassNameQualified(type))
-					//String typeref = (type == null ? null : j2sClassObject(type));
 					if (className != null && className.equals(lastClassName)) {
 						className = ".";
-						//typeref = "'.'";
 					} else {
 						lastClassName = className;
 					}
 					trailingBuffer.append(nn++ == 0 ? "C$.$getAnn$ = function(){ return [\n[[" : "]],\n  [[");
 					trailingBuffer.append((varName == null ? null : "'" + varName + "'"));
 					ptBuf = trailingBuffer.buf.length();
 					trailingBuffer.append(",'" + className + "'," 
-					//+ typeref + "," 
 							 + signature + ",['" + a.qname 
 							 + "']],[");
 					ptBuf1 = trailingBuffer.buf.length() - 5;
@@ -7079,16 +7077,6 @@ public static void dumpStack(String msg) {
 		}
 	}
 
-	public static String j2sClassObject(ITypeBinding type) {
-		boolean isArray = type.isArray() && !type.isTypeVariable();
-		if (isArray)
-			type = type.getComponentType();
-		String name = (type.isPrimitive() ? type.getName() : j2sNonPrimitiveName(type, true));
-		return "'" + (isArray ? name + "[]" : name) + "'";
-	}
-	
-//	private static Map<ITypeBinding, String> nonPrimitiveJ2STypeNames = new Hashtable<>();
-
 	static String j2sNonPrimitiveName(ITypeBinding type, boolean typeAsObject) {
 		if (type.isTypeVariable()) {
 			String n = type.toString();
