Revert "demand newline between declarations of inputs"

6 files changed, 21 insertions, 15 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DataTypeRecognizer.java b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DataTypeRecognizer.java
index 0c3b750d876..ecacfa43757 100644
--- a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DataTypeRecognizer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DataTypeRecognizer.java
@@ -35,6 +35,12 @@ public class DataTypeRecognizer {
     DataTypeRecognizer() {
     }
 
+    DataTypeRecognizer(DataTypeCollection dtc) {
+        for (var type : dtc.getTypes()) {
+            System.err.println("added: "+nameOf(type));
+        }
+    }
+
     String nameOf(Object type) {
         return toUniqueNames.computeIfAbsent(type, t -> makeUniqueName(t));
     }
diff --git a/config-model/src/main/javacc/SchemaParser.jj b/config-model/src/main/javacc/SchemaParser.jj
index 7a1a169747e..f298293ed57 100644
--- a/config-model/src/main/javacc/SchemaParser.jj
+++ b/config-model/src/main/javacc/SchemaParser.jj
@@ -2005,8 +2005,7 @@ void inputs(ParsedRankProfile profile) :
 }
 {
     <INPUTS> <LBRACE> (<NL>)*
-    (input(profile))?
-    (<NL> (input(profile))?)*
+      ( input(profile) (<NL>)*) *
     <RBRACE>
 }
 
@@ -2038,6 +2037,7 @@ Reference inputName() :
 TensorType valueType(Reference reference) :
 {
     TensorType type;
+
 }
 {
     (
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java
index b41d92bd63f..e5eba3d416a 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java
@@ -534,7 +534,7 @@ public class IndexingAndDocprocRoutingTest extends ContentBaseTest {
                "  }" +
                "  rank-profile inputs {" +
                "    inputs {" +
-               "      query(foo) tensor<float>(x[10])\n" +
+               "      query(foo) tensor<float>(x[10])" +
                "      query(bar) tensor(key{},x[1000])" +
                "    }" +
                "  }" +
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])" +
                         "    }" +
                         "  }";
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaInfoTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaInfoTestCase.java
index 8502bfa92f4..8e14ff9e5e6 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaInfoTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaInfoTestCase.java
@@ -130,16 +130,16 @@ public class SchemaInfoTestCase {
         String inputs =
                 "  rank-profile inputs {" +
                         "    inputs {" +
-                        "      query(foo) tensor<float>(x[10])\n"+
-                        "      query(bar) tensor(key{},x[1000])\n"+
-                        "      query(myDouble1) double: 0.5\n"+
-                        "      query(myDouble2) tensor()\n"+
-                        "      query(myMap) tensor(key{}): { label1:1.0,\n \"label2\": 2.0, 'label3': 3.0 }\n"+
-                        "      query(myVector1) tensor(x[3]):\n\n[1 ,2.0,3]\n"+
-                        "      query(myVector2) tensor(x[3]):{{x:0}:1,{x: 1}: 2 , { x:2}:3.0 }\n"+
-                        "      query(myMatrix) tensor(x[2],y[3]):[[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]]\n"+
-                        "      query(myMixed1) tensor(key{},x[2]): { key1:[-1.0, 1.1], key2: [1,2]}\n"+
-                        "      query(myMixed2) tensor(k1{},k2{},x[2]): { {k1:l1,k2:l1}:[-1.0, 1.1], {k1:l1,k2:l2}: [1,2]}\n"+
+                        "      query(foo) tensor<float>(x[10])" +
+                        "      query(bar) tensor(key{},x[1000])" +
+                        "      query(myDouble1) double: 0.5" +
+                        "      query(myDouble2) tensor()" +
+                        "      query(myMap) tensor(key{}): { label1:1.0,\n \"label2\": 2.0, 'label3': 3.0 }" +
+                        "      query(myVector1) tensor(x[3]):\n\n[1 ,2.0,3]" +
+                        "      query(myVector2) tensor(x[3]):{{x:0}:1,{x: 1}: 2 , { x:2}:3.0 }" +
+                        "      query(myMatrix) tensor(x[2],y[3]):[[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]]" +
+                        "      query(myMixed1) tensor(key{},x[2]): { key1:[-1.0, 1.1], key2: [1,2]}" +
+                        "      query(myMixed2) tensor(k1{},k2{},x[2]): { {k1:l1,k2:l1}:[-1.0, 1.1], {k1:l1,k2:l2}: [1,2]}" +
                         "    }" +
                         "  }";
         List<String> schemas = List.of("type1", "type2");
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java
index b9bc34688b7..1367b7a38ff 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java
@@ -42,7 +42,7 @@ public class ApplicationPackageUtils {
                "  }" +
                "  rank-profile inputs {" +
                "    inputs {" +
-               "      query(foo) tensor<float>(x[10])\n" +
+               "      query(foo) tensor<float>(x[10])" +
                "      query(bar) tensor(key{},x[1000])" +
                "    }" +
                "  }" +