Merge pull request #768 from powdr-labs/column_by_name

Retain column access by name.

executor/src/witgen/mod.rs

@@ -1,7 +1,8 @@
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, HashMap};
 
 use ast::analyzed::{
     AlgebraicReference, Analyzed, Expression, FunctionValueDefinition, PolyID, PolynomialType,
+    SymbolKind,
 };
 use number::{DegreeType, FieldElement};
 
@@ -155,6 +156,7 @@ pub struct FixedData<'a, T> {
     degree: DegreeType,
     fixed_cols: FixedColumnMap<FixedColumn<'a, T>>,
     witness_cols: WitnessColumnMap<WitnessColumn<'a, T>>,
+    column_by_name: HashMap<String, PolyID>,
 }
 
 impl<'a, T: FieldElement> FixedData<'a, T> {
@@ -193,6 +195,14 @@ impl<'a, T: FieldElement> FixedData<'a, T> {
             degree: analyzed.degree(),
             fixed_cols,
             witness_cols,
+            column_by_name: analyzed
+                .definitions
+                .iter()
+                .filter_map(|(name, (symbol, _))| {
+                    matches!(symbol.kind, SymbolKind::Poly(_))
+                        .then(|| (name.clone(), symbol.into()))
+                })
+                .collect(),
         }
     }
 
@@ -208,6 +218,10 @@ impl<'a, T: FieldElement> FixedData<'a, T> {
         }
     }
 
+    pub fn column_by_name(&self, name: &str) -> PolyID {
+        self.column_by_name[name]
+    }
+
     fn external_witness(&self, row: DegreeType, column: &PolyID) -> Option<T> {
         let row = row % self.degree;
         self.witness_cols[column]