Fixed conversion of enum constants with class bodies, incompatible st…

…ripping. Change on 2017/01/03 by tball <tball@google.com> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=143451467
google · Jan 6, 2017 · d3c4862 · d3c4862
1 parent 50d29da
commit d3c4862
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...lator/src/main/java/com/google/devtools/j2objc/javac/JavacJ2ObjCIncompatibleStripper.java b/...lator/src/main/java/com/google/devtools/j2objc/javac/JavacJ2ObjCIncompatibleStripper.java
@@ -26,6 +26,7 @@
 import com.sun.tools.javac.tree.JCTree.JCIdent;
 import com.sun.tools.javac.tree.JCTree.JCImport;
 import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
+import com.sun.tools.javac.tree.JCTree.JCMethodInvocation;
 import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
 import com.sun.tools.javac.tree.TreeInfo;
 import com.sun.tools.javac.tree.TreeScanner;
@@ -180,6 +181,8 @@ private String getFirstComponent(JCTree name) {
         return ((JCIdent) name).getName().toString();
       case MEMBER_SELECT:
         return getFirstComponent(((JCFieldAccess) name).getExpression());
+      case METHOD_INVOCATION:
+        return getFirstComponent(((JCMethodInvocation) name).getMethodSelect());
       default:
         throw new AssertionError("unexpected kind: " + name.getKind());
     }
@@ -191,6 +194,8 @@ private String getLastComponent(JCTree name) {
         return ((JCIdent) name).getName().toString();
       case MEMBER_SELECT:
         return ((JCFieldAccess) name).getIdentifier().toString();
+      case METHOD_INVOCATION:
+        return getLastComponent(((JCMethodInvocation) name).getMethodSelect());
       default:
         throw new AssertionError("unexpected kind: " + name.getKind());
     }

diff --git a/translator/src/main/java/com/google/devtools/j2objc/javac/TreeConverter.java b/translator/src/main/java/com/google/devtools/j2objc/javac/TreeConverter.java
@@ -672,6 +672,10 @@ private TreeNode convertEnum(JCTree.JCClassDecl node) {
         } else {
           newNode.addBodyDeclaration((BodyDeclaration) var);
         }
+      } else if (bodyDecl.getKind() == Kind.BLOCK) {
+        JCTree.JCBlock javacBlock = (JCTree.JCBlock) bodyDecl;
+        Block block = (Block) convert(javacBlock);
+        newNode.addBodyDeclaration(new Initializer(block, javacBlock.isStatic()));
       } else {
         newNode.addBodyDeclaration((BodyDeclaration) convert(bodyDecl));
       }
@@ -1225,8 +1229,9 @@ private TreeNode getAssociatedJavaDoc(JCTree node, Element element) {
   }
 
   private Comment convertAssociatedComment(JCTree node, Element element) {
+    boolean docCommentsEnabled = newUnit.getEnv().options().docCommentsEnabled();
     DocCommentTable docComments = unit.docComments;
-    if (docComments == null || !docComments.hasComment(node)) {
+    if (!docCommentsEnabled || docComments == null || !docComments.hasComment(node)) {
       return null;
     }
     com.sun.tools.javac.parser.Tokens.Comment javacComment = docComments.getComment(node);
@@ -1236,7 +1241,7 @@ private Comment convertAssociatedComment(JCTree node, Element element) {
         comment = new BlockComment();
         break;
       case JAVADOC:
-        comment = newUnit.getEnv().options().docCommentsEnabled()
+        comment = docCommentsEnabled
             ? convertJavadocComment(element) : new Javadoc();
         break;
       case LINE: