more j2sNative issues - PrefixExpressions

hansonr · hansonr · commit aae03a6803c2 · 2019-01-08T23:19:01.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
@@ -2600,7 +2600,7 @@ public boolean visit(ArrayInitializer node) {
 
 	public boolean visit(Assignment node) {
 		// note that this is not
-		// var x = .....
+		// var x = ..... -- that is a visit(VariableDeclaration)
 		//
 		// includes: =
 		// +=, -=, *=, /=, %=
@@ -2611,6 +2611,9 @@ public boolean visit(Assignment node) {
 
 		Expression left = node.getLeftHandSide();
 		Expression right = node.getRightHandSide();
+		
+//		buffer.append("/* assign left=" + left  + " " + left.getClass().getName() + " right=" + right + right.getClass().getName() + "*/");
+
 		ITypeBinding leftTypeBinding = left.resolveTypeBinding();
 		ITypeBinding rightTypeBinding = right.resolveTypeBinding();
 		String rightName = (rightTypeBinding == null ? null : rightTypeBinding.getName());
@@ -3216,14 +3219,17 @@ public boolean visit(PostfixExpression node) {
 	 * </pre>
 	 */
 	public boolean visit(PrefixExpression node) {
-		if (getConstantValue(node, true))
-			return false;
+		Expression exp = node.getOperand();
+// NO! Don't do this! !(/** @j2sNative true||*/false  does not work 
+//		if (getConstantValue(node, true))
+//			return false;
 		String op = node.getOperator().toString();
+		
 		if ("~".equals(op)) {
 			buffer.append(op);
 			return true;
 		}
-		return addPrePost(node, node.getOperand(), node.getOperator().toString(), false);
+		return addPrePost(node, exp, node.getOperator().toString(), false);
 	}
 
 	public boolean visit(QualifiedName node) {
@@ -3876,6 +3882,7 @@ private void addNonCharacter(Expression exp) {
 	 * @param isToString
 	 */
 	private void addOperand(Expression exp, boolean isToString) {
+		
 		boolean needRtParen = false;//(exp instanceof ParenthesizedExpression && getJ2sJavadoc(exp, DOC_CHECK_ONLY) != null);
 		ITypeBinding binding = exp.resolveTypeBinding();
 		String name = binding.getName();
@@ -3998,6 +4005,7 @@ private boolean addPrimitiveTypedExpression(Expression left, IVariableBinding as
 
 		String classIntArray = null;
 		String more = null;
+		
 		String prefix = (isAssignment ? "=" : "");
 		boolean fromChar = ("char".equals(rightName));
 		boolean fromIntType = ("long int short byte".indexOf(rightName) >= 0);
@@ -4252,8 +4260,8 @@ private boolean appendBoxingNode(ASTNode element, boolean toCharCode) {
 					buffer.append(toCharCode && name == "char" ? ")" + CHARCODEAT0 : ")." + name + "Value$()");
 					return true;
 				}
-			}
-			if (!(element instanceof ParenthesizedExpression) && getConstantValue(exp, true)) {
+			}			
+			if (!(element instanceof ParenthesizedExpression) && !(element instanceof PrefixExpression) && getConstantValue(exp, true)) {
 				return false;
 			}
 		}
@@ -5172,7 +5180,7 @@ private static boolean hasSuperClass(ITypeBinding typeBinding) {
 	private Object getConstant(Expression exp) {
 		boolean isOK = (getJ2sJavadoc(exp, DOC_CHECK_ONLY) == null);
 		if (!isOK) {
-			isOK = !(exp instanceof InfixExpression || exp instanceof ParenthesizedExpression);			
+			isOK = !(exp instanceof InfixExpression || exp instanceof PrefixExpression || exp instanceof ParenthesizedExpression);			
 		}
 		return (isOK ? exp.resolveConstantExpressionValue() : null); 
 	}
@@ -5295,9 +5303,10 @@ private void setMapJavaDoc(PackageDeclaration node) {
 			// normal termination from item after last j2sjavadoc
 		}
 
-//		for (int i = 0, n = list.size(); i < n; i++) {
-//			System. out.println(i + "  " + (list.get(i) == null ? null : list.get(i).getClass().getName() + " " + list.get(i).getStartPosition() + "..." + (list.get(i).getStartPosition() + list.get(i).getLength())));
-//		}
+		//System.out.println("/**** list ****/");
+		//for (int i = 0, n = list.size(); i < n; i++) {
+		//	System. out.println(i + "  " + (list.get(i) == null ? null : list.get(i).getClass().getName() + " " + list.get(i).getStartPosition() + "..." + (list.get(i).getStartPosition() + list.get(i).getLength())));
+		//}
 
 		// and link javadoc to its closest block
 
@@ -5313,11 +5322,7 @@ private void setMapJavaDoc(PackageDeclaration node) {
 					item = list.get(++i);
 				}
 				i++;
-				//System.out.println(">>>1 " + item.getStartPosition() + " " + item);
-				//if (item instanceof ParenthesizedExpression)
-				//	item = ((ParenthesizedExpression) item).getExpression();
 				Integer pt = Integer.valueOf(item.getStartPosition() * factor);
-				//System.out.println(">>>2 " + pt + " " + item);
 				List<Javadoc> docs = package_mapBlockJavadoc.get(pt);
 				if (docs == null)
 					package_mapBlockJavadoc.put(pt, docs = new ArrayList<Javadoc>());
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Native2.java b/sources/net.sf.j2s.java.core/src/test/Test_Native2.java
@@ -0,0 +1,33 @@
+package test;
+
+class Test_Native2 extends Test_ {
+
+	public static void main(String[] args) {
+
+		if (/** @j2sNative true || */ false)
+			System.out.println("OK");
+		
+//		if (true ||false) System.out.println$S("OK");
+
+		
+		boolean b = !(/** @j2sNative true || */false);
+		
+//		var b=!(true ||false);
+
+		
+		assert(!b);
+		b = !(/** @j2sNative true || */false);
+
+//		b=!(true ||false);
+		
+		int c; 
+		
+		c = ~(/** @j2sNative 1|| */0);
+		
+//		c=~(1||0);
+	
+		
+	}
+		
+} 
+
