summaryrefslogtreecommitdiffstats
path: root/config-model/src/main/javacc
diff options
context:
space:
mode:
Diffstat (limited to 'config-model/src/main/javacc')
-rw-r--r--config-model/src/main/javacc/IntermediateParser.jj12
1 files changed, 10 insertions, 2 deletions
diff --git a/config-model/src/main/javacc/IntermediateParser.jj b/config-model/src/main/javacc/IntermediateParser.jj
index 314de9878ee..fbd0181d307 100644
--- a/config-model/src/main/javacc/IntermediateParser.jj
+++ b/config-model/src/main/javacc/IntermediateParser.jj
@@ -2476,10 +2476,18 @@ String constantTensorErrorMessage(String rankProfileName, String constantTensorN
Tensor tensorValue(TensorType type) :
{
Tensor.Builder builder = Tensor.Builder.of(type);
+ Number doubleValue = null;
}
{
- ( mappedTensorValue(builder) | indexedTensorValues(builder) )
- { return builder.build(); }
+ ( mappedTensorValue(builder) | indexedTensorValues(builder) | doubleValue = consumeNumber() )
+ {
+ if (doubleValue != null) {
+ if (type.rank() > 0)
+ throw new IllegalArgumentException("A tensor of type " + type + " cannot be a number");
+ builder.cell(doubleValue.doubleValue());
+ }
+ return builder.build();
+ }
}
/** A mapped or mixed tensor value. */