greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Projects Releases 9 Packages Wiki Activity

Pre: Generalize NonNumericArgument to InvalidArgument.

Browse source
This commit is contained in:
Nick Alexander 2017-04-26 15:31:09 -07:00 committed by Richard Newman
parent 2f38f1e73e
commit 4d2eb7222e
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
query-algebrizer/src/clauses/resolve.rs
View file

@ -59,7 +59,7 @@ impl ConjoiningClauses {
Constant(NonIntegerConstant::BigInteger(_)) | Constant(NonIntegerConstant::BigInteger(_)) |
Vector(_) => { Vector(_) => {
self.mark_known_empty(EmptyBecause::NonNumericArgument); self.mark_known_empty(EmptyBecause::NonNumericArgument);
bail!(ErrorKind::NonNumericArgument(function.clone(), position)); bail!(ErrorKind::InvalidArgument(function.clone(), "numeric", position));
}, },
Constant(NonIntegerConstant::Float(f)) => Ok(QueryValue::TypedValue(TypedValue::Double(f))), Constant(NonIntegerConstant::Float(f)) => Ok(QueryValue::TypedValue(TypedValue::Double(f))),
} }

5
query-algebrizer/src/errors.rs
View file

@ -42,9 +42,10 @@ error_chain! {
display("unbound variable: {}", name) display("unbound variable: {}", name)
} }
NonNumericArgument(function: PlainSymbol, position: usize) {
InvalidArgument(function: PlainSymbol, expected_type: &'static str, position: usize) {
description("invalid argument") description("invalid argument")
display("invalid argument to {}: expected numeric in position {}.", function, position) display("invalid argument to {}: expected {} in position {}.", function, expected_type, position)
} }
InvalidLimit(val: String, kind: ValueType) { InvalidLimit(val: String, kind: ValueType) {