aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
diff options
context:
space:
mode:
authorGravatar Francois-Rene Rideau <tunes@google.com>2015-02-11 16:56:37 +0000
committerGravatar Han-Wen Nienhuys <hanwen@google.com>2015-02-11 16:56:37 +0000
commitcbebd63acff81620c46c24e26780a5803fe42156 (patch)
tree01b182c444427b0d4b7fa3e2fc0dd28834c0b136 /src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
parenta46125ca0e4569a41d2d078c3168dbfd8950534a (diff)
Cosmetic changes moved out of []
These shouldn't affect the semantic of the program in any significant way, but will hush the linter and other such metaprograms. -- MOS_MIGRATED_REVID=86089271
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.java12
1 files changed, 6 insertions, 6 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 a5190a64d9..38f4a7d82a 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
@@ -316,7 +316,7 @@ public final class FuncallExpression extends Expression {
result = SkylarkType.convertToSkylark(result, method);
if (result != null && !EvalUtils.isSkylarkImmutable(result.getClass())) {
throw new EvalException(loc, "Method '" + methodName
- + "' returns a mutable object (type of " + EvalUtils.getDatatypeName(result) + ")");
+ + "' returns a mutable object (type of " + EvalUtils.getDataTypeName(result) + ")");
}
return result;
}
@@ -386,7 +386,7 @@ public final class FuncallExpression extends Expression {
if (!first) {
sb.append(", ");
}
- sb.append(EvalUtils.getDatatypeName(obj));
+ sb.append(EvalUtils.getDataTypeName(obj));
first = false;
}
return sb.append(")").toString();
@@ -410,12 +410,12 @@ public final class FuncallExpression extends Expression {
throws EvalException {
if (!(items instanceof Map<?, ?>)) {
throw new EvalException(getLocation(),
- "Argument after ** must be a dictionary, not " + EvalUtils.getDatatypeName(items));
+ "Argument after ** must be a dictionary, not " + EvalUtils.getDataTypeName(items));
}
for (Map.Entry<?, ?> entry : ((Map<?, ?>) items).entrySet()) {
if (!(entry.getKey() instanceof String)) {
throw new EvalException(getLocation(),
- "Keywords must be strings, not " + EvalUtils.getDatatypeName(entry.getKey()));
+ "Keywords must be strings, not " + EvalUtils.getDataTypeName(entry.getKey()));
}
addKeywordArg(kwargs, (String) entry.getKey(), entry.getValue());
}
@@ -499,14 +499,14 @@ public final class FuncallExpression extends Expression {
} else {
throw new EvalException(getLocation(), String.format(
"function '%s' is not defined on '%s'", func.getName(),
- EvalUtils.getDatatypeName(objValue)));
+ EvalUtils.getDataTypeName(objValue)));
}
}
Object funcValue = func.eval(env);
if (!(funcValue instanceof Function)) {
throw new EvalException(getLocation(),
- "'" + EvalUtils.getDatatypeName(funcValue)
+ "'" + EvalUtils.getDataTypeName(funcValue)
+ "' object is not callable");
}
Function function = (Function) funcValue;