Added support for T tags on groups of attributes and relationships to reduce redundancy.

Author: Bob Garner

src/main/antlr4/org/entityc/compiler/EntityLanguage.g4

@@ -364,7 +364,8 @@ attributes
 
 attributesBody
     :
-    ( attribute
+    ( tagStatement
+    | attribute
     )*
     ;
 
@@ -411,7 +412,8 @@ relationships
 
 relationshipsBody
     :
-    ( relationshipStatement
+    ( tagStatement
+    | relationshipStatement
     )*
     ;
 
@@ -835,7 +837,8 @@ domainAttributes
 
 domainAttributesBody
     :
-    ( domainAttributesRenameTo
+    ( tagStatement
+    | domainAttributesRenameTo
     | domainAttributesRenameAppendPrepend
     | domainAttributeReplaces
     | domainAttributeExclude
@@ -901,7 +904,8 @@ domainRelationships
 
 domainRelationshipsBody
     :
-    ( domainRelationship
+    ( tagStatement
+    | domainRelationship
     )*
     ;
 

src/main/java/org/entityc/compiler/ASTVisitor.java

@@ -113,6 +113,7 @@ public class ASTVisitor extends EntityLanguageBaseVisitor {
     private       MTDEInterface                                       currentDomainEntityInterface;
     private       MTDEInterfaceOperation                              currentDomainEntityInterfaceOperation;
     private       MTSpace                                             foundSpace;
+    private       List<Vector<String>> inheritedTags;
 
     public MTSpace getFoundSpace() {
         return foundSpace;
@@ -1309,6 +1310,19 @@ public MTTagSet visitViewTaggedListItem(EntityLanguageParser.ViewTaggedListItemC
         return tagSet;
     }
 
+    @Override
+    public Object visitRelationshipsBody(EntityLanguageParser.RelationshipsBodyContext ctx) {
+        if (ctx.tagStatement() != null) {
+            inheritedTags = tagStringsFromTagStatements(ctx.tagStatement());
+        }
+
+        Object object = super.visitRelationshipsBody(ctx);
+
+        inheritedTags = null;
+
+        return object;
+    }
+
     @Override
     public MTRelationship visitRelationshipStatement(EntityLanguageParser.RelationshipStatementContext ctx) {
         HalfRelationshipPlurality toPlurality = HalfRelationshipPlurality.ONE;
@@ -1350,6 +1364,9 @@ public MTRelationship visitRelationshipStatement(EntityLanguageParser.Relationsh
                                                          toEntityName, optional, parent, reverseName, toEntityIdName,
                                                          null);
 
+        if (inheritedTags != null) {
+            relationship.addTagsWithValues(inheritedTags);
+        }
         if (instantiation != null) {
             relationship.getTo().setTemplateInstantiation(instantiation);
         }
@@ -1909,12 +1926,26 @@ public Object visitDomainVirtualAttribute(EntityLanguageParser.DomainVirtualAttr
         return null;
     }
 
+    @Override
+    public Object visitDomainAttributesBody(EntityLanguageParser.DomainAttributesBodyContext ctx) {
+        if (ctx.tagStatement() != null) {
+            inheritedTags = tagStringsFromTagStatements(ctx.tagStatement());
+        }
+        Object object = super.visitDomainAttributesBody(ctx);
+        inheritedTags = null;
+
+        return object;
+    }
+
     @Override
     public Object visitDomainAttribute(EntityLanguageParser.DomainAttributeContext ctx) {
         String attributeName = ctx.id().getText();
         if (currentDomainEntity != null) {
-            MTDEAttribute                                   domainEntityAttribute = currentDomainEntity.addDomainAttributeWithName(
+            MTDEAttribute domainEntityAttribute = currentDomainEntity.addDomainAttributeWithName(
                     attributeName);
+            if (inheritedTags != null) {
+                domainEntityAttribute.addTagsWithValues(inheritedTags);
+            }
             EntityLanguageParser.DomainAttributeBodyContext bodyContext           = ctx.domainAttributeBody();
             if (bodyContext != null) {
                 if (bodyContext.descriptionStatement() != null) {
@@ -1928,19 +1959,35 @@ public Object visitDomainAttribute(EntityLanguageParser.DomainAttributeContext c
         return null;
     }
 
+    @Override
+    public Object visitDomainRelationshipsBody(EntityLanguageParser.DomainRelationshipsBodyContext ctx) {
+        if (ctx.tagStatement() != null) {
+            inheritedTags = tagStringsFromTagStatements(ctx.tagStatement());
+        }
+
+        Object object = super.visitDomainRelationshipsBody(ctx);
+
+        inheritedTags = null;
+
+        return object;
+    }
+
     @Override
     public Object visitDomainRelationship(EntityLanguageParser.DomainRelationshipContext ctx) {
         String relationshipName = ctx.id().getText();
         if (currentDomainEntity != null) {
-            MTDERelationship                                   domainEntityAttribute = currentDomainEntity.addDomainRelationshipWithName(
+            MTDERelationship domainEntityRelationship = currentDomainEntity.addDomainRelationshipWithName(
                     relationshipName);
+            if (inheritedTags != null) {
+                domainEntityRelationship.addTagsWithValues(inheritedTags);
+            }
             EntityLanguageParser.DomainRelationshipBodyContext bodyContext           = ctx.domainRelationshipBody();
             if (bodyContext != null) {
                 if (bodyContext.descriptionStatement() != null) {
-                    setNodeDescription(domainEntityAttribute, bodyContext.descriptionStatement(), false);
+                    setNodeDescription(domainEntityRelationship, bodyContext.descriptionStatement(), false);
                 }
                 if (bodyContext.tagStatement() != null) {
-                    domainEntityAttribute.addTagsWithValues(tagStringsFromTagStatements(bodyContext.tagStatement()));
+                    domainEntityRelationship.addTagsWithValues(tagStringsFromTagStatements(bodyContext.tagStatement()));
                 }
             }
         }
@@ -1980,6 +2027,20 @@ public Object visitDomainAttributeAdd(EntityLanguageParser.DomainAttributeAddCon
         return null;
     }
 
+    @Override
+    public Object visitAttributesBody(EntityLanguageParser.AttributesBodyContext ctx) {
+
+        if (ctx.tagStatement() != null) {
+            inheritedTags = tagStringsFromTagStatements(ctx.tagStatement());
+        }
+
+        Object object = super.visitAttributesBody(ctx);
+
+        inheritedTags = null;
+
+        return object;
+    }
+
     @Override
     public MTAttribute visitAttribute(EntityLanguageParser.AttributeContext ctx) {
         String attributeName = ctx.id(0).getText();
@@ -2065,6 +2126,10 @@ public MTAttribute visitAttribute(EntityLanguageParser.AttributeContext ctx) {
             }
         }
 
+        if (inheritedTags != null) {
+            attribute.addTagsWithValues(inheritedTags);
+        }
+
         EntityLanguageParser.AttributeBodyContext bodyContext = ctx.attributeBody();
         if (bodyContext != null) {
             if (bodyContext.descriptionStatement() != null) {

src/main/java/org/entityc/compiler/EntityCompiler.java

@@ -52,8 +52,8 @@
 
 public class EntityCompiler {
 
-    public static final  String              COMPILER_VERSION   = "0.16.0";
-    public static final  String              LANGUAGE_VERSION   = "0.13.0";
+    public static final  String              COMPILER_VERSION   = "0.17.0";
+    public static final  String              LANGUAGE_VERSION   = "0.14.0";
     private static final Map<String, String> defineValues       = new HashMap<>();
     private static final Set<String>         templateSearchPath = new HashSet<>();
     private static       CommandLine         commandLine;