Do not treat constants specially during parsing. #647
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4937a78 to
0bbac00
Compare
chriseth
commented
Oct 2, 2023
halo2/src/circuit_builder.rs
Outdated
| @@ -38,7 +39,8 @@ pub(crate) fn analyzed_to_circuit<T: FieldElement>( | |||
|
|
|||
| let query = |column, rotation| Expr::Var(PlonkVar::Query(ColumnQuery { column, rotation })); | |||
|
|
|||
| let mut cd = CircuitData::from(fixed.to_owned(), witness, &analyzed.constants); | |||
| let constants = compute_constants(analyzed); | |||
There was a problem hiding this comment.
TOOD: use optimize_mildly instead.
georgwiese
reviewed
Oct 2, 2023
ast/src/analyzed/mod.rs
Outdated
| } | ||
| }); | ||
| self.definitions | ||
| .retain(|name, (poly, _def)| match poly.kind { |
There was a problem hiding this comment.
Maybe the poly variables should be renamed to symbol? Also in the rest of the file.
ast/src/analyzed/mod.rs
Outdated
| pub enum SymbolKind { | ||
| /// Fixed, witness or intermediate polynomial | ||
| Poly(PolynomialType), | ||
| /// A constant value. | ||
| Constant(), | ||
| /// Other symbol, could be a constant, depends on the type. |
There was a problem hiding this comment.
Suggested change
| /// Other symbol, could be a constant, depends on the type. | |
| /// Other symbol |
Can't be a constant anymore, right?
I think it would also be nice to list some examples of what it could be. I think array of numbers or lambda functions?
2a1b9d4 to
e48d5fc
Compare
e48d5fc to
7ff4bd6
Compare
e70c51b to
f433b1e
Compare
|
Ok I think this is almost ready. |
c2eef6b to
ee0781a
Compare
georgwiese
reviewed
Oct 10, 2023
| @@ -49,6 +46,14 @@ impl<T: Display> Display for Analyzed<T> { | |||
| writeln!(f, ";")? | |||
| } | |||
| } | |||
| SymbolKind::Constant() => { | |||
| let indentation = if is_local { " " } else { "" }; | |||
ee0781a to
5d080ed
Compare
5d080ed to
764ef2d
Compare
georgwiese
previously approved these changes
Oct 10, 2023
georgwiese
approved these changes
Oct 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.