Human-readable encoding 2: cleanups and syntax changes #158
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
Avoids a warning with --no-default-features.
So e.g. (1 * 1) -> ((1 + 1) * 1) becomes 1 * 1 -> (1 + 1) * 1
For now NamedConstructNode has no disconnect right child. A later PR will introduce typed holes, and then we can add disconnect children, but for now we'll just have single-child disconnects in the human readable encoding.
This illustrates how `ErrorSet` will be used to accumulate errors that can all be shown to the user at once.
|
Sigh, CI failure is a rustc bug rust-lang/rust#110475 I will need to patch it in elements-miniscript. |
Newly-released rustc 1.71 no longer compiles our rust-miniscript dependency. Patch rust-miniscript, then elements-miniscript, then this, to hack around it.
Closed
| @@ -151,7 +159,7 @@ Expressions may be | |||
| * one of the core combinators `unit`, `iden`, `comp`, `injl`, `injr`, `case`, `take`, `drop`, `pair`, followed by subexpression(s) as needed; | |||
| * the `disconnect` combinator followed by an expression and a hole; | |||
| * the `witness` combinator which currently allows no subexpressions; | |||
| * the assertions, `assertl` or `assertr`, which take two subexpressions, one of which will be hidden in the decoded program. The hidden subexpression should be prefixed by `#` which indicates to the parser to take the CMR of that expression, not the expression itself. | |||
| * the assertions, `assertl` or `assertr`, which take a subexpressions and a CMR. The CMR is encoded as a full expression prefixed by `#{` and suffixed by `}`; but in the bit-encoding the expression does not appear, only its CMR; | |||
There was a problem hiding this comment.
64c6ea4: Typo, and the definition of CMR was extended. I would leave out the latter part because it is already explained in an earlier section.
Suggested change
| * the assertions, `assertl` or `assertr`, which take a subexpressions and a CMR. The CMR is encoded as a full expression prefixed by `#{` and suffixed by `}`; but in the bit-encoding the expression does not appear, only its CMR; | |
| the assertions, `assertl` or `assertr`, which take a subexpression and a CMR; |
uncomputable
approved these changes
Jul 17, 2023
There was a problem hiding this comment.
ACK b608ec1 Feel free to address the nit.
The named construct node and the error sets look interesting. They are not being used at the moment, but I'm sure the next PR is already waiting.
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.
After/during review of #152 we decided to change the syntax in a couple ways:
?syntax in types whereA?is shorthand for1 + A#exprto#{expr}#<64 hex chars>format for directly specifying CMRs without giving an expressionThis PR also includes some cleanups and new types and utility methods that will be used by the parser. Let me know if you want me to move any to the next PR, or if you'd like me to pull the parser into this one.
Fixes #157