Skip to content
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

Fixed Int32 constructor handling of overflow to match Roku #435

Merged
merged 2 commits into from
Jan 7, 2025
Merged

Fixed Int32 constructor handling of overflow to match Roku #435

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb8b6e3
Fixed `Int32` constructor handling of overflow to match Roku
lvcabral Jan 7, 2025
787f46c
Fixed code formatting
lvcabral Jan 7, 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
Next Next commit
Fixed Int32 constructor handling of overflow to match Roku
  • Loading branch information
@lvcabral
lvcabral committed Jan 7, 2025
commit bb8b6e36d408619a1978bb87a1ee7774e8ff9674
8 changes: 8 additions & 0 deletions src/core/brsTypes/Int32.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,19 @@ export class Int32 implements Numeric, Comparable, Boxable {
* integer.
*/
constructor(value: number | Long) {
const maxInt = 0x80000000;
if (value instanceof Long) {
// RBI ignores the 32 most significant bits when converting a 64-bit int to a 32-bit int, effectively
// performing a bitwise AND with `0x00000000FFFFFFFF`. Since Long already tracks the lower and upper
// portions as separate 32-bit values, we can simply extract the least-significant portion.
value = value.low;
} else if (value > (maxInt-1) || value < -maxInt) {
// RBI truncates the value to a 32-bit integer, if not identified as LongInt, so we'll do the same here
if (value > maxInt - 1) {
value = maxInt - 1;
} else {
value = -maxInt;
}
}
this.value = Math.trunc(value);
}
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/BrsComponents.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,8 @@ describe("end to end brightscript functions", () => {
"Integer to string 23",
"LongInteger object typeroLongInteger",
"LongInteger to string 2000111222333",
"Integer truncated from LongInteger 2147483647",
"Integer converted from LongInteger -1343537603",
]);
});

Expand Down
6 changes: 6 additions & 0 deletions test/e2e/resources/components/roIntrinsics.brs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ sub main()
integerObject.setInt(23)
longIntegerObject = createObject("roLongInteger")
longIntegerObject.setLongInt(2000111222333)
intTruncated = createObject("roInt")
intTruncated.setInt(2000111222333)
intConverted = createObject("roInt")
intConverted.setInt(2000111222333&)

print "Boolean object A " booleanObjectA.toStr()
print "Boolean object B " booleanObjectB
Expand All @@ -25,4 +29,6 @@ sub main()
print "Integer to string "integerObject.toStr()
print "LongInteger object type"type(longIntegerObject)
print "LongInteger to string "longIntegerObject.toStr()
print "Integer truncated from LongInteger "intTruncated
print "Integer converted from LongInteger "intConverted
end sub
Loading