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

JS backend: remove Iterable from FAKE_CLASS list, remove Iterator from StandardClasses

Browse Source
This commit is contained in:
Michael Nedzelsky
2014-10-13 23:17:01 +04:00
parent edac2dd3bd
commit aa13a67371
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java
-2
View File
@@ -94,8 +94,6 @@ public final class StandardClasses {
} }
private static void declareKotlinStandardClasses(@NotNull StandardClasses standardClasses) { private static void declareKotlinStandardClasses(@NotNull StandardClasses standardClasses) {
standardClasses.declare().forFQ("kotlin.Iterator").kotlinClass("Iterator").methods("next").properties("hasNext");
for (PrimitiveType type : PrimitiveType.NUMBER_TYPES) { for (PrimitiveType type : PrimitiveType.NUMBER_TYPES) {
if (type == PrimitiveType.CHAR || type == PrimitiveType.LONG) continue; if (type == PrimitiveType.CHAR || type == PrimitiveType.LONG) continue;
js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java
+1 -2
View File
@@ -42,8 +42,7 @@ import static org.jetbrains.k2js.translate.utils.AnnotationsUtils.isNativeObject
public final class JsDescriptorUtils { public final class JsDescriptorUtils {
// TODO: maybe we should use external annotations or something else. // TODO: maybe we should use external annotations or something else.
private static final Set<String> FAKE_CLASSES = ContainerUtil.immutableSet( private static final Set<String> FAKE_CLASSES = ContainerUtil.immutableSet(
getFqNameSafe(KotlinBuiltIns.getInstance().getAny()).asString(), getFqNameSafe(KotlinBuiltIns.getInstance().getAny()).asString()
getFqNameSafe(KotlinBuiltIns.getInstance().getIterable()).asString()
); );
private JsDescriptorUtils() { private JsDescriptorUtils() {