Merge branch 'helper_math' into render
Tom Alexander
4 years ago
commit
c3ebf4c66c
GPG Key ID:
D3A179C9A53C0EDE
@ -0,0 +1,9 @@
|
||||
Early termination
|
||||
-----------------
|
||||
|
||||
If the math helper has a body then it stops rendering conditionals after the first conditional that returns true. Rendering an else block does not cause early termination, but else blocks are rendered.
|
||||
|
||||
Non-number values
|
||||
-----------------
|
||||
|
||||
If the math operation involves non-numbers, NaN is returned.
|
||||
@ -0,0 +1,7 @@
|
||||
{
|
||||
"number_7": 7,
|
||||
"string_7": "7",
|
||||
"string_cat": "cat",
|
||||
"add_operation": "add",
|
||||
"a_operation": "a"
|
||||
}
|
||||
@ -0,0 +1,111 @@
|
||||
Bodiless math{~n}
|
||||
============={~n}
|
||||
{@math key="7" method="add" operand="4" /}{~n}
|
||||
{@math key=number_7 method="add" operand="4" /}{~n}
|
||||
{@math key=string_7 method="add" operand="4" /}{~n}
|
||||
{@math key=string_cat method="add" operand="4" /}{~n}
|
||||
{@math key=string_cat method="add" operand="foo" /}{~n}
|
||||
|
||||
Math with body: dot reference{~n}
|
||||
============================={~n}
|
||||
{@math key="7" method="add" operand="4"}
|
||||
{.}{~n}
|
||||
{/math}
|
||||
|
||||
Math with body: eq literal{~n}
|
||||
=========================={~n}
|
||||
{@math key="7" method="add" operand="4"}
|
||||
{@eq value=11}math result is 11{:else}math result is not 11{/eq}{~n}
|
||||
{/math}
|
||||
|
||||
Math with body: eq string{~n}
|
||||
========================={~n}
|
||||
{@math key="7" method="add" operand="4"}
|
||||
{@eq value="11"}math result is "11"{:else}math result is not "11"{/eq}{~n}
|
||||
{/math}
|
||||
|
||||
Math with body: eq else block{~n}
|
||||
============================={~n}
|
||||
{@math key="7" method="add" operand="4"}
|
||||
{@eq value=12}math result is 12{:else}math result is not 12{/eq}{~n}
|
||||
{/math}
|
||||
|
||||
Math with body: standalone eq{~n}
|
||||
============================={~n}
|
||||
{@math key="7" method="add" operand="4"}
|
||||
{@eq key=12 value=12}12 is 12{:else}12 is not 12{/eq}{~n}
|
||||
{/math}
|
||||
|
||||
Math with body: standalone else block{~n}
|
||||
====================================={~n}
|
||||
{@math key="7" method="add" operand="4"}
|
||||
{@eq key=11 value=12}11 is 12{:else}11 is not 12{/eq}{~n}
|
||||
{/math}
|
||||
|
||||
Math with body: early termination{~n}
|
||||
============================={~n}
|
||||
{@math key="7" method="add" operand="4"}
|
||||
{@eq value=11}math result is 11{~n}{:else}math result is not 11{~n}{/eq}
|
||||
{@eq value=11}math result is 11{~n}{:else}math result is not 11{~n}{/eq}
|
||||
{/math}
|
||||
|
||||
Math with body: early termination else block{~n}
|
||||
============================================{~n}
|
||||
{@math key="7" method="add" operand="4"}
|
||||
{@eq value=12}math result is 12{~n}{:else}math result is not 12{~n}{/eq}
|
||||
{@eq value=11}math result is 11{~n}{:else}math result is not 11{~n}{/eq}
|
||||
{@eq value=12}math result is 12{~n}{:else}math result is not 12{~n}{/eq}
|
||||
{/math}
|
||||
|
||||
|
||||
Math with body: any{~n}
|
||||
==================={~n}
|
||||
{@math key="7" method="add" operand="4"}
|
||||
{@eq value=10}math result is 10{~n}{:else}math result is not 10{~n}{/eq}
|
||||
{@eq value=11}math result is 11{~n}{:else}math result is not 11{~n}{/eq}
|
||||
{@eq value=12}math result is 12{~n}{:else}math result is not 12{~n}{/eq}
|
||||
{@any}We found the value{~n}{/any}
|
||||
{@none}We did not find the value{~n}{/none}
|
||||
{/math}
|
||||
|
||||
Math with body: none{~n}
|
||||
===================={~n}
|
||||
{@math key="7" method="add" operand="4"}
|
||||
{@eq value=10}math result is 10{~n}{:else}math result is not 10{~n}{/eq}
|
||||
{@eq value=12}math result is 12{~n}{:else}math result is not 12{~n}{/eq}
|
||||
{@any}We found the value{~n}{/any}
|
||||
{@none}We did not find the value{~n}{/none}
|
||||
{/math}
|
||||
|
||||
Math where method is a reference{~n}
|
||||
================================{~n}
|
||||
{@math key="7" method=add_operation operand="4" /}{~n}
|
||||
|
||||
Math where method is a template{~n}
|
||||
==============================={~n}
|
||||
{@math key="7" method="{a_operation}dd" operand="4" /}{~n}
|
||||
|
||||
Math where key is a template{~n}
|
||||
============================{~n}
|
||||
{@math key="{string_7}1" method="add" operand="4" /}{~n}
|
||||
|
||||
Math where method is absent{~n}
|
||||
============================{~n}
|
||||
{@math key="7" operand="4" /}{~n}
|
||||
|
||||
Math where method is missing{~n}
|
||||
============================{~n}
|
||||
{@math key="7" method=foobar operand="4" /}{~n}
|
||||
|
||||
Math with unknown method{~n}
|
||||
========================{~n}
|
||||
{@math key="7" method="twirl" operand="4" /}{~n}
|
||||
|
||||
Math with body where method is absent{~n}
|
||||
===================================={~n}
|
||||
{@math key="7" operand="4"}
|
||||
{@eq value=12}math result is 12{~n}{:else}math result is not 12{~n}{/eq}
|
||||
{@any}We found the value{~n}{/any}
|
||||
{@none}We did not find the value{~n}{/none}
|
||||
plain text not inside a tag{~n}
|
||||
{/math}
|
||||
@ -0,0 +1,187 @@
|
||||
use crate::parser::OwnedLiteral;
|
||||
use std::convert::TryFrom;
|
||||
use std::convert::TryInto;
|
||||
use std::ops::Add;
|
||||
use std::ops::Div;
|
||||
use std::ops::Mul;
|
||||
use std::ops::Rem;
|
||||
use std::ops::Sub;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum MathNumber {
|
||||
Integer(i128),
|
||||
Decimal(f64),
|
||||
Failure,
|
||||
}
|
||||
|
||||
impl From<&OwnedLiteral> for MathNumber {
|
||||
fn from(original: &OwnedLiteral) -> Self {
|
||||
match original {
|
||||
OwnedLiteral::LString(_) => panic!("Strings should not be cast to numbers for math"),
|
||||
OwnedLiteral::LPositiveInteger(num) => {
|
||||
return MathNumber::Integer((*num).try_into().unwrap())
|
||||
}
|
||||
OwnedLiteral::LNegativeInteger(num) => return MathNumber::Integer((*num).into()),
|
||||
OwnedLiteral::LFloat(num) => return MathNumber::Decimal(*num),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Add<MathNumber> for MathNumber {
|
||||
type Output = Option<OwnedLiteral>;
|
||||
|
||||
fn add(self, other: MathNumber) -> Self::Output {
|
||||
match (self, other) {
|
||||
(MathNumber::Failure, _) | (_, MathNumber::Failure) => None,
|
||||
(MathNumber::Integer(self_num), MathNumber::Integer(other_num)) => {
|
||||
math_ints(self_num, other_num, std::ops::Add::add)
|
||||
}
|
||||
(MathNumber::Decimal(self_num), MathNumber::Decimal(other_num)) => {
|
||||
Some(OwnedLiteral::LFloat(self_num + other_num))
|
||||
}
|
||||
(MathNumber::Integer(self_num), MathNumber::Decimal(other_num)) => {
|
||||
Some(OwnedLiteral::LFloat((self_num as f64) + other_num))
|
||||
}
|
||||
(MathNumber::Decimal(self_num), MathNumber::Integer(other_num)) => {
|
||||
Some(OwnedLiteral::LFloat(self_num + (other_num as f64)))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Sub<MathNumber> for MathNumber {
|
||||
type Output = Option<OwnedLiteral>;
|
||||
|
||||
fn sub(self, other: MathNumber) -> Self::Output {
|
||||
match (self, other) {
|
||||
(MathNumber::Failure, _) | (_, MathNumber::Failure) => None,
|
||||
(MathNumber::Integer(self_num), MathNumber::Integer(other_num)) => {
|
||||
math_ints(self_num, other_num, std::ops::Sub::sub)
|
||||
}
|
||||
(MathNumber::Decimal(self_num), MathNumber::Decimal(other_num)) => {
|
||||
Some(OwnedLiteral::LFloat(self_num - other_num))
|
||||
}
|
||||
(MathNumber::Integer(self_num), MathNumber::Decimal(other_num)) => {
|
||||
Some(OwnedLiteral::LFloat((self_num as f64) - other_num))
|
||||
}
|
||||
(MathNumber::Decimal(self_num), MathNumber::Integer(other_num)) => {
|
||||
Some(OwnedLiteral::LFloat(self_num - (other_num as f64)))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Mul<MathNumber> for MathNumber {
|
||||
type Output = Option<OwnedLiteral>;
|
||||
|
||||
fn mul(self, other: MathNumber) -> Self::Output {
|
||||
match (self, other) {
|
||||
(MathNumber::Failure, _) | (_, MathNumber::Failure) => None,
|
||||
(MathNumber::Integer(self_num), MathNumber::Integer(other_num)) => {
|
||||
math_ints(self_num, other_num, std::ops::Mul::mul)
|
||||
}
|
||||
(MathNumber::Decimal(self_num), MathNumber::Decimal(other_num)) => {
|
||||
Some(OwnedLiteral::LFloat(self_num * other_num))
|
||||
}
|
||||
(MathNumber::Integer(self_num), MathNumber::Decimal(other_num)) => {
|
||||
Some(OwnedLiteral::LFloat((self_num as f64) * other_num))
|
||||
}
|
||||
(MathNumber::Decimal(self_num), MathNumber::Integer(other_num)) => {
|
||||
Some(OwnedLiteral::LFloat(self_num * (other_num as f64)))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Div<MathNumber> for MathNumber {
|
||||
type Output = Option<OwnedLiteral>;
|
||||
|
||||
fn div(self, other: MathNumber) -> Self::Output {
|
||||
match (self, other) {
|
||||
(MathNumber::Failure, _) | (_, MathNumber::Failure) => None,
|
||||
(MathNumber::Integer(self_num), MathNumber::Integer(other_num)) => {
|
||||
Some(OwnedLiteral::LFloat((self_num as f64) / (other_num as f64)))
|
||||
}
|
||||
(MathNumber::Decimal(self_num), MathNumber::Decimal(other_num)) => {
|
||||
Some(OwnedLiteral::LFloat(self_num / other_num))
|
||||
}
|
||||
(MathNumber::Integer(self_num), MathNumber::Decimal(other_num)) => {
|
||||
Some(OwnedLiteral::LFloat((self_num as f64) / other_num))
|
||||
}
|
||||
(MathNumber::Decimal(self_num), MathNumber::Integer(other_num)) => {
|
||||
Some(OwnedLiteral::LFloat(self_num / (other_num as f64)))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Rem<MathNumber> for MathNumber {
|
||||
type Output = Option<OwnedLiteral>;
|
||||
|
||||
fn rem(self, other: MathNumber) -> Self::Output {
|
||||
match (self, other) {
|
||||
(MathNumber::Failure, _) | (_, MathNumber::Failure) => None,
|
||||
(MathNumber::Integer(self_num), MathNumber::Integer(other_num)) => {
|
||||
math_ints(self_num, other_num, std::ops::Rem::rem)
|
||||
}
|
||||
(MathNumber::Decimal(self_num), MathNumber::Decimal(other_num)) => {
|
||||
Some(OwnedLiteral::LFloat(self_num % other_num))
|
||||
}
|
||||
(MathNumber::Integer(self_num), MathNumber::Decimal(other_num)) => {
|
||||
Some(OwnedLiteral::LFloat((self_num as f64) % other_num))
|
||||
}
|
||||
(MathNumber::Decimal(self_num), MathNumber::Integer(other_num)) => {
|
||||
Some(OwnedLiteral::LFloat(self_num % (other_num as f64)))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl MathNumber {
|
||||
pub fn math_abs(&self) -> Option<OwnedLiteral> {
|
||||
match self {
|
||||
MathNumber::Failure => None,
|
||||
MathNumber::Integer(num) => num.abs().try_into().ok(),
|
||||
MathNumber::Decimal(num) => Some(OwnedLiteral::LFloat(num.abs())),
|
||||
}
|
||||
}
|
||||
pub fn math_floor(&self) -> Option<OwnedLiteral> {
|
||||
match self {
|
||||
MathNumber::Failure => None,
|
||||
MathNumber::Integer(num) => (*num).try_into().ok(),
|
||||
MathNumber::Decimal(num) => Some(OwnedLiteral::LFloat(num.floor())),
|
||||
}
|
||||
}
|
||||
pub fn math_ceil(&self) -> Option<OwnedLiteral> {
|
||||
match self {
|
||||
MathNumber::Failure => None,
|
||||
MathNumber::Integer(num) => (*num).try_into().ok(),
|
||||
MathNumber::Decimal(num) => Some(OwnedLiteral::LFloat(num.ceil())),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// For math operations that take in integers and return integers
|
||||
/// (add, subtract, multiply)
|
||||
pub fn math_ints<L, R, F>(left: L, right: R, operation: F) -> Option<OwnedLiteral>
|
||||
where
|
||||
L: Into<i128>,
|
||||
R: Into<i128>,
|
||||
F: Fn(i128, i128) -> i128,
|
||||
{
|
||||
operation(left.into(), right.into()).try_into().ok()
|
||||
}
|
||||
|
||||
impl TryFrom<i128> for OwnedLiteral {
|
||||
type Error = &'static str;
|
||||
|
||||
fn try_from(original: i128) -> Result<Self, Self::Error> {
|
||||
std::convert::TryInto::<u64>::try_into(original)
|
||||
.map(OwnedLiteral::LPositiveInteger)
|
||||
.ok()
|
||||
.or(std::convert::TryInto::<i64>::try_into(original)
|
||||
.map(OwnedLiteral::LNegativeInteger)
|
||||
.ok())
|
||||
.ok_or("Value does not fit into either u64 or i64")
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue