From 7d743f56ce6ba1017662e49eb9c66df94c891d21 Mon Sep 17 00:00:00 2001
From: Michael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Mon, 16 Mar 2015 18:45:19 +0300
Subject: [PATCH] Rollback default object to class one

---
 .../src/org/jetbrains/kotlin/codegen/MemberCodegen.java       | 4 ++--
 .../backend/src/org/jetbrains/kotlin/codegen/SourceInfo.kt    | 2 +-
 .../kotlin/codegen/inline/AnonymousObjectTransformer.java     | 2 +-
 .../backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
index 03001de7389..dae1db64533 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
@@ -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;
     }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SourceInfo.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/SourceInfo.kt
index d1fd61ce7ff..b8781dec0c8 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/SourceInfo.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SourceInfo.kt
@@ -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)
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java
index f33ca0b75a8..2c793659426 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java
@@ -190,7 +190,7 @@ public class AnonymousObjectTransformer {
 
         result.addAllClassesToRemove(constructorResult);
 
-        SourceMapper.Default.flushToClassBuilder(sourceMapper, classBuilder);
+        SourceMapper.OBJECT$.flushToClassBuilder(sourceMapper, classBuilder);
 
         classBuilder.done();
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
index 7a4a112c052..b3c7a43c765 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
@@ -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"