From 4f8fa003117d3ad1f30b6dc0adcabf4e923b0f90 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Wed, 18 May 2022 14:37:17 +0200 Subject: Revert "Merge pull request #22642 from vespa-engine/revert-22637-bratseth/model-syntax" This reverts commit 2c9cb8159adaced573fd1e34689e533946feea85, reversing changes made to a4dbfc43c7df534ee5b032204ef19a7b038d7e3e. --- config-model/src/main/javacc/SchemaParser.jj | 74 +++++++++++++++------------- 1 file changed, 39 insertions(+), 35 deletions(-) (limited to 'config-model/src/main/javacc') diff --git a/config-model/src/main/javacc/SchemaParser.jj b/config-model/src/main/javacc/SchemaParser.jj index 421894e51cd..86a623071b5 100644 --- a/config-model/src/main/javacc/SchemaParser.jj +++ b/config-model/src/main/javacc/SchemaParser.jj @@ -1667,15 +1667,15 @@ void indexBody(ParsedIndex index) : double threshold; } { - ( { index.setPrefix(true); } - | str = identifierWithDash() { index.addAlias(str); } - | str = identifierWithDash() { index.setStemming(Stemming.get(str)); } - | arity = integer() { index.setArity(arity); } - | num = consumeLong() { index.setLowerBound(num); } - | num = consumeLong() { index.setUpperBound(num); } - | threshold = consumeFloat() { index.setDensePostingListThreshold(threshold); } - | { index.setEnableBm25(true); } - | hnswIndex(index) { } + ( { index.setPrefix(true); } + | str = identifierWithDash() { index.addAlias(str); } + | str = identifierWithDash() { index.setStemming(Stemming.get(str)); } + | arity = integer() { index.setArity(arity); } + | num = longValue() { index.setLowerBound(num); } + | num = longValue() { index.setUpperBound(num); } + | threshold = floatValue() { index.setDensePostingListThreshold(threshold); } + | { index.setEnableBm25(true); } + | hnswIndex(index) { } ) } @@ -1793,6 +1793,7 @@ String fileItem() : { ( ( | | ) { path = com.yahoo.path.Path.fromString(token.image).getRelative(); } { } ()*) { return path; } } + String uriItem() : { String path; @@ -1905,7 +1906,7 @@ String mutate_expr() : Number constant = null; } { - (("+=" | "-=" | "=") { op = token.image; } constant = consumeNumber()) + (("+=" | "-=" | "=") { op = token.image; } constant = number()) { return constant != null ? (op + constant) : op; } } @@ -1977,9 +1978,9 @@ void matchPhaseItem(MatchPhaseSettings settings) : | ( { settings.setAscending(true); } | { settings.setAscending(false); } ) | num = integer() { settings.setMaxHits(num); } - | coverage = consumeFloat() { settings.setMaxFilterCoverage(coverage); } - | multiplier = consumeFloat() { settings.setEvaluationPoint(multiplier); } - | multiplier = consumeFloat() { settings.setPrePostFilterTippingPoint(multiplier); } + | coverage = floatValue() { settings.setMaxFilterCoverage(coverage); } + | multiplier = floatValue() { settings.setEvaluationPoint(multiplier); } + | multiplier = floatValue() { settings.setPrePostFilterTippingPoint(multiplier); } ) } @@ -2008,7 +2009,7 @@ void diversityItem(DiversitySettings settings) : { ( str = identifier() { settings.setAttribute(str); } | num = integer() { settings.setMinGroups(num); } - | multiplier = consumeFloat() { settings.setCutoffFactor(multiplier); } + | multiplier = floatValue() { settings.setCutoffFactor(multiplier); } | ( { settings.setCutoffStrategy(Diversity.CutoffStrategy.strict); } | { settings.setCutoffStrategy(Diversity.CutoffStrategy.loose); } @@ -2038,9 +2039,9 @@ void firstPhaseItem(ParsedRankProfile profile) : double dropLimit; } { - ( expression = expression() { profile.setFirstPhaseRanking(expression); } - | ( keepRankCount = integer()) { profile.setKeepRankCount(keepRankCount); } - | ( dropLimit = consumeFloat()) { profile.setRankScoreDropLimit(dropLimit); } + ( expression = expression() { profile.setFirstPhaseRanking(expression); } + | ( keepRankCount = integer()) { profile.setKeepRankCount(keepRankCount); } + | ( dropLimit = floatValue()) { profile.setRankScoreDropLimit(dropLimit); } ) } @@ -2254,7 +2255,7 @@ void termwiseLimit(ParsedRankProfile profile) : double num; } { - ( num = consumeFloat()) { profile.setTermwiseLimit(num); } + ( num = floatValue()) { profile.setTermwiseLimit(num); } } /** @@ -2267,7 +2268,7 @@ void postFilterThreshold(ParsedRankProfile profile) : double threshold; } { - ( threshold = consumeFloat()) { profile.setPostFilterThreshold(threshold); } + ( threshold = floatValue()) { profile.setPostFilterThreshold(threshold); } } /** @@ -2280,7 +2281,7 @@ void approximateThreshold(ParsedRankProfile profile) : double threshold; } { - ( threshold = consumeFloat()) { profile.setApproximateThreshold(threshold); } + ( threshold = floatValue()) { profile.setApproximateThreshold(threshold); } } /** @@ -2381,7 +2382,7 @@ void rankDegradationBinSize() : double freq; } { - freq = consumeFloat() + freq = floatValue() { deployLogger.logApplicationPackage(Level.WARNING, "Specifying 'doc-frequency' in 'rank-degradation' is deprecated and has no effect."); } } @@ -2406,7 +2407,7 @@ void rankDegradationPosbinSize() : double avgOcc; } { - avgOcc = consumeFloat() + avgOcc = floatValue() { deployLogger.logApplicationPackage(Level.WARNING, "Specifying 'occurrences-per-doc' in 'rank-degradation' is deprecated and has no effect."); } } @@ -2429,7 +2430,7 @@ void rankDegradation() : double freq; } { - ( freq = consumeFloat() + ( freq = floatValue() { deployLogger.logApplicationPackage(Level.WARNING, "Specifying 'rank-degradation-frequency' in 'rank-profile' is deprecated and has no effect."); } | lbrace() ( rankDegradationItem() ()*)+ ) @@ -2526,7 +2527,7 @@ Tensor tensorValue(TensorType type) : Number doubleValue = null; } { - ( mappedTensorValue(builder) | indexedTensorValues(builder) | doubleValue = consumeNumber() ) + ( mappedTensorValue(builder) | indexedTensorValues(builder) | doubleValue = number() ) { if (doubleValue != null) { if (type.rank() > 0) @@ -2540,7 +2541,10 @@ Tensor tensorValue(TensorType type) : /** A mapped or mixed tensor value. */ void mappedTensorValue(Tensor.Builder builder) : {} { - "{" ( mappedTensorBlock(builder) )* ( ()* mappedTensorBlock(builder) )* "}" + "{" + ( mappedTensorBlock(builder) )* + ( ()* mappedTensorBlock(builder) )* + "}" } @@ -2549,11 +2553,11 @@ void mappedTensorBlock(Tensor.Builder builder) : TensorAddress mappedAddress; } { - mappedAddress = tensorAddress(builder.type().mappedSubtype()) ()* + mappedAddress = tensorAddress(builder.type()) ()* ( mappedTensorCellValue(mappedAddress, builder) | indexedTensorBlockValues(mappedAddress, builder) ) } -void indexedTensorBlockValues(TensorAddress sparseAddress, Tensor.Builder builder) : +void indexedTensorBlockValues(TensorAddress mappedAddress, Tensor.Builder builder) : { List values = new ArrayList(); } @@ -2565,7 +2569,7 @@ void indexedTensorBlockValues(TensorAddress sparseAddress, Tensor.Builder builde for (int i = 0; i < values.size(); i++ ) { arrayValues[i] = values.get(i); } - boundBuilder.block(sparseAddress, arrayValues); + boundBuilder.block(mappedAddress, arrayValues); } } @@ -2598,7 +2602,7 @@ void indexedTensorValue(List values) : Number value; } { - value = consumeNumber() + value = number() { values.add(value.doubleValue()); } } @@ -2613,7 +2617,7 @@ void mappedTensorCellValue(TensorAddress address, Tensor.Builder builder) : TensorAddress tensorAddress(TensorType type) : { - TensorAddress.Builder builder = new TensorAddress.Builder(type); + TensorAddress.Builder builder = new TensorAddress.PartialBuilder(type); String label; } { @@ -2649,7 +2653,7 @@ double tensorCellValue() : Number value; } { - value = consumeNumber() + value = number() { return value.doubleValue(); } } @@ -2922,7 +2926,7 @@ int integer() : { } } /** Consumes a long or integer token and returns its numeric value. */ -long consumeLong() : { } +long longValue() : { } { ( { return Long.parseLong(token.image); } | { return Long.parseLong(token.image.substring(0, token.image.length()-1)); } @@ -2930,17 +2934,17 @@ long consumeLong() : { } } /** Consumes a floating-point token and returns its numeric value. */ -double consumeFloat() : { } +double floatValue() : { } { { return Double.valueOf(token.image); } } -Number consumeNumber() : +Number number() : { Number num; } { - (num = consumeFloat() | num = consumeLong()) { return num; } + ( num = floatValue() | num = longValue() ) { return num; } } /** Consumes an opening brace with leading and trailing newline tokens. */ -- cgit v1.2.3