aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
diff options
context:
space:
mode:
authorGravatar Laurent Le Brun <laurentlb@google.com>2015-04-13 12:15:04 +0000
committerGravatar Lukacs Berki <lberki@google.com>2015-04-13 12:42:44 +0000
commit964d8d55f26341b4e81b38bf0b652d3a8d6a0fac (patch)
tree506023d056ca5dbc64af5cb7f1da806a2133f53b /src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
parentc07d9e462a0be4215582eeb95134e0b38b416736 (diff)
Skylark: Remove static type checking of variables/functions.
There are still some static checks (check existence of variable/function, readonly variables, etc.). More cleanup will come later. -- MOS_MIGRATED_REVID=90979748
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java14
1 files changed, 5 insertions, 9 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 41fe33238f..0f6cf14af1 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
@@ -556,15 +556,11 @@ public final class FuncallExpression extends Expression {
}
if (obj != null) {
- // TODO(bazel-team): validate function calls on objects too.
- return env.getReturnType(obj.validate(env), func.getName(), getLocation());
- } else {
- // TODO(bazel-team): Imported functions are not validated properly.
- if (!env.hasSymbolInEnvironment(func.getName())) {
- throw new EvalException(getLocation(),
- String.format("function '%s' does not exist", func.getName()));
- }
- return env.getReturnType(func.getName(), getLocation());
+ obj.validate(env);
+ } else if (!env.hasSymbolInEnvironment(func.getName())) {
+ throw new EvalException(getLocation(),
+ String.format("function '%s' does not exist", func.getName()));
}
+ return SkylarkType.UNKNOWN;
}
}