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

fix type issue

Browse source
This commit is contained in:
Daniella / Tove 2022-05-14 20:02:15 +02:00
parent b08915693f
commit c85c0242c5
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ISBPL.java
View file

@ -99,6 +99,8 @@ public class ISBPL {
ISBPLObject array = stack.pop();
array.checkTypeMulti(getType("array"), getType("string"));
String[] allowed;
if(debug)
System.out.println("try with " + array);
if(array.type.name.equals("string")) {
allowed = new String[] { toJavaString(array) };
}
@ -210,7 +212,7 @@ public class ISBPL {
ISBPLType type = registerType(typename);
for(; !words[idx].equals("{"); idx++) {
ISBPLType t = getType(words[idx]);
ISBPLType t = getType(words[idx].startsWith("\"") ? words[idx].substring(1) : words[idx]);
if(!type.superTypes.contains(t))
type.superTypes.add(t);
}
@ -243,6 +245,8 @@ public class ISBPL {
}
}
stack.push(new ISBPLObject(getType("int"), type.id));
if(debug)
System.err.println("Constructing type " + type);
return i.get();
};
case "string!":
@ -1796,6 +1800,8 @@ class ISBPLType {
return "ISBPLType{" +
"id=" + id +
", name='" + name + '\'' +
", superTypes=" + superTypes +
", methods=" + methods +
'}';
}
}
@ -1842,9 +1848,9 @@ class ISBPLObject {
Queue<ISBPLType> types = new LinkedList<>();
types.add(type);
while (!types.isEmpty()) {
type = types.poll();
types.addAll(type.superTypes);
if(type.id == wanted.id) {
ISBPLType t = types.poll();
types.addAll(t.superTypes);
if(t.id == wanted.id) {
return;
}
}
@ -1858,9 +1864,9 @@ class ISBPLObject {
Queue<ISBPLType> types = new LinkedList<>();
types.add(type);
while (!types.isEmpty()) {
type = types.poll();
types.addAll(type.superTypes);
if(type.id == wanted[i].id) {
ISBPLType t = types.poll();
types.addAll(t.superTypes);
if(t.id == wanted[i].id) {
return;
}
}