1 files changed, 18 insertions, 13 deletions
diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj
index 1a0b518bbb2..e90df2776e0 100644
--- a/config-model/src/main/javacc/SDParser.jj
+++ b/config-model/src/main/javacc/SDParser.jj
@@ -639,7 +639,7 @@ void field(SDDocumentType document, Schema schema) :
         if (name != null && Schema.isReservedName(name.toLowerCase())) {
             throw new IllegalArgumentException("Reserved name '" + name + "' can not be used as a field name.");
         }
-        field = new TemporarySDField(name, type, document);
+        field = new TemporarySDField(document == null ? schema.getDocument() : document, name, type, document);
     }
     lbrace() (fieldBody(field, schema, document) (<NL>)*)* <RBRACE>
     {
@@ -668,7 +668,7 @@ void fieldSet(Schema schema) :
     |
       ( <QUERYCOMMAND> <COLON> (queryCommand = identifierWithDash() | queryCommand = quotedString())) { queryCommands.add(queryCommand); }
     |
-      ( matchSetting = match(new SDField(setName, DataType.STRING)) ) { matchSettings.add(matchSetting); }
+      ( matchSetting = match(new SDField(null, setName, DataType.STRING)) ) { matchSettings.add(matchSetting); }
     )(<NL>)*)+
   <RBRACE>
   {
@@ -698,11 +698,13 @@ void annotationOutside(Schema schema) :
     <ANNOTATION> name = identifier()
     {
         type = new SDAnnotationType(name.trim());
+        if (schema.getDocument() == null) {
+            throw new IllegalArgumentException("Can't add annotation '"+name+"' to a document type, define a document type first or declare the annotation inside of one.");
+        }
     }
     [ inheritsAnnotation(type) (<NL>)* ]
-    lbrace() (type = annotationBody(schema, type)) <RBRACE>
+    lbrace() (type = annotationBody(schema, schema.getDocument(), type)) <RBRACE>
     {
-        if (schema.getDocument()==null) throw new IllegalArgumentException("Can't add annotation '"+name+"' to a document type, define a document type first or declare the annotation inside of one.");
         schema.addAnnotation(type);
     }
 }
@@ -723,7 +725,7 @@ void annotation(Schema schema, SDDocumentType document) :
         type = new SDAnnotationType(name.trim());
     }
     [ inheritsAnnotation(type) (<NL>)* ]
-    lbrace() (type = annotationBody(schema, type)) <RBRACE>
+    lbrace() (type = annotationBody(schema, document, type)) <RBRACE>
     {
         document.addAnnotation(type);
     }
@@ -737,12 +739,12 @@ void annotation(Schema schema, SDDocumentType document) :
  * @param type     the type being built
  * @return a modified or new AnnotationType instance
  */
-SDAnnotationType annotationBody(Schema schema, SDAnnotationType type) :
+SDAnnotationType annotationBody(Schema schema, SDDocumentType repo, SDAnnotationType type) :
 {
     SDDocumentType struct = new SDDocumentType("annotation." + type.getName(), schema);
 }
 {
-    (structFieldDefinition(struct) (<NL>)*)*
+    (structFieldDefinition(repo, struct) (<NL>)*)*
     {
         if (struct.getFieldCount() > 0) { // Must account for the temporary TemporarySDField.
             type = new SDAnnotationType(type.getName(), struct, type.getInherits());
@@ -809,9 +811,13 @@ SDDocumentType structDefinition(Schema schema, SDDocumentType repo) :
     SDDocumentType struct;
 }
 {
-    ( <STRUCT> name = identifier() (<NL>)* { struct = new SDDocumentType(name, schema); }
+    ( <STRUCT> name = identifier() (<NL>)* {
+        if (repo == null)
+            throw new IllegalArgumentException("Can't add struct '"+name+"' to a document type, define a document type first or declare the struct inside of one.");
+        struct = new SDDocumentType(name, schema);
+    }
     [ inheritsDocument(struct) (<NL>)* ]
-    lbrace() (structFieldDefinition(struct) (<NL>)*)* <RBRACE> )
+    lbrace() (structFieldDefinition(repo, struct) (<NL>)*)* <RBRACE> )
     {
         try {
             docMan.getDataType(name);
@@ -819,7 +825,6 @@ SDDocumentType structDefinition(Schema schema, SDDocumentType repo) :
         } catch (IllegalArgumentException e) {
             // empty
         }
-        if (repo==null) throw new IllegalArgumentException("Can't add struct '"+name+"' to a document type, define a document type first or declare the struct inside of one.");
         SDDocumentType sdtype = repo.getOwnedType(struct.getDocumentName());
         DataType stype = sdtype != null
                          ? sdtype.getStruct()
@@ -828,7 +833,7 @@ SDDocumentType structDefinition(Schema schema, SDDocumentType repo) :
         return struct;
     }
 }
-
+        
 /**
  * This rule consumes a data type block from within a field element.
  *
@@ -921,7 +926,7 @@ DataType wildCardType() :
  *
  * @param struct The struct to modify.
  */
-void structFieldDefinition(SDDocumentType struct) :
+void structFieldDefinition(SDDocumentType document, SDDocumentType struct) :
 {
     String name;
     SDField field;
@@ -932,7 +937,7 @@ void structFieldDefinition(SDDocumentType struct) :
         if (name != null && Schema.isReservedName(name.toLowerCase())) {
             throw new IllegalArgumentException("Reserved name '" + name + "' can not be used as a field name.");
         }
-        field = new TemporarySDField(name, type, struct);
+        field = new TemporarySDField(document, name, type, struct);
         struct.addField(field);
     }
     lbrace() (id(field,struct) (<NL>)*)? (match(field) (<NL>)*)* <RBRACE> {