shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper error messages for str-slice

Browse Source
This commit is contained in:
ConnorSkees 2020-02-16 18:42:35 -05:00
parent 09e4537e78
commit 3962c4410a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/builtin/string.rs
View File

@ -63,8 +63,8 @@ pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
Value::Dimension(n, Unit::None) if n == Number::from(0) => 1_usize, Value::Dimension(n, Unit::None) if n == Number::from(0) => 1_usize,
Value::Dimension(n, Unit::None) if n < -Number::from(str_len) => 1_usize, Value::Dimension(n, Unit::None) if n < -Number::from(str_len) => 1_usize,
Value::Dimension(n, Unit::None) => (BigInt::from(str_len + 1) + n.to_integer()).to_usize().unwrap(), Value::Dimension(n, Unit::None) => (BigInt::from(str_len + 1) + n.to_integer()).to_usize().unwrap(),
Value::Dimension(..) => todo!("$start: Expected ___ to have no units."), v @ Value::Dimension(..) => return Err(format!("$start: Expected {} to have no units.", v).into()),
_ => todo!("$start-at: ____ is not a number") v => return Err(format!("$start-at: {} is not a number.", v).into()),
}; };
let mut end = match arg!(args, 2, "end-at"=Value::Null).eval() { let mut end = match arg!(args, 2, "end-at"=Value::Null).eval() {
Value::Dimension(n, Unit::None) if n.is_decimal() => return Err(format!("{} is not an int.", n).into()), Value::Dimension(n, Unit::None) if n.is_decimal() => return Err(format!("{} is not an int.", n).into()),
@ -72,9 +72,9 @@ pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
Value::Dimension(n, Unit::None) if n == Number::from(0) => 0_usize, Value::Dimension(n, Unit::None) if n == Number::from(0) => 0_usize,
Value::Dimension(n, Unit::None) if n < -Number::from(str_len) => 0_usize, Value::Dimension(n, Unit::None) if n < -Number::from(str_len) => 0_usize,
Value::Dimension(n, Unit::None) => (BigInt::from(str_len + 1) + n.to_integer()).to_usize().unwrap(), Value::Dimension(n, Unit::None) => (BigInt::from(str_len + 1) + n.to_integer()).to_usize().unwrap(),
Value::Dimension(..) => todo!("$end: Expected ___ to have no units."), v @ Value::Dimension(..) => return Err(format!("$end: Expected {} to have no units.", v).into()),
Value::Null => str_len, Value::Null => str_len,
_ => todo!("$end-at: ____ is not a number") v => return Err(format!("$end-at: {} is not a number.", v).into()),
}; };
if end > str_len { if end > str_len {