Merge pull request #182 from ponder-lab/ctors

Ctors

Author: khatchad

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/analysis/OrderingInference.java

@@ -96,9 +96,10 @@ private String findStreamCreationMethod(TypeAbstraction typeAbstraction) {
 	private String findStreamCreationMethod(IClass type) {
 		Collection<com.ibm.wala.classLoader.IMethod> allMethods = type.getAllMethods();
 		for (com.ibm.wala.classLoader.IMethod method : allMethods) {
-			TypeReference returnType = method.getReturnType();
+			TypeReference typeToCheck = Util.getEvaluationType(method);
+
 			// find the first one that returns a stream.
-			if (Util.implementsBaseStream(returnType, this.getClassHierarchy()))
+			if (Util.implementsBaseStream(typeToCheck, this.getClassHierarchy()))
 				return method.getName().toString();
 		}
 

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/analysis/StreamStateMachine.java

@@ -272,10 +272,10 @@ private static Collection<? extends InstanceKey> getAdditionalNecessaryReceivers
 			// who's the caller?
 			LOGGER.fine(() -> "Called method is: " + calledMethod);
 
-			TypeReference returnType = calledMethod.getReturnType();
-			LOGGER.fine(() -> "Return type is: " + returnType);
+			TypeReference evaluationType = Util.getEvaluationType(calledMethod);
+			LOGGER.fine(() -> "Evaluation type is: " + evaluationType);
 
-			boolean implementsBaseStream = Util.implementsBaseStream(returnType, hierarchy);
+			boolean implementsBaseStream = Util.implementsBaseStream(evaluationType, hierarchy);
 			LOGGER.fine(() -> "Is it a stream? " + implementsBaseStream);
 
 			if (implementsBaseStream) {

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/analysis/Util.java

@@ -687,4 +687,23 @@ private static boolean wouldOrderingBeConsistent(final Collection<TypeAbstractio
 
 	private Util() {
 	}
+
+	/**
+	 * If it's a ctor, return the declaring class, otherwise, return the return
+	 * type.
+	 * 
+	 * @param method
+	 *            The {@link IMethod} in question.
+	 * @return The declaring class of target if target is a ctor and the return type
+	 *         otherwise.
+	 */
+	public static TypeReference getEvaluationType(IMethod method) {
+		// if it's a ctor.
+		if (method.isInit())
+			// then, use the declaring type.
+			return method.getDeclaringClass().getReference();
+		else // otherwise.
+				// use the return type.
+			return method.getReturnType();
+	}
 }

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/wala/nCFAContextWithReceiversSelector.java

@@ -14,6 +14,7 @@
 import com.ibm.wala.ipa.callgraph.propagation.cfa.CallString;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.CallStringContext;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.nCFAContextSelector;
+import com.ibm.wala.types.TypeReference;
 
 import edu.cuny.hunter.streamrefactoring.core.analysis.Util;
 
@@ -126,7 +127,8 @@ protected Map<CallStringTriple, CallStringWithReceivers> getCallStringWithReceiv
 	 */
 	@Override
 	protected int getLength(CGNode caller, CallSiteReference site, IMethod target) {
-		boolean implementsBaseStream = Util.implementsBaseStream(target.getReturnType(), target.getClassHierarchy());
+		TypeReference typeToCheck = Util.getEvaluationType(target);
+		boolean implementsBaseStream = Util.implementsBaseStream(typeToCheck, target.getClassHierarchy());
 
 		if (implementsBaseStream)
 			return CONTEXT_LENGTH_FOR_STREAMS;