summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorArne Juul <arnej@yahooinc.com>2024-02-28 11:10:49 +0000
committerArne Juul <arnej@yahooinc.com>2024-02-28 11:10:49 +0000
commite336eb77f61caf420db8bde4d8cb58a1f3b1e76c (patch)
tree107d0c369a2d5922798abf654d98aac3b2e5c8d1 /config-model
parent5444118b7f9e3001bda87ab83ad99320861c332c (diff)
revert newline requirement between inputs
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/javacc/SchemaParser.jj3
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java2
2 files changed, 2 insertions, 3 deletions
diff --git a/config-model/src/main/javacc/SchemaParser.jj b/config-model/src/main/javacc/SchemaParser.jj
index 3cffd623acb..7d251bd3514 100644
--- a/config-model/src/main/javacc/SchemaParser.jj
+++ b/config-model/src/main/javacc/SchemaParser.jj
@@ -2009,8 +2009,7 @@ void inputs(ParsedRankProfile profile) :
}
{
<INPUTS> <LBRACE> (<NL>)*
- (input(profile))?
- (<NL> (input(profile))?)*
+ ( input(profile) (<NL>)*) *
<RBRACE>
}
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java
index d1cd6a60821..5b501bad876 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java
@@ -277,7 +277,7 @@ public class DocumentDatabaseTestCase {
String inputsProfile =
" rank-profile inputs {" +
" inputs {" +
- " query(foo) tensor<float>(x[10])\n" +
+ " query(foo) tensor<float>(x[10])" +
" query(bar) tensor(key{},x[1000])" +
" }" +
" }";