Skip to content

Commit

Permalink
Adds Mappings class for managing class and method mappings. This make…
Browse files Browse the repository at this point in the history
…s NameTable.Factory no longer necessary.

	Change on 2016/11/03 by kstanger <kstanger@google.com>

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=138094849
  • Loading branch information
kstanger authored and tomball committed Nov 4, 2016
1 parent 1c55209 commit 127ba79
Show file tree
Hide file tree
Showing 10 changed files with 154 additions and 148 deletions.
1 change: 1 addition & 0 deletions translator/Makefile
Expand Up @@ -298,6 +298,7 @@ JAVA_SOURCES = \
util/ErrorUtil.java \ util/ErrorUtil.java \
util/FileUtil.java \ util/FileUtil.java \
util/HeaderMap.java \ util/HeaderMap.java \
util/Mappings.java \
util/NameTable.java \ util/NameTable.java \
util/PackageInfoLookup.java \ util/PackageInfoLookup.java \
util/PackagePrefixes.java \ util/PackagePrefixes.java \
Expand Down
66 changes: 8 additions & 58 deletions translator/src/main/java/com/google/devtools/j2objc/Options.java
Expand Up @@ -20,27 +20,23 @@
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.io.Resources; import com.google.common.io.Resources;
import com.google.devtools.j2objc.util.ErrorUtil; import com.google.devtools.j2objc.util.ErrorUtil;
import com.google.devtools.j2objc.util.FileUtil;
import com.google.devtools.j2objc.util.HeaderMap; import com.google.devtools.j2objc.util.HeaderMap;
import com.google.devtools.j2objc.util.Mappings;
import com.google.devtools.j2objc.util.PackageInfoLookup; import com.google.devtools.j2objc.util.PackageInfoLookup;
import com.google.devtools.j2objc.util.PackagePrefixes; import com.google.devtools.j2objc.util.PackagePrefixes;
import com.google.devtools.j2objc.util.Parser; import com.google.devtools.j2objc.util.Parser;
import com.google.devtools.j2objc.util.SourceVersion; import com.google.devtools.j2objc.util.SourceVersion;
import com.google.devtools.j2objc.util.Version; import com.google.devtools.j2objc.util.Version;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.net.URL; import java.net.URL;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.UnsupportedCharsetException; import java.nio.charset.UnsupportedCharsetException;
import java.util.Collections; import java.util.Collections;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.Enumeration;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.logging.Handler; import java.util.logging.Handler;
import java.util.logging.Level; import java.util.logging.Level;
Expand Down Expand Up @@ -73,8 +69,6 @@ public class Options {
private boolean deprecatedDeclarations = false; private boolean deprecatedDeclarations = false;
private HeaderMap headerMap = new HeaderMap(); private HeaderMap headerMap = new HeaderMap();
private File outputHeaderMappingFile = null; private File outputHeaderMappingFile = null;
private Map<String, String> classMappings = Maps.newLinkedHashMap();
private Map<String, String> methodMappings = Maps.newLinkedHashMap();
private boolean stripGwtIncompatible = false; private boolean stripGwtIncompatible = false;
private boolean segmentedHeaders = true; private boolean segmentedHeaders = true;
private String fileEncoding = System.getProperty("file.encoding", "UTF-8"); private String fileEncoding = System.getProperty("file.encoding", "UTF-8");
Expand All @@ -98,6 +92,7 @@ public class Options {
// TODO(tball): remove after front-end conversion is complete. // TODO(tball): remove after front-end conversion is complete.
private FrontEnd javaFrontEnd = FrontEnd.JDT; private FrontEnd javaFrontEnd = FrontEnd.JDT;


private Mappings mappings = new Mappings();
private PackageInfoLookup packageInfoLookup = new PackageInfoLookup(); private PackageInfoLookup packageInfoLookup = new PackageInfoLookup();
private PackagePrefixes packagePrefixes = new PackagePrefixes(packageInfoLookup); private PackagePrefixes packagePrefixes = new PackagePrefixes(packageInfoLookup);


Expand All @@ -111,8 +106,6 @@ public class Options {
public static final String DEFAULT_HEADER_MAPPING_FILE = "mappings.j2objc"; public static final String DEFAULT_HEADER_MAPPING_FILE = "mappings.j2objc";
// Null if not set (means we use the default). Can be empty also (means we use no mapping files). // Null if not set (means we use the default). Can be empty also (means we use no mapping files).


private static final String JRE_MAPPINGS_FILE = "JRE.mappings";

private static String fileHeader; private static String fileHeader;
private static final String FILE_HEADER_KEY = "file-header"; private static final String FILE_HEADER_KEY = "file-header";
private static String usageMessage; private static String usageMessage;
Expand Down Expand Up @@ -355,7 +348,7 @@ public static String[] load(String[] args) throws IOException {
private String[] loadInternal(String[] args) throws IOException { private String[] loadInternal(String[] args) throws IOException {
setLogLevel(Level.INFO); setLogLevel(Level.INFO);


addJreMappings(); mappings.addJreMappings();


// Create a temporary directory as the sourcepath's first entry, so that // Create a temporary directory as the sourcepath's first entry, so that
// modified sources will take precedence over regular files. // modified sources will take precedence over regular files.
Expand Down Expand Up @@ -393,7 +386,7 @@ private String[] loadInternal(String[] args) throws IOException {
if (++nArg == args.length) { if (++nArg == args.length) {
usage("--mapping requires an argument"); usage("--mapping requires an argument");
} }
addMappingsFiles(args[nArg].split(",")); mappings.addMappingsFiles(args[nArg].split(","));
} else if (arg.equals("--header-mapping")) { } else if (arg.equals("--header-mapping")) {
if (++nArg == args.length) { if (++nArg == args.length) {
usage("--header-mapping requires an argument"); usage("--header-mapping requires an argument");
Expand Down Expand Up @@ -615,45 +608,6 @@ private void addPrefixOption(String arg) {
packagePrefixes.addPrefix(arg.substring(0, i), arg.substring(i + 1)); packagePrefixes.addPrefix(arg.substring(0, i), arg.substring(i + 1));
} }


private void addMappingsFiles(String[] filenames) throws IOException {
for (String filename : filenames) {
if (!filename.isEmpty()) {
addMappingsProperties(FileUtil.loadProperties(filename));
}
}
}

private void addJreMappings() throws IOException {
InputStream stream = J2ObjC.class.getResourceAsStream(JRE_MAPPINGS_FILE);
addMappingsProperties(FileUtil.loadProperties(stream));
}

private void addMappingsProperties(Properties mappings) {
Enumeration<?> keyIterator = mappings.propertyNames();
while (keyIterator.hasMoreElements()) {
String key = (String) keyIterator.nextElement();
if (key.indexOf('(') > 0) {
// All method mappings have parentheses characters, classes don't.
String iosMethod = mappings.getProperty(key);
addMapping(methodMappings, key, iosMethod, "method mapping");
} else {
String iosClass = mappings.getProperty(key);
addMapping(classMappings, key, iosClass, "class mapping");
}
}
}

/**
* Adds a class, method or package-prefix property to its map, reporting an error
* if that mapping was previously specified.
*/
private static void addMapping(Map<String, String> map, String key, String value, String kind) {
String oldValue = map.put(key, value);
if (oldValue != null && !oldValue.equals(value)) {
ErrorUtil.error(kind + " redefined; was \"" + oldValue + ", now " + value);
}
}

/** /**
* Check that the memory management option wasn't previously set to a * Check that the memory management option wasn't previously set to a
* different value. If okay, then set the option. * different value. If okay, then set the option.
Expand Down Expand Up @@ -810,14 +764,6 @@ public static boolean generateDeprecatedDeclarations() {
return instance.deprecatedDeclarations; return instance.deprecatedDeclarations;
} }


public static Map<String, String> getClassMappings() {
return instance.classMappings;
}

public static Map<String, String> getMethodMappings() {
return instance.methodMappings;
}

public static HeaderMap getHeaderMap() { public static HeaderMap getHeaderMap() {
return instance.headerMap; return instance.headerMap;
} }
Expand Down Expand Up @@ -872,6 +818,10 @@ public static List<String> getBootClasspath() {
return getPathArgument(bootclasspath); return getPathArgument(bootclasspath);
} }


public static Mappings getMappings() {
return instance.mappings;
}

public static PackageInfoLookup getPackageInfoLookup() { public static PackageInfoLookup getPackageInfoLookup() {
return instance.packageInfoLookup; return instance.packageInfoLookup;
} }
Expand Down
Expand Up @@ -122,7 +122,7 @@ public void parseFiles(Collection<String> paths, Handler handler, SourceVersion
JavacTaskImpl task = (JavacTaskImpl) compiler.getTask( JavacTaskImpl task = (JavacTaskImpl) compiler.getTask(
null, fileManager, diagnostics, javacOptions, null, fileObjects); null, fileManager, diagnostics, javacOptions, null, fileObjects);
JavacEnvironment parserEnv = new JavacEnvironment(task.getContext()); JavacEnvironment parserEnv = new JavacEnvironment(task.getContext());
TranslationEnvironment env = new TranslationEnvironment(nameTableFactory, parserEnv); TranslationEnvironment env = new TranslationEnvironment(parserEnv);


List<CompilationUnitTree> units = new ArrayList<>(); List<CompilationUnitTree> units = new ArrayList<>();
try { try {
Expand Down
Expand Up @@ -134,7 +134,7 @@ public com.google.devtools.j2objc.ast.CompilationUnit parse(String mainTypeName,
mainTypeName = FileUtil.getQualifiedMainTypeName(file, unit); mainTypeName = FileUtil.getQualifiedMainTypeName(file, unit);
} }
ParserEnvironment parserEnv = new JdtParserEnvironment(unit.getAST()); ParserEnvironment parserEnv = new JdtParserEnvironment(unit.getAST());
TranslationEnvironment env = new TranslationEnvironment(nameTableFactory, parserEnv); TranslationEnvironment env = new TranslationEnvironment(parserEnv);
return TreeConverter.convertCompilationUnit(env, unit, path, mainTypeName, source); return TreeConverter.convertCompilationUnit(env, unit, path, mainTypeName, source);
} }


Expand Down Expand Up @@ -163,7 +163,7 @@ public void acceptAST(String sourceFilePath, CompilationUnit ast) {
try { try {
String source = FileUtil.readFile(file); String source = FileUtil.readFile(file);
ParserEnvironment parserEnv = new JdtParserEnvironment(ast.getAST()); ParserEnvironment parserEnv = new JdtParserEnvironment(ast.getAST());
TranslationEnvironment env = new TranslationEnvironment(nameTableFactory, parserEnv); TranslationEnvironment env = new TranslationEnvironment(parserEnv);
com.google.devtools.j2objc.ast.CompilationUnit unit = com.google.devtools.j2objc.ast.CompilationUnit unit =
TreeConverter.convertCompilationUnit( TreeConverter.convertCompilationUnit(
env, ast, sourceFilePath, FileUtil.getMainTypeName(file), source); env, ast, sourceFilePath, FileUtil.getMainTypeName(file), source);
Expand Down
Expand Up @@ -35,6 +35,7 @@
import com.google.devtools.j2objc.types.IOSMethodBinding; import com.google.devtools.j2objc.types.IOSMethodBinding;
import com.google.devtools.j2objc.util.BindingUtil; import com.google.devtools.j2objc.util.BindingUtil;
import com.google.devtools.j2objc.util.ErrorUtil; import com.google.devtools.j2objc.util.ErrorUtil;
import com.google.devtools.j2objc.util.Mappings;
import com.google.devtools.j2objc.util.NameTable; import com.google.devtools.j2objc.util.NameTable;


import org.eclipse.jdt.core.dom.IMethodBinding; import org.eclipse.jdt.core.dom.IMethodBinding;
Expand Down Expand Up @@ -85,7 +86,7 @@ public boolean visit(ClassInstanceCreation node) {


IMethodBinding binding = node.getMethodBinding(); IMethodBinding binding = node.getMethodBinding();
String key = BindingUtil.getMethodKey(binding); String key = BindingUtil.getMethodKey(binding);
String selector = NameTable.STRING_CONSTRUCTOR_TO_METHOD_MAPPINGS.get(key); String selector = Mappings.STRING_CONSTRUCTOR_TO_METHOD_MAPPINGS.get(key);
if (selector != null) { if (selector != null) {
assert !node.hasRetainedResult(); assert !node.hasRetainedResult();
if (key.equals("java.lang.String.String(Ljava/lang/String;)V")) { if (key.equals("java.lang.String.String(Ljava/lang/String;)V")) {
Expand Down
120 changes: 120 additions & 0 deletions translator/src/main/java/com/google/devtools/j2objc/util/Mappings.java
@@ -0,0 +1,120 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.google.devtools.j2objc.util;

import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableMap;
import com.google.devtools.j2objc.J2ObjC;
import java.io.IOException;
import java.io.InputStream;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;

/**
* Manages class and method name mappings.
*/
public class Mappings {

/**
* We convert all the String constructor invocations to factory method
* invocations because we want to avoid calling [NSString alloc].
*/
public static final Map<String, String> STRING_CONSTRUCTOR_TO_METHOD_MAPPINGS =
ImmutableMap.<String, String>builder()
.put("java.lang.String.String()V", "string")
.put("java.lang.String.String(Ljava/lang/String;)V", "stringWithString:")
.put("java.lang.String.String([B)V", "java_stringWithBytes:")
.put("java.lang.String.String([BLjava/lang/String;)V", "java_stringWithBytes:charsetName:")
.put("java.lang.String.String([BLjava/nio/charset/Charset;)V",
"java_stringWithBytes:charset:")
.put("java.lang.String.String([BI)V", "java_stringWithBytes:hibyte:")
.put("java.lang.String.String([BII)V", "java_stringWithBytes:offset:length:")
.put("java.lang.String.String([BIII)V", "java_stringWithBytes:hibyte:offset:length:")
.put("java.lang.String.String([BIILjava/lang/String;)V",
"java_stringWithBytes:offset:length:charsetName:")
.put("java.lang.String.String([BIILjava/nio/charset/Charset;)V",
"java_stringWithBytes:offset:length:charset:")
.put("java.lang.String.String([C)V", "java_stringWithCharacters:")
.put("java.lang.String.String([CII)V", "java_stringWithCharacters:offset:length:")
.put("java.lang.String.String([III)V", "java_stringWithInts:offset:length:")
.put("java.lang.String.String(II[C)V", "java_stringWithOffset:length:characters:")
.put("java.lang.String.String(Ljava/lang/StringBuffer;)V",
"java_stringWithJavaLangStringBuffer:")
.put("java.lang.String.String(Ljava/lang/StringBuilder;)V",
"java_stringWithJavaLangStringBuilder:")
.build();

private static final String JRE_MAPPINGS_FILE = "JRE.mappings";

private final Map<String, String> classMappings = new HashMap<>();
private final Map<String, String> methodMappings = new HashMap<>();
{
methodMappings.putAll(STRING_CONSTRUCTOR_TO_METHOD_MAPPINGS);
}

public ImmutableMap<String, String> getClassMappings() {
return ImmutableMap.copyOf(classMappings);
}

public ImmutableMap<String, String> getMethodMappings() {
return ImmutableMap.copyOf(methodMappings);
}

@VisibleForTesting
void addClass(String key, String name) {
classMappings.put(key, name);
}

public void addMappingsFiles(String[] filenames) throws IOException {
for (String filename : filenames) {
if (!filename.isEmpty()) {
addMappingsProperties(FileUtil.loadProperties(filename));
}
}
}

public void addJreMappings() throws IOException {
InputStream stream = J2ObjC.class.getResourceAsStream(JRE_MAPPINGS_FILE);
addMappingsProperties(FileUtil.loadProperties(stream));
}

private void addMappingsProperties(Properties mappings) {
Enumeration<?> keyIterator = mappings.propertyNames();
while (keyIterator.hasMoreElements()) {
String key = (String) keyIterator.nextElement();
if (key.indexOf('(') > 0) {
// All method mappings have parentheses characters, classes don't.
String iosMethod = mappings.getProperty(key);
addMapping(methodMappings, key, iosMethod, "method mapping");
} else {
String iosClass = mappings.getProperty(key);
addMapping(classMappings, key, iosClass, "class mapping");
}
}
}

/**
* Adds a class, method or package-prefix property to its map, reporting an error
* if that mapping was previously specified.
*/
private static void addMapping(Map<String, String> map, String key, String value, String kind) {
String oldValue = map.put(key, value);
if (oldValue != null && !oldValue.equals(value)) {
ErrorUtil.error(kind + " redefined; was \"" + oldValue + ", now " + value);
}
}
}

0 comments on commit 127ba79

Please sign in to comment.