Support struct inheritance

1 files changed, 4 insertions, 5 deletions

diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj
index 07171dea803..d2894442ab9 100644
--- a/config-model/src/main/javacc/SDParser.jj
+++ b/config-model/src/main/javacc/SDParser.jj
@@ -840,14 +840,13 @@ void structOutside(Schema schema) :
 SDDocumentType structDefinition(Schema schema, SDDocumentType repo) :
 {
     String name;
+    String inherited = null;
     SDDocumentType struct;
 }
 {
-    <STRUCT> name = identifier()
-    {
-        struct = new SDDocumentType(name, schema);
-    }
-    lbrace() (structFieldDefinition(struct) (<NL>)*)* <RBRACE>
+    ( <STRUCT> name = identifier() (<NL>)* { struct = new SDDocumentType(name, schema); }
+    [ inheritsDocument(struct) (<NL>)* ]
+    lbrace() (structFieldDefinition(struct) (<NL>)*)* <RBRACE> )
     {
         try {
             docMan.getDataType(name);