diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2019-05-08 12:24:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-08 12:24:41 +0200 |
| commit | 172698ac2c7af46e1446f7709ad0d67a444744c0 (patch) | |
| tree | 7648de3a0ea53aa2aa3e41570d52c9df4ed7d904 /config-model/src/main/javacc | |
| parent | 6c8283fc5264ae59f0f5eb90b073add1d3552ab3 (diff) | |
Revert "Bratseth/emit float tensors in config"
Diffstat (limited to 'config-model/src/main/javacc')
| -rw-r--r-- | config-model/src/main/javacc/SDParser.jj | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj index b0af54812a4..571ad452b01 100644 --- a/config-model/src/main/javacc/SDParser.jj +++ b/config-model/src/main/javacc/SDParser.jj @@ -298,7 +298,6 @@ TOKEN : | < FASTSEARCH: "fast-search" > | < HUGE: "huge" > | < TENSOR_TYPE: "tensor(" (~["(",")"])+ ")" > -| < TENSOR_TYPE_WITH_VALUE_TYPE: "tensor<" (["a"-"z","A"-"Z"])+ ">(" (~["(",")"])+ ")" > | < TENSOR_VALUE_SL: "value" (" ")* ":" (" ")* ("{"<BRACE_SL_LEVEL_1>) ("\n")? > | < TENSOR_VALUE_ML: "value" (<SEARCHLIB_SKIP>)? "{" (["\n"," "])* ("{"<BRACE_ML_LEVEL_1>) (["\n"," "])* "}" ("\n")? > | < COMPRESSION: "compression" > @@ -842,7 +841,6 @@ DataType dataType() : | 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); } ) - | LOOKAHEAD(<TENSOR_TYPE_WITH_VALUE_TYPE>) ( tensorType = tensorType("Field type") { return DataType.getTensor(tensorType); } ) | LOOKAHEAD(<REFERENCE>) ( <REFERENCE> <LESSTHAN> referenceType = referenceType() <GREATERTHAN> { return ReferenceDataType.createWithInferredId(referenceType); } ) | ( typeName = identifier() ["[]" { isArrayOldStyle = true; }] ) ) @@ -2407,7 +2405,7 @@ TensorType tensorType(String errorMessage) : String tensorTypeString; } { - ( <TENSOR_TYPE> | <TENSOR_TYPE_WITH_VALUE_TYPE> ) { tensorTypeString = token.image; } + <TENSOR_TYPE> { tensorTypeString = token.image; } { TensorType tensorType; try { |