diff options
| author |  Laurent Le Brun <laurentlb@google.com> | 2015-02-11 16:34:08 +0000 |
|---|---|---|
| committer |  Han-Wen Nienhuys <hanwen@google.com> | 2015-02-11 16:34:08 +0000 |
| commit | 386b90ca567b5997b567db7b211f613f38f02052 (patch) | |
| tree | 7361b8e5bf6fc01b451b3cf82c4f17768c7ae632 /src/main/java/com | |
| parent | f49bb0c9fd1b80a14e4b447fe3c0e1e8432f6b3e (diff) | |
Skylark: Validate function arguments.
--
MOS_MIGRATED_REVID=86087783
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/syntax/SkylarkFunction.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java b/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java index e24d97f1ad..a5190a64d9 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java @@ -533,7 +533,9 @@ public final class FuncallExpression extends Expression { @Override SkylarkType validate(ValidationEnvironment env) throws EvalException { - // TODO(bazel-team): implement semantical check. + for (Argument arg : args) { + arg.getValue().validate(env); + } if (obj != null) { // TODO(bazel-team): validate function calls on objects too. diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkFunction.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkFunction.java index 3af91f1afe..11f1877aad 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkFunction.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkFunction.java @@ -13,7 +13,6 @@ // limitations under the License. package com.google.devtools.build.lib.syntax; -import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -52,7 +51,6 @@ public abstract class SkylarkFunction extends AbstractFunction { /** * Configures the parameter of this Skylark function using the annotation. */ - @VisibleForTesting public void configure(SkylarkBuiltin annotation) { Preconditions.checkState(!configured); Preconditions.checkArgument(getName().equals(annotation.name()), |