extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-15 20:07:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix units and add test

Browse Source
This commit is contained in:
Jonathan Turner
2019-06-24 19:59:23 +12:00
parent 36a4289d37
commit 160074346f
9 changed files with 124 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/parser/ast/expression.rs
View File

@ -292,17 +292,6 @@ impl From<&str> for Unit {
}
impl Unit {
crate fn compute(&self, size: i64) -> Value {
Value::int(match self {
Unit::B => size,
Unit::KB => size * 1024,
Unit::MB => size * 1024 * 1024,
Unit::GB => size * 1024 * 1024 * 1024,
Unit::TB => size * 1024 * 1024 * 1024 * 1024,
Unit::PB => size * 1024 * 1024 * 1024 * 1024 * 1024,
})
}
crate fn to_string(&self) -> &str {
match self {
Unit::B => "B",

11
src/parser/parse2/parser.rs
View File

@ -213,11 +213,22 @@ pub fn raw_unit(input: NomSpan) -> IResult<NomSpan, Spanned<Unit>> {
let start = input.offset;
let (input, unit) = alt((
tag("B"),
tag("b"),
tag("KB"),
tag("kb"),
tag("Kb"),
tag("MB"),
tag("mb"),
tag("Mb"),
tag("GB"),
tag("gb"),
tag("Gb"),
tag("TB"),
tag("tb"),
tag("Tb"),
tag("PB"),
tag("pb"),
tag("Pb"),
))(input)?;
let end = input.offset;

24
src/parser/parse2/unit.rs
View File

@ -1,5 +1,6 @@
use serde_derive::{Deserialize, Serialize};
use std::str::FromStr;
use crate::object::base::Value;
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Deserialize, Serialize)]
pub enum Unit {
@ -22,6 +23,17 @@ impl Unit {
Unit::PB => "PB",
}
}
crate fn compute(&self, size: i64) -> Value {
Value::int(match self {
Unit::B => size,
Unit::KB => size * 1024,
Unit::MB => size * 1024 * 1024,
Unit::GB => size * 1024 * 1024 * 1024,
Unit::TB => size * 1024 * 1024 * 1024 * 1024,
Unit::PB => size * 1024 * 1024 * 1024 * 1024 * 1024,
})
}
}
impl From<&str> for Unit {
@ -34,12 +46,12 @@ impl FromStr for Unit {
type Err = ();
fn from_str(input: &str) -> Result<Self, <Self as std::str::FromStr>::Err> {
match input {
"B" => Ok(Unit::B),
"KB" => Ok(Unit::KB),
"MB" => Ok(Unit::MB),
"GB" => Ok(Unit::GB),
"TB" => Ok(Unit::TB),
"PB" => Ok(Unit::PB),
"B" | "b" => Ok(Unit::B),
"KB" | "kb" | "Kb" => Ok(Unit::KB),
"MB" | "mb" | "Mb" => Ok(Unit::MB),
"GB" | "gb" | "Gb" => Ok(Unit::GB),
"TB" | "tb" | "Tb" => Ok(Unit::TB),
"PB" | "pb" | "Pb" => Ok(Unit::PB),
_ => Err(()),
}
}