Compare commits
2 Commits
2744ecf387
...
678fb659ee
Author | SHA1 | Date | |
---|---|---|---|
678fb659ee | |||
e55c5688a8 |
@ -14,6 +14,12 @@ pub type Result<T> = std::result::Result<T, Error>;
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
#[non_exhaustive]
|
||||
pub enum Error {
|
||||
/// Dust's internal type checking failed to identify a type mismatch. This should never happen, /// the error prompts the user to report the bug.
|
||||
TypeCheckFailure {
|
||||
tool_info: ToolInfo<'static>,
|
||||
argument: Value,
|
||||
},
|
||||
|
||||
/// The 'assert' macro did not resolve successfully.
|
||||
AssertEqualFailed {
|
||||
expected: Value,
|
||||
@ -463,6 +469,7 @@ impl fmt::Display for Error {
|
||||
use Error::*;
|
||||
|
||||
match self {
|
||||
TypeCheckFailure { tool_info, argument } => write!(f, "Type check failure. This is a bug with the tool or with Dust's internal type checking. Please report this bug and include this error message.\nToolInfo = {tool_info:?}\nargument = {argument}"),
|
||||
AssertEqualFailed {expected, actual } => write!(f, "Equality assertion failed. {expected} does not equal {actual}."),
|
||||
AssertFailed => write!(f, "Assertion failed. A false value was passed to \"assert\"."),
|
||||
ExpectedOperatorArgumentAmount { expected, actual } => write!(
|
||||
|
@ -2,7 +2,7 @@ use std::convert::TryInto;
|
||||
|
||||
use rand::{random, thread_rng, Rng};
|
||||
|
||||
use crate::{Error, Result, Tool, ToolInfo, Value};
|
||||
use crate::{Error, Result, Tool, ToolInfo, Value, ValueType};
|
||||
|
||||
pub struct RandomBoolean;
|
||||
|
||||
@ -12,7 +12,7 @@ impl Tool for RandomBoolean {
|
||||
identifier: "random_boolean",
|
||||
description: "Create a random boolean.",
|
||||
group: "random",
|
||||
inputs: vec![],
|
||||
inputs: vec![ValueType::Empty],
|
||||
}
|
||||
}
|
||||
|
||||
@ -33,7 +33,11 @@ impl Tool for RandomInteger {
|
||||
identifier: "random_integer",
|
||||
description: "Create a random integer.",
|
||||
group: "random",
|
||||
inputs: vec![],
|
||||
inputs: vec![
|
||||
ValueType::Empty,
|
||||
ValueType::Integer,
|
||||
ValueType::ListExact(vec![ValueType::Integer, ValueType::Integer]),
|
||||
],
|
||||
}
|
||||
}
|
||||
|
||||
@ -47,14 +51,14 @@ impl Tool for RandomInteger {
|
||||
Value::List(min_max) => {
|
||||
Error::expect_function_argument_amount(self.info().identifier, min_max.len(), 2)?;
|
||||
|
||||
let min = min_max.get(0).unwrap().as_int()?;
|
||||
let max = min_max.get(1).unwrap().as_int()? + 1;
|
||||
let integer = rand::thread_rng().gen_range(min..max);
|
||||
let min = min_max[0].as_int()?;
|
||||
let max = min_max[1].as_int()?;
|
||||
let integer = rand::thread_rng().gen_range(min..=max);
|
||||
|
||||
Ok(Value::Integer(integer))
|
||||
}
|
||||
Value::Empty => Ok(crate::Value::Integer(random())),
|
||||
_ => todo!(),
|
||||
value => Err(Error::expected_empty(value.clone())),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user