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

Fix #304 Super inside closure #310

Merged
merged 4 commits into from
Nov 19, 2024
+9 −4
Merged

Fix #304 Super inside closure #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d9fd205
Fix #304
fdodino Nov 15, 2024
1872a82
add paranoid extra validation for closures
fdodino Nov 18, 2024
4cb81d2
Merge branch 'master' into fix-#304-super-inside-closure
PalumboN Nov 19, 2024
1eefd59
Hi isApplyMethodForClosures
PalumboN Nov 19, 2024
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
12 changes: 9 additions & 3 deletions src/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BOOLEAN_MODULE, CLOSURE_EVALUATE_METHOD, CLOSURE_TO_STRING_METHOD, INITIALIZE_METHOD, KEYWORDS, NUMBER_MODULE, OBJECT_MODULE, STRING_MODULE, VOID_WKO, WOLLOK_BASE_PACKAGE } from './constants'
import { BOOLEAN_MODULE, CLOSURE_EVALUATE_METHOD, CLOSURE_MODULE, CLOSURE_TO_STRING_METHOD, INITIALIZE_METHOD, KEYWORDS, NUMBER_MODULE, OBJECT_MODULE, STRING_MODULE, VOID_WKO, WOLLOK_BASE_PACKAGE } from './constants'
import { getPotentiallyUninitializedLazy } from './decorators'
import { count, is, isEmpty, last, List, match, notEmpty, otherwise, valueAsListOrEmpty, when, excludeNullish } from './extensions'
import { RuntimeObject, RuntimeValue } from './interpreter/runtimeModel'
Expand Down Expand Up @@ -217,7 +217,7 @@ export const usesField = (node: Node, field: Field): boolean =>
match(node)(
when(Singleton)(node => {
if (!node.isClosure()) return false
const applyMethod = node.methods.find(method => method.name === CLOSURE_EVALUATE_METHOD)
const applyMethod = node.methods.find(isApplyMethodForClosures)
return !!applyMethod && usesField(applyMethod, field)
}),
when(Variable)(node => usesField(node.value, field)),
Expand Down Expand Up @@ -441,8 +441,14 @@ export const getNodeDefinition = (environment: Environment) => (node: Node): Nod
}
}

export const isApplyMethodForClosures = (method: Method): boolean =>
method.name === CLOSURE_EVALUATE_METHOD && method.parent.fullyQualifiedName.startsWith(`${CLOSURE_MODULE}#`) // TODO: Maybe re-define isClosure() ?

export const superMethodDefinition = (superNode: Super, methodModule: Module): Method | undefined => {
const currentMethod = superNode.ancestors.find(is(Method))!
function isValidMethod(node: Node): node is Method {
return node.is(Method) && !isApplyMethodForClosures(node)
}
const currentMethod = superNode.ancestors.find(isValidMethod)!
return methodModule.lookupMethod(currentMethod.name, superNode.args.length, { lookupStartFQN: currentMethod.parent.fullyQualifiedName })
}

Expand Down
1 change: 0 additions & 1 deletion test/interpreter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,6 @@ describe('Wollok Interpreter', () => {
expect(errored).to.be.false
})


})

describe('DirectedInterpreter', () => {
Expand Down
Loading