added proper error checking and implemented bigint :3

This commit is contained in:
ika4422 2026-02-09 21:39:06 +00:00
parent a5afe12931
commit 419735c5f2
No known key found for this signature in database
3 changed files with 120 additions and 34 deletions

36
Cargo.lock generated
View file

@ -58,6 +58,12 @@ version = "1.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f0e0fee31ef5ed1ba1316088939cea399010ed7731dba877ed44aeb407a75ea"
[[package]]
name = "autocfg"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
[[package]]
name = "bitflags"
version = "2.10.0"
@ -141,6 +147,8 @@ name = "dolltool"
version = "0.1.0"
dependencies = [
"clap",
"num-bigint",
"num-traits",
"rand",
]
@ -245,6 +253,34 @@ version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
[[package]]
name = "num-bigint"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
dependencies = [
"num-integer",
"num-traits",
]
[[package]]
name = "num-integer"
version = "0.1.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
dependencies = [
"num-traits",
]
[[package]]
name = "num-traits"
version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
]
[[package]]
name = "once_cell_polyfill"
version = "1.70.2"

View file

@ -5,4 +5,6 @@ edition = "2024"
[dependencies]
clap = { version = "4.5.57", features = ["derive"] }
num-bigint = "0.4.6"
num-traits = "0.2.19"
rand = "0.10.0"

View file

@ -1,4 +1,8 @@
use std::process;
use clap::Parser;
use num_bigint::BigUint;
use num_traits::{One, ToPrimitive, Zero};
use rand::RngExt;
#[derive(Parser, Debug)]
@ -26,36 +30,40 @@ struct Args {
no_doll: bool,
}
fn to_dollcode(mut n: u64) -> String {
if n == 0 {
return String::from("value must be greater than zero :c");
fn to_dollcode(mut n: BigUint) -> Result<String, String> {
if n.is_zero() {
return Err("Value of n must be greater than zero!".to_string());
}
let symbols = ['▖', '▘', '▌'];
let three = BigUint::from(3u8);
let mut result = String::new();
while n > 0 {
n -= 1;
let remainder = (n % 3) as usize;
n /= 3;
while n > BigUint::zero() {
n -= BigUint::one();
let remainder = (&n % &three).to_usize().unwrap();
n /= &three;
result.insert(0, symbols[remainder]);
}
result
Ok(result)
}
fn from_dollcode(code: &str) -> u64 {
code.chars()
.rev()
.enumerate()
.map(|(power, c)| {
let val = match c {
'▖' => 1,
'▘' => 2,
'▌' => 3,
_ => panic!("invalid dollcode character: {} :c", c),
};
val * 3u64.pow(power as u32)
})
.sum()
fn from_dollcode(code: &str) -> Result<BigUint, String> {
let mut total = BigUint::zero();
let three = BigUint::from(3u8);
let mut multiplier = BigUint::one();
for c in code.chars().rev() {
let val = match c {
'▖' => BigUint::from(1u8),
'▘' => BigUint::from(2u8),
'▌' => BigUint::from(3u8),
_ => return Err(format!("Invalid dollcode character: '{}'", c)),
};
total += val * &multiplier;
multiplier *= &three;
}
Ok(total)
}
fn generate_from_pattern(pattern: &str, upper: bool) -> String {
@ -98,31 +106,71 @@ fn main() {
if args.no_doll {
println!("{}", generated);
} else {
let doll: Vec<String> = generated.chars().map(|c| to_dollcode(c as u64)).collect();
println!("{} :: {}", generated, doll.join(" "));
match BigUint::parse_bytes(generated.as_bytes(), 10) {
Some(num) => {
println!("{} :: {}", generated, to_dollcode(num).unwrap());
}
None => {
let doll: Vec<String> = generated
.chars()
.map(|c| to_dollcode(BigUint::from(c as u64)).unwrap())
.collect();
println!("{} :: {}", generated, doll.join(" "));
}
}
}
}
}
if let Some(input) = args.encode {
if args.text {
let result: Vec<String> = input.chars().map(|c| to_dollcode(c as u64)).collect();
let result: Vec<String> = input
.chars()
.map(|c| to_dollcode(BigUint::from(c as u64)).unwrap())
.collect();
println!("{}", result.join(" "));
} else {
match input.parse::<u64>() {
Ok(num) => println!("{}", to_dollcode(num)),
Err(_) => println!("input must be a positive integer :c"),
match input.parse::<BigUint>() {
Ok(num) => match to_dollcode(num) {
Ok(code) => println!("{}", code),
Err(e) => {
eprintln!("Error: {}", e);
process::exit(1);
}
},
Err(_) => {
eprintln!("Error: input must be a positive integer!");
process::exit(1);
}
}
}
} else if let Some(input) = args.decode {
if args.text {
let result: String = input
.split_whitespace()
.map(|s| char::from_u32(from_dollcode(s) as u32).unwrap_or('?'))
.collect();
println!("{}", result);
let mut decoded_chars = String::new();
for part in input.split_whitespace() {
match from_dollcode(part) {
Ok(val) => {
if let Some(u) = val.to_u32() {
decoded_chars.push(char::from_u32(u).unwrap_or('?'));
} else {
decoded_chars.push('?');
}
}
Err(e) => {
eprintln!("Error: {}", e);
process::exit(1);
}
}
}
println!("{}", decoded_chars);
} else {
println!("{}", from_dollcode(&input));
match from_dollcode(&input) {
Ok(val) => println!("{}", val),
Err(e) => {
eprintln!("Error: {}", e);
process::exit(1);
}
}
}
}
}