summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/ustring.cpp211
1 files changed, 154 insertions, 57 deletions
diff --git a/core/ustring.cpp b/core/ustring.cpp
index 222c445b43..476ab3f936 100644
--- a/core/ustring.cpp
+++ b/core/ustring.cpp
@@ -3554,15 +3554,17 @@ String String::sprintf(const Array& values) const {
String formatted;
CharType* self = (CharType*)c_str();
+ int num_items = values.size();
bool in_format = false;
int value_index = 0;
int min_chars;
- int num_decimals;
+ int min_decimals;
bool in_decimals;
bool pad_with_zeroes;
bool left_justified;
bool show_sign;
+
for (; *self; self++) {
const CharType c = *self;
@@ -3577,71 +3579,88 @@ String String::sprintf(const Array& values) const {
case 'o': // Octal
case 'x': // Hexadecimal (lowercase)
case 'X': { // Hexadecimal (uppercase)
- if (values[value_index].is_num()) {
- int64_t value = values[value_index];
- int base;
- bool capitalize = false;
- switch (c) {
- case 'd': base = 10; break;
- case 'o': base = 8; break;
- case 'x': base = 16; break;
- case 'X': base = 16; capitalize = true; break;
- }
- // Get basic number.
- String str = String::num_int64(value, base, capitalize);
+ if (value_index >= values.size()) {
+ ERR_EXPLAIN("not enough arguments for format string");
+ ERR_FAIL_V("");
+ }
- // Sign.
- if (show_sign && value >= 0) {
- str = str.insert(0, "+");
- }
+ if (!values[value_index].is_num()) {
+ ERR_EXPLAIN("a number is required");
+ ERR_FAIL_V("");
+ }
+
+ int64_t value = values[value_index];
+ int base;
+ bool capitalize = false;
+ switch (c) {
+ case 'd': base = 10; break;
+ case 'o': base = 8; break;
+ case 'x': base = 16; break;
+ case 'X': base = 16; capitalize = true; break;
+ }
+ // Get basic number.
+ String str = String::num_int64(value, base, capitalize);
- // Padding.
- String pad_char = pad_with_zeroes ? String("0") : String(" ");
- if (left_justified) {
- str = str.rpad(min_chars, pad_char);
- } else {
- str = str.lpad(min_chars, pad_char);
- }
+ // Sign.
+ if (show_sign && value >= 0) {
+ str = str.insert(0, "+");
+ }
- formatted += str;
- ++value_index;
- in_format = false;
+ // Padding.
+ String pad_char = pad_with_zeroes ? String("0") : String(" ");
+ if (left_justified) {
+ str = str.rpad(min_chars, pad_char);
} else {
- // TODO: Error?
+ str = str.lpad(min_chars, pad_char);
}
-
+
+ formatted += str;
+ ++value_index;
+ in_format = false;
+
break;
}
case 'f': { // Float
- if (values[value_index].is_num()) {
- double value = values[value_index];
- String str = String::num(value, num_decimals);
+ if (value_index >= values.size()) {
+ ERR_EXPLAIN("not enough arguments for format string");
+ ERR_FAIL_V("");
+ }
- // Pad decimals out.
- str = str.pad_decimals(num_decimals);
+ if (!values[value_index].is_num()) {
+ ERR_EXPLAIN("a number is required");
+ ERR_FAIL_V("");
+ }
- // Show sign
- if (show_sign && value >= 0) {
- str = str.insert(0, "+");
- }
+ double value = values[value_index];
+ String str = String::num(value, min_decimals);
- // Padding
- if (left_justified) {
- str = str.rpad(min_chars);
- } else {
- str = str.lpad(min_chars);
- }
+ // Pad decimals out.
+ str = str.pad_decimals(min_decimals);
+
+ // Show sign
+ if (show_sign && value >= 0) {
+ str = str.insert(0, "+");
+ }
- formatted += str;
- ++value_index;
- in_format = false;
+ // Padding
+ if (left_justified) {
+ str = str.rpad(min_chars);
} else {
- // TODO: Error?
+ str = str.lpad(min_chars);
}
+
+ formatted += str;
+ ++value_index;
+ in_format = false;
break;
}
case 's': { // String
+ if (value_index >= values.size()) {
+ ERR_EXPLAIN("not enough arguments for format string");
+ ERR_FAIL_V("");
+ }
+
String str = values[value_index];
// Padding.
if (left_justified) {
@@ -3655,6 +3674,47 @@ String String::sprintf(const Array& values) const {
in_format = false;
break;
}
+ case 'c': {
+ if (value_index >= values.size()) {
+ ERR_EXPLAIN("not enough arguments for format string");
+ ERR_FAIL_V("");
+ }
+
+ // Convert to character.
+ String str;
+ if (values[value_index].is_num()) {
+ int value = values[value_index];
+ if (value < 0) {
+ ERR_EXPLAIN("unsigned byte integer is lower than maximum")
+ ERR_FAIL_V("");
+ } else if (value > 255) {
+ ERR_EXPLAIN("unsigned byte integer is greater than maximum")
+ ERR_FAIL_V("");
+ }
+ str = chr(values[value_index]);
+ } else if (values[value_index].get_type() == Variant::STRING) {
+ str = values[value_index];
+ if (str.length() != 1) {
+ ERR_EXPLAIN("%c requires number or single-character string");
+ ERR_FAIL_V("");
+ }
+ } else {
+ ERR_EXPLAIN("%c requires number or single-character string");
+ ERR_FAIL_V("");
+ }
+
+ // Padding.
+ if (left_justified) {
+ str = str.rpad(min_chars);
+ } else {
+ str = str.lpad(min_chars);
+ }
+
+ formatted += str;
+ ++value_index;
+ in_format = false;
+ break;
+ }
case '-': { // Left justify
left_justified = true;
break;
@@ -3667,8 +3727,8 @@ String String::sprintf(const Array& values) const {
case '5': case '6': case '7': case '8': case '9': {
int n = c - '0';
if (in_decimals) {
- num_decimals *= 10;
- num_decimals += n;
+ min_decimals *= 10;
+ min_decimals += n;
} else {
if (c == '0' && min_chars == 0) {
pad_with_zeroes = true;
@@ -3679,16 +3739,43 @@ String String::sprintf(const Array& values) const {
}
break;
}
- case '.': // Float separtor.
+ case '.': { // Float separtor.
+ if (in_decimals) {
+ ERR_EXPLAIN("too many decimal points in format");
+ ERR_FAIL_V("");
+ }
in_decimals = true;
- num_decimals = 0; // We want to add the value manually.
+ min_decimals = 0; // We want to add the value manually.
break;
+ }
+
+ case '*': { // Dyanmic width, based on value.
+ if (value_index >= values.size()) {
+ ERR_EXPLAIN("not enough arguments for format string");
+ ERR_FAIL_V("");
+ }
+
+ if (!values[value_index].is_num()) {
+ ERR_EXPLAIN("* wants number");
+ ERR_FAIL_V("");
+ }
+
+ int size = values[value_index];
+
+ if (in_decimals) {
+ min_decimals = size;
+ } else {
+ min_chars = size;
+ }
- // case '*': // Dyanmic width, based on value.
- // break;
+ ++value_index;
+ break;
+ }
- //default:
- // TODO: error?
+ default: {
+ ERR_EXPLAIN("unsupported format character");
+ ERR_FAIL_V("");
+ }
}
} else { // Not in format string.
switch (c) {
@@ -3696,7 +3783,7 @@ String String::sprintf(const Array& values) const {
in_format = true;
// Back to defaults:
min_chars = 0;
- num_decimals = 6;
+ min_decimals = 6;
pad_with_zeroes = false;
left_justified = false;
show_sign = false;
@@ -3708,5 +3795,15 @@ String String::sprintf(const Array& values) const {
}
}
+ if (in_format) {
+ ERR_EXPLAIN("incomplete format");
+ ERR_FAIL_V("");
+ }
+
+ if (value_index != values.size()) {
+ ERR_EXPLAIN("not all arguments converted during string formatting");
+ ERR_FAIL_V("");
+ }
+
return formatted;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-09 13:21:45 +0000