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

Error messages for string functions

Browse Source
This commit is contained in:
ConnorSkees 2020-02-16 18:32:13 -05:00
parent 908104ec1c
commit c9f7289670
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/builtin/string.rs
View File

@ -15,7 +15,7 @@ pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
let s: &Value = arg!(args, 0, "string"); let s: &Value = arg!(args, 0, "string");
match s.eval() { match s.eval() {
Value::Ident(i, q) => Ok(Value::Ident(i.to_ascii_uppercase(), q)), Value::Ident(i, q) => Ok(Value::Ident(i.to_ascii_uppercase(), q)),
_ => todo!("") v => Err(format!("$string: {} is not a string.", v).into()),
} }
}); });
decl!(f "to-lower-case", |args, _| { decl!(f "to-lower-case", |args, _| {
@ -23,7 +23,7 @@ pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
let s: &Value = arg!(args, 0, "string"); let s: &Value = arg!(args, 0, "string");
match s.eval() { match s.eval() {
Value::Ident(i, q) => Ok(Value::Ident(i.to_ascii_lowercase(), q)), Value::Ident(i, q) => Ok(Value::Ident(i.to_ascii_lowercase(), q)),
_ => todo!("") v => Err(format!("$string: {} is not a string.", v).into()),
} }
}); });
decl!(f "str-length", |args, _| { decl!(f "str-length", |args, _| {
@ -31,7 +31,7 @@ pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
let s: &Value = arg!(args, 0, "string"); let s: &Value = arg!(args, 0, "string");
match s.eval() { match s.eval() {
Value::Ident(i, _) => Ok(Value::Dimension(Number::from(i.len()), Unit::None)), Value::Ident(i, _) => Ok(Value::Dimension(Number::from(i.len()), Unit::None)),
_ => todo!("") v => Err(format!("$string: {} is not a string.", v).into()),
} }
}); });
decl!(f "quote", |args, _| { decl!(f "quote", |args, _| {
@ -39,18 +39,22 @@ pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
let s = arg!(args, 0, "string").eval(); let s = arg!(args, 0, "string").eval();
match s { match s {
Value::Ident(i, _) => Ok(Value::Ident(i, QuoteKind::Double)), Value::Ident(i, _) => Ok(Value::Ident(i, QuoteKind::Double)),
_ => todo!("") v => Err(format!("$string: {} is not a string.", v).into()),
} }
}); });
decl!(f "unquote", |args, _| { decl!(f "unquote", |args, _| {
max_args!(args, 1); max_args!(args, 1);
Ok(arg!(args, 0, "string").eval().unquote()) match arg!(args, 0, "string").eval() {
Value::Ident(i, QuoteKind::None) if i.is_empty() => Ok(Value::Null),
i @ Value::Ident(..) => Ok(i.unquote()),
v => Err(format!("$string: {} is not a string.", v).into()),
}
}); });
decl!(f "str-slice", |args, _| { decl!(f "str-slice", |args, _| {
max_args!(args, 3); max_args!(args, 3);
let (string, quotes) = match arg!(args, 0, "string").eval() { let (string, quotes) = match arg!(args, 0, "string").eval() {
Value::Ident(s, q) => (s, q), Value::Ident(s, q) => (s, q),
_ => todo!("____ is not a string") v => return Err(format!("$string: {} is not a string.", v).into()),
}; };
let str_len = string.len(); let str_len = string.len();
let start = match arg!(args, 1, "start-at").eval() { let start = match arg!(args, 1, "start-at").eval() {