java-projects/Own-Programming-Language-Tutorial
1
0
Fork 0
mirror of https://github.com/aNNiMON/Own-Programming-Language-Tutorial.git synced 2024-09-20 08:44:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Авто вызов toString() (#9)

Browse Source 
* Added auto toString()
* Update ClassInstanceValue.java
This commit is contained in:
corgifist 2021-07-08 17:58:11 +03:00 committed by GitHub
parent 493a3995a9
commit d18a14b2ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/annimon/ownlang/lib/ClassInstanceValue.java
View File

@ -8,6 +8,7 @@ public class ClassInstanceValue implements Value {
private final String className; private final String className;
private final MapValue thisMap; private final MapValue thisMap;
private ClassMethod constructor; private ClassMethod constructor;
private UserDefinedFunction toString;
public ClassInstanceValue(String name) { public ClassInstanceValue(String name) {
this.className = name; this.className = name;
@ -27,12 +28,16 @@ public class ClassInstanceValue implements Value {
} }
public void addMethod(String name, ClassMethod method) { public void addMethod(String name, ClassMethod method) {
if (name.equals("toString")) {
toString = method;
}
thisMap.set(name, method); thisMap.set(name, method);
if (name.equals(className)) { if (name.equals(className)) {
constructor = method; constructor = method;
} }
} }
public void callConstructor(Value[] args) { public void callConstructor(Value[] args) {
if (constructor != null) { if (constructor != null) {
constructor.execute(args); constructor.execute(args);
@ -69,7 +74,10 @@ public class ClassInstanceValue implements Value {
@Override @Override
public String asString() { public String asString() {
return "class " + className + "@" + thisMap; if (toString != null) {
return toString.execute(new Value[] {}).asString();
}
return className + "@" + thisMap;
} }
@Override @Override