Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Wire up PathMapper in more parts of StarlarkCustomCommandLine #18165

Closed
wants to merge 1 commit into from
Closed

Wire up PathMapper in more parts of StarlarkCustomCommandLine #18165

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkCustomCommandLine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,10 +600,9 @@ private static void push(ImmutableListBuilderWithSize<Object> arguments, Builder
}
}

private int eval(List<Object> arguments, int argi, List<String> builder)
throws CommandLineExpansionException {
private int eval(List<Object> arguments, int argi, List<String> builder, PathMapper pathMapper) {
Object object = arguments.get(argi++);
String stringValue = CommandLineItem.expandToCommandLine(object);
String stringValue = StarlarkCustomCommandLine.expandToCommandLine(object, pathMapper);
if (hasFormat) {
String formatStr = (String) arguments.get(argi++);
stringValue = SingleStringArgFormatter.format(formatStr, stringValue);
Expand Down Expand Up @@ -739,22 +738,22 @@ public Iterable<String> arguments(@Nullable ArtifactExpander artifactExpander)

@Override
public Iterable<String> arguments(
@Nullable ArtifactExpander artifactExpander, PathMapper stripPaths)
@Nullable ArtifactExpander artifactExpander, PathMapper pathMapper)
throws CommandLineExpansionException, InterruptedException {
List<String> result = new ArrayList<>();

for (int argi = 0; argi < arguments.size(); ) {
Object arg = arguments.get(argi++);
if (arg instanceof VectorArg) {
argi = ((VectorArg) arg).eval(arguments, argi, result, artifactExpander, stripPaths);
argi = ((VectorArg) arg).eval(arguments, argi, result, artifactExpander, pathMapper);

} else if (arg instanceof ScalarArg) {
argi = ((ScalarArg) arg).eval(arguments, argi, result);
argi = ((ScalarArg) arg).eval(arguments, argi, result, pathMapper);
} else {
result.add(expandToCommandLine(arg, stripPaths));
result.add(expandToCommandLine(arg, pathMapper));
}
}
return ImmutableList.copyOf(stripPaths.mapCustomStarlarkArgs(result));
return ImmutableList.copyOf(pathMapper.mapCustomStarlarkArgs(result));
}

private static String expandToCommandLine(Object object, PathMapper pathMapper) {
Expand Down Expand Up @@ -789,7 +788,7 @@ public Iterable<String> arguments(@Nullable ArtifactExpander artifactExpander)

@Override
public Iterable<String> arguments(
@Nullable ArtifactExpander artifactExpander, PathMapper stripPaths)
@Nullable ArtifactExpander artifactExpander, PathMapper pathMapper)
throws CommandLineExpansionException, InterruptedException {

List<String> result = new ArrayList<>();
Expand All @@ -811,11 +810,11 @@ public Iterable<String> arguments(

Object arg = arguments.get(argi++);
if (arg instanceof VectorArg) {
argi = ((VectorArg) arg).eval(arguments, argi, result, artifactExpander, stripPaths);
argi = ((VectorArg) arg).eval(arguments, argi, result, artifactExpander, pathMapper);
} else if (arg instanceof ScalarArg) {
argi = ((ScalarArg) arg).eval(arguments, argi, result);
argi = ((ScalarArg) arg).eval(arguments, argi, result, pathMapper);
} else {
result.add(CommandLineItem.expandToCommandLine(arg));
result.add(StarlarkCustomCommandLine.expandToCommandLine(arg, pathMapper));
}
}

Expand Down