github/powdr
1
1
Fork 0
mirror of https://github.com/powdr-labs/powdr.git synced 2026-05-13 03:00:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improved error messages.

Browse Source
This commit is contained in:
chriseth
2023-03-02 14:06:46 +01:00
parent 37b7a3bbf0
commit e69fa52896
2 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/commit_evaluator/affine_expression.rs
View File

@@ -86,6 +86,11 @@ impl AffineExpression {
}
})
}
/// Returns true if it can be determined that this expression can never be zero.
pub fn is_invalid(&self) -> bool {
self.constant_value().map(|v| v != 0.into()) == Some(true)
}
}
fn clamp(mut x: AbstractNumberType) -> AbstractNumberType {

48
src/commit_evaluator/mod.rs
View File

@@ -243,7 +243,7 @@ where
fn interpolate_query(&self, query: &Expression) -> Result<String, String> {
if let Ok(v) = self.evaluate(query, EvaluationRow::Next) {
if v.is_constant() {
return Ok(self.format_affine_expression(v));
return Ok(self.format_affine_expression(&v));
}
}
// TODO combine that with the constant evaluator and the commit evaluator...
@@ -279,10 +279,14 @@ where
} else {
match evaluated.solve() {
Some((id, value)) => Ok(vec![(id, value)]),
None => Err(format!(
"Could not solve expression {} (might be an invalid constraint)",
self.format_affine_expression(evaluated)
)),
None => {
let formatted = self.format_affine_expression(&evaluated);
Err(if evaluated.is_invalid() {
format!("Constraint is invalid ({formatted} != 0).")
} else {
format!("Could not solve expression {formatted} = 0.")
})
}
}
}
}
@@ -309,7 +313,7 @@ where
Some(v) => Ok(v),
None => Err(format!(
"First expression needs to be constant but is not: {}.",
self.format_affine_expression(v)
self.format_affine_expression(&v)
)),
})?;
@@ -368,7 +372,7 @@ where
r.constant_value().ok_or_else(|| {
format!(
"Constant value required: {}",
self.format_affine_expression(r)
self.format_affine_expression(&r)
)
})
})?;
@@ -381,10 +385,18 @@ where
let evaluated = self.evaluate(&expr, EvaluationRow::Next)?;
match evaluated.solve() {
Some((id, value)) => Ok(vec![(id, value)]),
None => Err(format!(
"Could not solve expression {} (might be an invalid constraint)",
self.format_affine_expression(evaluated)
)),
None => match evaluated.solve() {
Some((id, value)) => Ok(vec![(id, value)]),
None => {
// TODO somehow also add `l` and `r` to the error message.
let formatted = self.format_affine_expression(&evaluated);
Err(if evaluated.is_invalid() {
format!("Constraint is invalid ({formatted} != 0).")
} else {
format!("Could not solve expression {formatted} = 0.")
})
}
},
}
}
@@ -498,8 +510,8 @@ where
} else {
Err(format!(
"Multiplication of two non-constants: ({}) * ({})",
self.format_affine_expression(left),
self.format_affine_expression(right)
self.format_affine_expression(&left),
self.format_affine_expression(&right)
))
}
}
@@ -515,8 +527,8 @@ where
} else {
Err(format!(
"Division of two non-constants: ({}) / ({})",
self.format_affine_expression(left),
self.format_affine_expression(right)
self.format_affine_expression(&left),
self.format_affine_expression(&right)
))
}
}
@@ -526,8 +538,8 @@ where
} else {
Err(format!(
"Pow of two non-constants: ({}) ** ({})",
self.format_affine_expression(left),
self.format_affine_expression(right)
self.format_affine_expression(&left),
self.format_affine_expression(&right)
))
}
}
@@ -590,7 +602,7 @@ where
}
}
fn format_affine_expression(&self, e: AffineExpression) -> String {
fn format_affine_expression(&self, e: &AffineExpression) -> String {
e.coefficients
.iter()
.enumerate()