Skip to content

Fix #38 #39

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
berkenvr merged 10 commits into from
Apr 27, 2025
Merged

Fix #38 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ae0d7ee
shift Exp error message fix
mcngit Apr 18, 2025
3d99a2a
shift Exp error message fix
mcngit Apr 20, 2025
af99be3
shift Exp error message fix
mcngit Apr 20, 2025
f076552
Shift Exp test file modified
mcngit Apr 20, 2025
91dca20
Shift Exp test file modified
mcngit Apr 20, 2025
eccb16a
Shift Exp test file improved
mcngit Apr 27, 2025
36aa82e
Merge remote-tracking branch 'origin/main' into dev/mehmet
mcngit Apr 27, 2025
c9a8d1a
fix #38
mcngit Apr 27, 2025
a465448
fix #38
mcngit Apr 27, 2025
8b72997
fix #38
mcngit Apr 27, 2025
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
6 changes: 6 additions & 0 deletions examples/expression/shiftExpr.tile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
func main(argc: int): void {
x: int = 4;
y: int = 4 << 2;
z: int = 4 >> 1 + 2;
t: int = 4 << 2 * 2;
}
2 changes: 1 addition & 1 deletion src/tile/AntlrToExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ public Expression visitShiftExpression(ShiftExpressionContext ctx) {
Expression left = visit(exprs.get(0));
Expression right = visit(exprs.get(1));
String operator = ctx.getChild(1).getText();
return new ShiftExpression(left, operator, right, new TypeInfoBinopInt());
return new ShiftExpression(left, operator, right, TypeResolver.resolveBinopShiftType(left.getType(), right.getType()));
} else if (exprs.size() == 1) {
return visit(exprs.get(0));
}
Expand Down
4 changes: 2 additions & 2 deletions src/tile/ast/expr/ShiftExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ public String generateTasm(String generatedCode) {
generatedCode = right.generateTasm(generatedCode);

if (operator.equals("<<")) {
generatedCode += " shl\n";
generatedCode += " lshft\n";
} else if (operator.equals(">>")) {
generatedCode += " shr\n";
generatedCode += " rshft\n";
} else {
System.err.println("Unknown shift operator: " + operator);
}
Expand Down