- Added MFR support for 1.6.4

- Improved API for blocks
- NBT compound tags with non-identifier keys should now be output properly
This commit is contained in:
Stan Hebben committed 2014-08-09 12:06:26 +02:00
1 parent e644398505
commit e2b4f50dfc
97 files changed
+5307 -216

No files matched your search

@@ -52,17 +52,18 @@ public class ExpressionArray extends Expression {
@Override
public void compile(boolean result, IEnvironmentMethod environment) {
Type baseType = type.getBaseType().toASMType();
ZenType baseType = type.getBaseType();
Type asmBaseType = type.getBaseType().toASMType();
MethodOutput output = environment.getOutput();
output.constant(contents.length);
output.newArray(baseType);
output.newArray(asmBaseType);
for (int i = 0; i < contents.length; i++) {
output.dup();
output.constant(i);
contents[i].compile(result, environment);
output.arrayStore(baseType);
contents[i].cast(this.getPosition(), environment, baseType).compile(result, environment);
output.arrayStore(asmBaseType);
}
}
}
@@ -46,6 +46,7 @@ public class ExpressionMapIndexGet extends Expression {
internal(Map.class),
"get",
"(Ljava/lang/Object;)Ljava/lang/Object;");
environment.getOutput().checkCast(type.toASMType().getInternalName());
}
}
}
@@ -14,7 +14,7 @@ import static stanhebben.zenscript.util.ZenTypeUtil.internal;
public class ExpressionTable extends Expression {
private final Expression[] keys;
private final Expression[] values;
private final ZenType type;
private final ZenTypeAssociative type;
public ExpressionTable(ZenPosition position, Expression[] keys, Expression[] values) {
super(position);
@@ -25,7 +25,7 @@ public class ExpressionTable extends Expression {
type = new ZenTypeAssociative(ZenTypeAny.INSTANCE, ZenTypeAny.INSTANCE);
}
public ExpressionTable(ZenPosition position, Expression[] keys, Expression[] values, ZenType type) {
public ExpressionTable(ZenPosition position, Expression[] keys, Expression[] values, ZenTypeAssociative type) {
super(position);
this.keys = keys;
@@ -42,6 +42,9 @@ public class ExpressionTable extends Expression {
@Override
public void compile(boolean result, IEnvironmentMethod environment) {
if (result) {
ZenType keyType = type.getKeyType();
ZenType valueType = type.getValueType();
MethodOutput output = environment.getOutput();
output.newObject(HashMap.class);
output.dup();
@@ -49,8 +52,8 @@ public class ExpressionTable extends Expression {
for (int i = 0; i < keys.length; i++) {
output.dup();
keys[i].compile(true, environment);
values[i].compile(true, environment);
keys[i].cast(getPosition(), environment, keyType).compile(true, environment);
values[i].cast(getPosition(), environment, valueType).compile(true, environment);
output.invokeInterface(internal(Map.class), "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
output.pop();
}
@@ -76,7 +79,7 @@ public class ExpressionTable extends Expression {
newValues[i] = values[i].cast(position, environment, keyType.getValueType());
}
return new ExpressionTable(getPosition(), newKeys, newValues, type);
return new ExpressionTable(getPosition(), newKeys, newValues, keyType);
} else if (this.type.canCastImplicit(type, environment)) {
return this.type.cast(position, environment, this, type);
} else {