refactor: use parse requests in dataflow processor info

flowr-analysis · Feb 6, 2024 · c0eb3fc · EagleoutIce · Feb 6, 2024 · c0eb3fc
1 parent 53d69de
commit c0eb3fc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/src/core/slicer.ts b/src/core/slicer.ts
@@ -208,7 +208,7 @@ export class SteppingSlicer<InterestedIn extends StepName | undefined = typeof L
 				break
 			case 2:
 				step = guardStep('dataflow')
-				result = executeSingleSubStep(step, this.results.normalize as NormalizedAst)
+				result = executeSingleSubStep(step, this.request, this.results.normalize as NormalizedAst)
 				break
 			case 3:
 				step = guardStep('ai')

diff --git a/src/core/steps.ts b/src/core/steps.ts
@@ -96,7 +96,7 @@ export const STEPS_PER_FILE = {
 	} satisfies IStep<typeof normalize>,
 	'dataflow': {
 		description: 'Construct the dataflow graph',
-		processor:   a => produceDataFlowGraph(a),
+		processor:   (r, a) => produceDataFlowGraph(r, a),
 		required:    'once-per-file',
 		printer:     {
 			[StepOutputFormat.Internal]:   internalPrinter,

diff --git a/src/dataflow/extractor.ts b/src/dataflow/extractor.ts
@@ -1,4 +1,4 @@
-import type { NormalizedAst, ParentInformation, RAssignmentOp, RBinaryOp} from '../r-bridge'
+import type {NormalizedAst, ParentInformation, RAssignmentOp, RBinaryOp, RParseRequest} from '../r-bridge'
 import { RType } from '../r-bridge'
 import type { DataflowInformation } from './internal/info'
 import type { DataflowProcessorInformation, DataflowProcessors} from './processor'
@@ -48,13 +48,13 @@ const processors: DataflowProcessors<any> = {
 	[RType.ExpressionList]:     processExpressionList,
 }
 
-export function produceDataFlowGraph<OtherInfo>(ast: NormalizedAst<OtherInfo & ParentInformation>, initialScope: DataflowScopeName = LocalScope): DataflowInformation {
+export function produceDataFlowGraph<OtherInfo>(request: RParseRequest, ast: NormalizedAst<OtherInfo & ParentInformation>, initialScope: DataflowScopeName = LocalScope): DataflowInformation {
 	return processDataflowFor<OtherInfo>(ast.ast, {
 		completeAst:      ast,
 		activeScope:      initialScope,
 		environments:     initializeCleanEnvironments(),
 		processors:       processors as DataflowProcessors<OtherInfo & ParentInformation>,
-		currentPath:      'initial',
+		currentRequest:   request,
 		sourceReferences: new Map<string, string[]>()
 	})
 }

diff --git a/src/dataflow/internal/process/functions/source.ts b/src/dataflow/internal/process/functions/source.ts
@@ -30,7 +30,7 @@ export function processSourceCall<OtherInfo>(functionCall: RFunctionCall<OtherIn
 
 		// TODO we shouldn't skip a re-analysis *always*, just when it's a cycle - right?
 		// check if the sourced file has already been dataflow analyzed, and if so, skip it
-		if(data.sourceReferences.has(path)) {
+		if(data.sourceReferences.has(JSON.stringify(request))) {
 			dataflowLogger.info(`Sourced file ${path} was already dataflow analyzed, skipping`)
 			return information
 		}
@@ -45,10 +45,11 @@ export function processSourceCall<OtherInfo>(functionCall: RFunctionCall<OtherIn
 		}
 
 		// make the currently analyzed file remember that it already referenced the path
-		data.sourceReferences.set(data.currentPath, [...(data.sourceReferences.get(data.currentPath) ?? []), path])
+		const currRequest = JSON.stringify(data.currentRequest)
+		data.sourceReferences.set(currRequest, [...(data.sourceReferences.get(currRequest) ?? []), path])
 
 		const normalized = executeSingleSubStep('normalize', parsed, executor.getTokenMap(), undefined, fileNameDeterministicCountingIdGenerator(path)) as NormalizedAst<OtherInfo & ParentInformation>
-		const dataflow = processDataflowFor(normalized.ast, {...data, currentPath: path, environments: information.environments})
+		const dataflow = processDataflowFor(normalized.ast, {...data, currentRequest: request, environments: information.environments})
 
 		// update our graph with the sourced file's information
 		const newInformation = {...information}

diff --git a/src/dataflow/processor.ts b/src/dataflow/processor.ts
@@ -4,7 +4,7 @@
 import type {
 	NormalizedAst,
 	ParentInformation, RNode,
-	RNodeWithParent
+	RNodeWithParent, RParseRequest
 } from '../r-bridge'
 import type { DataflowInformation } from './internal/info'
 import type { DataflowScopeName, REnvironmentInformation } from './environments'
@@ -27,8 +27,7 @@ export interface DataflowProcessorInformation<OtherInfo> {
    * Other processors to be called by the given functions
    */
 	readonly processors:       DataflowProcessors<OtherInfo>
-	// TODO using "initial" as the default path doesn't allow us to skip re-sourcing the initial file - how do we find out the initial file's name/path?
-	readonly currentPath:      string | 'initial'
+	readonly currentRequest:   RParseRequest
 	readonly sourceReferences: Map<string, string[]>
 }