eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2025-01-03 05:44:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename object's $id field to $id$

Browse Source 
To avoid clash with user-defined fields
This commit is contained in:
Alexey Andreev 2017-06-07 12:46:43 +03:00
parent 91a7f69bee
commit 27bb8fe9ed
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classlib/src/main/java/org/teavm/classlib/java/lang/TObject.java
View File

@ -34,10 +34,6 @@ import org.teavm.runtime.RuntimeClass;
import org.teavm.runtime.RuntimeJavaObject; import org.teavm.runtime.RuntimeJavaObject;
import org.teavm.runtime.RuntimeObject; import org.teavm.runtime.RuntimeObject;
/**
*
* @author Alexey Andreev
*/
@Superclass("") @Superclass("")
public class TObject { public class TObject {
Monitor monitor; Monitor monitor;

2
core/src/main/java/org/teavm/backend/javascript/rendering/Renderer.java
View File

@ -323,7 +323,7 @@ public class Renderer implements RenderingManager {
} }
if (cls.getName().equals("java.lang.Object")) { if (cls.getName().equals("java.lang.Object")) {
writer.append("this.$id").ws().append('=').ws().append("0;").softNewLine(); writer.append("this.$id$").ws().append('=').ws().append("0;").softNewLine();
} }
writer.outdent().append("}").newLine(); writer.outdent().append("}").newLine();

2
core/src/main/resources/org/teavm/backend/javascript/runtime.js
View File

@ -124,7 +124,7 @@ function $rt_arraycls(cls) {
if (result === null) { if (result === null) {
var arraycls = function(data) { var arraycls = function(data) {
this.data = data; this.data = data;
this.$id = 0; this.$id$ = 0;
}; };
arraycls.prototype = new ($rt_objcls())(); arraycls.prototype = new ($rt_objcls())();
arraycls.prototype.constructor = arraycls; arraycls.prototype.constructor = arraycls;

8
platform/src/main/java/org/teavm/platform/PlatformObject.java
View File

@ -18,17 +18,13 @@ package org.teavm.platform;
import org.teavm.jso.JSObject; import org.teavm.jso.JSObject;
import org.teavm.jso.JSProperty; import org.teavm.jso.JSProperty;
/**
*
* @author Alexey Andreev
*/
public interface PlatformObject extends JSObject { public interface PlatformObject extends JSObject {
@JSProperty("constructor") @JSProperty("constructor")
PlatformClass getPlatformClass(); PlatformClass getPlatformClass();
@JSProperty("$id") @JSProperty("$id$")
int getId(); int getId();
@JSProperty("$id") @JSProperty("$id$")
void setId(int id); void setId(int id);
} }