diff options
| author | Jon Bratseth <jonbratseth@yahoo.com> | 2017-01-12 21:48:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-12 21:48:54 +0100 |
| commit | c10677061733478b8e4028fafc68f05972877643 (patch) | |
| tree | fd8ea0f55ec4a17feff93139238a435ddf7715ac /config-model/src/main/javacc/SDParser.jj | |
| parent | 08fbcebedf2c2bd78c13727fb91cc25b9b196c2f (diff) | |
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, 1 insertions, 2 deletions
diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj index 3fc84f2860b..32be8906ffc 100644 --- a/config-model/src/main/javacc/SDParser.jj +++ b/config-model/src/main/javacc/SDParser.jj @@ -805,14 +805,13 @@ 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; }] ) ) { |