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

Remove duplicated sources of built-ins

Browse Source 
BuiltInsSerializer now serializes built-ins found in two source roots:
core/builtins/native and core/builtins/src

Add return types to some declarations in core/builtins/src, because now that
BuiltInsSerializer processes them, it launches lazy resolution which can't
always deduce the return type
This commit is contained in:
Alexander Udalov
2014-01-16 23:19:43 +04:00
parent 3b4c341046
commit 61ad9fba4a
232 changed files with 156 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java
+2 -2
View File
@@ -52,11 +52,11 @@ import java.util.*;
public class LightClassUtil {
private static final Logger LOG = Logger.getInstance(LightClassUtil.class);
public static final File BUILT_INS_SRC_DIR = new File("idea/builtinsSrc", KotlinBuiltIns.BUILT_INS_PACKAGE_NAME_STRING);
public static final File BUILT_INS_SRC_DIR = new File("core/builtins/native", KotlinBuiltIns.BUILT_INS_PACKAGE_NAME_STRING);
/**
* Checks whether the given file is loaded from the location where Kotlin's built-in classes are defined.
* As of today, this is idea/builtinsSrc/jet directory and files such as Any.jet, Nothing.jet etc.
* As of today, this is core/builtins/native/jet directory and files such as Any.kt, Nothing.kt etc.
*
* Used to skip JetLightClass creation for built-ins, because built-in classes have no Java counterparts
*/