diff options
author | Lester Solbakken <lesters@users.noreply.github.com> | 2022-03-24 09:41:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-24 09:41:25 +0100 |
commit | 0f0d8f84e5ff63f3fb01c650d38bbd0800150941 (patch) | |
tree | e8bc8987174d84702e430577e83c0d71661ba958 /config-model/src/main/javacc/SDParser.jj | |
parent | b28e1c6946df008a3cf802b0b7b8931f6b9b2f6a (diff) | |
parent | 430aca046a032fd7f5aa2de6f6f6bb706d6de624 (diff) |
Merge pull request #21761 from vespa-engine/lesters/multiple-embedders
Lesters/multiple embedders
Diffstat (limited to 'config-model/src/main/javacc/SDParser.jj')
-rw-r--r-- | config-model/src/main/javacc/SDParser.jj | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj index ab0cdefc355..aeffe6e5c39 100644 --- a/config-model/src/main/javacc/SDParser.jj +++ b/config-model/src/main/javacc/SDParser.jj @@ -112,7 +112,7 @@ public class SDParser { */ @SuppressWarnings("deprecation") private IndexingOperation newIndexingOperation(boolean multiline) throws ParseException { - return newIndexingOperation(multiline, new SimpleLinguistics(), Embedder.throwsOnUse); + return newIndexingOperation(multiline, new SimpleLinguistics(), Embedder.throwsOnUse.asMap()); } /** @@ -121,13 +121,13 @@ public class SDParser { * @param multiline Whether or not to allow multi-line expressions. * @param linguistics What to use for tokenizing. */ - private IndexingOperation newIndexingOperation(boolean multiline, Linguistics linguistics, Embedder embedder) throws ParseException { + private IndexingOperation newIndexingOperation(boolean multiline, Linguistics linguistics, Map<String, Embedder> embedders) throws ParseException { SimpleCharStream input = (SimpleCharStream)token_source.input_stream; if (token.next != null) { input.backup(token.next.image.length()); } try { - return IndexingOperation.fromStream(input, multiline, linguistics, embedder); + return IndexingOperation.fromStream(input, multiline, linguistics, embedders); } finally { token.next = null; jj_ntk = -1; |