diff options
| author | Arne Juul <arnej@yahooinc.com> | 2023-04-21 13:11:46 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahooinc.com> | 2023-04-21 13:11:46 +0000 |
| commit | 64d0414f237cd31484ec234d3582dab1021f03b4 (patch) | |
| tree | e0d7424f0d38d0f1963430033d37f1ea292070f9 /config-model/src/main/javacc | |
| parent | eaedf1a1417e5592ebb736aa34a7b72bd03fe169 (diff) | |
for document-summary blocks:
* for existing fields, allow skipping the type declaration
* if type is same except for weighted-set flags, adjust type to match
* for this to work with inheritance, wire in inherited schema early
Diffstat (limited to 'config-model/src/main/javacc')
| -rw-r--r-- | config-model/src/main/javacc/SchemaParser.jj | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config-model/src/main/javacc/SchemaParser.jj b/config-model/src/main/javacc/SchemaParser.jj index 9d6e16b3f67..9a38fdc673e 100644 --- a/config-model/src/main/javacc/SchemaParser.jj +++ b/config-model/src/main/javacc/SchemaParser.jj @@ -1075,15 +1075,16 @@ void attributeSetting(ParsedAttribute attribute) : void summaryInDocument(ParsedDocumentSummary docsum) : { String name; - ParsedType type; + ParsedType type = null; ParsedSummaryField psf; } { <SUMMARY> name = identifierWithDash() { } - <TYPE> type = dataType() { + (<TYPE> type = dataType())? + lbrace() { psf = new ParsedSummaryField(name, type); } - lbrace() (summaryItem(psf) (<NL>)*)* <RBRACE> + (summaryItem(psf) (<NL>)*)* <RBRACE> { var old = docsum.addField(psf); if (old != null) { |