Moved JdtParser to com.google.devtools.j2objc.jdt package.

Change on 2016/08/22 by tball <tball@google.com> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=130967743
google · Sep 8, 2016 · 7f5eb57 · 7f5eb57
1 parent d792a9f
commit 7f5eb57
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 7 deletions.
diff --git a/cycle_finder/src/main/java/com/google/devtools/cyclefinder/CycleFinder.java b/cycle_finder/src/main/java/com/google/devtools/cyclefinder/CycleFinder.java
@@ -18,11 +18,11 @@
 import com.google.common.io.Files;
 import com.google.devtools.j2objc.ast.CompilationUnit;
 import com.google.devtools.j2objc.file.RegularInputFile;
+import com.google.devtools.j2objc.jdt.JdtParser;
 import com.google.devtools.j2objc.pipeline.J2ObjCIncompatibleStripper;
 import com.google.devtools.j2objc.translate.OuterReferenceResolver;
 import com.google.devtools.j2objc.util.ErrorUtil;
 import com.google.devtools.j2objc.util.FileUtil;
-import com.google.devtools.j2objc.util.JdtParser;
 import com.google.devtools.j2objc.util.Parser;
 import java.io.File;
 import java.io.IOException;

diff --git a/translator/Makefile b/translator/Makefile
@@ -202,6 +202,7 @@ JAVA_SOURCES = \
 	jdt/JdtNullType.java \
 	jdt/JdtPackageBinding.java \
 	jdt/JdtPackageElement.java \
+	jdt/JdtParser.java \
 	jdt/JdtPrimitiveType.java \
 	jdt/JdtTypeBinding.java \
 	jdt/JdtTypeElement.java \
@@ -287,7 +288,6 @@ JAVA_SOURCES = \
 	util/ErrorUtil.java \
 	util/FileUtil.java \
 	util/HeaderMap.java \
-	util/JdtParser.java \
 	util/NameTable.java \
 	util/PackagePrefixes.java \
 	util/Parser.java \

diff --git a/translator/src/main/java/com/google/devtools/j2objc/Options.java b/translator/src/main/java/com/google/devtools/j2objc/Options.java
@@ -1029,7 +1029,7 @@ public static TimingLevel timingLevel() {
   // TODO(tball): remove after front-end conversion is complete.
   public static Parser newParser() {
     if (instance.javaFrontEnd == FrontEnd.JDT) {
-        return new com.google.devtools.j2objc.util.JdtParser();
+        return new com.google.devtools.j2objc.jdt.JdtParser();
     }
     throw new AssertionError("javac front-end not implemented");
   }

diff --git a/translator/src/main/java/com/google/devtools/j2objc/javac/JavacEnvironment.java b/translator/src/main/java/com/google/devtools/j2objc/javac/JavacEnvironment.java
@@ -14,6 +14,7 @@
 
 package com.google.devtools.j2objc.javac;
 
+import com.google.devtools.j2objc.ast.TreeNode;
 import com.google.devtools.j2objc.util.NameTable.Factory;
 import com.google.devtools.j2objc.util.ParserEnvironment;
 import com.sun.tools.javac.code.Symbol.ClassSymbol;
@@ -94,4 +95,10 @@ public Elements elementUtilities() {
   public Types typeUtilities() {
     return javacTypes;
   }
+
+  @Override
+  public TreeNode convert(Object tree) {
+    // TODO(tball): replace with call to javac tree converter.
+    return null;
+  }
 }
diff --git a/...oogle/devtools/j2objc/util/JdtParser.java → ...google/devtools/j2objc/jdt/JdtParser.java b/...oogle/devtools/j2objc/util/JdtParser.java → ...google/devtools/j2objc/jdt/JdtParser.java
@@ -12,17 +12,22 @@
  * limitations under the License.
  */
 
-package com.google.devtools.j2objc.util;
+package com.google.devtools.j2objc.jdt;
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.devtools.j2objc.Options;
 import com.google.devtools.j2objc.Options.LintOption;
+import com.google.devtools.j2objc.ast.TreeNode;
 import com.google.devtools.j2objc.file.InputFile;
 import com.google.devtools.j2objc.file.RegularInputFile;
-import com.google.devtools.j2objc.jdt.BindingConverter;
-import com.google.devtools.j2objc.jdt.TreeConverter;
+import com.google.devtools.j2objc.util.ErrorUtil;
+import com.google.devtools.j2objc.util.FileUtil;
+import com.google.devtools.j2objc.util.NameTable;
+import com.google.devtools.j2objc.util.Parser;
+import com.google.devtools.j2objc.util.ParserEnvironment;
+import com.google.devtools.j2objc.util.SourceVersion;
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
@@ -292,5 +297,10 @@ public javax.lang.model.util.Elements elementUtilities() {
     public javax.lang.model.util.Types typeUtilities() {
       throw new AssertionError("not implemented");
     }
+
+    @Override
+    public TreeNode convert(Object tree) {
+      return TreeConverter.convert(tree);
+    }
   }
 }
diff --git a/translator/src/main/java/com/google/devtools/j2objc/pipeline/FileProcessor.java b/translator/src/main/java/com/google/devtools/j2objc/pipeline/FileProcessor.java
@@ -22,9 +22,9 @@
 import com.google.devtools.j2objc.ast.CompilationUnit;
 import com.google.devtools.j2objc.file.InputFile;
 import com.google.devtools.j2objc.jdt.BindingConverter;
+import com.google.devtools.j2objc.jdt.JdtParser;
 import com.google.devtools.j2objc.util.ErrorUtil;
 import com.google.devtools.j2objc.util.FileUtil;
-import com.google.devtools.j2objc.util.JdtParser;
 import com.google.devtools.j2objc.util.Parser;
 import java.util.List;
 import java.util.Map;

diff --git a/translator/src/main/java/com/google/devtools/j2objc/util/ParserEnvironment.java b/translator/src/main/java/com/google/devtools/j2objc/util/ParserEnvironment.java
@@ -15,6 +15,7 @@
 package com.google.devtools.j2objc.util;
 
 import com.google.common.base.Preconditions;
+import com.google.devtools.j2objc.ast.TreeNode;
 import com.google.devtools.j2objc.types.Types;
 import javax.lang.model.element.Element;
 
@@ -52,6 +53,15 @@ public synchronized Types types() {
    */
   public abstract Element resolve(String name);
 
+  /**
+   * Converts a tree provided by the compiler front-end to one
+   * from the com.google.devtools.j2objc.ast package.
+   *
+   * @throws IllegalArgumentException if the tree argument was
+   *     not created by the compiler front-end.
+   */
+  public abstract TreeNode convert(Object tree);
+
   // TODO(tball): return an instance that merges j.l.m.u.Elements and ElementUtil.
   public abstract javax.lang.model.util.Elements elementUtilities();