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

Import EvalError. (#1392)

Browse Source
This commit is contained in:
chriseth
2024-05-22 09:45:33 +02:00
committed by GitHub
parent 8362be3e3e
commit b72acfae00
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pil-analyzer/src/condenser.rs
View File

@@ -25,7 +25,7 @@ use powdr_ast::{
use powdr_number::{DegreeType, FieldElement};
use crate::{
evaluator::{self, Definitions, SymbolLookup, Value},
evaluator::{self, Definitions, EvalError, SymbolLookup, Value},
statement_processor::Counters,
};
@@ -325,7 +325,7 @@ impl<'a, T: FieldElement> SymbolLookup<'a, T> for Condenser<'a, T> {
&mut self,
name: &'a str,
type_args: Option<Vec<Type>>,
) -> Result<Arc<Value<'a, T>>, evaluator::EvalError> {
) -> Result<Arc<Value<'a, T>>, EvalError> {
// Cache already computed values.
// Note that the cache is essential because otherwise
// we re-evaluate simple values, which users would not expect.
@@ -340,15 +340,12 @@ impl<'a, T: FieldElement> SymbolLookup<'a, T> for Condenser<'a, T> {
Ok(value)
}
fn lookup_public_reference(
&self,
name: &str,
) -> Result<Arc<Value<'a, T>>, evaluator::EvalError> {
fn lookup_public_reference(&self, name: &str) -> Result<Arc<Value<'a, T>>, EvalError> {
Definitions(self.symbols).lookup_public_reference(name)
}
fn degree(&self) -> Result<Arc<Value<'a, T>>, evaluator::EvalError> {
let degree = self.degree.ok_or(evaluator::EvalError::DataNotAvailable)?;
fn degree(&self) -> Result<Arc<Value<'a, T>>, EvalError> {
let degree = self.degree.ok_or(EvalError::DataNotAvailable)?;
Ok(Value::Integer(degree.into()).into())
}
@@ -356,7 +353,7 @@ impl<'a, T: FieldElement> SymbolLookup<'a, T> for Condenser<'a, T> {
&mut self,
name: &str,
source: SourceRef,
) -> Result<Arc<Value<'a, T>>, evaluator::EvalError> {
) -> Result<Arc<Value<'a, T>>, EvalError> {
let name = self.find_unused_name(name);
let symbol = Symbol {
id: self.next_witness_id,
@@ -383,7 +380,7 @@ impl<'a, T: FieldElement> SymbolLookup<'a, T> for Condenser<'a, T> {
&mut self,
constraints: Arc<Value<'a, T>>,
source: SourceRef,
) -> Result<(), evaluator::EvalError> {
) -> Result<(), EvalError> {
match constraints.as_ref() {
Value::Array(items) => {
for item in items {