Rebase of #201 #224
Merged
Rebase of #201 #224
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
Also update some store-related functions that can only return StoreError, to return that instead of a more generic LurkError.
The only place this is used is in proofs, so the name seems more fitting.
Errors during reduce will be dealt with later, with an explicit notion of a provable vs non-provable error.
Split into two functions, one which considers provable errors a rust Result::Err just like any other error. Then a higher level function that examines any error and if it's Provable, return the proper Control object. Pass any other errors up. TODO: the Control object has a Ptr in the first field, even in the case of errors. Need to preserve that.
2 tasks
porcuquine
reviewed
Jan 23, 2023
src/eval.rs
Outdated
| } | ||
| pub fn output_vector(&self, store: &Store<F>) -> Result<Vec<F>, store::Error> { | ||
| self.output.to_vector(store) | ||
| } |
There was a problem hiding this comment.
I think these got re-added accidentally.
porcuquine
approved these changes
Jan 23, 2023
This was referenced Jan 24, 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.
The master branch diverged significantly since #201 was started, and merging/rebasing was basically impossible. This is a rebase of some of the earlier commits and then manual replaying of the rest of the changes. Doing manual edits is rather error prone but hopefully I got everything.