Add source roots to modules 'builtins' and 'runtime.jvm'

This is done to be able to write code in the module 'reflection.jvm' in the IDE
without lots of unresolved errors and such
This commit is contained in:
Alexander Udalov
2015-07-01 17:14:44 +03:00
parent feb4dd7b8f
commit 5e011b92ef
6 changed files with 14 additions and 9 deletions
-2
View File
@@ -7,8 +7,6 @@
<JAVADOC />
<SOURCES>
<root url="file://$PROJECT_DIR$/libraries/stdlib/src" />
<root url="file://$PROJECT_DIR$/core/builtins/src" />
<root url="file://$PROJECT_DIR$/core/runtime.jvm/src" />
</SOURCES>
</library>
</component>
+4 -3
View File
@@ -2,9 +2,10 @@
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
</module>
+1
View File
@@ -8,6 +8,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="builtins" />
<orderEntry type="module" module-name="runtime.jvm" />
<orderEntry type="module" module-name="descriptors.runtime" />
<orderEntry type="library" name="kotlin-runtime" level="project" />
</component>
+3 -1
View File
@@ -2,7 +2,9 @@
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="builtins" />
@@ -19,5 +19,6 @@ package kotlin.jvm.internal
public abstract class Lambda(private val arity: Int) : FunctionImpl() {
override fun getArity() = arity
@suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
override fun toString() = "${(this as Object).getClass().getGenericInterfaces()[0]}"
}
@@ -20,6 +20,8 @@ private abstract class PrimitiveSpreadBuilder<T : Any>(private val size: Int) {
abstract protected fun T.getSize(): Int
protected var position: Int = 0
@suppress("CAST_NEVER_SUCCEEDS")
private val spreads: Array<T?> = arrayOfNulls<Any>(size) as Array<T?>
public fun addSpread(spreadArgument: T) {
@@ -41,17 +43,17 @@ private abstract class PrimitiveSpreadBuilder<T : Any>(private val size: Int) {
val spreadArgument = spreads[i]
if (spreadArgument != null) {
if (copyValuesFrom < i) {
System.arraycopy(values, copyValuesFrom, result, dstIndex, i-copyValuesFrom)
System.arraycopy(values, copyValuesFrom, result, dstIndex, i - copyValuesFrom)
dstIndex += i - copyValuesFrom
}
val spreadSize = spreadArgument.getSize()
System.arraycopy(spreadArgument, 0, result, dstIndex, spreadSize)
dstIndex += spreadSize
copyValuesFrom = i+1
copyValuesFrom = i + 1
}
}
if (copyValuesFrom < size) {
System.arraycopy(values, copyValuesFrom, result, dstIndex, size-copyValuesFrom)
System.arraycopy(values, copyValuesFrom, result, dstIndex, size - copyValuesFrom)
}
return result