From 4baafaca73cee2d3237999048acfc0d5f5f59a5b Mon Sep 17 00:00:00 2001
From: cparsons <cparsons@google.com>
Date: Wed, 11 Apr 2018 11:09:17 -0700
Subject: Introduce Param.legacyNamed() to handle migration from
 @SkylarkSignature to @SkylarkCallable.

@SkylarkSignature.parameters() treat named()=true for parameters regardless of whether named() was actually set to true, and thus for ease of migration we mark migrated parameters as legacyNamed() = true, which is currently semantically equivalent to named() = true.
We make a distinction so that it's easier to bulk fix these later.

RELNOTES: None.
PiperOrigin-RevId: 192477405
---
 .../com/google/devtools/build/lib/syntax/FuncallExpression.java  | 9 +++++++--
 .../devtools/build/lib/syntax/SkylarkSignatureProcessor.java     | 6 +++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/syntax')

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java b/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
index c9f3aee01d..e19113c93f 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
@@ -484,6 +484,10 @@ public final class FuncallExpression extends Expression {
     return result;
   }
 
+  private static boolean isParamNamed(Param param) {
+    return param.named() || param.legacyNamed();
+  }
+
   /**
    * Constructs the parameters list to actually pass to the method, filling with default values if
    * any. If there is a type or argument mismatch, returns a result containing an error message.
@@ -557,13 +561,14 @@ public final class FuncallExpression extends Expression {
                   "expected value of type '%s' for parameter '%s'",
                   type.toString(), param.name()));
         }
-        if (param.named() && keys.contains(param.name())) {
+        if (isParamNamed(param) && keys.contains(param.name())) {
           return ArgumentListConversionResult.fromError(
               String.format("got multiple values for keyword argument '%s'", param.name()));
         }
         argIndex++;
       } else { // No more positional arguments, or no more positional parameters.
-        if (param.named() && keys.remove(param.name())) { // Param specified by keyword argument.
+        if (isParamNamed(param) && keys.remove(param.name())) {
+          // Param specified by keyword argument.
           value = kwargs.get(param.name());
           if (!type.contains(value)) {
             return ArgumentListConversionResult.fromError(
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSignatureProcessor.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSignatureProcessor.java
index cbc653a087..a4302b57ed 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSignatureProcessor.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSignatureProcessor.java
@@ -112,6 +112,10 @@ public class SkylarkSignatureProcessor {
         annotation.extraKeywords(), defaultValues, paramDoc, enforcedTypesList);
   }
 
+  private static boolean isParamNamed(Param param) {
+    return param.named() || param.legacyNamed();
+  }
+
   private static FunctionSignature.WithValues<Object, SkylarkType> getSignatureForCallable(
       String name, boolean documented,
       ImmutableList<Parameter<Object, SkylarkType>> mandatoryPositionals,
@@ -133,7 +137,7 @@ public class SkylarkSignatureProcessor {
       for (Param param : parameters) {
         boolean mandatory = param.defaultValue() != null && param.defaultValue().isEmpty();
         Object defaultValue = mandatory ? null : getDefaultValue(param, defaultValuesIterator);
-        if (param.named() && !param.positional() && !named) {
+        if (isParamNamed(param) && !param.positional() && !named) {
           named = true;
           @Nullable Param starParam = null;
           if (extraPositionals != null && !extraPositionals.name().isEmpty()) {
-- 
cgit v1.2.3