wip: futile attempts at more work ✨

flowr-analysis · Jul 4, 2024 · 73d3c2f · 73d3c2f
1 parent 687f33f
commit 73d3c2f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/slicing/static/slice-call.ts b/src/slicing/static/slice-call.ts
@@ -71,7 +71,10 @@ export function sliceForCall(current: NodeToSlice, callerInfo: DataflowGraphVert
 			}
 
 			for(const def of defs.filter(d => d.nodeId !== BuiltIn)) {
-				queue.add(def.nodeId, baseEnvironment, baseEnvPrint, current.onlyForSideEffects)
+				// we don't add other nodes used by the function to the queue when forward slicing!
+				if(!forward) {
+					queue.add(def.nodeId, baseEnvironment, baseEnvPrint, current.onlyForSideEffects)
+				}
 				if(nodesToSlice.has(def.nodeId)) {
 					slicedNodeInFunction = true
 				}

diff --git a/src/slicing/static/static-slicer.ts b/src/slicing/static/static-slicer.ts
@@ -44,7 +44,7 @@ export function staticForwardSlicing(graph: DataflowGraph, ast: NormalizedAst, c
 			}
 		}
 
-		traverseEdges(ingoingEdges, queue, baseEnvironment, baseEnvFingerprint)
+		traverseEdges(currentVertex, ingoingEdges, queue, baseEnvironment, baseEnvFingerprint, true)
 	}
 
 	return { ...queue.status(), decodedCriteria }
@@ -89,7 +89,7 @@ export function staticSlicing(graph: DataflowGraph, ast: NormalizedAst, criteria
 			}
 		}
 
-		traverseEdges(currentEdges, queue, baseEnvironment, baseEnvFingerprint)
+		traverseEdges(currentVertex, currentEdges, queue, baseEnvironment, baseEnvFingerprint)
 	}
 
 	return { ...queue.status(), decodedCriteria }
@@ -112,7 +112,7 @@ function addCriteriaToQueue(decodedCriteria: DecodedCriteria, ast: NormalizedAst
 	return { nodesToSlice, minDepth }
 }
 
-function traverseEdges(currentEdges: Map<NodeId, DataflowGraphEdge>, queue: VisitingQueue, baseEnvironment: REnvironmentInformation, baseEnvFingerprint: string) {
+function traverseEdges(currentVertex: DataflowGraphVertexInfo, currentEdges: Map<NodeId, DataflowGraphEdge>, queue: VisitingQueue, baseEnvironment: REnvironmentInformation, baseEnvFingerprint: string, forward = false) {
 	for(const [target, { types }] of currentEdges) {
 		if(edgeIncludesType(types, EdgeType.NonStandardEvaluation)) {
 			continue