Browse Source

Add conversion methods into `Text`/`MutableText`

Added more conversion methods from primitive types (`bool`, `byte`,
`int`, `float`) into `Text` and `MutableText` into the standart
`TextAPI`. Made `JSONAPI` use these methods instead.
pull/8/head
Anton Tarasenko 4 years ago
parent
commit
0d1203467d
  1. 80
      sources/Text/JSON/JSONAPI.uc
  2. BIN
      sources/Text/Tests/TEST_TextAPI.uc
  3. 182
      sources/Text/TextAPI.uc

80
sources/Text/JSON/JSONAPI.uc

@ -796,22 +796,22 @@ public final function MutableText Print(AcediaObject toPrint)
return T(default.TNULL).MutableCopy(); return T(default.TNULL).MutableCopy();
} }
if (toPrint.class == class'IntBox') { if (toPrint.class == class'IntBox') {
return _.text.FromStringM(DisplayInt(IntBox(toPrint).Get())); return _.text.FromIntM(IntBox(toPrint).Get());
} }
if (toPrint.class == class'IntRef') { if (toPrint.class == class'IntRef') {
return _.text.FromStringM(DisplayInt(IntRef(toPrint).Get())); return _.text.FromIntM(IntRef(toPrint).Get());
} }
if (toPrint.class == class'BoolBox') { if (toPrint.class == class'BoolBox') {
return _.text.FromStringM(DisplayBool(BoolBox(toPrint).Get())); return _.text.FromBoolM(BoolBox(toPrint).Get());
} }
if (toPrint.class == class'BoolRef') { if (toPrint.class == class'BoolRef') {
return _.text.FromStringM(DisplayBool(BoolRef(toPrint).Get())); return _.text.FromBoolM(BoolRef(toPrint).Get());
} }
if (toPrint.class == class'FloatBox') { if (toPrint.class == class'FloatBox') {
return _.text.FromStringM(DisplayFloat(FloatBox(toPrint).Get())); return _.text.FromFloatM(FloatBox(toPrint).Get(), MAX_FLOAT_PRECISION);
} }
if (toPrint.class == class'FloatRef') { if (toPrint.class == class'FloatRef') {
return _.text.FromStringM(DisplayFloat(FloatRef(toPrint).Get())); return _.text.FromFloatM(FloatRef(toPrint).Get(), MAX_FLOAT_PRECISION);
} }
if ( toPrint.class == class'Text' if ( toPrint.class == class'Text'
|| toPrint.class == class'MutableText') { || toPrint.class == class'MutableText') {
@ -923,77 +923,11 @@ public final function MutableText PrintObject(AssociativeArray toPrint)
return result; return result;
} }
// Auxiliary method to convert `bool` into it's JSON `string` representation.
private final function string DisplayBool(bool toDisplay)
{
if (toDisplay) {
return stringConstants[default.TTRUE];
}
return stringConstants[default.TFALSE];
}
// Auxiliary method to convert `int` into it's JSON `string` representation.
private final function string DisplayInt(int toDisplay)
{
return string(toDisplay);
}
// Auxiliary method to convert `float` into it's JSON `string` representation.
private final function string DisplayFloat(float toDisplay)
{
local int integerPart, fractionalPart;
local int precision;
local int howManyZeroes;
local string zeroes;
local string result;
precision = Clamp(MAX_FLOAT_PRECISION, 0, 10);
if (toDisplay < 0)
{
toDisplay *= -1;
result = "-";
}
integerPart = toDisplay;
result $= string(integerPart);
toDisplay = (toDisplay - integerPart);
// We try to perform minimal amount of operations to extract fractional
// part as integer in order to avoid accumulating too much of an error.
fractionalPart = Round(toDisplay * (10 ** precision));
if (fractionalPart <= 0) {
return result;
}
result $= ".";
// Pad necessary zeroes in front
howManyZeroes = precision - CountDigits(fractionalPart);
while (howManyZeroes > 0)
{
zeroes $= "0";
howManyZeroes -= 1;
}
// Cut off trailing zeroes and
while (fractionalPart > 0 && fractionalPart % 10 == 0) {
fractionalPart /= 10;
}
return result $ zeroes $ string(fractionalPart);
}
// Auxiliary method that counts amount of digits in decimal representation
// of `number`.
private final function int CountDigits(int number)
{
local int digitCounter;
while (number > 0)
{
number -= (number % 10);
number /= 10;
digitCounter += 1;
}
return digitCounter;
}
// Auxiliary method to convert `Text` into it's JSON `string` // Auxiliary method to convert `Text` into it's JSON `string`
// representation. // representation.
// We can't just dump `original`'s contents into JSON output as is, // We can't just dump `original`'s contents into JSON output as is,
// since we have to replace several special characters with escaped sequences. // since we have to replace several special characters with escaped sequences.
// TODO: replace this with a more sensible solution later
private final function string DisplayText(Text original) private final function string DisplayText(Text original)
{ {
local int i, length; local int i, length;

BIN
sources/Text/Tests/TEST_TextAPI.uc

Binary file not shown.

182
sources/Text/TextAPI.uc

@ -665,10 +665,186 @@ public final function Parser ParseString(string source)
return parser; return parser;
} }
//TODO: remove this /**
public final function int GetHash(string source) * Method for converting `bool` values into immutable `Text`.
*
* To create `MutableText` instead use `FromBoolM()` method.
*
* @param value `bool` value to be displayed as `Text`.
* @return Text representation of given `bool` value.
*/
public final function Text FromBool(bool value)
{
if (value) {
return P("true").Copy();
}
return P("false").Copy();
}
/**
* Method for converting `bool` values into mutable `MutableText`.
*
* To create `Text` instead use `FromBool()` method.
*
* @param value `bool` value to be displayed as `MutableText`.
* @return Text representation of given `bool` value.
*/
public final function MutableText FromBoolM(bool value)
{
if (value) {
return P("true").MutableCopy();
}
return P("false").MutableCopy();
}
/**
* Method for converting `byte` values into immutable `Text`.
*
* To create `MutableText` instead use `FromByteM()` method.
*
* @param value `byte` value to be displayed as `Text`.
* @return Text representation of given `byte` value.
*/
public final function Text FromByte(byte value)
{
return FromString(string(value));
}
/**
* Method for converting `byte` values into mutable `MutableText`.
*
* To create `Text` instead use `FromByte()` method.
*
* @param value `byte` value to be displayed as `MutableText`.
* @return Text representation of given `byte` value.
*/
public final function MutableText FromByteM(byte value)
{ {
return 0; return FromStringM(string(value));
}
/**
* Method for converting `int` values into immutable `Text`.
*
* To create `MutableText` instead use `FromIntM()` method.
*
* @param value `int` value to be displayed as `Text`.
* @return Text representation of given `int` value.
*/
public final function Text FromInt(int value)
{
return FromString(string(value));
}
/**
* Method for converting `int` values into mutable `MutableText`.
*
* To create `Text` instead use `FromInt()` method.
*
* @param value `int` value to be displayed as `MutableText`.
* @return Text representation of given `int` value.
*/
public final function MutableText FromIntM(int value)
{
return FromStringM(string(value));
}
/**
* Method for converting `float` values into immutable `Text`.
*
* To create `MutableText` instead use `FromFloatM()` method.
*
* @param value `float` value to be displayed as `Text`.
* @param precision Up to how many digits after the decimal point to
* display in resulting `Text`. If `0` (default value) is passed - method
* will use native `float` conversion that usually specifies up to
* 2 digits. To render number without any digits after the decimal point,
* specify any negative precision as a value.
* @return Text representation of given `float` value.
*/
public final function Text FromFloat(float value, optional int precision)
{
return FromString(FloatToString(value, precision));
}
/**
* Method for converting `float` values into mutable `MutableText`.
*
* To create `Text` instead use `FromFloat()` method.
*
* @param value `float` value to be displayed as `MutableText`.
* @param precision Up to how many digits after the decimal point to
* display in resulting `MutableText`. If `0` (default value) is passed -
* method will use native `float` conversion that usually specifies up to
* 2 digits. To render number without any digits after the decimal point,
* specify any negative precision as a value.
* @return Text representation of given `float` value.
*/
public final function MutableText FromFloatM(
float value,
optional int precision)
{
return FromStringM(FloatToString(value, precision));
}
// Auxiliary method that does `float` into `string` conversion to later
// reassemble it into `Text` / `MutableText`. Likely to be replaced later.
private final function string FloatToString(float value, optional int precision)
{
local int integerPart, fractionalPart;
local int howManyZeroes;
local string zeroes;
local string result;
// Special cases of: native `float` -> `string` conversion
// and of displaying `float`, effectively, as an `int`
if (precision == 0) {
return string(value);
}
if (precision < 0) {
return string(int(Round(value)));
}
// Display sign if needed and then the absolute value of the `value`
if (value < 0)
{
value *= -1;
result = "-";
}
// Separate integer and fractional parts
integerPart = value;
value = (value - integerPart);
fractionalPart = Round(value * (10 ** precision));
// Display integer & fractional parts (if latter even needed)
result $= string(integerPart);
if (fractionalPart <= 0) {
return result;
}
result $= ".";
// Pad necessary zeroes in front
howManyZeroes = precision - CountDigits(fractionalPart);
while (howManyZeroes > 0)
{
zeroes $= "0";
howManyZeroes -= 1;
}
// Cut off trailing zeroes from fractional part
while (fractionalPart > 0 && fractionalPart % 10 == 0) {
fractionalPart /= 10;
}
return result $ zeroes $ string(fractionalPart);
}
// Auxiliary method that counts amount of digits in decimal representation
// of `number`.
private final function int CountDigits(int number)
{
local int digitCounter;
while (number > 0)
{
number -= (number % 10);
number /= 10;
digitCounter += 1;
}
return digitCounter;
} }
defaultproperties defaultproperties

Loading…
Cancel
Save