fix for inappropriate use of P$ for static variables

BobHanson · BobHanson · commit e5d13949d62a · 2018-01-09T08:47:24.000-06:00
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/Java2ScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/Java2ScriptVisitor.java
@@ -1071,7 +1071,7 @@ private boolean addClassOrInterface(ASTNode node, ITypeBinding binding, List<?>
 			// definition in the static buffer and return
 			String className;
 			if (parent instanceof TypeDeclarationStatement) {
-				String anonClassName = assureQualifiedName(binding.isAnonymous() || binding.isLocal()
+				String anonClassName = assureQualifiedNameAllowP$(binding.isAnonymous() || binding.isLocal()
 						? binding.getBinaryName() : binding.getQualifiedName());
 				className = anonClassName.substring(anonClassName.lastIndexOf('.') + 1);
 			} else {
@@ -1742,7 +1742,7 @@ private String getAnonymousName(ITypeBinding binding) {
 		if ((binding.isAnonymous() || binding.isLocal()) && (binaryName = binding.getBinaryName()) == null
 				&& (bindingKey = binding.getKey()) != null)
 			binaryName = bindingKey.substring(1, bindingKey.length() - 1).replace('/', '.');
-		return assureQualifiedName(binaryName == null ? binding.getQualifiedName() : binaryName);
+		return assureQualifiedNameAllowP$(binaryName == null ? binding.getQualifiedName() : binaryName);
 	}
 
 	private static String getSuperClassNameNoBrackets(ITypeBinding typeBinding) {
@@ -1789,7 +1789,7 @@ private void log(String msg) {
 	 */
 	private void openNew(String className, IMethodBinding mbinding) {
 		buffer.append("Clazz.new_(");
-		String name = assureQualifiedName(className);
+		String name = assureQualifiedNameAllowP$(className);
 		if (!name.equals("C$"))
 			name = getQualifiedStaticName(null, className, true, true, false);
 		if (mbinding == null) {
@@ -2269,7 +2269,7 @@ public boolean visit(FieldAccess node) {
 
 		if (varBinding != null) {
 			buffer.append(", ");
-			addQualifiedNameFromBinding(varBinding);
+			addQualifiedNameFromBinding(varBinding, false);
 			buffer.append(')');
 		}
 		buffer.append(".");
@@ -2514,15 +2514,15 @@ public boolean visit(QualifiedName node) {
 		// page.x =...
 		
 		
-		if (NameMapper.isJ2SSimpleQualified(node) && getConstantValue(node, true))
+		if (/*isSimpleQualified(node) && */ getConstantValue(node, true))
 			return false;
 		IBinding nameBinding = node.resolveBinding();
 		IVariableBinding varBinding = (nameBinding instanceof IVariableBinding ? (IVariableBinding) nameBinding : null);
 		ASTNode parent = node.getParent();
 		Name qualifier = node.getQualifier();
 		boolean skipQualifier = false;
 		if (isStatic(nameBinding) && varBinding != null) {
-			addQualifiedNameFromBinding(varBinding);
+			addQualifiedNameFromBinding(varBinding, true);
 			buffer.append('.');
 			skipQualifier = true;
 		} else if (!checkStaticBinding(varBinding) || qualifier.resolveBinding() instanceof ITypeBinding) {
@@ -2572,7 +2572,7 @@ public boolean visit(QualifiedName node) {
 		if (!skipQualifier) {
 			if (varBinding != null) {
 				if (qualifier instanceof SimpleName) {
-					addQualifiedNameFromBinding(varBinding);
+					addQualifiedNameFromBinding(varBinding, false);
 					// buffer.append("<qsn<");
 				} else {
 					buffer.append('(');
@@ -2581,7 +2581,7 @@ public boolean visit(QualifiedName node) {
 					else
 						buffer.append(className);
 					buffer.append(", ");
-					addQualifiedNameFromBinding(varBinding);
+					addQualifiedNameFromBinding(varBinding, false);
 					buffer.append(')');
 				}
 			} else if (className == null) {
@@ -2634,7 +2634,7 @@ private String getQualifiedSimpleName(SimpleName node) {
 		if (xparent instanceof ClassInstanceCreation && !(binding instanceof IVariableBinding)) {
 			String name = (binding == null ? NameMapper.getJ2SName(node)
 					: node.resolveTypeBinding().getQualifiedName());
-			return assureQualifiedName(name);
+			return assureQualifiedNameAllowP$(name);
 		}
 		if (binding == null) {
 			String name = getShortenedQualifiedName(NameMapper.getJ2SName(node));
@@ -2648,7 +2648,7 @@ private String getQualifiedSimpleName(SimpleName node) {
 		ITypeBinding typeBinding = node.resolveTypeBinding();
 		// >>Math<<.max
 		return NameMapper.getJ2SValidFieldName$Qualifier(typeBinding == null ? node.getFullyQualifiedName()
-				: assureQualifiedName(typeBinding.getQualifiedName()), true);
+				: assureQualifiedNameAllowP$(typeBinding.getQualifiedName()), true);
 	}
 
 	private char getLastChar() {
@@ -2677,7 +2677,7 @@ private String simpleNameInMethodBinding(SimpleName node, boolean isQualified, I
 					MethodInvocation mthInv = (MethodInvocation) parent;
 					if (mthInv.getExpression() == null) {
 						String cname = declaringClass.getQualifiedName();
-						cname = assureQualifiedName(cname);
+						cname = assureQualifiedNameAllowP$(cname);
 						if (cname.length() > 0)
 							ret = cname + ".";
 					}
@@ -2722,7 +2722,7 @@ private String simpleNameInVarBinding(SimpleName node, char ch, IVariableBinding
 				if ((name == null || name.length() == 0) && declaringClass.isAnonymous()) {
 					name = declaringClass.getBinaryName();
 				}
-				name = assureQualifiedName(name);
+				name = assureQualifiedNameAllowP$(name);
 				if (name.length() != 0) {
 					ret = getQualifiedStaticName(null, name, true, true, false) + ".";
 				}
@@ -2759,15 +2759,17 @@ private String simpleNameInVarBinding(SimpleName node, char ch, IVariableBinding
 			if (declaringClass == null)
 				name = (fieldVar == null ? getNormalVariableName(node.getIdentifier()) : fieldVar);
 		}
-		if (declaringClass != null)
+		if (declaringClass != null) {
 			name = NameMapper.getJ2SName(node);
+
+		}
 		ret += NameMapper.getJ2SCheckedFieldName(declaringClass, name);
 		return ret;
 	}
 
 	public boolean visit(SimpleType node) {
 		ITypeBinding binding = node.resolveBinding();
-		buffer.append(binding == null ? node : assureQualifiedName(binding.getQualifiedName()));
+		buffer.append(binding == null ? node : assureQualifiedNameAllowP$(binding.getQualifiedName()));
 		return false;
 	}
 
@@ -3115,7 +3117,7 @@ private void addExtendedOperands(List<?> extendedOperands, String operator, char
 
 	private void addFieldName(Expression left, IVariableBinding qualifier) {
 		if (qualifier != null) {
-			addQualifiedNameFromBinding(qualifier);
+			addQualifiedNameFromBinding(qualifier, false);
 			buffer.append('.');
 			left = (left instanceof QualifiedName ? ((QualifiedName) left).getName()
 					: left instanceof FieldAccess ? ((FieldAccess) left).getName() : left);
@@ -3412,9 +3414,10 @@ private void addPrimitiveTypedExpression(Expression left, IVariableBinding assig
 	 * for example: new Test_Static().y++
 	 * 
 	 * @param varBinding
+	 * @param isStatic TODO
 	 */
-	private void addQualifiedNameFromBinding(IVariableBinding varBinding) {
-		appendShortenedQualifiedName(global_PackageName, varBinding.getDeclaringClass().getQualifiedName(),
+	private void addQualifiedNameFromBinding(IVariableBinding varBinding, boolean isStatic) {
+		appendShortenedQualifiedName((isStatic ? null : global_PackageName), varBinding.getDeclaringClass().getQualifiedName(),
 				isStatic(varBinding), true);
 	}
 
@@ -3518,8 +3521,8 @@ private String ensureNameIfLocal(String name, ITypeBinding typeBinding, ASTNode
 	 */
 	private void appendShortenedQualifiedName(String packageName, String name, boolean isStatic, boolean doCache) {
 		name = removeBrackets(name);
-		String shortName = (doCache ? assureQualifiedName(name) : assureQualifiedNameNoC$(packageName, name));
-		if (isStatic && (shortName.length() < 2 || shortName.charAt(1) != '$')) {
+		String shortName = (doCache ? assureQualifiedNameAllowP$(name) : assureQualifiedNameNoC$(packageName, name));
+		if (isStatic && (shortName.length() < 2 || packageName == null || shortName.charAt(1) != '$')) {
 			if (!doCache || isClassKnown(name))
 				name = shortName;
 			getQualifiedStaticName(null, name, true, doCache, true);
@@ -3614,7 +3617,7 @@ private boolean checkStaticBinding(IVariableBinding varBinding) {
 		return TypeAdapter.assureQualifiedName(packageName, name);
 	}
 
-	private String assureQualifiedName(String name) {
+	private String assureQualifiedNameAllowP$(String name) {
 		return (name == null ? null
 				: TypeAdapter.assureQualifiedName(global_PackageName, getShortenedQualifiedName(name)));
 	}
@@ -4021,6 +4024,18 @@ private String getJ2SQualifiedName(String j2sName, String nodeName, IMethodBindi
 		return j2sName + s;
 	}
 
+//	/**
+//	 * Check whether the given QualifiedName is just simple or not.
+//	 * abandoned -- guarangteed to be true -- that's the definition
+//	 * 
+//	 * @param node
+//	 * @return
+//	 */
+//	public static boolean isSimpleQualified(QualifiedName node) {
+//		Name qualifier = node.getQualifier();
+//		return (qualifier instanceof SimpleName || isSimpleQualified((QualifiedName) qualifier));
+//	}
+
 	/**
 	 * finish the generic foo || bar fix
 	 * 
@@ -4989,24 +5004,6 @@ public static boolean isJ2SInheritedFieldName(ITypeBinding binding, String name)
 			return false;
 		}
 
-		/**
-		 * Check whether the given QualifiedName is just simple or not.
-		 * The "just simple" means foo.bar not just foo?
-		 * 
-		 * @param node
-		 * @return
-		 */
-		public static boolean isJ2SSimpleQualified(QualifiedName node) {
-			Name qualifier = node.getQualifier();
-			if (qualifier instanceof SimpleName) {
-				return true;
-			} else if (qualifier instanceof QualifiedName) {
-				return isJ2SSimpleQualified((QualifiedName) qualifier);
-			}
-			System.err.println(">>> FieldAdapter not simple " + node.getFullyQualifiedName());
-			return false;
-		}
-
 		/*
 		 * IE passes the following: 
 		 * public,private,private,static,package,
@@ -5242,4 +5239,15 @@ private static Object getJ2SKeepOrIgnore(BodyDeclaration node, String tagName) {
 
 
 	}
+	
+	/**
+	 * for debugging --  to System.err.println
+	 */
+	public static void dumpStack() {
+		try{
+			throw new NullPointerException();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 }
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/TypeAdapter.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/TypeAdapter.java
@@ -215,50 +215,10 @@ static public String getTypeStringName(Type type) {
 	 * @param name
 	 * @return
 	 */
-	@SuppressWarnings("null")
 	public static String assureQualifiedName(String thisPackageName, String name) {
-		if (name == null || name.length() == 0)
-			return name;
-		if (thisPackageName != null) {
-			if (name.startsWith(thisPackageName + "."))
-				return "P$." + name.substring(thisPackageName.length() + 1);
-			if (name.equals(thisPackageName))
-				return "P$";
-		}
-		String[] packages = null;
-		boolean existedKeyword = false;
-//		String[] keywords = FieldAdapter.keywords;
-//		for (int i = 0; i < keywords.length; i++) {
-//			if (name.indexOf(keywords[i]) >= 0) {
-//				if (packages == null) {
-//					packages = name.split("\\.");
-//				}
-//				for (int j = 0; j < packages.length; j++) {
-//					if (keywords[i].equals(packages[j])) {
-//						packages[j] = "[\"" + packages[j] + "\"]";
-//						existedKeyword = true;
-//					}
-//				}
-//			}
-//		}
-		if (existedKeyword) {
-			StringBuffer sb = new StringBuffer();
-			for (int i = 0; i < packages.length; i++) {
-				if (packages[i].charAt(0) == '[') {
-					if (i == 0) {
-						sb.append("window");
-					}
-					sb.append(packages[i]);
-				} else {
-					if (i != 0) {
-						sb.append('.');
-					}
-					sb.append(packages[i]);
-				}
-			}
-			return sb.toString();
-		}
-		return name;
+		return (name == null || name.length() == 0 || thisPackageName == null ?
+			name : name.startsWith(thisPackageName + ".") ?  "P$." + name.substring(thisPackageName.length() + 1)
+			: name.equals(thisPackageName) ? "P$" : name);
 	}
 
 }
