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

Tweak trampoline function to accept DataCon closures #896

Merged
merged 2 commits into from
Nov 8, 2018
Merged

Tweak trampoline function to accept DataCon closures #896

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e189caa
Tweak trampoline function to accept DataCon closures. This fixes a pr…
mmisamore Nov 8, 2018
43ffe2e
Make the trampoline IllegalStateException message match the condition
mmisamore Nov 8, 2018
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
4 changes: 2 additions & 2 deletions rts/src/main/java/eta/runtime/stg/Stg.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ public TrampolineBounceException initialValue() {
};

public static Closure trampoline(final StgContext context, final Closure closure) {
if (!(closure instanceof Thunk)) {
if (!(closure instanceof Thunk) && !(closure instanceof DataCon)) {
final Class<?> clazz = closure.getClass();
throw new IllegalStateException
("The trampoline function expects a thunk and not a function ["
("The trampoline function expects a thunk or data constructor and not a function ["
+ clazz + " extends "
+ clazz.getSuperclass() + "]");
}
Expand Down