Simmering.

Author: UnquietCode

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

@@ -44,7 +44,7 @@
 /**
  * Assignment statements, which are also expressions.
  */
-public class JAssignment extends JExpressionImpl implements JStatement {
+public class JAssignment extends JExpressionImpl implements JExpressionStatement {
 
     JAssignmentTarget lhs;
     JExpression rhs;

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

@@ -51,48 +51,40 @@ public abstract class JExpr {
      */
     private JExpr() { }
 
-    public static JExpression assign(JAssignmentTarget lhs, JExpression rhs) {
+    public static JExpressionStatement assign(JAssignmentTarget lhs, JExpression rhs) {
         return new JAssignment(lhs, rhs);
     }
 
-    public static JExpression assignPlus(JAssignmentTarget lhs, JExpression rhs) {
+    public static JExpressionStatement 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 JExpressionStatement assignMinus(JAssignmentTarget lhs, JExpression rhs) {
+		return new JAssignment(lhs, rhs, "-");
+	}
+
+	public static JExpressionStatement assignTimes(JAssignmentTarget lhs, JExpression rhs) {
+		return new JAssignment(lhs, rhs, "*");
+	}
+
+	public static JExpressionStatement assignDivide(JAssignmentTarget lhs, JExpression rhs) {
+		return new JAssignment(lhs, rhs, "/");
+	}
+
+	public static JExpressionStatement incr(final JExpression expression) {
+		return new JExpressionStatementWrapper(JOp.incr(expression));
 	}
 
 	public static JStatement preincr(final JExpression expression) {
-		return new JStatement() {
-			public void state(JFormatter f) {
-				JOp.preincr(expression).generate(f);
-				f.p(';').nl();
-			}
-		};
+		return new JExpressionStatementWrapper(JOp.preincr(expression));
 	}
 
 	public static JStatement decr(final JExpression expression) {
-		return new JStatement() {
-			public void state(JFormatter f) {
-				JOp.decr(expression).generate(f);
-				f.p(';').nl();
-			}
-		};
+		return new JExpressionStatementWrapper(JOp.decr(expression));
 	}
 
 	public static JStatement predecr(final JExpression expression) {
-		return new JStatement() {
-			public void state(JFormatter f) {
-				JOp.predecr(expression).generate(f);
-				f.p(';').nl();
-			}
-		};
+		return new JExpressionStatementWrapper(JOp.predecr(expression));
 	}
 
     public static JInvocation _new(JClass c) {
@@ -337,5 +329,21 @@ public void generate( JFormatter f ) {
             }
         };
     }
-}
 
+	static class JExpressionStatementWrapper extends JExpressionImpl implements JExpressionStatement {
+		final JExpression expression;
+
+		JExpressionStatementWrapper(JExpression expression) {
+			this.expression = expression;
+		}
+
+		public void generate(JFormatter f) {
+			expression.generate(f);
+		}
+
+		public void state(JFormatter f) {
+			expression.generate(f);
+			f.p(';').nl();
+		}
+	}
+}

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

@@ -0,0 +1,9 @@
+package com.sun.codemodel;
+
+/**
+ * Expressions which can stand alone as statements, such as a += b; or ++i;
+ * @author Ben Fagin
+ */
+public interface JExpressionStatement extends JExpression, JStatement {
+	// nothing for now
+}

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

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

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

@@ -221,11 +221,23 @@ public void generate(JFormatter f) {
     }
 
 
-    public JExpression assign(JExpression rhs) {
+    public JExpressionStatement assign(JExpression rhs) {
 		return JExpr.assign(this,rhs);
     }
-    public JExpression assignPlus(JExpression rhs) {
+
+	public JExpressionStatement assignPlus(JExpression rhs) {
 		return JExpr.assignPlus(this,rhs);
     }
-	
+
+	public JExpressionStatement assignMinus(JExpression rhs) {
+		return JExpr.assignMinus(this,rhs);
+	}
+
+	public JExpressionStatement assignTimes(JExpression rhs) {
+		return JExpr.assignTimes(this,rhs);
+	}
+
+	public JExpressionStatement assignDivide(JExpression rhs) {
+		return JExpr.assignDivide(this,rhs);
+	}
 }