diff options
author | Jon Bratseth <bratseth@oath.com> | 2022-02-01 23:04:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-01 23:04:53 +0100 |
commit | 58dbe08ac1cb5783787d4abb826b6ffe7d9f6714 (patch) | |
tree | abf83f8aba13bb612a73e15e483910edea649f88 /config-model/src/main/javacc/SDParser.jj | |
parent | b754deecd3cd7856f7c407dbab479e950316a9ab (diff) | |
parent | d91569194fe13bed6c2fef28fc9b5633d6299a5f (diff) |
Merge pull request #21011 from vespa-engine/bratseth/avoid-schema-dir
Bratseth/avoid schema dir
Diffstat (limited to 'config-model/src/main/javacc/SDParser.jj')
-rw-r--r-- | config-model/src/main/javacc/SDParser.jj | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj index 5b7721c0fe9..b6a9ab789bf 100644 --- a/config-model/src/main/javacc/SDParser.jj +++ b/config-model/src/main/javacc/SDParser.jj @@ -395,16 +395,15 @@ SPECIAL_TOKEN : * The rule consumes any schema and returns the corresponding object. This is the only production that should * ever consume leading newlines. * - * @param dir the directory containing the file being parsed * @return the schema object */ -Schema schema(DocumentTypeManager docMan, String dir) : +Schema schema(DocumentTypeManager docMan) : { this.docMan = docMan; Schema schema; } { - (<NL>)* (schema = rootSchema(dir) | schema = rootDocument(dir)) + (<NL>)* (schema = rootSchema() | schema = rootDocument()) { return schema; } } @@ -412,10 +411,9 @@ Schema schema(DocumentTypeManager docMan, String dir) : * This rule consumes a proper schema block. This and rootDocument() are the only rules that should ever consume * trailing newline tokens. * - * @param dir the directory containing the file being parsed. * @return the schema definition object. */ -Schema rootSchema(String dir) : +Schema rootSchema() : { String name; String inherited = null; @@ -459,10 +457,9 @@ Object rootSchemaItem(Schema schema) : { } /** * Consumes a schema definition that contains only documents to be used for inheritance, etc. * - * @param dir the directory containing the file being parsed. * @return the schema definition object. */ -Schema rootDocument(String dir) : +Schema rootDocument() : { Schema schema = new DocumentOnlySchema(applicationPackage, fileRegistry, deployLogger, properties); } |