Variables IR and Codegen #100
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
tohrnii
force-pushed
the
tohrnii-variables-ir-codegen
branch
6 times, most recently
from
4180902 to
5d980da
Compare
tohrnii
force-pushed
the
tohrnii-variables-ir-codegen
branch
2 times, most recently
from
335e360 to
b6fddf7
Compare
bobbinth
reviewed
Dec 11, 2022
tohrnii
force-pushed
the
tohrnii-variables-ir-codegen
branch
5 times, most recently
from
0424320 to
c26a0bd
Compare
tohrnii
force-pushed
the
tohrnii-variables-ir-codegen
branch
from
c26a0bd to
b37f500
Compare
Al-Kindi-0
reviewed
Dec 16, 2022
grjte
suggested changes
Dec 16, 2022
Comment on lines
+208
to
+239
| IdentifierType::TransitionVariable(transition_variable) => { | ||
| if let TransitionVariableType::Scalar(expr) = transition_variable.value() { | ||
| if let Some((trace_segment, node_index)) = | ||
| variable_roots.get(&VariableValue::Scalar(ident.to_string())) | ||
| { | ||
| Ok((*trace_segment, *node_index)) | ||
| } else { | ||
| let (trace_segment, node_index) = | ||
| self.insert_expr(symbol_table, expr.clone(), variable_roots)?; | ||
| variable_roots.insert( | ||
| VariableValue::Scalar(ident.to_string()), | ||
| (trace_segment, node_index), | ||
| ); | ||
| Ok((trace_segment, node_index)) | ||
| } | ||
| } else { | ||
| Err(SemanticError::InvalidUsage(format!( | ||
| "Identifier {} was declared as a {} which is not a supported type.", | ||
| ident, elem_type | ||
| ))) | ||
| } | ||
| } |
There was a problem hiding this comment.
There's quite a bit of similarity/near-redundancy between this, insert_vector_access, and `insert_matrix_access, so I think there's probably a better way. Can you take a look at refactoring a bit or ping me if you want to discuss?
There was a problem hiding this comment.
I agree with you that there is some redundancy but I can't think of a way to reduce it much here.
There was a problem hiding this comment.
Ok, let's leave it for now and revisit in the future once the tests are in place.
tohrnii
force-pushed
the
tohrnii-variables-ir-codegen
branch
from
b37f500 to
d2591d6
Compare
tohrnii
force-pushed
the
tohrnii-variables-ir-codegen
branch
4 times, most recently
from
8201cb5 to
02175ee
Compare
|
Thank you @grjte and @Al-Kindi-0 for the review. Made suggested changes. |
Al-Kindi-0
approved these changes
Dec 20, 2022
grjte
suggested changes
Dec 21, 2022
Comment on lines
+208
to
+239
| IdentifierType::TransitionVariable(transition_variable) => { | ||
| if let TransitionVariableType::Scalar(expr) = transition_variable.value() { | ||
| if let Some((trace_segment, node_index)) = | ||
| variable_roots.get(&VariableValue::Scalar(ident.to_string())) | ||
| { | ||
| Ok((*trace_segment, *node_index)) | ||
| } else { | ||
| let (trace_segment, node_index) = | ||
| self.insert_expr(symbol_table, expr.clone(), variable_roots)?; | ||
| variable_roots.insert( | ||
| VariableValue::Scalar(ident.to_string()), | ||
| (trace_segment, node_index), | ||
| ); | ||
| Ok((trace_segment, node_index)) | ||
| } | ||
| } else { | ||
| Err(SemanticError::InvalidUsage(format!( | ||
| "Identifier {} was declared as a {} which is not a supported type.", | ||
| ident, elem_type | ||
| ))) | ||
| } | ||
| } |
There was a problem hiding this comment.
Ok, let's leave it for now and revisit in the future once the tests are in place.
tohrnii
force-pushed
the
tohrnii-variables-ir-codegen
branch
2 times, most recently
from
13bf212 to
9ad732b
Compare
|
Thanks @grjte. Fixed. |
Fumuran
approved these changes
Dec 22, 2022
tohrnii
force-pushed
the
tohrnii-variables-ir-codegen
branch
from
9ad732b to
51ccbe3
Compare
- Remove variables for boundary constraints - Remove variables graph - Remove variables vector
tohrnii
force-pushed
the
tohrnii-variables-ir-codegen
branch
from
51ccbe3 to
f087117
Compare
This was referenced Dec 22, 2022
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.
Partly addressing #61.