PlexSheep
/
numf
generated from PlexSheep/rs-base
1
1
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases 8 Wiki Activity

add parser for all formats #13

Merged
PlexSheep merged 11 commits from feat/parse-formats into devel 2024-05-13 15:54:23 +02:00
Conversation 1 Commits 11 Files Changed 4 +9 -14
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1bb0ffd6f8 - Show all commits

23
src/format.rs
View File

@ -1,7 +1,7 @@
#![allow(dead_code)] // this is exported to lib.rs #![allow(dead_code)] // this is exported to lib.rs
use anyhow::anyhow; use anyhow::anyhow;
use clap::{ArgGroup, Parser}; use clap::{ArgGroup, Parser};
use libpt::bintols::split; use libpt::bintols::{join, split};
use num::traits::Pow; use num::traits::Pow;
pub type NumberType = u128; pub type NumberType = u128;
@ -240,11 +240,17 @@ impl Format {
/// ``` /// ```
pub fn numf_parser<T>(s: &str) -> anyhow::Result<T> pub fn numf_parser<T>(s: &str) -> anyhow::Result<T>
PlexSheep marked this conversation as resolved Outdated
PlexSheep commented 2024-05-13 13:32:14 +02:00
Outdated
Review
Copy Link

Make this function generic for all unsigned integer types

Make this function generic for all unsigned integer types
where where
T: std::str::FromStr, T: std::str::FromStr + std::convert::TryFrom<u128>,
<T as std::str::FromStr>::Err: std::fmt::Display, <T as std::str::FromStr>::Err: std::fmt::Display,
T: num::Num, T: num::Num,
<T as num::Num>::FromStrRadixErr: std::fmt::Display, <T as num::Num>::FromStrRadixErr: std::fmt::Display,
<T as std::str::FromStr>::Err: std::fmt::Debug, <T as std::str::FromStr>::Err: std::fmt::Debug,
u128: std::convert::From<T>,
<T as std::str::FromStr>::Err: std::error::Error,
<T as std::convert::TryFrom<u128>>::Error: std::error::Error,
<T as std::convert::TryFrom<u128>>::Error: std::marker::Send,
<T as std::convert::TryFrom<u128>>::Error: std::marker::Sync,
<T as std::convert::TryFrom<u128>>::Error: 'static,
{ {
if s.starts_with(&Format::Dec.prefix()) || s.parse::<T>().is_ok() { if s.starts_with(&Format::Dec.prefix()) || s.parse::<T>().is_ok() {
let s = match s.strip_prefix(&Format::Dec.prefix()) { let s = match s.strip_prefix(&Format::Dec.prefix()) {
@ -323,18 +329,7 @@ where
None => s, None => s,
}; };
match fast32::base32::RFC4648.decode_str(s) { match fast32::base32::RFC4648.decode_str(s) {
Ok(r) => { Ok(r) => Ok(join::array_to_unsigned::<T>(&r)?),
if r.len() > 16 {
panic!("boom");
}
let mut ri: u128 = 0;
for (i, e) in r.iter().rev().enumerate() {
ri += (*e as u128) * 256.pow(i as u32) as u128;
}
dbg!(ri);
dbg!(format!("{ri:#x}"));
Ok(ri.to_string().parse().unwrap())
}
Err(e) => { Err(e) => {
let e = format!("{e}"); let e = format!("{e}");
Err(anyhow!(e)) Err(anyhow!(e))