Make Skylark dicts mutable

Represent Skylark dict using a new subclass SkylarkDict<K, V> of Map<K, V>.
Back it with a TreeMap to provide a deterministic iteration order.
Also make SkylarkList generic in its element type <E>.
Have Artifact implement Comparable<Object> so it can be used as TreeMap key.

--
MOS_MIGRATED_REVID=113277489

1 files changed, 4 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/FunctionSignature.java b/src/main/java/com/google/devtools/build/lib/syntax/FunctionSignature.java
index f2543cb581..b858d35ed5 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/FunctionSignature.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/FunctionSignature.java
@@ -27,7 +27,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import javax.annotation.Nullable;
@@ -150,7 +149,7 @@ public abstract class FunctionSignature implements Serializable {
         parameters.add(Tuple.class);
       }
       if (hasKwArg()) {
-        parameters.add(Map.class);
+        parameters.add(SkylarkDict.class);
       }
 
       return parameters;
@@ -412,7 +411,9 @@ public abstract class FunctionSignature implements Serializable {
         private int j = 0;
 
         public void comma() {
-          if (isMore) { sb.append(", "); }
+          if (isMore) {
+            sb.append(", ");
+          }
           isMore = true;
         }
         public void type(int i) {