mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-04 23:06:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

constant returnable helper method

Browse Source
This commit is contained in:
dfsek
2021-08-08 12:22:54 -07:00
parent 3594beb406
commit fb505fe28b
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/lang/Returnable.java
View File

@@ -1,5 +1,10 @@
package com.dfsek.terra.addons.terrascript.api.lang;
import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
import com.dfsek.terra.addons.terrascript.api.Position;
import java.util.Map;
public interface Returnable<T> extends Item<T> {
ReturnType returnType();
@@ -16,4 +21,23 @@ public interface Returnable<T> extends Item<T> {
return comparable;
}
}
static <T> Returnable<T> constant(T value, ReturnType type, Position position) {
return new Returnable<T>() {
@Override
public ReturnType returnType() {
return type;
}
@Override
public T apply(ImplementationArguments implementationArguments, Map<String, Variable<?>> variableMap) {
return value;
}
@Override
public Position getPosition() {
return position;
}
};
}
}

17
common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/BlockFunctionBuilder.java
View File

@@ -24,22 +24,7 @@ public class BlockFunctionBuilder implements FunctionBuilder<BlockFunction> {
@Override
public BlockFunction build(List<Returnable<?>> argumentList, Position position) throws ParseException {
if(argumentList.size() < 4) throw new ParseException("Expected data", position);
Returnable<Boolean> booleanReturnable = new Returnable<Boolean>() {
@Override
public ReturnType returnType() {
return ReturnType.BOOLEAN;
}
@Override
public Boolean apply(ImplementationArguments implementationArguments, Map<String, Variable<?>> variableMap) {
return true;
}
@Override
public Position getPosition() {
return position;
}
};
Returnable<Boolean> booleanReturnable = Returnable.constant(true, Returnable.ReturnType.BOOLEAN, position);
if(argumentList.size() == 5) booleanReturnable = (Returnable<Boolean>) argumentList.get(4);
if(argumentList.get(3).returnType() == Returnable.ReturnType.STRING && argumentList.get(3) instanceof ConstantExpression) {
return new BlockFunction.Constant((Returnable<Number>) argumentList.get(0), (Returnable<Number>) argumentList.get(1), (Returnable<Number>) argumentList.get(2), (ConstantExpression<String>) argumentList.get(3), booleanReturnable, main, position);