azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify class object naming madness

Browse Source 
- get rid of DescriptorNamer, always use descriptor.getName() instead
- delete AbstractClassResolver.getClassObjectName(), always use
  "<class-object-for-...>", except for the case of built-ins serialization
  (class object names should be replaced by "object" when writing files with
  serialized data for built-ins)
- delete NestedClassResolver.resolveClassObject(), always use the other method
  of this class instead
This commit is contained in:
Alexander Udalov
2013-07-01 19:26:38 +04:00
parent 5db2ecd1fc
commit f9ad6827d4
190 changed files with 103 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java
+11 -8
View File
@@ -9,13 +9,14 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.config.CompilerConfiguration;
import org.jetbrains.jet.descriptors.serialization.*;
import org.jetbrains.jet.descriptors.serialization.ClassSerializationUtil;
import org.jetbrains.jet.descriptors.serialization.DescriptorSerializer;
import org.jetbrains.jet.descriptors.serialization.NameSerializationUtil;
import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.lang.BuiltInsSerializationUtil;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.test.util.DescriptorValidator;
@@ -29,11 +30,14 @@ import java.util.regex.Pattern;
public class BuiltInsSerializer {
private static final String BUILT_INS_SRC_DIR = "idea/builtinsSrc";
private static final String DEST_DIR = "compiler/frontend/" + BuiltInsSerializationUtil.BUILT_INS_DIR;
private static final String DEST_DIR = "compiler/frontend/builtins";
private static int totalSize = 0;
private static int totalFiles = 0;
private BuiltInsSerializer() {
}
public static void main(String[] args) throws IOException {
List<File> sourceFiles = FileUtil.findFilesByMask(Pattern.compile(".*\\.jet"), new File(BUILT_INS_SRC_DIR));
Disposable rootDisposable = Disposer.newDisposable();
@@ -43,9 +47,8 @@ public class BuiltInsSerializer {
ModuleDescriptor module = LazyResolveTestUtil.resolveLazily(files, environment, false);
FqName fqName = FqName.topLevel(Name.identifier(KotlinBuiltIns.BUILT_INS_PACKAGE_NAME_STRING));
NamespaceDescriptor namespace = module.getNamespace(fqName);
assert namespace != null : "No built-ins namespace: " + fqName;
NamespaceDescriptor namespace = module.getNamespace(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME);
assert namespace != null : "No built-ins namespace: " + KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME;
DescriptorValidator.validate(namespace);
@@ -59,7 +62,7 @@ public class BuiltInsSerializer {
System.err.println("Could not make directories: " + destDir);
}
final DescriptorSerializer serializer = new DescriptorSerializer(BuiltInsSerializationUtil.BUILTINS_NAMER, new Predicate<ClassDescriptor>() {
final DescriptorSerializer serializer = new DescriptorSerializer(new Predicate<ClassDescriptor>() {
private final ImmutableSet<String> set = ImmutableSet.of("Any", "Nothing");
@Override