diff options
Diffstat (limited to 'config-model/src/main/javacc')
-rw-r--r-- | config-model/src/main/javacc/IntermediateParser.jj | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/config-model/src/main/javacc/IntermediateParser.jj b/config-model/src/main/javacc/IntermediateParser.jj index 873196d8bda..01f111df284 100644 --- a/config-model/src/main/javacc/IntermediateParser.jj +++ b/config-model/src/main/javacc/IntermediateParser.jj @@ -427,7 +427,7 @@ void rootSchemaItem(ParsedSchema schema) : { } | structOutside(schema) | annotationOutside(schema) | fieldSet(schema) - | onnxModel(schema) + | onnxModelInSchema(schema) // Deprecated: TODO: Emit warning when on Vespa 8 ) } @@ -1703,31 +1703,38 @@ void hnswIndexBody(HnswIndexParams.Builder params) : | <MULTITHREADEDINDEXING> <COLON> bool = bool() { params.setMultiThreadedIndexing(bool); } ) } -/** - * Consumes a onnx-model block of a schema element. - * - * @param schema the schema object to add content to. - */ -void onnxModel(ParsedSchema schema) : +void onnxModelInSchema(ParsedSchema schema) : +{ + OnnxModel onnxModel; +} +{ + onnxModel = onnxModel() { schema.add(onnxModel); } +} + +void onnxModelInProfile(ParsedRankProfile profile) : +{ + OnnxModel onnxModel; +} +{ + onnxModel = onnxModel() { profile.add(onnxModel); } +} + +/** Consumes an onnx-model block. */ +OnnxModel onnxModel() : { String name; OnnxModel onnxModel; } { - ( <ONNXMODEL> name = identifier() - { - onnxModel = new OnnxModel(name); - } + ( <ONNXMODEL> name = identifier() { onnxModel = new OnnxModel(name); } lbrace() (onnxModelItem(onnxModel) (<NL>)*)+ <RBRACE> ) - { - schema.addOnnxModel(onnxModel); - } + { return onnxModel; } } /** - * This rule consumes an onnx-model block. + * Consumes an onnx-model block. * - * @param onnxModel The onnxModel to modify. + * @param onnxModel the onnxModel to modify */ void onnxModelItem(OnnxModel onnxModel) : { @@ -1849,6 +1856,7 @@ void rankProfileItem(ParsedSchema schema, ParsedRankProfile profile) : { } | constants(schema, profile) | matchFeatures(profile) | summaryFeatures(profile) + | onnxModelInProfile(profile) | strict(profile) ) } |