update schema

Author: sdkrystian

mrdox.rnc

@@ -51,10 +51,9 @@ grammar
         (
             BaseInfo |
             Attr |
-            MemberTypeInfo |
             element friend { ID } |
             Javadoc? |
-            Scope
+            RecordScope
         ) *
     )
 
@@ -67,17 +66,6 @@ grammar
             ID
         }
 
-    MemberTypeInfo =
-        element data
-        {
-            Name,
-            attribute type { text },
-            attribute value { text } ?,
-            Access ?,
-            ID ?,
-            Attr *
-        }
-
     #---------------------------------------------
 
     Function =
@@ -140,6 +128,23 @@ grammar
 
     #---------------------------------------------
 
+    Field =
+        element data
+        {
+            Name,
+            Access?,
+            ID,
+            attribute default { text } ?,
+            (
+                Location &
+                Attr * &
+                element type { Name, ID ? } &
+                Javadoc ?
+            )
+        }
+
+    #---------------------------------------------
+
     Var =
         element variable
         {
@@ -220,6 +225,15 @@ grammar
             Enum      |
             Var)*
 
+    RecordScope = (
+            Namespace |
+            Record    |
+            Function  |
+            Typedef   |
+            Enum      |
+            Field     |
+            Var)*
+
     # JavaDoc not in a nested grammar , so we can convert it to a XSD
 
     Javadoc = element doc {Brief ?, Node* }

source/-XML/XMLWriter.cpp

@@ -449,9 +449,9 @@ writeField(
 {
     tags_.open(dataMemberTagName, {
         { "name", I.Name },
-        { "default", I.Default, ! I.Default.empty() },
         { access },
-        { I.id }
+        { I.id },
+        { "default", I.Default, ! I.Default.empty() }
     });
 
     writeSymbol(I);