jasder
/
antlr
1
0
Fork 1
Code Issues Pull Requests Releases 1 Wiki Activity

Specifically test for the ModelElement annotation on fields (not just any annotation will do)

This commit is contained in:
Sam Harwell 2012-07-18 15:38:31 -05:00
parent f220212a95
commit 45815d97f7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tool/src/org/antlr/v4/codegen/OutputModelWalker.java
View File

@ -30,6 +30,7 @@
package org.antlr.v4.codegen;
import org.antlr.v4.Tool;
import org.antlr.v4.codegen.model.ModelElement;
import org.antlr.v4.codegen.model.OutputModelObject;
import org.antlr.v4.tool.ErrorType;
import org.stringtemplate.v4.*;
@ -96,8 +97,11 @@ public class OutputModelWalker {
// COMPUTE STs FOR EACH NESTED MODEL OBJECT MARKED WITH @ModelElement AND MAKE ST ATTRIBUTE
Field fields[] = cl.getFields();
for (Field fi : fields) {
Annotation[] annotations = fi.getAnnotations();
if ( annotations.length==0 ) continue;
ModelElement annotation = fi.getAnnotation(ModelElement.class);
if (annotation == null) {
continue;
}
String fieldName = fi.getName();
// Just don't set @ModelElement fields w/o formal arg in target ST
if ( formalArgs.get(fieldName)==null ) continue;