AcediaFramework
/
AcediaCore
2
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity
Browse Source

Add implicit conversion between `int` and `float` inside collections

pull/8/head
Anton Tarasenko 2 years ago
parent
c0137e5003
commit
acd7f311fe
3 changed files with 160 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      sources/Data/Collections/ArrayList.uc
  2. 120
      sources/Data/Collections/Collection.uc
  3. 44
      sources/Data/Collections/HashTable.uc

44
sources/Data/Collections/ArrayList.uc
Unescape View File

@ -597,11 +597,15 @@ public final function ArrayList SetByte(
} }
/** /**
* Returns `int` item at `index`. If index is invalid or * Returns `int` or `float` item at `index` as `int`. If index is invalid or
* stores a non-`int` value, returns `defaultValue`. * stores a non-`int` (or non-`float`) value, returns `defaultValue`.
* *
* Referred value must be stored as `IntBox` or `IntRef` * Referred value must be stored as `IntBox`, `IntRef`, `FloatBox` or
* (or one of their sub-classes) for this method to work. * `FloatRef` (or one of their sub-classes) for this method to work.
*
* Allowing for implicit conversion between non-`byte` numeric types simplifies
* handling parsed input as there is no need to know whether parsed value is
* expected to be integer or floating point.
* *
* @param index Index of a `int` item that `ArrayList` * @param index Index of a `int` item that `ArrayList`
* has to return. * has to return.
@ -616,6 +620,8 @@ public final function int GetInt(int index, optional int defaultValue)
local AcediaObject result; local AcediaObject result;
local IntBox asBox; local IntBox asBox;
local IntRef asRef; local IntRef asRef;
local FloatBox asFloatBox;
local FloatRef asFloatRef;
result = BorrowItem(index); result = BorrowItem(index);
if (result == none) { if (result == none) {
@ -629,6 +635,14 @@ public final function int GetInt(int index, optional int defaultValue)
if (asRef != none) { if (asRef != none) {
return asRef.Get(); return asRef.Get();
} }
asFloatBox = FloatBox(result);
if (asFloatBox != none) {
return int(asFloatBox.Get());
}
asFloatRef = FloatRef(result);
if (asFloatRef != none) {
return int(asFloatRef.Get());
}
return defaultValue; return defaultValue;
} }
@ -664,11 +678,15 @@ public final function ArrayList SetInt(
} }
/** /**
* Returns `float` item at `index`. If index is invalid or * Returns `int` or `float` item at `index` as `float`. If index is invalid or
* stores a non-`int` value, returns `defaultValue`. * stores a non-`float` (or non-`int`) value, returns `defaultValue`.
* *
* Referred value must be stored as `FloatBox` or `FloatRef` * Referred value must be stored as `IntBox`, `IntRef`, `FloatBox` or
* (or one of their sub-classes) for this method to work. * `FloatRef` (or one of their sub-classes) for this method to work.
*
* Allowing for implicit conversion between non-`byte` numeric types simplifies
* handling parsed input as there is no need to know whether parsed value is
* expected to be integer or floating point.
* *
* @param index Index of a `float` item that `ArrayList` * @param index Index of a `float` item that `ArrayList`
* has to return. * has to return.
@ -683,6 +701,8 @@ public final function float GetFloat(int index, optional float defaultValue)
local AcediaObject result; local AcediaObject result;
local FloatBox asBox; local FloatBox asBox;
local FloatRef asRef; local FloatRef asRef;
local IntBox asIntBox;
local IntRef asIntRef;
result = BorrowItem(index); result = BorrowItem(index);
if (result == none) { if (result == none) {
@ -696,6 +716,14 @@ public final function float GetFloat(int index, optional float defaultValue)
if (asRef != none) { if (asRef != none) {
return asRef.Get(); return asRef.Get();
} }
asIntBox = IntBox(result);
if (asIntBox != none) {
return float(asIntBox.Get());
}
asIntRef = IntRef(result);
if (asIntRef != none) {
return float(asIntRef.Get());
}
return defaultValue; return defaultValue;
} }

120
sources/Data/Collections/Collection.uc
Unescape View File

@ -177,7 +177,7 @@ public final function AcediaObject GetItemBy(BaseText jsonPointerAsText)
} }
/** /**
* Returns a `bool` value stored (in the caller `Collection` or * Returns a `bool` value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by * one of it's sub-collections) pointed by
* [JSON pointer](https://tools.ietf.org/html/rfc6901). * [JSON pointer](https://tools.ietf.org/html/rfc6901).
* See `GetItemBy()` for more information. * See `GetItemBy()` for more information.
@ -219,7 +219,7 @@ public final function bool GetBoolBy(
} }
/** /**
* Returns a `byte` value stored (in the caller `Collection` or * Returns a `byte` value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by * one of it's sub-collections) pointed by
* [JSON pointer](https://tools.ietf.org/html/rfc6901). * [JSON pointer](https://tools.ietf.org/html/rfc6901).
* See `GetItemBy()` for more information. * See `GetItemBy()` for more information.
@ -261,13 +261,17 @@ public final function byte GetByteBy(
} }
/** /**
* Returns a `int` value stored (in the caller `Collection` or * Returns a `int` or `float` value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by * one of it's sub-collections) pointed by
* [JSON pointer](https://tools.ietf.org/html/rfc6901). * [JSON pointer](https://tools.ietf.org/html/rfc6901) as `int`.
* See `GetItemBy()` for more information. * See `GetItemBy()` for more information.
* *
* Referred value must be stored as `IntBox` or `IntRef` * Referred value must be stored as `IntBox`, `IntRef`, `FloatBox` or
* (or one of their sub-classes) for this method to work. * `FloatRef` (or one of their sub-classes) for this method to work.
*
* Allowing for implicit conversion between non-`byte` numeric types simplifies
* handling parsed input as there is no need to know whether parsed value is
* expected to be integer or floating point.
* *
* @param jsonPointerAsText Description of a path to the `int` value. * @param jsonPointerAsText Description of a path to the `int` value.
* @param defaultValue Value to return in case `jsonPointerAsText` * @param defaultValue Value to return in case `jsonPointerAsText`
@ -284,6 +288,8 @@ public final function int GetIntBy(
local AcediaObject resultObject; local AcediaObject resultObject;
local IntBox asBox; local IntBox asBox;
local IntRef asRef; local IntRef asRef;
local FloatBox asFloatBox;
local FloatRef asFloatRef;
resultObject = GetItemBy(jsonPointerAsText); resultObject = GetItemBy(jsonPointerAsText);
if (resultObject == none) { if (resultObject == none) {
@ -298,18 +304,30 @@ public final function int GetIntBy(
if (asRef != none) { if (asRef != none) {
result = asRef.Get(); result = asRef.Get();
} }
asFloatBox = FloatBox(resultObject);
if (asFloatBox != none) {
result = int(asFloatBox.Get());
}
asFloatRef = FloatRef(resultObject);
if (asFloatRef != none) {
result = int(asFloatRef.Get());
}
_.memory.Free(resultObject); _.memory.Free(resultObject);
return result; return result;
} }
/** /**
* Returns a `float` value stored (in the caller `Collection` or * Returns a `float` or `int` value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by * one of it's sub-collections) pointed by
* [JSON pointer](https://tools.ietf.org/html/rfc6901). * [JSON pointer](https://tools.ietf.org/html/rfc6901) as `float`.
* See `GetItemBy()` for more information. * See `GetItemBy()` for more information.
* *
* Referred value must be stored as `FloatBox` or `FloatRef` * Referred value must be stored as `IntBox`, `IntRef`, `FloatBox` or
* (or one of their sub-classes) for this method to work. * `FloatRef` (or one of their sub-classes) for this method to work.
*
* Allowing for implicit conversion between non-`byte` numeric types simplifies
* handling parsed input as there is no need to know whether parsed value is
* expected to be integer or floating point.
* *
* @param jsonPointerAsText Description of a path to the `float` value. * @param jsonPointerAsText Description of a path to the `float` value.
* @param defaultValue Value to return in case `jsonPointerAsText` * @param defaultValue Value to return in case `jsonPointerAsText`
@ -326,6 +344,8 @@ public final function float GetFloatBy(
local AcediaObject resultObject; local AcediaObject resultObject;
local FloatBox asBox; local FloatBox asBox;
local FloatRef asRef; local FloatRef asRef;
local IntBox asIntBox;
local IntRef asIntRef;
resultObject = GetItemBy(jsonPointerAsText); resultObject = GetItemBy(jsonPointerAsText);
if (resultObject == none) { if (resultObject == none) {
@ -340,12 +360,20 @@ public final function float GetFloatBy(
if (asRef != none) { if (asRef != none) {
result = asRef.Get(); result = asRef.Get();
} }
asIntBox = IntBox(resultObject);
if (asIntBox != none) {
result = float(asIntBox.Get());
}
asIntRef = IntRef(resultObject);
if (asIntRef != none) {
result = float(asIntRef.Get());
}
_.memory.Free(resultObject); _.memory.Free(resultObject);
return result; return result;
} }
/** /**
* Returns a `Vector` value stored (in the caller `Collection` or * Returns a `Vector` value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by * one of it's sub-collections) pointed by
* [JSON pointer](https://tools.ietf.org/html/rfc6901). * [JSON pointer](https://tools.ietf.org/html/rfc6901).
* See `GetItemBy()` for more information. * See `GetItemBy()` for more information.
@ -387,7 +415,7 @@ public final function Vector GetVectorBy(
} }
/** /**
* Returns a plain string value stored (in the caller `Collection` or * Returns a plain string value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by * one of it's sub-collections) pointed by
* [JSON pointer](https://tools.ietf.org/html/rfc6901). * [JSON pointer](https://tools.ietf.org/html/rfc6901).
* See `GetItemBy()` for more information. * See `GetItemBy()` for more information.
@ -422,7 +450,7 @@ public final function string GetStringBy(
} }
/** /**
* Returns a formatted string value stored (in the caller `Collection` or * Returns a formatted string value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by * one of it's sub-collections) pointed by
* [JSON pointer](https://tools.ietf.org/html/rfc6901). * [JSON pointer](https://tools.ietf.org/html/rfc6901).
* See `GetItemBy()` for more information. * See `GetItemBy()` for more information.
@ -457,7 +485,7 @@ public final function string GetFormattedStringBy(
} }
/** /**
* Returns a `Text` value stored (in the caller `Collection` or * Returns a `Text` value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by * one of it's sub-collections) pointed by
* [JSON pointer](https://tools.ietf.org/html/rfc6901). * [JSON pointer](https://tools.ietf.org/html/rfc6901).
* See `GetItemBy()` for more information. * See `GetItemBy()` for more information.
@ -484,7 +512,7 @@ public final function Text GetTextBy(BaseText jsonPointerAsText)
} }
/** /**
* Returns an `HashTable` value stored (in the caller `Collection` or * Returns an `HashTable` value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by * one of it's sub-collections) pointed by
* [JSON pointer](https://tools.ietf.org/html/rfc6901). * [JSON pointer](https://tools.ietf.org/html/rfc6901).
* See `GetItemBy()` for more information. * See `GetItemBy()` for more information.
@ -512,7 +540,7 @@ public final function HashTable GetHashTableBy(
} }
/** /**
* Returns an `ArrayList` value stored (in the caller `Collection` or * Returns an `ArrayList` value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by * one of it's sub-collections) pointed by
* [JSON pointer](https://tools.ietf.org/html/rfc6901). * [JSON pointer](https://tools.ietf.org/html/rfc6901).
* See `GetItemBy()` for more information. * See `GetItemBy()` for more information.
@ -539,7 +567,7 @@ public final function ArrayList GetArrayListBy(BaseText jsonPointerAsText)
} }
/** /**
* Returns a `bool` value stored (in the caller `Collection` or * Returns a `bool` value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by JSON pointer. * one of it's sub-collections) pointed by JSON pointer.
* See `GetItemByJSON()` for more information. * See `GetItemByJSON()` for more information.
* *
@ -580,7 +608,7 @@ public final function bool GetBoolByJSON(
} }
/** /**
* Returns a `byte` value stored (in the caller `Collection` or * Returns a `byte` value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by JSON pointer. * one of it's sub-collections) pointed by JSON pointer.
* See `GetItemByJSON()` for more information. * See `GetItemByJSON()` for more information.
* *
@ -621,12 +649,16 @@ public final function byte GetByteByJSON(
} }
/** /**
* Returns a `int` value stored (in the caller `Collection` or * Returns a `int` or `float` value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by JSON pointer. * one of it's sub-collections) pointed by JSON pointer as `int`.
* See `GetItemByJSON()` for more information. * See `GetItemByJSON()` for more information.
* *
* Referred value must be stored as `IntBox` or `IntRef` * Referred value must be stored as `IntBox`, `IntRef`, `FloatBox` or
* (or one of their sub-classes) for this method to work. * `FloatRef` (or one of their sub-classes) for this method to work.
*
* Allowing for implicit conversion between non-`byte` numeric types simplifies
* handling parsed input as there is no need to know whether parsed value is
* expected to be integer or floating point.
* *
* @param jsonPointer JSON path to the `int` value. * @param jsonPointer JSON path to the `int` value.
* @param defaultValue Value to return in case `jsonPointer` * @param defaultValue Value to return in case `jsonPointer`
@ -643,6 +675,8 @@ public final function int GetIntByJSON(
local AcediaObject resultObject; local AcediaObject resultObject;
local IntBox asBox; local IntBox asBox;
local IntRef asRef; local IntRef asRef;
local FloatBox asFloatBox;
local FloatRef asFloatRef;
resultObject = GetItemByJSON(jsonPointer); resultObject = GetItemByJSON(jsonPointer);
if (resultObject == none) { if (resultObject == none) {
@ -657,17 +691,29 @@ public final function int GetIntByJSON(
if (asRef != none) { if (asRef != none) {
result = asRef.Get(); result = asRef.Get();
} }
asFloatBox = FloatBox(resultObject);
if (asFloatBox != none) {
result = int(asFloatBox.Get());
}
asFloatRef = FloatRef(resultObject);
if (asFloatRef != none) {
result = int(asFloatRef.Get());
}
_.memory.Free(resultObject); _.memory.Free(resultObject);
return result; return result;
} }
/** /**
* Returns a `float` value stored (in the caller `Collection` or * Returns a `float` or `int` value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by JSON pointer. * one of it's sub-collections) pointed by JSON pointer as `float`.
* See `GetItemByJSON()` for more information. * See `GetItemByJSON()` for more information.
* *
* Referred value must be stored as `FloatBox` or `FloatRef` * Referred value must be stored as `IntBox`, `IntRef`, `FloatBox` or
* (or one of their sub-classes) for this method to work. * `FloatRef` (or one of their sub-classes) for this method to work.
*
* Allowing for implicit conversion between non-`byte` numeric types simplifies
* handling parsed input as there is no need to know whether parsed value is
* expected to be integer or floating point.
* *
* @param jsonPointer JSON path to the `float` value. * @param jsonPointer JSON path to the `float` value.
* @param defaultValue Value to return in case `jsonPointer` * @param defaultValue Value to return in case `jsonPointer`
@ -684,6 +730,8 @@ public final function float GetFloatByJSON(
local AcediaObject resultObject; local AcediaObject resultObject;
local FloatBox asBox; local FloatBox asBox;
local FloatRef asRef; local FloatRef asRef;
local IntBox asIntBox;
local IntRef asIntRef;
resultObject = GetItemByJSON(jsonPointer); resultObject = GetItemByJSON(jsonPointer);
if (resultObject == none) { if (resultObject == none) {
@ -698,12 +746,20 @@ public final function float GetFloatByJSON(
if (asRef != none) { if (asRef != none) {
result = asRef.Get(); result = asRef.Get();
} }
asIntBox = IntBox(resultObject);
if (asIntBox != none) {
result = float(asIntBox.Get());
}
asIntRef = IntRef(resultObject);
if (asIntRef != none) {
result = float(asIntRef.Get());
}
_.memory.Free(resultObject); _.memory.Free(resultObject);
return result; return result;
} }
/** /**
* Returns a `Vector` value stored (in the caller `Collection` or * Returns a `Vector` value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by JSON pointer. * one of it's sub-collections) pointed by JSON pointer.
* See `GetItemByJSON()` for more information. * See `GetItemByJSON()` for more information.
* *
@ -744,7 +800,7 @@ public final function Vector GetVectorByJSON(
} }
/** /**
* Returns a plain string value stored (in the caller `Collection` or * Returns a plain string value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by JSON pointer. * one of it's sub-collections) pointed by JSON pointer.
* See `GetItemByJSON()` for more information. * See `GetItemByJSON()` for more information.
* *
@ -778,7 +834,7 @@ public final function string GetStringByJSON(
} }
/** /**
* Returns a formatted string value stored (in the caller `Collection` or * Returns a formatted string value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by JSON pointer. * one of it's sub-collections) pointed by JSON pointer.
* See `GetItemByJSON()` for more information. * See `GetItemByJSON()` for more information.
* *
@ -812,7 +868,7 @@ public final function string GetFormattedStringByJSON(
} }
/** /**
* Returns a `Text` value stored (in the caller `Collection` or * Returns a `Text` value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by JSON pointer. * one of it's sub-collections) pointed by JSON pointer.
* See `GetItemByJSON()` for more information. * See `GetItemByJSON()` for more information.
* *
@ -838,7 +894,7 @@ public final function Text GetTextByJSON(JSONPointer jsonPointer)
} }
/** /**
* Returns an `HashTable` value stored (in the caller `Collection` or * Returns an `HashTable` value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by JSON pointer. * one of it's sub-collections) pointed by JSON pointer.
* See `GetItemByJSON()` for more information. * See `GetItemByJSON()` for more information.
* *
@ -865,7 +921,7 @@ public final function HashTable GetHashTableByJSON(
} }
/** /**
* Returns an `ArrayList` value stored (in the caller `Collection` or * Returns an `ArrayList` value (stored in the caller `Collection` or
* one of it's sub-collections) pointed by JSON pointer. * one of it's sub-collections) pointed by JSON pointer.
* See `GetItemByJSON()` for more information. * See `GetItemByJSON()` for more information.
* *

44
sources/Data/Collections/HashTable.uc
Unescape View File

@ -800,11 +800,15 @@ public final function HashTable SetByte(
} }
/** /**
* Returns `int` item at key `key`. If key is invalid or * Returns `int` or `float` item at key `key` as `int`. If key is invalid or
* stores a non-`int` value, returns `defaultValue`. * stores a non-`int` (or non-`float`) value, returns `defaultValue`.
* *
* Referred value must be stored as `IntBox` or `IntRef` * Referred value must be stored as `IntBox`, `IntRef`, `FloatBox` or
* (or one of their sub-classes) for this method to work. * `FloatRef` (or one of their sub-classes) for this method to work.
*
* Allowing for implicit conversion between non-`byte` numeric types simplifies
* handling parsed input as there is no need to know whether parsed value is
* expected to be integer or floating point.
* *
* @param key Key of a `int` item that `HashTable` * @param key Key of a `int` item that `HashTable`
* has to return. * has to return.
@ -819,6 +823,8 @@ public final function int GetInt(AcediaObject key, optional int defaultValue)
local AcediaObject result; local AcediaObject result;
local IntBox asBox; local IntBox asBox;
local IntRef asRef; local IntRef asRef;
local FloatBox asFloatBox;
local FloatRef asFloatRef;
result = BorrowItem(key); result = BorrowItem(key);
if (result == none) { if (result == none) {
@ -832,6 +838,14 @@ public final function int GetInt(AcediaObject key, optional int defaultValue)
if (asRef != none) { if (asRef != none) {
return asRef.Get(); return asRef.Get();
} }
asFloatBox = FloatBox(result);
if (asFloatBox != none) {
return int(asFloatBox.Get());
}
asFloatRef = FloatRef(result);
if (asFloatRef != none) {
return int(asFloatRef.Get());
}
return defaultValue; return defaultValue;
} }
@ -867,11 +881,15 @@ public final function HashTable SetInt(
} }
/** /**
* Returns `float` item at key `key`. If key is invalid or * Returns `int` or `float` item at key `key` as `float`. If key is invalid or
* stores a non-`float` value, returns `defaultValue`. * stores a non-`float` (or non-`int`) value, returns `defaultValue`.
* *
* Referred value must be stored as `FloatBox` or `FloatRef` * Referred value must be stored as `IntBox`, `IntRef`, `FloatBox` or
* (or one of their sub-classes) for this method to work. * `FloatRef` (or one of their sub-classes) for this method to work.
*
* Allowing for implicit conversion between non-`byte` numeric types simplifies
* handling parsed input as there is no need to know whether parsed value is
* expected to be integer or floating point.
* *
* @param key Key of a `float` item that `HashTable` * @param key Key of a `float` item that `HashTable`
* has to return. * has to return.
@ -888,6 +906,8 @@ public final function float GetFloat(
local AcediaObject result; local AcediaObject result;
local FloatBox asBox; local FloatBox asBox;
local FloatRef asRef; local FloatRef asRef;
local IntBox asIntBox;
local IntRef asIntRef;
result = BorrowItem(key); result = BorrowItem(key);
if (result == none) { if (result == none) {
@ -901,6 +921,14 @@ public final function float GetFloat(
if (asRef != none) { if (asRef != none) {
return asRef.Get(); return asRef.Get();
} }
asIntBox = IntBox(result);
if (asIntBox != none) {
return float(asIntBox.Get());
}
asIntRef = IntRef(result);
if (asIntRef != none) {
return float(asIntRef.Get());
}
return defaultValue; return defaultValue;
} }

Write Preview
Loading…
Cancel
Save