From 014388cec904f391ce8e54d323c9e9ce527ca0eb Mon Sep 17 00:00:00 2001 From: Damien Martin-Guillerez Date: Tue, 14 Jun 2016 10:28:31 +0000 Subject: Use only one list of parameters for SkylarkSignature Optional and named parameters are now specified using `defaultValue` and `named` (and `positional`). The new structure allow for parameters that are both named and positional (which was forbidden before). This new structure will be used to give the @SkylarkCallable annotation the possibility to provide named and default arguments. It should be a functional no-op for Bazel users. -- MOS_MIGRATED_REVID=124821455 --- .../lib/skylark/SkylarkRuleImplementationFunctionsTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/skylark') diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java index 9d58f885be..e41b90c134 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java @@ -67,10 +67,12 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { @SkylarkSignature( name = "mock", documented = false, - mandatoryPositionals = {@Param(name = "mandatory", doc = "")}, - optionalPositionals = {@Param(name = "optional", doc = "")}, - mandatoryNamedOnly = {@Param(name = "mandatory_key", doc = "")}, - optionalNamedOnly = {@Param(name = "optional_key", doc = "", defaultValue = "'x'")}, + parameters = { + @Param(name = "mandatory", doc = ""), + @Param(name = "optional", doc = "", defaultValue = "None"), + @Param(name = "mandatory_key", doc = "", positional = false, named = true), + @Param(name = "optional_key", doc = "", defaultValue = "'x'", + positional = false, named = true)}, useEnvironment = true ) private BuiltinFunction mockFunc; -- cgit v1.2.3