TudbuT/isbpl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add fields to OOP

Browse source
This commit is contained in:
Daniella / Tove 2022-04-16 00:44:52 +02:00
parent 8ca9e13cad
commit 4992213f21
2 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
bootstrap/ISBPL.java
View file

@ -850,7 +850,7 @@ public class ISBPL {
}
};
break;
case "def":
case "deffunc":
func = (stack) -> {
ISBPLObject str = stack.pop();
ISBPLObject callable = stack.pop();
@ -868,7 +868,19 @@ public class ISBPL {
callable.checkType(getType("func"));
ISBPLType t = types.get((int) type.object);
String s = toJavaString(str);
t.methods.put(s, (ISBPLCallable) callable.object);
addFunction(t, s, (ISBPLCallable) callable.object);
};
break;
case "deffield":
func = (stack) -> {
ISBPLObject type = stack.pop();
ISBPLObject str = stack.pop();
type.checkType(getType("int"));
ISBPLType t = types.get((int) type.object);
String s = toJavaString(str);
Object var = new Object();
addFunction(t, s, (stack1) -> stack1.push(t.varget(stack1.pop()).get(var)));
addFunction(t, "=" + s, (stack1) -> t.varget(stack1.pop()).put(var, stack1.pop()));
};
break;
default:
@ -878,6 +890,11 @@ public class ISBPL {
addFunction(name, func);
}
public void addFunction(ISBPLType type, String name, ISBPLCallable callable) {
type.methods.put(name, callable);
type.methods.put("&" + name, stack -> stack.push(new ISBPLObject(getType("func"), callable)));
}
public void addFunction(String name, ISBPLCallable callable) {
functionStack.get().peek().put(name, callable);
functionStack.get().peek().put("&" + name, stack -> stack.push(new ISBPLObject(getType("func"), callable)));
@ -1201,11 +1218,19 @@ class ISBPLType {
int id = gid++;
String name;
HashMap<String, ISBPLCallable> methods = new HashMap<>();
HashMap<ISBPLObject, HashMap<Object, ISBPLObject>> vars = new HashMap<>();
public ISBPLType(String name) {
this.name = name;
}
public HashMap<Object, ISBPLObject> varget(ISBPLObject o) {
if(!vars.containsKey(o)) {
vars.put(o, new HashMap<>());
}
return vars.get(o);
}
@Override
public boolean equals(Object o) {
if (this == o) return true;

3
std.isbpl
View file

@ -64,8 +64,9 @@ native %
native ^
native fcall
native def
native deffunc
native defmethod
native deffield
func ++ { 1 + }
func -- { 1 - }