Minor changes to for use of libs in script resolution (for consistency, should not matter in practice)

Author: mahills

src/lang/php/analysis/includes/ScriptResolve.rsc

@@ -70,7 +70,7 @@ public IncludeGraphNode decorateNode(IncludeGraphNode n, map[loc,set[ConstItemEx
 	}
 }
 
-public tuple[rel[loc,loc] resolved, lrel[str,datetime] timings] scriptResolve(System sys, str p, str v, loc toResolve, loc baseLoc, list[str] ipath=[], map[loc,rel[loc,Expr,loc]] quickResolveInfo = ( )) {
+public tuple[rel[loc,loc] resolved, lrel[str,datetime] timings] scriptResolve(System sys, str p, str v, loc toResolve, loc baseLoc, set[loc] libs = { }, list[str] ipath=[], map[loc,rel[loc,Expr,loc]] quickResolveInfo = ( )) {
 	lrel[str,datetime] timings = [ < "Starting includes resolution", now() > ];
 	clearLookupCache();
 
@@ -84,7 +84,7 @@ public tuple[rel[loc,loc] resolved, lrel[str,datetime] timings] scriptResolve(Sy
 	// and perform simplifications
 	IncludesInfo iinfo = loadIncludesInfo(p, v);
 	timings += < "Includes info loaded", now()>;
-	quickResolved = (size(quickResolveInfo) > 0) ? ( (toResolve in quickResolveInfo) ? quickResolveInfo[toResolve] : { }) : quickResolveExpr(sys, iinfo, toResolve, baseLoc);
+	quickResolved = (size(quickResolveInfo) > 0) ? ( (toResolve in quickResolveInfo) ? quickResolveInfo[toResolve] : { }) : quickResolveExpr(sys, iinfo, toResolve, baseLoc, libs=libs);
 	timings += < "Finished with initial quick resolve", now()>;
 	
 	// This gives us a base model of what can be immediately included
@@ -98,7 +98,7 @@ public tuple[rel[loc,loc] resolved, lrel[str,datetime] timings] scriptResolve(Sy
 	while (! isEmpty(worklist) ) {
 		next = getOneFrom(worklist); worklist -= next; worked += next;
 		includeMap += ( i@at : i | /i:include(_,_) := sys[next] );
-		nextResolved = (size(quickResolveInfo) > 0) ? ( (next in quickResolveInfo) ? quickResolveInfo[next] : { } ) : quickResolveExpr(sys, iinfo, next, baseLoc);
+		nextResolved = (size(quickResolveInfo) > 0) ? ( (next in quickResolveInfo) ? quickResolveInfo[next] : { } ) : quickResolveExpr(sys, iinfo, next, baseLoc, libs=libs);
 		quickResolved += nextResolved;
 		worklist += ({ qri | qri <- nextResolved<2>, qri.scheme != "php+lib" } - worked);
 		worked += { qri | qri <- nextResolved<2>, qri.scheme == "php+lib" };

src/lang/php/experiments/ase2014/ASE2014.rsc

@@ -103,7 +103,7 @@ public void doQuickResolve(Corpus corpus) {
 		counter = 0;
 		for (l <- pt) {
 			dt1 = now();
-			qr = quickResolve(pt, iinfo, l, getCorpusItem(p,v) libs = (p in usedLibs) ? usedLibs[p] : { });
+			qr = quickResolve(pt, iinfo, l, getCorpusItem(p,v), libs = (p in usedLibs) ? usedLibs[p] : { });
 			dt2 = now();
 			res = res + { < l, ll, lr > | < ll, lr > <- qr };
 			counter += 1;
@@ -126,7 +126,7 @@ public void doQuickResolveExpr(Corpus corpus) {
 		println("Resolving <p> for <size(pt<0>)> files");
 		counter = 0;
 		for (l <- pt) {
-			qr = quickResolveExpr(pt, iinfo, l, getCorpusItem(p,v) libs = (p in usedLibs) ? usedLibs[p] : { });
+			qr = quickResolveExpr(pt, iinfo, l, getCorpusItem(p,v), libs = (p in usedLibs) ? usedLibs[p] : { });
 			res = res + { < l, ll, e, lr > | < ll, e, lr > <- qr };
 			counter += 1;
 			if (counter % 100 == 0) {
@@ -295,7 +295,7 @@ public void buildResolveInfo(Corpus corpus, str p, set[loc] files) {
 	}
 	for (f <- files) {
 		println("Resolving script <f>");
-		res = scriptResolve(pt, p, corpus[p], f, rootloc, ipath=getIncludePath(p), quickResolveInfo=qrmap);
+		res = scriptResolve(pt, p, corpus[p], f, rootloc, libs = (p in usedLibs) ? usedLibs[p] : { }, ipath=getIncludePath(p), quickResolveInfo=qrmap);
 		ResolveInfo ri = rinfo(p, corpus[p], f, res);
 		lipath = incLoc + "ri<rmap.nextidx>.bin";
 		writeBinaryValueFile(lipath, ri);