affixed ROOT locale, should fix #151

This commit is contained in:
gnembon committed 2020-02-23 02:40:48 -04:00
1 parent 72a7bed11a
commit 2968f77ed0
4 files changed
+8 -7

No files matched your search

@@ -2860,7 +2860,7 @@ public class CarpetExpression
@Override @Override
public String getString() public String getString()
{ {
return String.format("rect[(%d,%d,%d),..,(%d,%d,%d)]",minx, miny, minz, maxx, maxy, maxz); return String.format(Locale.ROOT, "rect[(%d,%d,%d),..,(%d,%d,%d)]",minx, miny, minz, maxx, maxy, maxz);
} }
}; };
}); });
@@ -2957,7 +2957,7 @@ public class CarpetExpression
@Override @Override
public String getString() public String getString()
{ {
return String.format("diamond[(%d,%d,%d),%d,0]",cx, cy, cz, width); return String.format(Locale.ROOT, "diamond[(%d,%d,%d),%d,0]",cx, cy, cz, width);
} }
}; };
} }
@@ -3019,7 +3019,7 @@ public class CarpetExpression
@Override @Override
public String getString() public String getString()
{ {
return String.format("diamond[(%d,%d,%d),%d,%d]",cx, cy, cz, width, height); return String.format(Locale.ROOT, "diamond[(%d,%d,%d),%d,%d]",cx, cy, cz, width, height);
} }
}; };
} }
+1 -1
View File
@@ -2944,7 +2944,7 @@ public class Expression
} }
try try
{ {
return new StringValue(String.format(format, args.toArray())); return new StringValue(String.format(Locale.ROOT, format, args.toArray()));
} }
catch (IllegalFormatException ife) catch (IllegalFormatException ife)
{ {
@@ -3,9 +3,9 @@ package carpet.script.value;
import carpet.script.exception.InternalExpressionException; import carpet.script.exception.InternalExpressionException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale;
public abstract class LazyListValue extends AbstractListValue implements Iterator<Value> public abstract class LazyListValue extends AbstractListValue implements Iterator<Value>
{ {
@@ -48,7 +48,7 @@ public abstract class LazyListValue extends AbstractListValue implements Iterato
@Override @Override
public String getString() public String getString()
{ {
return String.format("[%d, %d, ..., %d]",start, start+stepp, limit); return String.format(Locale.ROOT, "[%d, %d, ..., %d]",start, start+stepp, limit);
} }
}; };
} }
@@ -4,6 +4,7 @@ import carpet.script.exception.InternalExpressionException;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Locale;
import static java.lang.Math.abs; import static java.lang.Math.abs;
@@ -42,7 +43,7 @@ public class NumericValue extends Value
} }
else else
{ {
return String.format("%.1f..", getDouble()); return String.format(Locale.ROOT, "%.1f..", getDouble());
} }
} }