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

Add record class name to toString implementation (#691)

Browse Source
This commit is contained in:
Ivan Hetman 2023-04-21 13:57:51 +03:00 committed by GitHub
parent 09cdc63267
commit 25890adcf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classlib/src/main/java/org/teavm/classlib/impl/record/ObjectMethodsSubstitutor.java
View File

@ -156,7 +156,13 @@ public class ObjectMethodsSubstitutor implements BootstrapMethodSubstitutor {
private ValueEmitter substituteToString(DynamicCallSite callSite, ProgramEmitter pe) { private ValueEmitter substituteToString(DynamicCallSite callSite, ProgramEmitter pe) {
ValueEmitter thisVar = callSite.getArguments().get(0); ValueEmitter thisVar = callSite.getArguments().get(0);
String names = callSite.getBootstrapArguments().get(1).getString(); String names = callSite.getBootstrapArguments().get(1).getString();
ValueEmitter resultVar = pe.construct(StringBuilder.class, pe.constant("[")); String className = ((ValueType.Object) thisVar.getType()).getClassName();
String simpleName = callSite.getAgent().getClassSource().get(className).getSimpleName();
if (simpleName == null) {
int idx = className.lastIndexOf('.');
simpleName = idx >= 0 ? className.substring(idx + 1) : className;
}
ValueEmitter resultVar = pe.construct(StringBuilder.class, pe.constant(simpleName + "["));
int argIndex = 2; int argIndex = 2;
int index = 0; int index = 0;

11
classlib/src/main/java/org/teavm/classlib/java/util/TPriorityQueue.java
View File

@ -17,7 +17,6 @@ package org.teavm.classlib.java.util;
import java.util.Arrays; import java.util.Arrays;
import org.teavm.classlib.java.io.TSerializable; import org.teavm.classlib.java.io.TSerializable;
import org.teavm.classlib.java.lang.TComparable;
import org.teavm.classlib.java.lang.TIllegalArgumentException; import org.teavm.classlib.java.lang.TIllegalArgumentException;
import org.teavm.classlib.java.lang.TIllegalStateException; import org.teavm.classlib.java.lang.TIllegalStateException;
import org.teavm.classlib.java.lang.TNullPointerException; import org.teavm.classlib.java.lang.TNullPointerException;
@ -99,15 +98,7 @@ public class TPriorityQueue<E> extends TAbstractQueue<E> implements TSerializabl
private void setComparator(TComparator<? super E> comparator) { private void setComparator(TComparator<? super E> comparator) {
this.originalComparator = comparator; this.originalComparator = comparator;
if (comparator == null) { if (comparator == null) {
comparator = new TComparator<Object>() { comparator = TComparator.NaturalOrder.instance();
@Override public int compare(Object o1, Object o2) {
if (o1 instanceof TComparable) {
return ((TComparable<Object>) o1).compareTo(o2);
} else {
return -((TComparable<Object>) o2).compareTo(o1);
}
}
};
} }
this.comparator = (TComparator<Object>) comparator; this.comparator = (TComparator<Object>) comparator;
} }

8
classlib/src/main/java/org/teavm/classlib/java/util/TTreeMap.java
View File

@ -17,7 +17,6 @@ package org.teavm.classlib.java.util;
import org.teavm.classlib.java.io.TSerializable; import org.teavm.classlib.java.io.TSerializable;
import org.teavm.classlib.java.lang.TCloneable; import org.teavm.classlib.java.lang.TCloneable;
import org.teavm.classlib.java.lang.TComparable;
import org.teavm.classlib.java.lang.TIllegalArgumentException; import org.teavm.classlib.java.lang.TIllegalArgumentException;
public class TTreeMap<K, V> extends TAbstractMap<K, V> implements TCloneable, TSerializable, TNavigableMap<K, V> { public class TTreeMap<K, V> extends TAbstractMap<K, V> implements TCloneable, TSerializable, TNavigableMap<K, V> {
@ -105,12 +104,7 @@ public class TTreeMap<K, V> extends TAbstractMap<K, V> implements TCloneable, TS
public TTreeMap(TComparator<? super K> comparator) { public TTreeMap(TComparator<? super K> comparator) {
this.originalComparator = comparator; this.originalComparator = comparator;
if (comparator == null) { if (comparator == null) {
comparator = new TComparator<Object>() { comparator = TComparator.NaturalOrder.instance();
@SuppressWarnings("unchecked") @Override public int compare(Object o1, Object o2) {
return o1 != null ? ((TComparable<Object>) o1).compareTo(o2)
: ((TComparable<Object>) o2).compareTo(o1);
}
};
} }
this.comparator = comparator; this.comparator = comparator;
} }

4
tests/src/test/java/org/teavm/vm/RecordTest.java
View File

@ -44,6 +44,10 @@ public class RecordTest {
int index = 0; int index = 0;
index = s.indexOf("B", index);
assertTrue(index >= 0);
++index;
index = s.indexOf("x", index); index = s.indexOf("x", index);
assertTrue(index > 0); assertTrue(index > 0);
++index; ++index;