Fixed to_text not returning single digits
This commit is contained in:
@@ -79,6 +79,9 @@ pub fn to_text(number: u32) -> String {
|
|||||||
.collect();
|
.collect();
|
||||||
let second_digit_array: [usize; 2] = [0, 3];
|
let second_digit_array: [usize; 2] = [0, 3];
|
||||||
let mut last: Option<u8> = None;
|
let mut last: Option<u8> = None;
|
||||||
|
if digits.len() == 1 {
|
||||||
|
numtext.push_str(digit_to_text(*digits.last().unwrap()).unwrap().as_str());
|
||||||
|
} else {
|
||||||
for (index, digit) in digits.iter().rev().enumerate() {
|
for (index, digit) in digits.iter().rev().enumerate() {
|
||||||
if second_digit_array.contains(&index) {
|
if second_digit_array.contains(&index) {
|
||||||
last = Some(digit.clone());
|
last = Some(digit.clone());
|
||||||
@@ -101,5 +104,6 @@ pub fn to_text(number: u32) -> String {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
numtext
|
numtext
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,9 @@ mod tests {
|
|||||||
fn digits() {
|
fn digits() {
|
||||||
use crate::digit_to_text;
|
use crate::digit_to_text;
|
||||||
assert_eq!(digit_to_text(9).unwrap(), "nine");
|
assert_eq!(digit_to_text(9).unwrap(), "nine");
|
||||||
|
assert_eq!(digit_to_text(3).unwrap(), "three");
|
||||||
|
assert_eq!(digit_to_text(7).unwrap(), "seven");
|
||||||
|
assert_eq!(digit_to_text(5).unwrap(), "five");
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
fn numbers() {
|
fn numbers() {
|
||||||
@@ -11,6 +14,7 @@ mod tests {
|
|||||||
assert_eq!(to_text(12345), "twelvethousandthreehundredfortyfive");
|
assert_eq!(to_text(12345), "twelvethousandthreehundredfortyfive");
|
||||||
assert_eq!(to_text(81123), "eightyonethousandonehundredtwentythree");
|
assert_eq!(to_text(81123), "eightyonethousandonehundredtwentythree");
|
||||||
assert_eq!(to_text(12), "twelve");
|
assert_eq!(to_text(12), "twelve");
|
||||||
|
assert_eq!(to_text(2), "two");
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
fn tens() {
|
fn tens() {
|
||||||
|
|||||||
Reference in New Issue
Block a user