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

Rollback default object to class one

Browse Source
This commit is contained in:
Michael Bogdanov
2015-03-16 18:45:19 +03:00
parent 90651e4b28
commit 7d743f56ce
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+2 -2
View File
@@ -138,7 +138,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
writeInnerClasses();
if (sourceMapper != null) {
SourceMapper.Default.flushToClassBuilder(sourceMapper, v);
SourceMapper.OBJECT$.flushToClassBuilder(sourceMapper, v);
}
v.done();
@@ -517,7 +517,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
@NotNull
public SourceMapper getOrCreateSourceMapper() {
if (sourceMapper == null) {
sourceMapper = new DefaultSourceMapper(SourceInfo.Default.createInfo(element, getClassName()), null);
sourceMapper = new DefaultSourceMapper(SourceInfo.OBJECT$.createInfo(element, getClassName()), null);
}
return sourceMapper;
}
compiler/backend/src/org/jetbrains/kotlin/codegen/SourceInfo.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.JetNamedFunction
data public class SourceInfo(val source: String, val pathOrCleanFQN: String, val linesInFile: Int) {
default object {
class object {
fun createInfo(element: JetElement?, internalClassName: String): SourceInfo {
assert(element != null) { "Couldn't create source mapper for null element " + internalClassName }
val lineNumbers = CodegenUtil.getLineNumberForElement(element!!.getContainingFile(), true)
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java
+1 -1
View File
@@ -190,7 +190,7 @@ public class AnonymousObjectTransformer {
result.addAllClassesToRemove(constructorResult);
SourceMapper.Default.flushToClassBuilder(sourceMapper, classBuilder);
SourceMapper.OBJECT$.flushToClassBuilder(sourceMapper, classBuilder);
classBuilder.done();
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
+2 -2
View File
@@ -137,7 +137,7 @@ trait SourceMapper {
parent?.visitOrigin()
}
default object {
class object {
fun flushToClassBuilder(mapper: SourceMapper, v: ClassBuilder) {
for (fileMapping in mapper.resultMappings) {
@@ -240,7 +240,7 @@ class SMAP(val fileMappings: List<FileMapping>) {
sourceInfo = SourceInfo(default.name, default.path, defaultMapping.source + defaultMapping.range - 1)
}
default object {
class object {
val FILE_SECTION = "*F"
val LINE_SECTION = "*L"