icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix integers operation results being downcasted to floating point

Browse Source 
Co-authored-by: manyrandomthings <42223559+manyrandomthings@users.noreply.github.com>
This commit is contained in:
altrisiandmanyrandomthings authored and gnembon committed 2023-05-05 00:14:28 +02:00
1 parent a8ead7ff24
commit 5759e23794
2 files changed
+6 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/language/Sys.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class Sys
{
if (v instanceof final NumericValue num)
{
return new NumericValue(num.isInteger() ? num.getLong() : num.getDouble());
return num.clone();
}
if (v instanceof ListValue || v instanceof MapValue)
{
src/main/java/carpet/script/value/NumericValue.java
+5 -6
View File
@@ -131,7 +131,7 @@ public class NumericValue extends Value
{ // TODO test if definintn add(NumericVlaue) woud solve the casting
if (v instanceof final NumericValue nv)
{
return new NumericValue(longValue != null && nv.longValue != null ? (longValue + nv.longValue) : (value + nv.value));
return longValue != null && nv.longValue != null ? new NumericValue(longValue + nv.longValue) : new NumericValue(value + nv.value);
}
return super.add(v);
}
@@ -141,7 +141,7 @@ public class NumericValue extends Value
{ // TODO test if definintn add(NumericVlaue) woud solve the casting
if (v instanceof final NumericValue nv)
{
return new NumericValue(longValue != null && nv.longValue != null ? (longValue - nv.longValue) : (value - nv.value));
return longValue != null && nv.longValue != null ? new NumericValue(longValue - nv.longValue) : new NumericValue(value - nv.value);
}
return super.subtract(v);
}
@@ -151,7 +151,7 @@ public class NumericValue extends Value
{
if (v instanceof final NumericValue nv)
{
return new NumericValue(longValue != null && nv.longValue != null ? (longValue * nv.longValue) : (value * nv.value));
return longValue != null && nv.longValue != null ? new NumericValue(longValue * nv.longValue) : new NumericValue(value * nv.value);
}
return v instanceof ListValue ? v.multiply(this) : new StringValue(StringUtils.repeat(v.getString(), (int) getLong()));
}
@@ -303,13 +303,12 @@ public class NumericValue extends Value
{
return new JsonPrimitive(longValue);
}
long lv = getLong();
return new JsonPrimitive(value == lv ? getLong() : value);
return isInteger() ? new JsonPrimitive(getLong()) : new JsonPrimitive(getDouble());
}
public NumericValue opposite()
{
return new NumericValue(longValue != null ? -longValue : -value);
return longValue != null ? new NumericValue(-longValue) : new NumericValue(-value);
}
public boolean isInteger()