diff options
author | Arne Juul <arnej@vespa.ai> | 2024-02-21 08:26:55 +0000 |
---|---|---|
committer | Arne Juul <arnej@vespa.ai> | 2024-02-21 08:26:55 +0000 |
commit | 31e7f346309152a4db547a2bd2160a9e2ca0b7b1 (patch) | |
tree | b7ddf280cf774bc9b69a0cbbb6ed9d3417016d2c /config-model/src/main | |
parent | 54b293758a77be1b1ce50ac8443fcb7dfb629acd (diff) |
demand newline between declarations of inputs
Diffstat (limited to 'config-model/src/main')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DataTypeRecognizer.java | 6 | ||||
-rw-r--r-- | config-model/src/main/javacc/SchemaParser.jj | 4 |
2 files changed, 2 insertions, 8 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 ecacfa43757..0c3b750d876 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,12 +35,6 @@ 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 f298293ed57..7a1a169747e 100644 --- a/config-model/src/main/javacc/SchemaParser.jj +++ b/config-model/src/main/javacc/SchemaParser.jj @@ -2005,7 +2005,8 @@ void inputs(ParsedRankProfile profile) : } { <INPUTS> <LBRACE> (<NL>)* - ( input(profile) (<NL>)*) * + (input(profile))? + (<NL> (input(profile))?)* <RBRACE> } @@ -2037,7 +2038,6 @@ Reference inputName() : TensorType valueType(Reference reference) : { TensorType type; - } { ( |