talexander/duster
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Implemented float literals for OwnedLiterals, not yet for serde_json.

Browse Source
This commit is contained in:
Tom Alexander 2020-06-13 13:37:26 -04:00
parent 8daa746da6
commit 978bbe6eb3
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/test_cases/helpers_eq/main.dust
View File

@ -27,3 +27,7 @@ Do objects with different paths referencing the same variable match?{~n}
{#int renamed=some_obj} {#int renamed=some_obj}
{@eq key=some_obj value=renamed}some_obj equals renamed{:else}some_obj does not equal renamed{/eq}{~n} {@eq key=some_obj value=renamed}some_obj equals renamed{:else}some_obj does not equal renamed{/eq}{~n}
{/int} {/int}
Floating point equality{~n}
======================={~n}
{@eq key=int value=7.0}int is equal to 7.0{:else}int is not equal to 7.0{/eq}

1
src/parser/parser.rs
View File

@ -119,6 +119,7 @@ pub struct Partial<'a> {
pub enum OwnedLiteral { pub enum OwnedLiteral {
LString(String), LString(String),
LPositiveInteger(u64), LPositiveInteger(u64),
LFloat(f64),
} }
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]

32
src/renderer/parameters_context.rs
View File

@ -137,6 +137,7 @@ impl Truthiness for OwnedLiteral {
match self { match self {
OwnedLiteral::LString(text) => !text.is_empty(), OwnedLiteral::LString(text) => !text.is_empty(),
OwnedLiteral::LPositiveInteger(_num) => true, OwnedLiteral::LPositiveInteger(_num) => true,
OwnedLiteral::LFloat(_num) => true,
} }
} }
} }
@ -146,6 +147,7 @@ impl Renderable for OwnedLiteral {
match self { match self {
OwnedLiteral::LString(text) => Ok(text.clone()), OwnedLiteral::LString(text) => Ok(text.clone()),
OwnedLiteral::LPositiveInteger(num) => Ok(num.to_string()), OwnedLiteral::LPositiveInteger(num) => Ok(num.to_string()),
OwnedLiteral::LFloat(num) => Ok(num.to_string()),
} }
} }
} }
@ -180,10 +182,25 @@ impl CompareContextElement for OwnedLiteral {
(OwnedLiteral::LString(self_text), OwnedLiteral::LPositiveInteger(other_num)) => { (OwnedLiteral::LString(self_text), OwnedLiteral::LPositiveInteger(other_num)) => {
self_text == &other_num.to_string() self_text == &other_num.to_string()
} }
(OwnedLiteral::LFloat(self_num), OwnedLiteral::LString(other_text)) => {
&self_num.to_string() == other_text
}
(OwnedLiteral::LString(self_text), OwnedLiteral::LFloat(other_num)) => {
self_text == &other_num.to_string()
}
( (
OwnedLiteral::LPositiveInteger(self_num), OwnedLiteral::LPositiveInteger(self_num),
OwnedLiteral::LPositiveInteger(other_num), OwnedLiteral::LPositiveInteger(other_num),
) => self_num == other_num, ) => self_num == other_num,
(OwnedLiteral::LFloat(self_num), OwnedLiteral::LFloat(other_num)) => {
self_num == other_num
}
(OwnedLiteral::LFloat(self_num), OwnedLiteral::LPositiveInteger(other_num)) => {
*self_num == (*other_num as f64)
}
(OwnedLiteral::LPositiveInteger(self_num), OwnedLiteral::LFloat(other_num)) => {
(*self_num as f64) == *other_num
}
}, },
} }
} }
@ -212,10 +229,25 @@ impl CompareContextElement for OwnedLiteral {
(OwnedLiteral::LString(self_text), OwnedLiteral::LPositiveInteger(other_num)) => { (OwnedLiteral::LString(self_text), OwnedLiteral::LPositiveInteger(other_num)) => {
self_text.partial_cmp(&other_num.to_string()) self_text.partial_cmp(&other_num.to_string())
} }
(OwnedLiteral::LFloat(self_num), OwnedLiteral::LString(other_text)) => {
self_num.to_string().partial_cmp(other_text)
}
(OwnedLiteral::LString(self_text), OwnedLiteral::LFloat(other_num)) => {
self_text.partial_cmp(&other_num.to_string())
}
( (
OwnedLiteral::LPositiveInteger(self_num), OwnedLiteral::LPositiveInteger(self_num),
OwnedLiteral::LPositiveInteger(other_num), OwnedLiteral::LPositiveInteger(other_num),
) => self_num.partial_cmp(other_num), ) => self_num.partial_cmp(other_num),
(OwnedLiteral::LFloat(self_num), OwnedLiteral::LFloat(other_num)) => {
self_num.partial_cmp(other_num)
}
(OwnedLiteral::LPositiveInteger(self_num), OwnedLiteral::LFloat(other_num)) => {
(*self_num as f64).partial_cmp(other_num)
}
(OwnedLiteral::LFloat(self_num), OwnedLiteral::LPositiveInteger(other_num)) => {
self_num.partial_cmp(&(*other_num as f64))
}
}, },
} }
} }