commit 4feb160bc00823d63942882904155d7dd6ebcae9
author Francois-Rene Rideau <tunes@google.com> Wed Mar 18 19:49:13 2015 +0000
committer Han-Wen Nienhuys <hanwen@google.com> Fri Mar 20 14:31:09 2015 +0000
tree 892da448c23b1bdee2ad23b35801a928d39de712
parent 5c8ea36152216fb2b7cd1fd80ec568dfcb8bf428

New class hierarchy for Skylark functions

* New hierarchy BaseFunction > UserModeFunction, BuiltinFunction.
  The old hierarchy still exists for now, to be deleted after migration:
  Function > AbstractFunction > MixedModeFunction >
    (UserModeFunction, SkylarkFunction > SimpleSkylarkFunction)
  (UserModeFunction is already migrated, and
  BaseFunction implements Function, for now.)

* Function supports *args and **kwargs when calling functions, and
  mandatory named-only parameters in the style of Python 3.
  Notable difference with Python: *args binds the variable to a tuple,
  because a Skylark list would have to be monomorphic.

* A better, simpler, safer FFI using reflection with BuiltinFunction.
  Handles typechecking, passes parameters in a more Java style.
  (Not used for now, will be used later.)

* A new annotation @SkylarkSignature, intended to replace @SkylarkBuiltin,
  supports the full function call protocol, including default arguments.

* Support for annotating function Factory-s rather than functions.

--
MOS_MIGRATED_REVID=88958581

src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java b/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java
index f97282e..1707b3aa 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java
@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.syntax.DictionaryLiteral.DictionaryEntryLiteral;
 
@@ -968,9 +969,20 @@
   @Test
   public void testUnnamedStar() throws Exception {
     syntaxEvents.setFailFast(false);
-    parseFileForSkylark(
-        "def func(a, b1=2, b2=3, *, c1, c2, d=4): return a + b1 + b2 + c1 + c2 + d\n");
-    syntaxEvents.assertContainsEvent("no star, star-star or named-only parameters (for now)");
+    List<Statement> statements = parseFileForSkylark(
+        "def func(a, b1=2, b2=3, *, c1, d=4, c2): return a + b1 + b2 + c1 + c2 + d\n");
+    assertThat(statements).hasSize(1);
+    assertThat(statements.get(0)).isInstanceOf(FunctionDefStatement.class);
+    FunctionDefStatement stmt = (FunctionDefStatement) statements.get(0);
+    FunctionSignature sig = stmt.getArgs().getSignature();
+    // Note the reordering of mandatory named-only at the end.
+    assertThat(sig.getNames()).isEqualTo(ImmutableList.<String>of(
+        "a", "b1", "b2", "d", "c1", "c2"));
+    FunctionSignature.Shape shape = sig.getShape();
+    assertThat(shape.getMandatoryPositionals()).isEqualTo(1);
+    assertThat(shape.getOptionalPositionals()).isEqualTo(2);
+    assertThat(shape.getMandatoryNamedOnly()).isEqualTo(2);
+    assertThat(shape.getOptionalNamedOnly()).isEqualTo(1);
   }
 
   @Test