spec: Define generic attribute key types

4 files changed, 19 insertions, 11 deletions

diff --git a/spec/spec/build-action-set-test-state.yml b/spec/spec/build-action-set-test-state.yml
index c630c8f8..b8a97192 100644
--- a/spec/spec/build-action-set-test-state.yml
+++ b/spec/spec/build-action-set-test-state.yml
@@ -19,7 +19,8 @@ spec-info:
         ${build-ada-test-program:/spec-name} item.  Due to the processing order
         of items, there is no way to check if the name specified by the
         attribute key is valid.
-      spec-type: build-test-state
+      key-spec-type: name
+      value-spec-type: build-test-state
     mandatory-attributes: all
 spec-name: Build Option Set Test State Action
 spec-type: build-action-set-test-state
diff --git a/spec/spec/spec-attributes.yml b/spec/spec/spec-attributes.yml
index 4d4f1686..eb489783 100644
--- a/spec/spec/spec-attributes.yml
+++ b/spec/spec/spec-attributes.yml
@@ -13,9 +13,12 @@ spec-info:
     description: null
     generic-attributes:
       description: |
-        The generic attributes specify an attribute set.
-      spec-type: spec-attribute-value
+        Each generic attribute specifies an explicit attribute of the attribute
+        set.  The key of the each generic attribute defines the attribute key
+        of the explicit attribute.
+      key-spec-type: name
+      value-spec-type: spec-attribute-value
     mandatory-attributes: none
-spec-name: Specification Attribute
+spec-name: Specification Explicit Attributes
 spec-type: spec-attributes
 type: spec
diff --git a/spec/spec/spec-dict.yml b/spec/spec/spec-dict.yml
index d917c52e..1fae4d15 100644
--- a/spec/spec/spec-dict.yml
+++ b/spec/spec/spec-dict.yml
@@ -12,7 +12,7 @@ spec-info:
     attributes:
       attributes:
         description: |
-          It shall be the specification of the set of explicit attributes.
+          It shall specify the explicit attributes of the attribute set.
         spec-type: spec-attributes
       description:
         description: |
@@ -20,12 +20,11 @@ spec-info:
         spec-type: optional-str
       generic-attributes:
         description: |
-          It shall be the specification of the generic attributes of the
-          attribute set.
+          It shall specify the generic attributes of the attribute set.
         spec-type: spec-generic-attributes
       mandatory-attributes:
         description: |
-          It shall be the set of mandatory attributes of the attribute set.
+          It shall specify the mandatory attributes of the attribute set.
         spec-type: spec-mandatory-attributes
     description: |
       This set of attributes specifies a set of attributes.
diff --git a/spec/spec/spec-generic-attributes.yml b/spec/spec/spec-generic-attributes.yml
index 50e89bc8..8f9b4180 100644
--- a/spec/spec/spec-generic-attributes.yml
+++ b/spec/spec/spec-generic-attributes.yml
@@ -14,14 +14,19 @@ spec-info:
         description: |
           It shall be the description of the generic attributes.
         spec-type: optional-str
-      spec-type:
+      key-spec-type:
+        description: |
+          It shall be the specification type of the generic attribute keys.
+        spec-type: name
+      value-spec-type:
         description: |
           It shall be the specification type of the generic attribute values.
         spec-type: name
     description: |
       This set of attributes specifies generic attributes.  Generic attributes
-      are attributes which are not explicitly defined.  They are restricted to
-      a uniform attribute value type.
+      are attributes which are not explicitly specified by
+      ${spec-attributes:/spec-name}.  They are restricted to uniform attribute
+      key and value types.
     mandatory-attributes: all
 spec-name: Specification Generic Attributes
 spec-type: spec-generic-attributes