Add HashableValue as part of ConstValue, and ContainerValue #322
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
acl-cqc
commented
Aug 1, 2023
| } | ||
| } | ||
|
|
||
| #[cfg(test)] |
There was a problem hiding this comment.
These have gone to ops/constant.rs. I could write some HashableValue-specific ones in values.rs...
acl-cqc
commented
Aug 1, 2023
| @@ -87,132 +54,3 @@ pub(crate) fn check_int_fits_in_width( | |||
| Err(ConstIntError::IntWidthInvalid(width)) | |||
| } | |||
| } | |||
|
|
|||
| fn map_vals<T: PrimType, T2: PrimType>( | |||
There was a problem hiding this comment.
This has moved to values.rs
acl-cqc
commented
Aug 1, 2023
| } | ||
|
|
||
| /// Typecheck a constant value | ||
| pub(super) fn typecheck_const(typ: &ClassicType, val: &ConstValue) -> Result<(), ConstTypeError> { |
There was a problem hiding this comment.
This has been split into values.rs and constant.rs parts
acl-cqc
changed the title
acl-cqc
commented
Aug 1, 2023
| /// An arbitrary length integer constant. | ||
| Int(HugrIntValueStore), | ||
| Hashable(HashableValue), | ||
| /// A collection of constant values (at least some of which are not [ConstValue::Hashable]) |
There was a problem hiding this comment.
"not known to be", perhaps
acl-cqc
commented
Aug 1, 2023
src/ops/constant.rs
Outdated
| match ty { | ||
| ClassicType::Container(cty) => return vals.check_container(cty), | ||
| // We might also fail to deduce a container *value* was hashable, | ||
| // because it contains opaque values which don't synthesize their type. |
There was a problem hiding this comment.
This comment might need rewording given #325 provides no way for a value "to synthesize its type". Perhaps it motivates allowing such a way?
ss2165
approved these changes
Aug 2, 2023
src/ops/constant.rs
Outdated
| @@ -145,57 +149,128 @@ impl PartialEq for dyn CustomConst { | |||
|
|
|||
| impl Default for ConstValue { | |||
| fn default() -> Self { | |||
| Self::Int(0) | |||
| Self::Hashable(HashableValue::Int(0)) | |||
There was a problem hiding this comment.
i think a default no longer makes sense
src/values.rs
Outdated
| } | ||
| ContainerValue::Map(_) => "a map".to_string(), | ||
| ContainerValue::Sum(tag, val) => format!("const:sum:{{tag:{tag}, val:{}}}", val.name()), | ||
| ContainerValue::Opaque(c) => format!("const:{:?}", c), |
There was a problem hiding this comment.
Used const:custom: and const:yaml: for the two different forms that we still have ATM
src/values.rs
Outdated
Comment on lines
220
to
222
| /*/// Expected width (packed with const int) doesn't match type | ||
| #[error("Type mismatch for int: expected I{0}, but found I{1}")] | ||
| IntWidthMismatch(HugrIntWidthStore, HugrIntWidthStore),*/ |
Add src/values.rs w/new {Hashable,Container}Value, also move ConstTypeError etc.
+trait ValueOfType defines 'check_type' method breaking up old typecheck_const
src/ops/constant.rs contains ConstValue (which uses HashableValue)
src/ops/constant/typecheck.rs contains bits still shared with TypeArg/TypeParam
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.
serde_yaml::ValueandBox<dyn CustomConst>in different placestypecheck.rsremains, as the code that's used by both the new and the old, not-yet-updated (TypeParam/TypeArg) code. When we update the latter, the classes/routines intypecheck.rsshould only have one caller (in values.rs) and then they can be moved into values.rs. [So, this is kinda in the wrong place now, if we want to move it.]