Better support for prefix and postfix increment and decrement operators (++/--). The primary gap was in the ability to use ++var or --var as pure statements rather than just expressions.

Author: UnquietCode

codemodel/src/main/java/com/sun/codemodel/JExpr.java

@@ -59,6 +59,42 @@ public static JExpression assignPlus(JAssignmentTarget lhs, JExpression rhs) {
         return new JAssignment(lhs, rhs, "+");
     }
 
+	public static JStatement incr(final JExpression expression) {
+		return new JStatement() {
+			public void state(JFormatter f) {
+				JOp.incr(expression).generate(f);
+				f.p(';').nl();
+			}
+		};
+	}
+
+	public static JStatement preincr(final JExpression expression) {
+		return new JStatement() {
+			public void state(JFormatter f) {
+				JOp.preincr(expression).generate(f);
+				f.p(';').nl();
+			}
+		};
+	}
+
+	public static JStatement decr(final JExpression expression) {
+		return new JStatement() {
+			public void state(JFormatter f) {
+				JOp.decr(expression).generate(f);
+				f.p(';').nl();
+			}
+		};
+	}
+
+	public static JStatement predecr(final JExpression expression) {
+		return new JStatement() {
+			public void state(JFormatter f) {
+				JOp.predecr(expression).generate(f);
+				f.p(';').nl();
+			}
+		};
+	}
+
     public static JInvocation _new(JClass c) {
         return new JInvocation(c);
     }
@@ -179,7 +215,7 @@ public static JExpression _null() {
     public static final JExpression FALSE = new JAtom("false");
 
     public static JExpression lit(boolean b) {
-        return b?TRUE:FALSE;
+        return b ? TRUE : FALSE;
     }
 
     public static JExpression lit(int n) {
@@ -297,7 +333,7 @@ public static JExpression lit(String s) {
     public static JExpression direct( final String source ) {
         return new JExpressionImpl(){
             public void generate( JFormatter f ) {
-                    f.p('(').p(source).p(')');
+                f.p('(').p(source).p(')');
             }
         };
     }

codemodel/src/main/java/com/sun/codemodel/JExpression.java

@@ -45,9 +45,9 @@
  * A Java expression.
  *
  * <p>
- * Unlike most of CodeModel, JExpressions are built bottom-up (
- * meaning you start from leaves and then gradually build compliated expressions
- * by combining them.)
+ * Unlike most of CodeModel, JExpressions are built bottom-up
+ * (meaning you start from leaves and then gradually build complicated expressions
+ * by combining them).
  *
  * <p>
  * {@link JExpression} defines a series of composer methods,
@@ -76,11 +76,21 @@ public interface JExpression extends JGenerable {
      */
     JExpression incr();
 
+	/**
+	 * Returns "++[this]" from "[this]".
+	 */
+	JExpression preincr();
+
     /**
      * Returns "[this]--" from "[this]".
      */
     JExpression decr();
 
+	/**
+	 * Returns "--[this]" from "[this]".
+	 */
+	JExpression predecr();
+
     /**
      * Returns "[this]+[right]"
      */

codemodel/src/main/java/com/sun/codemodel/JExpressionImpl.java

@@ -69,10 +69,18 @@ public final JExpression incr() {
         return JOp.incr(this);
     }
 
+	public final JExpression preincr() {
+		return JOp.preincr(this);
+	}
+
     public final JExpression decr() {
         return JOp.decr(this);
     }
 
+	public final JExpression predecr() {
+		return JOp.predecr(this);
+	}
+
     public final JExpression plus(JExpression right) {
         return JOp.plus(this, right);
     }

codemodel/src/main/java/com/sun/codemodel/JFormatter.java

@@ -184,7 +184,6 @@ private boolean needSpace(char c1, char c2) {
             switch (c2) {
             case '{':
             case '}':
-            case '+':
             case '>':
             case '@':
                 return true;

codemodel/src/main/java/com/sun/codemodel/JOp.java

@@ -47,8 +47,7 @@
 
 abstract public class JOp {
 
-    private JOp() {
-    }
+    private JOp() { }
 
 
     /**
@@ -65,11 +64,12 @@ static private class UnaryOp extends JExpressionImpl {
 
         protected String op;
         protected JExpression e;
-        protected boolean opFirst = true;
+        protected final boolean opFirst;
 
         UnaryOp(String op, JExpression e) {
             this.op = op;
             this.e = e;
+	        opFirst = true;
         }
 
         UnaryOp(JExpression e, String op) {
@@ -84,7 +84,6 @@ public void generate(JFormatter f) {
             else
                 f.p('(').g(e).p(op).p(')');
         }
-
     }
 
     public static JExpression minus(JExpression e) {
@@ -110,23 +109,34 @@ static private class TightUnaryOp extends UnaryOp {
             super(e, op);
         }
 
+	    TightUnaryOp(String op, JExpression e) {
+		    super(op, e);
+	    }
+
         public void generate(JFormatter f) {
             if (opFirst)
                 f.p(op).g(e);
             else
                 f.g(e).p(op);
         }
-
     }
 
     public static JExpression incr(JExpression e) {
         return new TightUnaryOp(e, "++");
     }
 
+	public static JExpression preincr(JExpression e) {
+		return new TightUnaryOp("++", e);
+	}
+
     public static JExpression decr(JExpression e) {
         return new TightUnaryOp(e, "--");
     }
 
+	public static JExpression predecr(JExpression e) {
+		return new TightUnaryOp("--", e);
+	}
+
 
     /* -- Binary operators -- */