Skip to content

refactor: Compile comparison logic in Bitcoin Script order #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msinkec merged 4 commits into from
Jul 8, 2026
Merged

refactor: Compile comparison logic in Bitcoin Script order #47

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f29524
Compile comparison logic in Bitcoin Script order
shubertm Jun 18, 2026
6184c19
Fix property-property comparison
shubertm Jun 18, 2026
c842930
rm comparison order asm test
msinkec Jul 8, 2026
06411f9
merge origin/master
msinkec Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions src/compiler/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1395,88 +1395,88 @@ fn generate_comparison_asm(left: &Expression, op: &str, right: &Expression, asm:
match (left, op, right) {
(Expression::Variable(var), ">=", Expression::Literal(value)) => {
asm.push(format!("<{}>", var));
asm.push(OP_GREATERTHANOREQUAL.to_string());
asm.push(value.clone());
asm.push(OP_GREATERTHANOREQUAL.to_string());
}
(Expression::Variable(var), "==", Expression::Variable(var2)) => {
asm.push(format!("<{}>", var));
asm.push(OP_EQUAL.to_string());
asm.push(format!("<{}>", var2));
asm.push(OP_EQUAL.to_string());
}
(Expression::Variable(var), ">=", Expression::Variable(var2)) => {
asm.push(format!("<{}>", var));
asm.push(OP_GREATERTHANOREQUAL.to_string());
asm.push(format!("<{}>", var2));
asm.push(OP_GREATERTHANOREQUAL.to_string());
}
(Expression::Variable(var), "==", Expression::Property(prop)) => {
asm.push(format!("<{}>", var));
asm.push(OP_EQUAL.to_string());
asm.push(format!("<{}>", prop));
asm.push(OP_EQUAL.to_string());
}
(Expression::Variable(var), ">=", Expression::Property(prop)) => {
asm.push(format!("<{}>", var));
asm.push(OP_GREATERTHANOREQUAL.to_string());
asm.push(format!("<{}>", prop));
asm.push(OP_GREATERTHANOREQUAL.to_string());
}
(Expression::Literal(lit), "==", Expression::Variable(var)) => {
asm.push(lit.clone());
asm.push(OP_EQUAL.to_string());
asm.push(format!("<{}>", var));
asm.push(OP_EQUAL.to_string());
}
(Expression::Literal(lit), ">=", Expression::Variable(var)) => {
asm.push(lit.clone());
asm.push(OP_GREATERTHANOREQUAL.to_string());
asm.push(format!("<{}>", var));
asm.push(OP_GREATERTHANOREQUAL.to_string());
}
(Expression::Literal(lit), "==", Expression::Literal(value)) => {
asm.push(lit.clone());
asm.push(OP_EQUAL.to_string());
asm.push(value.clone());
asm.push(OP_EQUAL.to_string());
}
(Expression::Literal(lit), ">=", Expression::Literal(value)) => {
asm.push(lit.clone());
asm.push(OP_GREATERTHANOREQUAL.to_string());
asm.push(value.clone());
asm.push(OP_GREATERTHANOREQUAL.to_string());
}
(Expression::Literal(lit), "==", Expression::Property(prop)) => {
asm.push(lit.clone());
asm.push(OP_EQUAL.to_string());
asm.push(format!("<{}>", prop));
asm.push(OP_EQUAL.to_string());
}
(Expression::Literal(lit), ">=", Expression::Property(prop)) => {
asm.push(lit.clone());
asm.push(OP_GREATERTHANOREQUAL.to_string());
asm.push(format!("<{}>", prop));
asm.push(OP_GREATERTHANOREQUAL.to_string());
}
(Expression::Property(prop), "==", Expression::Variable(var)) => {
asm.push(format!("<{}>", prop));
asm.push(OP_EQUAL.to_string());
asm.push(format!("<{}>", var));
asm.push(OP_EQUAL.to_string());
}
(Expression::Property(prop), ">=", Expression::Variable(var)) => {
asm.push(format!("<{}>", prop));
asm.push(OP_GREATERTHANOREQUAL.to_string());
asm.push(format!("<{}>", var));
asm.push(OP_GREATERTHANOREQUAL.to_string());
}
(Expression::Property(prop), "==", Expression::Literal(value)) => {
asm.push(format!("<{}>", prop));
asm.push(OP_EQUAL.to_string());
asm.push(value.clone());
asm.push(OP_EQUAL.to_string());
}
(Expression::Property(prop), ">=", Expression::Literal(value)) => {
asm.push(format!("<{}>", prop));
asm.push(OP_GREATERTHANOREQUAL.to_string());
asm.push(value.clone());
asm.push(OP_GREATERTHANOREQUAL.to_string());
}
(Expression::Property(prop), "==", Expression::Property(prop2)) => {
asm.push(format!("<{}>", prop));
asm.push(OP_EQUAL.to_string());
asm.push(format!("<{}>", prop2));
asm.push(OP_EQUAL.to_string());
}
(Expression::Property(prop), ">=", Expression::Property(prop2)) => {
asm.push(format!("<{}>", prop));
asm.push(OP_GREATERTHANOREQUAL.to_string());
asm.push(format!("<{}>", prop2));
asm.push(OP_GREATERTHANOREQUAL.to_string());
}
(Expression::CurrentInput(property), "==", Expression::Literal(value)) => {
if value == "true" {
Expand Down
Loading
Loading