semi-auto cleanup

This commit is contained in:
gnembon committed 2023-02-04 13:26:21 +01:00
1 parent cad80f82c6
commit 8f61271606
99 files changed
+11463 -8007

No files matched your search

+18 -8
View File
@@ -2,7 +2,9 @@ package carpet.script;
import carpet.script.value.Value;
/** LazyNumber interface created for lazily evaluated functions */
/**
* LazyNumber interface created for lazily evaluated functions
*/
@FunctionalInterface
public interface LazyValue
{
@@ -11,13 +13,15 @@ public interface LazyValue
LazyValue NULL = (c, t) -> Value.NULL;
LazyValue ZERO = (c, t) -> Value.ZERO;
public static LazyValue ofConstant(Value val) {
static LazyValue ofConstant(final Value val)
{
return new Constant(val);
}
Value evalValue(Context c, Context.Type type);
default Value evalValue(Context c){
default Value evalValue(final Context c)
{
return evalValue(c, Context.Type.NONE);
}
@@ -28,7 +32,8 @@ public interface LazyValue
Value evalType(Context.Type type);
@Override
default Value evalValue(Context c, Context.Type type) {
default Value evalValue(final Context c, final Context.Type type)
{
return evalType(type);
}
}
@@ -38,21 +43,26 @@ public interface LazyValue
{
Value result;
public Constant(Value value)
public Constant(final Value value)
{
result = value;
}
public Value get() {return result;}
public Value get()
{
return result;
}
@Override
public Value evalType(Context.Type type) {
public Value evalType(final Context.Type type)
{
return result.fromConstant();
}
@Override
public Value evalValue(Context c, Context.Type type) {
public Value evalValue(final Context c, final Context.Type type)
{
return result.fromConstant();
}
}