Skip to content

Issue 80 #179

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
merged 5 commits into from
Feb 7, 2018
Merged

Issue 80 #179

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0fe5b98
Also include StreamSupport type in workaround for #80.
khatchad Feb 6, 2018
2f5b870
Clean up.
khatchad Feb 6, 2018
552f221
Clean up.
khatchad Feb 6, 2018
6c6a374
Extract constant.
khatchad Feb 6, 2018
7f8db2e
Clean up.
khatchad Feb 6, 2018
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Extract constant.
  • Loading branch information
@khatchad
khatchad committed Feb 6, 2018
commit 6c6a374b4cec05461d246f3e160d90216ba02db6
9 changes: 7 additions & 2 deletions ...ore/src/edu/cuny/hunter/streamrefactoring/core/wala/nCFAContextWithReceiversSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@

public class nCFAContextWithReceiversSelector extends nCFAContextSelector {

/**
* The N to use if the instance implements BaseStream.
*/
public static final int CONTEXT_LENGTH_FOR_STREAMS = 2;

protected class CallStringTriple {

public CallStringTriple(CGNode node, CallSiteReference site, IMethod target) {
Expand Down Expand Up @@ -118,15 +123,15 @@ protected Map<CallStringTriple, CallStringWithReceivers> getCallStringWithReceiv
/**
* {@inheritDoc}
*
* @return 2 if the target's return type implements {@link BaseStream},
* @return CONTEXT_LENGTH_FOR_STREAMS if the target's return type implements {@link BaseStream},
* otherwise, return the original value.
*/
@Override
protected int getLength(CGNode caller, CallSiteReference site, IMethod target) {
boolean implementsBaseStream = Util.implementsBaseStream(target.getReturnType(), target.getClassHierarchy());

if (implementsBaseStream)
return 2;
return CONTEXT_LENGTH_FOR_STREAMS;
else
return super.getLength(caller, site, target);
}
Expand Down