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

Restored back temporarily renamed properties

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-09-30 22:50:27 +03:00
parent 6466facffa
commit 5afa91d4ec
50 changed files with 84 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java
+1 -1
View File
@@ -148,7 +148,7 @@ public abstract class Config {
}
private ModuleDescriptorImpl createModuleDescriptor(KotlinJavascriptMetadata metadata) {
assert metadata.getTEMP_isAbiVersionCompatible() :
assert metadata.getIsAbiVersionCompatible() :
"expected abi version " + KotlinJavascriptMetadataUtils.ABI_VERSION + ", but metadata.abiVersion = " + metadata.getAbiVersion();
ModuleDescriptorImpl moduleDescriptor = new ModuleDescriptorImpl(
js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java
+1 -1
View File
@@ -168,7 +168,7 @@ public class LibrarySourcesConfig extends Config {
}
for (KotlinJavascriptMetadata metadata : metadataList) {
if (!metadata.getTEMP_isAbiVersionCompatible()) {
if (!metadata.getIsAbiVersionCompatible()) {
report.invoke("File '" + path + "' was compiled with an incompatible version of Kotlin. Its ABI version is " + metadata.getAbiVersion() + ", expected ABI version is " + KotlinJavascriptMetadataUtils.ABI_VERSION);
return true;
}
js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.java
+2 -2
View File
@@ -42,7 +42,7 @@ import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getFunctionDe
import static org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils.message;
import static org.jetbrains.kotlin.js.translate.utils.FunctionBodyTranslator.translateFunctionBody;
import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.setParameters;
import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getTEMP_isEffectivelyPublicApi;
import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getIsEffectivelyPublicApi;
public final class FunctionTranslator extends AbstractTranslator {
@NotNull
@@ -100,7 +100,7 @@ public final class FunctionTranslator extends AbstractTranslator {
JsName functionName = context().getNameForDescriptor(descriptor);
generateFunctionObject();
if (shouldBeInlined(descriptor) && getTEMP_isEffectivelyPublicApi(descriptor)) {
if (shouldBeInlined(descriptor) && getIsEffectivelyPublicApi(descriptor)) {
InlineMetadata metadata = InlineMetadata.compose(functionObject, descriptor);
return new JsPropertyInitializer(functionName.makeRef(), metadata.getFunctionWithMetadata());
}
js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.java
+2 -2
View File
@@ -82,7 +82,7 @@ public class ManglingUtils {
DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration();
if (containingDeclaration instanceof PackageFragmentDescriptor) {
return descriptor.getVisibility().getTEMP_isPublicAPI();
return descriptor.getVisibility().getIsPublicAPI();
}
else if (containingDeclaration instanceof ClassDescriptor) {
ClassDescriptor classDescriptor = (ClassDescriptor) containingDeclaration;
@@ -98,7 +98,7 @@ public class ManglingUtils {
}
// Don't use stable mangling when it inside a non-public API declaration.
if (!classDescriptor.getVisibility().getTEMP_isPublicAPI()) {
if (!classDescriptor.getVisibility().getIsPublicAPI()) {
return false;
}