Add only_i32
and only_i64
features.
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
#![cfg(not(feature = "no_index"))]
|
||||
use rhai::{Engine, EvalAltResult, RegisterFn};
|
||||
use rhai::{Engine, EvalAltResult, RegisterFn, INT};
|
||||
|
||||
#[test]
|
||||
fn test_arrays() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<i64>("let x = [1, 2, 3]; x[1]")?, 2);
|
||||
assert_eq!(engine.eval::<i64>("let y = [1, 2, 3]; y[1] = 5; y[1]")?, 5);
|
||||
assert_eq!(engine.eval::<INT>("let x = [1, 2, 3]; x[1]")?, 2);
|
||||
assert_eq!(engine.eval::<INT>("let y = [1, 2, 3]; y[1] = 5; y[1]")?, 5);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -15,7 +15,7 @@ fn test_arrays() -> Result<(), EvalAltResult> {
|
||||
fn test_array_with_structs() -> Result<(), EvalAltResult> {
|
||||
#[derive(Clone)]
|
||||
struct TestStruct {
|
||||
x: i64,
|
||||
x: INT,
|
||||
}
|
||||
|
||||
impl TestStruct {
|
||||
@@ -23,11 +23,11 @@ fn test_array_with_structs() -> Result<(), EvalAltResult> {
|
||||
self.x += 1000;
|
||||
}
|
||||
|
||||
fn get_x(&mut self) -> i64 {
|
||||
fn get_x(&mut self) -> INT {
|
||||
self.x
|
||||
}
|
||||
|
||||
fn set_x(&mut self, new_x: i64) {
|
||||
fn set_x(&mut self, new_x: INT) {
|
||||
self.x = new_x;
|
||||
}
|
||||
|
||||
@@ -44,10 +44,10 @@ fn test_array_with_structs() -> Result<(), EvalAltResult> {
|
||||
engine.register_fn("update", TestStruct::update);
|
||||
engine.register_fn("new_ts", TestStruct::new);
|
||||
|
||||
assert_eq!(engine.eval::<i64>("let a = [new_ts()]; a[0].x")?, 1);
|
||||
assert_eq!(engine.eval::<INT>("let a = [new_ts()]; a[0].x")?, 1);
|
||||
|
||||
assert_eq!(
|
||||
engine.eval::<i64>(
|
||||
engine.eval::<INT>(
|
||||
"let a = [new_ts()]; \
|
||||
a[0].x = 100; \
|
||||
a[0].update(); \
|
||||
|
@@ -1,15 +1,15 @@
|
||||
use rhai::{Engine, EvalAltResult};
|
||||
use rhai::{Engine, EvalAltResult, INT};
|
||||
|
||||
#[test]
|
||||
fn test_binary_ops() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<i64>("10 % 4")?, 2);
|
||||
assert_eq!(engine.eval::<i64>("10 << 4")?, 160);
|
||||
assert_eq!(engine.eval::<i64>("10 >> 4")?, 0);
|
||||
assert_eq!(engine.eval::<i64>("10 & 4")?, 0);
|
||||
assert_eq!(engine.eval::<i64>("10 | 4")?, 14);
|
||||
assert_eq!(engine.eval::<i64>("10 ^ 4")?, 14);
|
||||
assert_eq!(engine.eval::<INT>("10 % 4")?, 2);
|
||||
assert_eq!(engine.eval::<INT>("10 << 4")?, 160);
|
||||
assert_eq!(engine.eval::<INT>("10 >> 4")?, 0);
|
||||
assert_eq!(engine.eval::<INT>("10 & 4")?, 0);
|
||||
assert_eq!(engine.eval::<INT>("10 | 4")?, 14);
|
||||
assert_eq!(engine.eval::<INT>("10 ^ 4")?, 14);
|
||||
|
||||
assert_eq!(engine.eval::<bool>("42 == 42")?, true);
|
||||
assert_eq!(engine.eval::<bool>("42 > 42")?, false);
|
||||
|
@@ -1,15 +1,15 @@
|
||||
use rhai::{Engine, EvalAltResult};
|
||||
use rhai::{Engine, EvalAltResult, INT};
|
||||
|
||||
#[test]
|
||||
fn test_left_shift() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
assert_eq!(engine.eval::<i64>("4 << 2")?, 16);
|
||||
assert_eq!(engine.eval::<INT>("4 << 2")?, 16);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_right_shift() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
assert_eq!(engine.eval::<i64>("9 >> 1")?, 4);
|
||||
assert_eq!(engine.eval::<INT>("9 >> 1")?, 4);
|
||||
Ok(())
|
||||
}
|
||||
|
@@ -1,14 +1,14 @@
|
||||
use rhai::Engine;
|
||||
use rhai::{Engine, INT};
|
||||
|
||||
#[test]
|
||||
fn test_comments() {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert!(engine
|
||||
.eval::<i64>("let x = 5; x // I am a single line comment, yay!")
|
||||
.eval::<INT>("let x = 5; x // I am a single line comment, yay!")
|
||||
.is_ok());
|
||||
|
||||
assert!(engine
|
||||
.eval::<i64>("let /* I am a multiline comment, yay! */ x = 5; x")
|
||||
.eval::<INT>("let /* I am a multiline comment, yay! */ x = 5; x")
|
||||
.is_ok());
|
||||
}
|
||||
|
@@ -1,10 +1,10 @@
|
||||
use rhai::{Engine, EvalAltResult};
|
||||
use rhai::{Engine, EvalAltResult, INT};
|
||||
|
||||
#[test]
|
||||
fn test_or_equals() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<i64>("let x = 16; x |= 74; x")?, 90);
|
||||
assert_eq!(engine.eval::<INT>("let x = 16; x |= 74; x")?, 90);
|
||||
assert_eq!(engine.eval::<bool>("let x = true; x |= false; x")?, true);
|
||||
assert_eq!(engine.eval::<bool>("let x = false; x |= true; x")?, true);
|
||||
|
||||
@@ -15,7 +15,7 @@ fn test_or_equals() -> Result<(), EvalAltResult> {
|
||||
fn test_and_equals() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<i64>("let x = 16; x &= 31; x")?, 16);
|
||||
assert_eq!(engine.eval::<INT>("let x = 16; x &= 31; x")?, 16);
|
||||
assert_eq!(engine.eval::<bool>("let x = true; x &= false; x")?, false);
|
||||
assert_eq!(engine.eval::<bool>("let x = false; x &= true; x")?, false);
|
||||
assert_eq!(engine.eval::<bool>("let x = true; x &= true; x")?, true);
|
||||
@@ -26,41 +26,41 @@ fn test_and_equals() -> Result<(), EvalAltResult> {
|
||||
#[test]
|
||||
fn test_xor_equals() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
assert_eq!(engine.eval::<i64>("let x = 90; x ^= 12; x")?, 86);
|
||||
assert_eq!(engine.eval::<INT>("let x = 90; x ^= 12; x")?, 86);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_multiply_equals() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
assert_eq!(engine.eval::<i64>("let x = 2; x *= 3; x")?, 6);
|
||||
assert_eq!(engine.eval::<INT>("let x = 2; x *= 3; x")?, 6);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_divide_equals() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
assert_eq!(engine.eval::<i64>("let x = 6; x /= 2; x")?, 3);
|
||||
assert_eq!(engine.eval::<INT>("let x = 6; x /= 2; x")?, 3);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_left_shift_equals() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
assert_eq!(engine.eval::<i64>("let x = 9; x >>=1; x")?, 4);
|
||||
assert_eq!(engine.eval::<INT>("let x = 9; x >>=1; x")?, 4);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_right_shift_equals() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
assert_eq!(engine.eval::<i64>("let x = 4; x<<= 2; x")?, 16);
|
||||
assert_eq!(engine.eval::<INT>("let x = 4; x<<= 2; x")?, 16);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_modulo_equals() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
assert_eq!(engine.eval::<i64>("let x = 10; x %= 4; x")?, 2);
|
||||
assert_eq!(engine.eval::<INT>("let x = 10; x %= 4; x")?, 2);
|
||||
Ok(())
|
||||
}
|
||||
|
@@ -1,10 +1,10 @@
|
||||
use rhai::{Engine, EvalAltResult};
|
||||
use rhai::{Engine, EvalAltResult, INT};
|
||||
|
||||
#[test]
|
||||
fn test_decrement() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<i64>("let x = 10; x -= 7; x")?, 3);
|
||||
assert_eq!(engine.eval::<INT>("let x = 10; x -= 7; x")?, 3);
|
||||
|
||||
let r = engine.eval::<String>("let s = \"test\"; s -= \"ing\"; s");
|
||||
|
||||
|
@@ -1,5 +1,5 @@
|
||||
#![cfg(not(feature = "no_stdlib"))]
|
||||
use rhai::{Engine, EvalAltResult};
|
||||
use rhai::{Engine, EvalAltResult, INT};
|
||||
|
||||
#[test]
|
||||
fn test_engine_call_fn() -> Result<(), EvalAltResult> {
|
||||
@@ -13,7 +13,7 @@ fn test_engine_call_fn() -> Result<(), EvalAltResult> {
|
||||
",
|
||||
)?;
|
||||
|
||||
let result: i64 = engine.call_fn("hello", &ast, (String::from("abc"), 123_i64))?;
|
||||
let result: INT = engine.call_fn("hello", &ast, (String::from("abc"), 123 as INT))?;
|
||||
|
||||
assert_eq!(result, 126);
|
||||
|
||||
|
@@ -1,5 +1,5 @@
|
||||
#![cfg(not(feature = "no_index"))]
|
||||
use rhai::{Engine, EvalAltResult};
|
||||
use rhai::{Engine, EvalAltResult, INT};
|
||||
|
||||
#[test]
|
||||
fn test_for() -> Result<(), EvalAltResult> {
|
||||
@@ -21,7 +21,7 @@ fn test_for() -> Result<(), EvalAltResult> {
|
||||
sum1 + sum2
|
||||
";
|
||||
|
||||
assert_eq!(engine.eval::<i64>(script)?, 30);
|
||||
assert_eq!(engine.eval::<INT>(script)?, 30);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
@@ -1,18 +1,18 @@
|
||||
use rhai::{Engine, EvalAltResult, RegisterFn};
|
||||
use rhai::{Engine, EvalAltResult, RegisterFn, INT};
|
||||
|
||||
#[test]
|
||||
fn test_get_set() -> Result<(), EvalAltResult> {
|
||||
#[derive(Clone)]
|
||||
struct TestStruct {
|
||||
x: i64,
|
||||
x: INT,
|
||||
}
|
||||
|
||||
impl TestStruct {
|
||||
fn get_x(&mut self) -> i64 {
|
||||
fn get_x(&mut self) -> INT {
|
||||
self.x
|
||||
}
|
||||
|
||||
fn set_x(&mut self, new_x: i64) {
|
||||
fn set_x(&mut self, new_x: INT) {
|
||||
self.x = new_x;
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ fn test_get_set() -> Result<(), EvalAltResult> {
|
||||
engine.register_get_set("x", TestStruct::get_x, TestStruct::set_x);
|
||||
engine.register_fn("new_ts", TestStruct::new);
|
||||
|
||||
assert_eq!(engine.eval::<i64>("let a = new_ts(); a.x = 500; a.x")?, 500);
|
||||
assert_eq!(engine.eval::<INT>("let a = new_ts(); a.x = 500; a.x")?, 500);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -37,15 +37,15 @@ fn test_get_set() -> Result<(), EvalAltResult> {
|
||||
fn test_big_get_set() -> Result<(), EvalAltResult> {
|
||||
#[derive(Clone)]
|
||||
struct TestChild {
|
||||
x: i64,
|
||||
x: INT,
|
||||
}
|
||||
|
||||
impl TestChild {
|
||||
fn get_x(&mut self) -> i64 {
|
||||
fn get_x(&mut self) -> INT {
|
||||
self.x
|
||||
}
|
||||
|
||||
fn set_x(&mut self, new_x: i64) {
|
||||
fn set_x(&mut self, new_x: INT) {
|
||||
self.x = new_x;
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ fn test_big_get_set() -> Result<(), EvalAltResult> {
|
||||
engine.register_fn("new_tp", TestParent::new);
|
||||
|
||||
assert_eq!(
|
||||
engine.eval::<i64>("let a = new_tp(); a.child.x = 500; a.child.x")?,
|
||||
engine.eval::<INT>("let a = new_tp(); a.child.x = 500; a.child.x")?,
|
||||
500
|
||||
);
|
||||
|
||||
|
@@ -1,18 +1,18 @@
|
||||
use rhai::{Engine, EvalAltResult};
|
||||
use rhai::{Engine, EvalAltResult, INT};
|
||||
|
||||
#[test]
|
||||
fn test_if() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<i64>("if true { 55 }")?, 55);
|
||||
assert_eq!(engine.eval::<i64>("if false { 55 } else { 44 }")?, 44);
|
||||
assert_eq!(engine.eval::<i64>("if true { 55 } else { 44 }")?, 55);
|
||||
assert_eq!(engine.eval::<INT>("if true { 55 }")?, 55);
|
||||
assert_eq!(engine.eval::<INT>("if false { 55 } else { 44 }")?, 44);
|
||||
assert_eq!(engine.eval::<INT>("if true { 55 } else { 44 }")?, 55);
|
||||
assert_eq!(
|
||||
engine.eval::<i64>("if false { 55 } else if true { 33 } else { 44 }")?,
|
||||
engine.eval::<INT>("if false { 55 } else if true { 33 } else { 44 }")?,
|
||||
33
|
||||
);
|
||||
assert_eq!(
|
||||
engine.eval::<i64>(
|
||||
engine.eval::<INT>(
|
||||
r"
|
||||
if false { 55 }
|
||||
else if false { 33 }
|
||||
|
@@ -1,10 +1,10 @@
|
||||
use rhai::{Engine, EvalAltResult};
|
||||
use rhai::{Engine, EvalAltResult, INT};
|
||||
|
||||
#[test]
|
||||
fn test_increment() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<i64>("let x = 1; x += 2; x")?, 3);
|
||||
assert_eq!(engine.eval::<INT>("let x = 1; x += 2; x")?, 3);
|
||||
assert_eq!(
|
||||
engine.eval::<String>("let s = \"test\"; s += \"ing\"; s")?,
|
||||
"testing".to_string()
|
||||
|
@@ -1,11 +1,11 @@
|
||||
use rhai::{Engine, EvalAltResult};
|
||||
use rhai::{Engine, EvalAltResult, INT};
|
||||
|
||||
#[test]
|
||||
fn test_internal_fn() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<i64>("fn addme(a, b) { a+b } addme(3, 4)")?, 7);
|
||||
assert_eq!(engine.eval::<i64>("fn bob() { return 4; 5 } bob()")?, 4);
|
||||
assert_eq!(engine.eval::<INT>("fn addme(a, b) { a+b } addme(3, 4)")?, 7);
|
||||
assert_eq!(engine.eval::<INT>("fn bob() { return 4; 5 } bob()")?, 4);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -15,7 +15,7 @@ fn test_big_internal_fn() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(
|
||||
engine.eval::<i64>(
|
||||
engine.eval::<INT>(
|
||||
r"
|
||||
fn mathme(a, b, c, d, e, f) {
|
||||
a - b * c + d * e - f
|
||||
|
@@ -1,41 +1,73 @@
|
||||
use rhai::{Engine, EvalAltResult};
|
||||
use rhai::{Engine, EvalAltResult, INT};
|
||||
|
||||
#[test]
|
||||
fn test_math() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<i64>("1 + 2")?, 3);
|
||||
assert_eq!(engine.eval::<i64>("1 - 2")?, -1);
|
||||
assert_eq!(engine.eval::<i64>("2 * 3")?, 6);
|
||||
assert_eq!(engine.eval::<i64>("1 / 2")?, 0);
|
||||
assert_eq!(engine.eval::<i64>("3 % 2")?, 1);
|
||||
assert_eq!(engine.eval::<INT>("1 + 2")?, 3);
|
||||
assert_eq!(engine.eval::<INT>("1 - 2")?, -1);
|
||||
assert_eq!(engine.eval::<INT>("2 * 3")?, 6);
|
||||
assert_eq!(engine.eval::<INT>("1 / 2")?, 0);
|
||||
assert_eq!(engine.eval::<INT>("3 % 2")?, 1);
|
||||
|
||||
#[cfg(not(feature = "only_i32"))]
|
||||
assert_eq!(
|
||||
engine.eval::<i64>("(-9223372036854775807).abs()")?,
|
||||
engine.eval::<INT>("(-9223372036854775807).abs()")?,
|
||||
9223372036854775807
|
||||
);
|
||||
|
||||
#[cfg(feature = "only_i32")]
|
||||
assert_eq!(engine.eval::<INT>("(-2147483647).abs()")?, 2147483647);
|
||||
|
||||
// Overflow/underflow/division-by-zero errors
|
||||
#[cfg(not(feature = "unchecked"))]
|
||||
{
|
||||
match engine.eval::<i64>("9223372036854775807 + 1") {
|
||||
Err(EvalAltResult::ErrorArithmetic(_, _)) => (),
|
||||
r => panic!("should return overflow error: {:?}", r),
|
||||
#[cfg(not(feature = "only_i32"))]
|
||||
{
|
||||
match engine.eval::<INT>("9223372036854775807 + 1") {
|
||||
Err(EvalAltResult::ErrorArithmetic(_, _)) => (),
|
||||
r => panic!("should return overflow error: {:?}", r),
|
||||
}
|
||||
match engine.eval::<INT>("-9223372036854775808 - 1") {
|
||||
Err(EvalAltResult::ErrorArithmetic(_, _)) => (),
|
||||
r => panic!("should return underflow error: {:?}", r),
|
||||
}
|
||||
match engine.eval::<INT>("9223372036854775807 * 9223372036854775807") {
|
||||
Err(EvalAltResult::ErrorArithmetic(_, _)) => (),
|
||||
r => panic!("should return overflow error: {:?}", r),
|
||||
}
|
||||
match engine.eval::<INT>("9223372036854775807 / 0") {
|
||||
Err(EvalAltResult::ErrorArithmetic(_, _)) => (),
|
||||
r => panic!("should return division by zero error: {:?}", r),
|
||||
}
|
||||
match engine.eval::<INT>("9223372036854775807 % 0") {
|
||||
Err(EvalAltResult::ErrorArithmetic(_, _)) => (),
|
||||
r => panic!("should return division by zero error: {:?}", r),
|
||||
}
|
||||
}
|
||||
match engine.eval::<i64>("-9223372036854775808 - 1") {
|
||||
Err(EvalAltResult::ErrorArithmetic(_, _)) => (),
|
||||
r => panic!("should return underflow error: {:?}", r),
|
||||
}
|
||||
match engine.eval::<i64>("9223372036854775807 * 9223372036854775807") {
|
||||
Err(EvalAltResult::ErrorArithmetic(_, _)) => (),
|
||||
r => panic!("should return overflow error: {:?}", r),
|
||||
}
|
||||
match engine.eval::<i64>("9223372036854775807 / 0") {
|
||||
Err(EvalAltResult::ErrorArithmetic(_, _)) => (),
|
||||
r => panic!("should return division by zero error: {:?}", r),
|
||||
}
|
||||
match engine.eval::<i64>("9223372036854775807 % 0") {
|
||||
Err(EvalAltResult::ErrorArithmetic(_, _)) => (),
|
||||
r => panic!("should return division by zero error: {:?}", r),
|
||||
|
||||
#[cfg(feature = "only_i32")]
|
||||
{
|
||||
match engine.eval::<INT>("2147483647 + 1") {
|
||||
Err(EvalAltResult::ErrorArithmetic(_, _)) => (),
|
||||
r => panic!("should return overflow error: {:?}", r),
|
||||
}
|
||||
match engine.eval::<INT>("-2147483648 - 1") {
|
||||
Err(EvalAltResult::ErrorArithmetic(_, _)) => (),
|
||||
r => panic!("should return underflow error: {:?}", r),
|
||||
}
|
||||
match engine.eval::<INT>("2147483647 * 2147483647") {
|
||||
Err(EvalAltResult::ErrorArithmetic(_, _)) => (),
|
||||
r => panic!("should return overflow error: {:?}", r),
|
||||
}
|
||||
match engine.eval::<INT>("2147483647 / 0") {
|
||||
Err(EvalAltResult::ErrorArithmetic(_, _)) => (),
|
||||
r => panic!("should return division by zero error: {:?}", r),
|
||||
}
|
||||
match engine.eval::<INT>("2147483647 % 0") {
|
||||
Err(EvalAltResult::ErrorArithmetic(_, _)) => (),
|
||||
r => panic!("should return division by zero error: {:?}", r),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -1,10 +1,10 @@
|
||||
use rhai::{Engine, EvalAltResult, RegisterFn};
|
||||
use rhai::{Engine, EvalAltResult, RegisterFn, INT};
|
||||
|
||||
#[test]
|
||||
fn test_method_call() -> Result<(), EvalAltResult> {
|
||||
#[derive(Clone)]
|
||||
struct TestStruct {
|
||||
x: i64,
|
||||
x: INT,
|
||||
}
|
||||
|
||||
impl TestStruct {
|
||||
|
@@ -1,11 +1,11 @@
|
||||
use rhai::{Engine, EvalAltResult, RegisterFn};
|
||||
use rhai::{Engine, EvalAltResult, RegisterFn, INT};
|
||||
|
||||
#[test]
|
||||
#[cfg(not(feature = "no_stdlib"))]
|
||||
fn test_mismatched_op() {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
let r = engine.eval::<i64>("60 + \"hello\"");
|
||||
let r = engine.eval::<INT>("60 + \"hello\"");
|
||||
|
||||
match r {
|
||||
Err(EvalAltResult::ErrorMismatchOutputType(err, _)) if err == "string" => (),
|
||||
@@ -17,7 +17,7 @@ fn test_mismatched_op() {
|
||||
fn test_mismatched_op_custom_type() {
|
||||
#[derive(Clone)]
|
||||
struct TestStruct {
|
||||
x: i64,
|
||||
x: INT,
|
||||
}
|
||||
|
||||
impl TestStruct {
|
||||
@@ -30,10 +30,15 @@ fn test_mismatched_op_custom_type() {
|
||||
engine.register_type_with_name::<TestStruct>("TestStruct");
|
||||
engine.register_fn("new_ts", TestStruct::new);
|
||||
|
||||
let r = engine.eval::<i64>("60 + new_ts()");
|
||||
let r = engine.eval::<INT>("60 + new_ts()");
|
||||
|
||||
match r {
|
||||
#[cfg(feature = "only_i32")]
|
||||
Err(EvalAltResult::ErrorFunctionNotFound(err, _)) if err == "+ (i32, TestStruct)" => (),
|
||||
|
||||
#[cfg(not(feature = "only_i32"))]
|
||||
Err(EvalAltResult::ErrorFunctionNotFound(err, _)) if err == "+ (i64, TestStruct)" => (),
|
||||
|
||||
_ => panic!(),
|
||||
}
|
||||
}
|
||||
|
@@ -1,10 +1,10 @@
|
||||
use rhai::{Engine, EvalAltResult};
|
||||
use rhai::{Engine, EvalAltResult, INT};
|
||||
|
||||
#[test]
|
||||
fn test_number_literal() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<i64>("65")?, 65);
|
||||
assert_eq!(engine.eval::<INT>("65")?, 65);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -13,8 +13,8 @@ fn test_number_literal() -> Result<(), EvalAltResult> {
|
||||
fn test_hex_literal() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<i64>("let x = 0xf; x")?, 15);
|
||||
assert_eq!(engine.eval::<i64>("let x = 0xff; x")?, 255);
|
||||
assert_eq!(engine.eval::<INT>("let x = 0xf; x")?, 15);
|
||||
assert_eq!(engine.eval::<INT>("let x = 0xff; x")?, 255);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -23,8 +23,8 @@ fn test_hex_literal() -> Result<(), EvalAltResult> {
|
||||
fn test_octal_literal() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<i64>("let x = 0o77; x")?, 63);
|
||||
assert_eq!(engine.eval::<i64>("let x = 0o1234; x")?, 668);
|
||||
assert_eq!(engine.eval::<INT>("let x = 0o77; x")?, 63);
|
||||
assert_eq!(engine.eval::<INT>("let x = 0o1234; x")?, 668);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -33,9 +33,9 @@ fn test_octal_literal() -> Result<(), EvalAltResult> {
|
||||
fn test_binary_literal() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<i64>("let x = 0b1111; x")?, 15);
|
||||
assert_eq!(engine.eval::<INT>("let x = 0b1111; x")?, 15);
|
||||
assert_eq!(
|
||||
engine.eval::<i64>("let x = 0b0011_1100_1010_0101; x")?,
|
||||
engine.eval::<INT>("let x = 0b0011_1100_1010_0101; x")?,
|
||||
15525
|
||||
);
|
||||
|
||||
|
@@ -1,11 +1,11 @@
|
||||
use rhai::{Engine, EvalAltResult};
|
||||
use rhai::{Engine, EvalAltResult, INT};
|
||||
|
||||
#[test]
|
||||
fn test_ops() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<i64>("60 + 5")?, 65);
|
||||
assert_eq!(engine.eval::<i64>("(1 + 2) * (6 - 4) / 2")?, 3);
|
||||
assert_eq!(engine.eval::<INT>("60 + 5")?, 65);
|
||||
assert_eq!(engine.eval::<INT>("(1 + 2) * (6 - 4) / 2")?, 3);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -15,7 +15,7 @@ fn test_op_prec() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(
|
||||
engine.eval::<i64>("let x = 0; if x == 10 || true { x = 1} x")?,
|
||||
engine.eval::<INT>("let x = 0; if x == 10 || true { x = 1} x")?,
|
||||
1
|
||||
);
|
||||
|
||||
|
@@ -1,19 +1,22 @@
|
||||
use rhai::{Engine, EvalAltResult};
|
||||
use rhai::{Engine, EvalAltResult, FLOAT, INT};
|
||||
|
||||
#[test]
|
||||
fn test_power_of() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<i64>("2 ~ 3")?, 8);
|
||||
assert_eq!(engine.eval::<i64>("(-2 ~ 3)")?, -8);
|
||||
assert_eq!(engine.eval::<INT>("2 ~ 3")?, 8);
|
||||
assert_eq!(engine.eval::<INT>("(-2 ~ 3)")?, -8);
|
||||
|
||||
#[cfg(not(feature = "no_float"))]
|
||||
{
|
||||
assert_eq!(engine.eval::<f64>("2.2 ~ 3.3")?, 13.489468760533386_f64);
|
||||
assert_eq!(engine.eval::<f64>("2.0~-2.0")?, 0.25_f64);
|
||||
assert_eq!(engine.eval::<f64>("(-2.0~-2.0)")?, 0.25_f64);
|
||||
assert_eq!(engine.eval::<f64>("(-2.0~-2)")?, 0.25_f64);
|
||||
assert_eq!(engine.eval::<i64>("4~3")?, 64);
|
||||
assert_eq!(
|
||||
engine.eval::<FLOAT>("2.2 ~ 3.3")?,
|
||||
13.489468760533386 as FLOAT
|
||||
);
|
||||
assert_eq!(engine.eval::<FLOAT>("2.0~-2.0")?, 0.25 as FLOAT);
|
||||
assert_eq!(engine.eval::<FLOAT>("(-2.0~-2.0)")?, 0.25 as FLOAT);
|
||||
assert_eq!(engine.eval::<FLOAT>("(-2.0~-2)")?, 0.25 as FLOAT);
|
||||
assert_eq!(engine.eval::<INT>("4~3")?, 64);
|
||||
}
|
||||
|
||||
Ok(())
|
||||
@@ -23,19 +26,28 @@ fn test_power_of() -> Result<(), EvalAltResult> {
|
||||
fn test_power_of_equals() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<i64>("let x = 2; x ~= 3; x")?, 8);
|
||||
assert_eq!(engine.eval::<i64>("let x = -2; x ~= 3; x")?, -8);
|
||||
assert_eq!(engine.eval::<INT>("let x = 2; x ~= 3; x")?, 8);
|
||||
assert_eq!(engine.eval::<INT>("let x = -2; x ~= 3; x")?, -8);
|
||||
|
||||
#[cfg(not(feature = "no_float"))]
|
||||
{
|
||||
assert_eq!(
|
||||
engine.eval::<f64>("let x = 2.2; x ~= 3.3; x")?,
|
||||
13.489468760533386_f64
|
||||
engine.eval::<FLOAT>("let x = 2.2; x ~= 3.3; x")?,
|
||||
13.489468760533386 as FLOAT
|
||||
);
|
||||
assert_eq!(engine.eval::<f64>("let x = 2.0; x ~= -2.0; x")?, 0.25_f64);
|
||||
assert_eq!(engine.eval::<f64>("let x = -2.0; x ~= -2.0; x")?, 0.25_f64);
|
||||
assert_eq!(engine.eval::<f64>("let x = -2.0; x ~= -2; x")?, 0.25_f64);
|
||||
assert_eq!(engine.eval::<i64>("let x =4; x ~= 3; x")?, 64);
|
||||
assert_eq!(
|
||||
engine.eval::<FLOAT>("let x = 2.0; x ~= -2.0; x")?,
|
||||
0.25 as FLOAT
|
||||
);
|
||||
assert_eq!(
|
||||
engine.eval::<FLOAT>("let x = -2.0; x ~= -2.0; x")?,
|
||||
0.25 as FLOAT
|
||||
);
|
||||
assert_eq!(
|
||||
engine.eval::<FLOAT>("let x = -2.0; x ~= -2; x")?,
|
||||
0.25 as FLOAT
|
||||
);
|
||||
assert_eq!(engine.eval::<INT>("let x =4; x ~= 3; x")?, 64);
|
||||
}
|
||||
|
||||
Ok(())
|
||||
|
@@ -1,16 +1,16 @@
|
||||
use rhai::{Engine, EvalAltResult};
|
||||
use rhai::{Engine, EvalAltResult, INT};
|
||||
|
||||
#[test]
|
||||
fn test_throw() {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
match engine.eval::<i64>(r#"if true { throw "hello" }"#) {
|
||||
match engine.eval::<INT>(r#"if true { throw "hello" }"#) {
|
||||
Ok(_) => panic!("not an error"),
|
||||
Err(EvalAltResult::ErrorRuntime(s, _)) if s == "hello" => (),
|
||||
Err(err) => panic!("wrong error: {}", err),
|
||||
}
|
||||
|
||||
match engine.eval::<i64>(r#"throw;"#) {
|
||||
match engine.eval::<INT>(r#"throw;"#) {
|
||||
Ok(_) => panic!("not an error"),
|
||||
Err(EvalAltResult::ErrorRuntime(s, _)) if s == "" => (),
|
||||
Err(err) => panic!("wrong error: {}", err),
|
||||
|
@@ -4,8 +4,12 @@ use rhai::{Engine, EvalAltResult};
|
||||
fn test_type_of() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
#[cfg(not(feature = "only_i32"))]
|
||||
assert_eq!(engine.eval::<String>("type_of(60 + 5)")?, "i64");
|
||||
|
||||
#[cfg(feature = "only_i32")]
|
||||
assert_eq!(engine.eval::<String>("type_of(60 + 5)")?, "i32");
|
||||
|
||||
#[cfg(not(feature = "no_float"))]
|
||||
assert_eq!(engine.eval::<String>("type_of(1.0 + 2.0)")?, "f64");
|
||||
|
||||
@@ -17,7 +21,12 @@ fn test_type_of() -> Result<(), EvalAltResult> {
|
||||
);
|
||||
|
||||
assert_eq!(engine.eval::<String>(r#"type_of("hello")"#)?, "string");
|
||||
|
||||
#[cfg(not(feature = "only_i32"))]
|
||||
assert_eq!(engine.eval::<String>("let x = 123; x.type_of()")?, "i64");
|
||||
|
||||
#[cfg(feature = "only_i32")]
|
||||
assert_eq!(engine.eval::<String>("let x = 123; x.type_of()")?, "i32");
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
@@ -1,4 +1,4 @@
|
||||
use rhai::{Engine, EvalAltResult};
|
||||
use rhai::{Engine, EvalAltResult, INT};
|
||||
|
||||
#[test]
|
||||
// TODO also add test case for unary after compound
|
||||
@@ -6,12 +6,12 @@ use rhai::{Engine, EvalAltResult};
|
||||
fn test_unary_after_binary() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<i64>("10 % +4")?, 2);
|
||||
assert_eq!(engine.eval::<i64>("10 << +4")?, 160);
|
||||
assert_eq!(engine.eval::<i64>("10 >> +4")?, 0);
|
||||
assert_eq!(engine.eval::<i64>("10 & +4")?, 0);
|
||||
assert_eq!(engine.eval::<i64>("10 | +4")?, 14);
|
||||
assert_eq!(engine.eval::<i64>("10 ^ +4")?, 14);
|
||||
assert_eq!(engine.eval::<INT>("10 % +4")?, 2);
|
||||
assert_eq!(engine.eval::<INT>("10 << +4")?, 160);
|
||||
assert_eq!(engine.eval::<INT>("10 >> +4")?, 0);
|
||||
assert_eq!(engine.eval::<INT>("10 & +4")?, 0);
|
||||
assert_eq!(engine.eval::<INT>("10 | +4")?, 14);
|
||||
assert_eq!(engine.eval::<INT>("10 ^ +4")?, 14);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
@@ -1,12 +1,12 @@
|
||||
use rhai::{Engine, EvalAltResult};
|
||||
use rhai::{Engine, EvalAltResult, INT};
|
||||
|
||||
#[test]
|
||||
fn test_unary_minus() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<i64>("let x = -5; x")?, -5);
|
||||
assert_eq!(engine.eval::<i64>("fn neg(x) { -x } neg(5)")?, -5);
|
||||
assert_eq!(engine.eval::<i64>("5 - -+++--+-5")?, 0);
|
||||
assert_eq!(engine.eval::<INT>("let x = -5; x")?, -5);
|
||||
assert_eq!(engine.eval::<INT>("fn neg(x) { -x } neg(5)")?, -5);
|
||||
assert_eq!(engine.eval::<INT>("5 - -+++--+-5")?, 0);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
@@ -1,4 +1,4 @@
|
||||
use rhai::{Engine, EvalAltResult, Scope};
|
||||
use rhai::{Engine, EvalAltResult, Scope, INT};
|
||||
|
||||
#[test]
|
||||
fn test_var_scope() -> Result<(), EvalAltResult> {
|
||||
@@ -6,14 +6,14 @@ fn test_var_scope() -> Result<(), EvalAltResult> {
|
||||
let mut scope = Scope::new();
|
||||
|
||||
engine.eval_with_scope::<()>(&mut scope, false, "let x = 4 + 5")?;
|
||||
assert_eq!(engine.eval_with_scope::<i64>(&mut scope, false, "x")?, 9);
|
||||
assert_eq!(engine.eval_with_scope::<INT>(&mut scope, false, "x")?, 9);
|
||||
engine.eval_with_scope::<()>(&mut scope, false, "x = x + 1; x = x + 2;")?;
|
||||
assert_eq!(engine.eval_with_scope::<i64>(&mut scope, false, "x")?, 12);
|
||||
assert_eq!(engine.eval_with_scope::<INT>(&mut scope, false, "x")?, 12);
|
||||
assert_eq!(
|
||||
engine.eval_with_scope::<()>(&mut scope, false, "{let x = 3}")?,
|
||||
()
|
||||
);
|
||||
assert_eq!(engine.eval_with_scope::<i64>(&mut scope, false, "x")?, 12);
|
||||
assert_eq!(engine.eval_with_scope::<INT>(&mut scope, false, "x")?, 12);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -26,10 +26,10 @@ fn test_scope_eval() -> Result<(), EvalAltResult> {
|
||||
let mut scope = Scope::new();
|
||||
|
||||
// Then push some initialized variables into the state
|
||||
// NOTE: Remember the default numbers used by Rhai are i64 and f64.
|
||||
// NOTE: Remember the default numbers used by Rhai are INT and f64.
|
||||
// Better stick to them or it gets hard to work with other variables in the script.
|
||||
scope.push("y", 42_i64);
|
||||
scope.push("z", 999_i64);
|
||||
scope.push("y", 42 as INT);
|
||||
scope.push("z", 999 as INT);
|
||||
|
||||
// First invocation
|
||||
engine
|
||||
@@ -37,12 +37,12 @@ fn test_scope_eval() -> Result<(), EvalAltResult> {
|
||||
.expect("y and z not found?");
|
||||
|
||||
// Second invocation using the same state
|
||||
let result = engine.eval_with_scope::<i64>(&mut scope, false, "x")?;
|
||||
let result = engine.eval_with_scope::<INT>(&mut scope, false, "x")?;
|
||||
|
||||
println!("result: {}", result); // should print 966
|
||||
|
||||
// Variable y is changed in the script
|
||||
assert_eq!(scope.get_value::<i64>("y").unwrap(), 1);
|
||||
assert_eq!(scope.get_value::<INT>("y").unwrap(), 1);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
@@ -1,11 +1,11 @@
|
||||
use rhai::{Engine, EvalAltResult};
|
||||
use rhai::{Engine, EvalAltResult, INT};
|
||||
|
||||
#[test]
|
||||
fn test_while() -> Result<(), EvalAltResult> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
assert_eq!(
|
||||
engine.eval::<i64>(
|
||||
engine.eval::<INT>(
|
||||
"let x = 0; while x < 10 { x = x + 1; if x > 5 { \
|
||||
break } } x",
|
||||
)?,
|
||||
|
Reference in New Issue
Block a user