Skylark: Fix typing of structs

-- MOS_MIGRATED_REVID=88546692
Kuramyo · Mar 16, 2015 · e314e25 · e314e25
1 parent 00d7223
commit e314e25
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/MethodLibrary.java b/src/main/java/com/google/devtools/build/lib/packages/MethodLibrary.java
@@ -966,7 +966,7 @@ public static final class DictModule {}
       .<Function, SkylarkType>builder()
       .putAll(pureGlobalFunctions)
       .put(list, SkylarkType.of(SkylarkList.class))
-      .put(struct, SkylarkType.of(ClassObject.class))
+      .put(struct, SkylarkType.of(ClassObject.SkylarkClassObject.class))
       .put(hasattr, SkylarkType.BOOL)
       .put(getattr, SkylarkType.UNKNOWN)
       .put(set, SkylarkType.of(SkylarkNestedSet.class))

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
@@ -468,6 +468,23 @@ public void testStructAccessOfMethod() throws Exception {
         "v = mock.function", MOCK_TYPES), env, "Object of type 'Mock' has no field 'function'");
   }
 
+  @Test
+  public void testConditionalStructConcatenation() throws Exception {
+    MethodLibrary.setupMethodEnvironment(env);
+    exec(parseFileForSkylark(
+          "def func():\n"
+        + "  x = struct(a = 1, b = 2)\n"
+        + "  if True:\n"
+        + "    x += struct(c = 1, d = 2)\n"
+        + "  return x\n"
+        + "x = func()\n"), env);
+    SkylarkClassObject x = (SkylarkClassObject) env.lookup("x");
+    assertEquals(1, x.getValue("a"));
+    assertEquals(2, x.getValue("b"));
+    assertEquals(1, x.getValue("c"));
+    assertEquals(2, x.getValue("d"));
+  }
+
   @Test
   public void testJavaFunctionReturnsMutableObject() throws Exception {
     env.update("mock", new Mock());