Turn on unsequenced expression rewriting by default.

	Change on 2015/03/02 by kstanger <[email protected]>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=87512781

Author: kstanger

doc/man/j2objc.1

@@ -69,8 +69,8 @@ Specify a ProGuard usage report for dead code elimination.
 .BI \-\-doc\-comments
 Translate Javadoc comments into Xcode-compatible comments.
 .TP
-.BI \-\-extract\-unsequenced
-Rewrite expressions that would produce unsequenced modification errors.
+.BI \-\-no\-extract\-unsequenced
+Don't rewrite expressions that would produce unsequenced modification errors.
 .TP
 .BI \-\-generate\-deprecated
 Generate deprecated attributes for deprecated methods, classes, and interfaces.

translator/src/main/java/com/google/devtools/j2objc/Options.java

@@ -75,7 +75,7 @@ public class Options {
   private static boolean jsniWarnings = true;
   private static boolean buildClosure = false;
   private static boolean stripReflection = false;
-  private static boolean extractUnsequencedModifications = false;
+  private static boolean extractUnsequencedModifications = true;
   private static boolean docCommentsEnabled = false;
   private static boolean finalMethodsAsFunctions = true;
   private static boolean removeClassMethods = false;
@@ -299,6 +299,8 @@ public static String[] load(String[] args) throws IOException {
         buildClosure = true;
       } else if (arg.equals("--extract-unsequenced")) {
         extractUnsequencedModifications = true;
+      } else if (arg.equals("--no-extract-unsequenced")) {
+        extractUnsequencedModifications = false;
       } else if (arg.equals("--doc-comments")) {
         docCommentsEnabled = true;
       } else if (arg.startsWith(BATCH_PROCESSING_MAX_FLAG)) {

translator/src/main/java/com/google/devtools/j2objc/ast/TreeUtil.java

@@ -26,6 +26,7 @@
 import org.eclipse.jdt.core.dom.IVariableBinding;
 
 import java.io.File;
+import java.util.AbstractList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
@@ -263,10 +264,52 @@ public static List<Statement> asStatementList(Statement node) {
         }
       }
     }
-    Block block = new Block();
-    node.replaceWith(block);
-    block.getStatements().add(node);
-    return block.getStatements();
+    return new LonelyStatementList(node);
+  }
+
+  /**
+   * This list wraps a single statement, and inserts a block node in its place
+   * upon adding additional nodes.
+   */
+  private static class LonelyStatementList extends AbstractList<Statement> {
+
+    private final Statement lonelyStatement;
+    private List<Statement> delegate = null;
+
+    public LonelyStatementList(Statement stmt) {
+      lonelyStatement = stmt;
+    }
+
+    private List<Statement> getDelegate() {
+      if (delegate == null) {
+        Block block = new Block();
+        lonelyStatement.replaceWith(block);
+        delegate = block.getStatements();
+        delegate.add(lonelyStatement);
+      }
+      return delegate;
+    }
+
+    public Statement get(int idx) {
+      if (delegate != null) {
+        return delegate.get(idx);
+      }
+      if (idx != 0) {
+        throw new IndexOutOfBoundsException();
+      }
+      return lonelyStatement;
+    }
+
+    public int size() {
+      if (delegate != null) {
+        return delegate.size();
+      }
+      return 1;
+    }
+
+    public void add(int idx, Statement stmt) {
+      getDelegate().add(idx, stmt);
+    }
   }
 
   public static void insertAfter(Statement node, Statement toInsert) {

translator/src/main/resources/com/google/devtools/j2objc/J2ObjC.properties

@@ -45,7 +45,7 @@ Other options:\n\
   --build-closure              Translate dependent classes if out-of-date.\n\
   --dead-code-report <file>    Specify a ProGuard usage report for dead code elimination.\n\
   --doc-comments               Translate Javadoc comments into Xcode-compatible comments.\n\
-  --extract-unsequenced        Rewrite expressions that would produce unsequenced\
+  --no-extract-unsequenced     Don't rewrite expressions that would produce unsequenced\
   \n                               modification errors.\n\
   --generate-deprecated        Generate deprecated attributes for deprecated methods,\
   \n                               classes and interfaces.\n\