diff options
| author | Jon Bratseth <jonbratseth@yahoo.com> | 2017-01-17 14:16:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 14:16:32 +0100 |
| commit | 7c136a06e1a792a1147417db02d7999290bb945a (patch) | |
| tree | 23c65a0422bf1499f9f8dfb6f0b50c4859498d5c /config-model/src/main/javacc/SDParser.jj | |
| parent | ae39567b503c746f68e04ba5b7a1aa64467fdd29 (diff) | |
Revert "Revert "Revert "Revert "Bratseth/tensor type info in documents""""
Diffstat (limited to 'config-model/src/main/javacc/SDParser.jj')
| -rw-r--r-- | config-model/src/main/javacc/SDParser.jj | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj index 32be8906ffc..3fc84f2860b 100644 --- a/config-model/src/main/javacc/SDParser.jj +++ b/config-model/src/main/javacc/SDParser.jj @@ -805,13 +805,14 @@ DataType dataType() : DataType mapType=null; DataType arrayType=null; DataType wsetType=null; - + TensorType tensorType; } { ( LOOKAHEAD(<ARRAY> <LESSTHAN>) ( <ARRAY> <LESSTHAN> arrayType = dataType() <GREATERTHAN> { return DataType.getArray(arrayType); } ) | LOOKAHEAD(<WEIGHTEDSET> <LESSTHAN>) ( <WEIGHTEDSET> <LESSTHAN> wsetType = dataType() <GREATERTHAN> { return DataType.getWeightedSet(wsetType); } ) | LOOKAHEAD(<MAP> <LESSTHAN>) ( mapType = mapDataType() { return mapType; } ) | LOOKAHEAD(<ANNOTATIONREFERENCE> <LESSTHAN>) ( mapType = annotationRefDataType() { return mapType; } ) + | LOOKAHEAD(<TENSOR_TYPE>) ( tensorType = tensorType("Field type") { return DataType.getTensor(tensorType); } ) | ( typeName = identifier() ["[]" { isArrayOldStyle = true; }] ) ) { |