From e3108c51acd41f98a78eeed85a558bd50253cc32 Mon Sep 17 00:00:00 2001
From: Damien Martin-Guillerez <dmarting@google.com>
Date: Wed, 8 Jun 2016 08:54:45 +0000
Subject: Replaced arrays by single value for extra{Positionnals,Named} in
 SkylarkSignature

Those arrays were checked to never have more than one value so use an empty name
instead of the empty array. This simplify comprehension of the API.

--
MOS_MIGRATED_REVID=124330918
---
 .../devtools/build/docgen/skylark/SkylarkBuiltinMethodDoc.java |  8 ++++++--
 .../google/devtools/build/docgen/skylark/SkylarkMethodDoc.java | 10 +++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/docgen/skylark')

diff --git a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkBuiltinMethodDoc.java b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkBuiltinMethodDoc.java
index 318ec24ad5..1fe4fdd861 100644
--- a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkBuiltinMethodDoc.java
+++ b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkBuiltinMethodDoc.java
@@ -85,8 +85,12 @@ public final class SkylarkBuiltinMethodDoc extends SkylarkMethodDoc {
     processParams(annotation.optionalPositionals());
     processParams(annotation.optionalNamedOnly());
     processParams(annotation.mandatoryNamedOnly());
-    processParams(annotation.extraPositionals());
-    processParams(annotation.extraKeywords());
+    if (!annotation.extraPositionals().name().isEmpty()) {
+      this.params.add(new SkylarkParamDoc(this, annotation.extraPositionals()));
+    }
+    if (!annotation.extraKeywords().name().isEmpty()) {
+      this.params.add(new SkylarkParamDoc(this, annotation.extraKeywords()));
+    }
   }
 
   private void processParams(Param[] params) {
diff --git a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkMethodDoc.java b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkMethodDoc.java
index bf254e17e6..5dbd6a79d6 100644
--- a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkMethodDoc.java
+++ b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkMethodDoc.java
@@ -82,10 +82,10 @@ abstract class SkylarkMethodDoc extends SkylarkDoc {
     for (Param param : method.optionalPositionals()) {
       argList.add(formatOptionalParameter(param));
     }
-    for (Param param : method.extraPositionals()) {
-      argList.add("*" + param.name());
+    if (!method.extraPositionals().name().isEmpty()) {
+      argList.add("*" + method.extraPositionals().name());
     }
-    if (argList.size() > 0 && method.extraPositionals().length == 0
+    if (!argList.isEmpty() && method.extraPositionals().name().isEmpty()
         && (method.optionalNamedOnly().length > 0 || method.mandatoryNamedOnly().length > 0)) {
       argList.add("*");
     }
@@ -95,8 +95,8 @@ abstract class SkylarkMethodDoc extends SkylarkDoc {
     for (Param param : method.optionalNamedOnly()) {
       argList.add(formatOptionalParameter(param));
     }
-    for (Param param : method.extraKeywords()) {
-      argList.add("**" + param.name());
+    if (!method.extraKeywords().name().isEmpty()) {
+      argList.add("**" + method.extraKeywords().name());
     }
     String args = "(" + Joiner.on(", ").join(argList) + ")";
     if (!objectName.equals(TOP_LEVEL_ID)) {
-- 
cgit v1.2.3