Skip to content

Commit d53f7cf

Browse files
lars-reimannlars-reimann
committed
refactor: remove OrUndefined suffix from methods of NodeMapper 
1 parent 0a7e50f commit d53f7cf

File tree

19 files changed

+66
-68
lines changed

19 files changed

+66
-68
lines changed

‎src/cli/generator.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -291,9 +291,7 @@ const generateStatement = function (statement: SdsStatement, frame: GenerationIn
291291

292292
const generateAssignment = function (assignment: SdsAssignment, frame: GenerationInfoFrame): string {
293293
const requiredAssignees = isSdsCall(assignment.expression)
294-
? abstractResultsOrEmpty(
295-
frame.getServices().helpers.NodeMapper.callToCallableOrUndefined(assignment.expression),
296-
).length
294+
? abstractResultsOrEmpty(frame.getServices().helpers.NodeMapper.callToCallable(assignment.expression)).length
297295
: /* c8 ignore next */
298296
1;
299297
const assignees = assigneesOrEmpty(assignment);
@@ -474,7 +472,7 @@ const generateExpression = function (expression: SdsExpression, frame: Generatio
474472
const sortArguments = function (services: SafeDsServices, argumentList: SdsArgument[]): SdsArgument[] {
475473
// $containerIndex contains the index of the parameter in the receivers parameter list
476474
const parameters = argumentList.map((argument) => {
477-
return { par: services.helpers.NodeMapper.argumentToParameterOrUndefined(argument), arg: argument };
475+
return { par: services.helpers.NodeMapper.argumentToParameter(argument), arg: argument };
478476
});
479477
return parameters
480478
.slice()
@@ -486,7 +484,7 @@ const sortArguments = function (services: SafeDsServices, argumentList: SdsArgum
486484
};
487485

488486
const generateArgument = function (argument: SdsArgument, frame: GenerationInfoFrame) {
489-
const parameter = frame.getServices().helpers.NodeMapper.argumentToParameterOrUndefined(argument);
487+
const parameter = frame.getServices().helpers.NodeMapper.argumentToParameter(argument);
490488
return expandToString`${
491489
parameter !== undefined && !isRequiredParameter(parameter)
492490
? generateParameter(parameter, frame, false) + '='

‎src/language/builtins/safe-ds-annotations.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export class SafeDsAnnotations extends SafeDsModuleMembers<SdsAnnotation> {
9797
): EvaluatedNode {
9898
const annotationCall = findFirstAnnotationCallOf(node, annotation);
9999
const argumentValue = argumentsOrEmpty(annotationCall).find(
100-
(it) => this.nodeMapper.argumentToParameterOrUndefined(it)?.name === parameterName,
100+
(it) => this.nodeMapper.argumentToParameter(it)?.name === parameterName,
101101
)?.value;
102102
return this.partialEvaluator.evaluate(argumentValue);
103103
}

‎src/language/helpers/safe-ds-node-mapper.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class SafeDsNodeMapper {
5050
/**
5151
* Returns the parameter that the argument is assigned to. If there is no matching parameter, returns undefined.
5252
*/
53-
argumentToParameterOrUndefined(node: SdsArgument | undefined): SdsParameter | undefined {
53+
argumentToParameter(node: SdsArgument | undefined): SdsParameter | undefined {
5454
if (!node) {
5555
return undefined;
5656
}
@@ -73,7 +73,7 @@ export class SafeDsNodeMapper {
7373
}
7474

7575
// Find parameter at the same position
76-
const callable = this.callToCallableOrUndefined(containingAbstractCall);
76+
const callable = this.callToCallable(containingAbstractCall);
7777
const parameters = parametersOrEmpty(callable);
7878
if (argumentPosition < parameters.length) {
7979
return parameters[argumentPosition];
@@ -86,7 +86,7 @@ export class SafeDsNodeMapper {
8686
* Returns the result, block lambda result, or expression that is assigned to the given assignee. If nothing is
8787
* assigned, `undefined` is returned.
8888
*/
89-
assigneeToAssignedObjectOrUndefined(node: SdsAssignee | undefined): SdsAbstractResult | SdsExpression | undefined {
89+
assigneeToAssignedObject(node: SdsAssignee | undefined): SdsAbstractResult | SdsExpression | undefined {
9090
if (!node) {
9191
return undefined;
9292
}
@@ -111,7 +111,7 @@ export class SafeDsNodeMapper {
111111
}
112112

113113
// If the RHS instantiates a class or enum variant, the first assignee gets the entire RHS
114-
const callable = this.callToCallableOrUndefined(expression);
114+
const callable = this.callToCallable(expression);
115115
if (isSdsClass(callable) || isSdsEnumVariant(callable)) {
116116
if (assigneePosition === 0) {
117117
return expression;
@@ -128,7 +128,7 @@ export class SafeDsNodeMapper {
128128
/**
129129
* Returns the callable that is called by the given call. If no callable can be found, returns undefined.
130130
*/
131-
callToCallableOrUndefined(node: SdsAbstractCall | undefined): SdsCallable | undefined {
131+
callToCallable(node: SdsAbstractCall | undefined): SdsCallable | undefined {
132132
if (!node) {
133133
return undefined;
134134
}
@@ -212,7 +212,7 @@ export class SafeDsNodeMapper {
212212
* Returns the type parameter that the type argument is assigned to. If there is no matching type parameter, returns
213213
* undefined.
214214
*/
215-
typeArgumentToTypeParameterOrUndefined(node: SdsTypeArgument | undefined): SdsTypeParameter | undefined {
215+
typeArgumentToTypeParameter(node: SdsTypeArgument | undefined): SdsTypeParameter | undefined {
216216
if (!node) {
217217
return undefined;
218218
}

‎src/language/partialEvaluation/safe-ds-partial-evaluator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ export class SafeDsPartialEvaluator {
376376

377377
// Override default values with the actual arguments
378378
argumentsOrEmpty(node).forEach((it) => {
379-
const parameter = this.nodeMapper.argumentToParameterOrUndefined(it);
379+
const parameter = this.nodeMapper.argumentToParameter(it);
380380
if (parameter && args.has(parameter)) {
381381
args.set(parameter, this.cachedDoEvaluate(it.value, substitutions));
382382
}

‎src/language/scoping/safe-ds-scope-provider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export class SafeDsScopeProvider extends DefaultScopeProvider {
114114

115115
private getScopeForArgumentParameter(node: SdsArgument): Scope {
116116
const containingAbstractCall = getContainerOfType(node, isSdsAbstractCall);
117-
const callable = this.nodeMapper.callToCallableOrUndefined(containingAbstractCall);
117+
const callable = this.nodeMapper.callToCallable(containingAbstractCall);
118118
if (!callable) {
119119
return EMPTY_SCOPE;
120120
}
@@ -191,7 +191,7 @@ export class SafeDsScopeProvider extends DefaultScopeProvider {
191191
// Call results
192192
let resultScope = EMPTY_SCOPE;
193193
if (isSdsCall(node.receiver)) {
194-
const callable = this.nodeMapper.callToCallableOrUndefined(node.receiver);
194+
const callable = this.nodeMapper.callToCallable(node.receiver);
195195
const results = abstractResultsOrEmpty(callable);
196196

197197
if (results.length > 1) {

‎src/language/typing/safe-ds-type-computer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ export class SafeDsTypeComputer {
225225

226226
// Lambda passed as argument
227227
if (isSdsArgument(containerOfLambda)) {
228-
const parameter = this.nodeMapper.argumentToParameterOrUndefined(containerOfLambda);
228+
const parameter = this.nodeMapper.argumentToParameter(containerOfLambda);
229229
if (!parameter) {
230230
return UnknownType;
231231
}

‎src/language/validation/builtins/deprecated.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const assigneeAssignedResultShouldNotBeDeprecated =
2727
return;
2828
}
2929

30-
const assignedObject = services.helpers.NodeMapper.assigneeToAssignedObjectOrUndefined(node);
30+
const assignedObject = services.helpers.NodeMapper.assigneeToAssignedObject(node);
3131
if (!isSdsResult(assignedObject)) {
3232
return;
3333
}
@@ -60,7 +60,7 @@ export const annotationCallAnnotationShouldNotBeDeprecated =
6060

6161
export const argumentCorrespondingParameterShouldNotBeDeprecated =
6262
(services: SafeDsServices) => (node: SdsArgument, accept: ValidationAcceptor) => {
63-
const parameter = services.helpers.NodeMapper.argumentToParameterOrUndefined(node);
63+
const parameter = services.helpers.NodeMapper.argumentToParameter(node);
6464
if (!parameter) {
6565
return;
6666
}

‎src/language/validation/builtins/experimental.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export const assigneeAssignedResultShouldNotBeExperimental =
2222
return;
2323
}
2424

25-
const assignedObject = services.helpers.NodeMapper.assigneeToAssignedObjectOrUndefined(node);
25+
const assignedObject = services.helpers.NodeMapper.assigneeToAssignedObject(node);
2626
if (!isSdsResult(assignedObject)) {
2727
return;
2828
}
@@ -53,7 +53,7 @@ export const annotationCallAnnotationShouldNotBeExperimental =
5353

5454
export const argumentCorrespondingParameterShouldNotBeExperimental =
5555
(services: SafeDsServices) => (node: SdsArgument, accept: ValidationAcceptor) => {
56-
const parameter = services.helpers.NodeMapper.argumentToParameterOrUndefined(node);
56+
const parameter = services.helpers.NodeMapper.argumentToParameter(node);
5757
if (!parameter) {
5858
return;
5959
}

‎src/language/validation/other/argumentLists.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export const argumentListMustNotHaveTooManyArguments = (services: SafeDsServices
3939
}
4040

4141
// We already report other errors in those cases
42-
const callable = nodeMapper.callToCallableOrUndefined(node);
42+
const callable = nodeMapper.callToCallable(node);
4343
if (!callable || (isSdsCall(node) && isSdsAnnotation(callable))) {
4444
return;
4545
}
@@ -76,12 +76,12 @@ export const argumentListMustNotHaveTooManyArguments = (services: SafeDsServices
7676

7777
export const argumentListMustNotSetParameterMultipleTimes = (services: SafeDsServices) => {
7878
const nodeMapper = services.helpers.NodeMapper;
79-
const argumentToParameterOrUndefined = nodeMapper.argumentToParameterOrUndefined.bind(nodeMapper);
79+
const argumentToParameterOrUndefined = nodeMapper.argumentToParameter.bind(nodeMapper);
8080

8181
return (node: SdsArgumentList, accept: ValidationAcceptor): void => {
8282
// We already report other errors in this case
8383
const containingCall = getContainerOfType(node, isSdsCall);
84-
const callable = nodeMapper.callToCallableOrUndefined(containingCall);
84+
const callable = nodeMapper.callToCallable(containingCall);
8585
if (isSdsAnnotation(callable)) {
8686
return;
8787
}
@@ -109,7 +109,7 @@ export const argumentListMustSetAllRequiredParameters = (services: SafeDsService
109109
}
110110

111111
// We already report other errors in those cases
112-
const callable = nodeMapper.callToCallableOrUndefined(node);
112+
const callable = nodeMapper.callToCallable(node);
113113
if (!callable || (isSdsCall(node) && isSdsAnnotation(callable))) {
114114
return;
115115
}
@@ -119,7 +119,7 @@ export const argumentListMustSetAllRequiredParameters = (services: SafeDsService
119119
return;
120120
}
121121

122-
const actualParameters = argumentsOrEmpty(node).map((it) => nodeMapper.argumentToParameterOrUndefined(it));
122+
const actualParameters = argumentsOrEmpty(node).map((it) => nodeMapper.argumentToParameter(it));
123123

124124
const missingTypeParameters = expectedParameters.filter((it) => !actualParameters.includes(it));
125125
if (!isEmpty(missingTypeParameters)) {

‎src/language/validation/other/expressions/calls.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export const callArgumentsMustBeConstantIfParameterIsConstant = (services: SafeD
1111

1212
return (node: SdsCall, accept: ValidationAcceptor) => {
1313
for (const argument of argumentsOrEmpty(node)) {
14-
const parameter = nodeMapper.argumentToParameterOrUndefined(argument);
14+
const parameter = nodeMapper.argumentToParameter(argument);
1515
if (!isConstantParameter(parameter)) continue;
1616

1717
const evaluatedArgumentValue = partialEvaluator.evaluate(argument.value);

0 commit comments

Comments
 (0)