diff options
Diffstat (limited to 'config-model/src/main/javacc/IntermediateParser.jj')
-rw-r--r-- | config-model/src/main/javacc/IntermediateParser.jj | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/config-model/src/main/javacc/IntermediateParser.jj b/config-model/src/main/javacc/IntermediateParser.jj index 67e8b84c66d..cf0ad9eb101 100644 --- a/config-model/src/main/javacc/IntermediateParser.jj +++ b/config-model/src/main/javacc/IntermediateParser.jj @@ -976,13 +976,10 @@ void summaryTo(ParsedField field) : { <SUMMARYTO> [name = identifier()] <COLON> destination = identifier() { - psf = new ParsedSummaryField(name); + psf = field.summaryFieldFor(name); psf.addDestination(destination); } ( <COMMA> destination = identifier() { psf.addDestination(destination); } )* - { - field.addSummaryField(psf); - } } /** @@ -1184,59 +1181,47 @@ void summaryInDocument(ParsedDocumentSummary docsum) : * * @param field The field to modify. */ -void summaryInField(ParsedField field) : +void summaryInField(ParsedField field) : { } { - ParsedSummaryField psf; -} -{ - ( <SUMMARY> ( LOOKAHEAD(2) psf = summaryInFieldShort(field.name()) - | psf = summaryInFieldLong(field.name())) ) - { - field.addSummaryField(psf); - } + <SUMMARY> ( LOOKAHEAD(2) summaryInFieldShort(field) + | summaryInFieldLong(field) ) } /** * This rule consumes a single-line summary field. - * - * @return The consumed summary field. */ -ParsedSummaryField summaryInFieldShort(String fieldName) : +void summaryInFieldShort(ParsedField field) : { - String name = fieldName; + String name = field.name(); ParsedSummaryField psf; } { [ name = identifier() ] { - psf = new ParsedSummaryField(name); + psf = field.summaryFieldFor(name); } <COLON> ( <DYNAMIC> { psf.setDynamic(); } | <MATCHEDELEMENTSONLY> { psf.setMatchedElementsOnly(); } | (<FULL> | <STATIC>) { psf.setFull(); } ) - { return psf; } } /** * This rule consumes a multi-line summary field. - * - * @return The consumed summary field. */ -ParsedSummaryField summaryInFieldLong(String fieldName) : +void summaryInFieldLong(ParsedField field) : { - String name = fieldName; - ParsedType type = null; + String name = field.name(); + ParsedType type = field.getType(); ParsedSummaryField psf; } { ( [ name = identifier() [ <TYPE> type = dataType() ] ] lbrace() { - psf = new ParsedSummaryField(name, type); + psf = field.summaryFieldFor(name, type); } (summaryItem(psf) (<NL>)*)* <RBRACE> ) - { return psf; } } /** |