eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 08:14:09 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix of exporting a wasm function for scala objects (#498). Fix #497

Browse Source 
Co-authored-by: VGORDIEVSKII <vgordievskii@luxoft.com>
This commit is contained in:
Vladislav Gordievskiy 2020-05-18 09:08:28 +02:00 committed by GitHub
parent 333ee95604
commit 6892c4f0ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
classlib/src/main/java/org/teavm/classlib/impl/ScalaHacks.java
View File

@ -16,6 +16,9 @@
package org.teavm.classlib.impl; package org.teavm.classlib.impl;
import java.util.Properties; import java.util.Properties;
import org.teavm.interop.Export;
import org.teavm.model.AnnotationContainer;
import org.teavm.model.AnnotationHolder;
import org.teavm.model.BasicBlock; import org.teavm.model.BasicBlock;
import org.teavm.model.ClassHierarchy; import org.teavm.model.ClassHierarchy;
import org.teavm.model.ClassHolder; import org.teavm.model.ClassHolder;
@ -32,6 +35,8 @@ import org.teavm.model.instructions.PutFieldInstruction;
public class ScalaHacks implements ClassHolderTransformer { public class ScalaHacks implements ClassHolderTransformer {
private static final String ATTR_NAME_CLASS = "java.util.jar.Attributes$Name"; private static final String ATTR_NAME_CLASS = "java.util.jar.Attributes$Name";
private static final String SCALA_INTERNAL_CLASS_MARKER = "$";
@Override @Override
public void transformClass(ClassHolder cls, ClassHolderTransformerContext context) { public void transformClass(ClassHolder cls, ClassHolderTransformerContext context) {
switch (cls.getName()) { switch (cls.getName()) {
@ -41,6 +46,12 @@ public class ScalaHacks implements ClassHolderTransformer {
case "scala.util.Properties$": case "scala.util.Properties$":
transformProperties(cls); transformProperties(cls);
break; break;
default:
{
if (cls.getName().endsWith(SCALA_INTERNAL_CLASS_MARKER)) {
checkAndRemoveExportAnnotation(cls);
}
} break;
} }
} }
@ -86,4 +97,14 @@ public class ScalaHacks implements ClassHolderTransformer {
} }
} }
} }
private void checkAndRemoveExportAnnotation(ClassHolder cls) {
for (MethodHolder method : cls.getMethods()) {
AnnotationContainer items = method.getAnnotations();
AnnotationHolder exportAnn = items.get(Export.class.getTypeName());
if (exportAnn != null) {
method.getAnnotations().remove(exportAnn);
}
}
}
} }