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 m context when getting function with index #494 #498

Merged
merged 1 commit into from
Mar 18, 2025
Merged

Fixed m context when getting function with index #494 #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/core/interpreter/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,7 +1179,10 @@ export class Interpreter implements Expr.Visitor<BrsType>, Stmt.Visitor<BrsType>
return arg;
});

if (expression.callee instanceof Expr.DottedGet) {
if (
expression.callee instanceof Expr.DottedGet ||
expression.callee instanceof Expr.IndexedGet
) {
mPointer = callee.getContext() ?? mPointer;
}
return this.inSubEnv((subInterpreter) => {
Expand Down
3 changes: 3 additions & 0 deletions test/e2e/Functions.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ describe("end to end functions", () => {
expect(allArgs(outputStreams.stdout.write).map((arg) => arg.trimEnd())).toEqual([
"not root",
"root",
"bar",
"bar",
"invalid",
]);
});

Expand Down
14 changes: 14 additions & 0 deletions test/e2e/resources/function/m-pointer-func.brs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Sub Main()
m.someValue = "root"
objA = { myMethod: do_something, someValue: "not root" }
print objA.myMethod()
anon_func_context()
End Sub

function do_something()
Expand All @@ -12,3 +13,16 @@ end function
Function GenericFunction()
return m.someValue 'Must use Global m
End Function

function anon_func_context()
a = {
foo: "bar",
printM: sub()
print(m.foo)
end sub
}
a.printM()
a["printM"]()
x = a["printM"]
x()
end function