New operator refactor #38
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
# Conflicts: # src/expr.rs # src/main.rs # src/operator.rs # src/params.rs
JayXon
approved these changes
Jan 4, 2024
| @@ -122,16 +121,31 @@ fn find_binary_operators( | |||
| } | |||
| seq!(idx in 0..100 { | |||
| if let Some(&op) = BINARY_OPERATORS.get(idx) { | |||
| let op_idx: OpIndex = OpIndex::new(idx + UNARY_OPERATORS.len()); | |||
There was a problem hiding this comment.
no need to specify the type here, especially we are using OpIndex::new so the type is very clear
Suggested change
| let op_idx: OpIndex = OpIndex::new(idx + UNARY_OPERATORS.len()); | |
| let op_idx = OpIndex::new(idx + UNARY_OPERATORS.len()); |
| if let Some(&op) = UNARY_OPERATORS.get(op_idx) { | ||
| seq!(idx in 0..10 { | ||
| if let Some(&op) = UNARY_OPERATORS.get(idx) { | ||
| let op_idx: OpIndex = OpIndex::new(idx); |
There was a problem hiding this comment.
Suggested change
| let op_idx: OpIndex = OpIndex::new(idx); | |
| let op_idx = OpIndex::new(idx); |
| name: "<", | ||
| prec: 5, | ||
| apply: apply_lt, | ||
| can_apply: can_apply_binary_always, |
There was a problem hiding this comment.
We can either implement a Default trait for BinaryOp, or define a OP_EMPTY constant, and then we can do ..OP_EMPTY, instead of having to specify can_apply_binary_always and the bool flags in every struct.
| commutative: false, | ||
| right_assoc: false, | ||
| }; | ||
| pub const OP_BIT_SHL_WRAP: BinaryOp = BinaryOp { |
There was a problem hiding this comment.
could just be
pub const OP_BIT_SHL_WRAP: BinaryOp = BinaryOp {
apply: apply_bit_shl_wrap,
..OP_BIT_SHL,
};| @@ -50,46 +44,46 @@ pub const LITERALS: &[Num] = &[ | |||
| 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, | |||
| ]; | |||
| /// If not 0, include all numbers in 1..=MAX_LITERAL in addition to LITERALS. | |||
| pub const MAX_LITERAL: Num = 0; | |||
| pub const MAX_LITERAL: Num = 4; | |||
There was a problem hiding this comment.
is this an intentional change?
There was a problem hiding this comment.
No, my bad, I didn't see that I changed it (will address the changes in the next PR).
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.