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

Rename object$ -> OBJECT$, instance$ -> INSTANCE$

Browse Source 
According to Java code conventions, public static final constants should be
named with all capital letters
This commit is contained in:
Alexander Udalov
2014-07-18 21:28:31 +04:00
parent 1168cf62bf
commit 485f63e1cd
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+14
View File
@@ -125,6 +125,20 @@
<target name="init">
<mkdir dir="${kotlin-home}"/>
<mkdir dir="${kotlin-home}/lib"/>
<if>
<isfalse value="${bootstrap.build.no.tests}"/>
<then>
<replace dir="${basedir}/compiler" token="instance$" value="INSTANCE$"/>
<replace dir="${basedir}/idea" token="instance$" value="INSTANCE$"/>
<replace dir="${basedir}/j2k/tests/testData/ast" token="instance$" value="INSTANCE$"/>
<replace dir="${basedir}/js/js.translator/src" token="instance$" value="INSTANCE$"/>
<replace dir="${basedir}/compiler" excludes="**/classInClassObject.kt" token="object$" value="OBJECT$"/>
<replace dir="${basedir}/idea" token="object$" value="OBJECT$"/>
<replace dir="${basedir}/j2k/tests/testData/ast" token="object$" value="OBJECT$"/>
<replace dir="${basedir}/js/js.translator/src" token="object$" value="OBJECT$"/>
</then>
</if>
</target>
<target name="prepareDist">
compiler/testData/codegen/bytecodeText/constClosureOptimization.kt
+3 -3
View File
@@ -17,6 +17,6 @@ fun test() {
(::local)()
}
// 3 GETSTATIC _DefaultPackage\$test\$1\.instance\$
// 1 GETSTATIC _DefaultPackage\$test\$2\.instance\$
// 1 GETSTATIC _DefaultPackage\$test\$3\.instance\$
// 3 GETSTATIC _DefaultPackage\$test\$1\.INSTANCE\$
// 1 GETSTATIC _DefaultPackage\$test\$2\.INSTANCE\$
// 1 GETSTATIC _DefaultPackage\$test\$3\.INSTANCE\$
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java
+2 -2
View File
@@ -41,8 +41,8 @@ public final class JvmAbi {
public static final String PROPERTY_METADATA_ARRAY_NAME = "$propertyMetadata";
public static final String ANNOTATED_PROPERTY_METHOD_NAME_SUFFIX = "$annotations";
public static final String INSTANCE_FIELD = "instance$";
public static final String CLASS_OBJECT_FIELD = "object$";
public static final String INSTANCE_FIELD = "INSTANCE$";
public static final String CLASS_OBJECT_FIELD = "OBJECT$";
public static final FqName K_OBJECT = new FqName("kotlin.jvm.internal.KObject");
public static final String KOTLIN_CLASS_FIELD_NAME = "$kotlinClass";