spec: Use common wording

7 files changed, 117 insertions, 102 deletions

diff --git a/spec/rtems/barrier/req/create.yml b/spec/rtems/barrier/req/create.yml
index c7936882..c70bf443 100644
--- a/spec/rtems/barrier/req/create.yml
+++ b/spec/rtems/barrier/req/create.yml
@@ -89,20 +89,22 @@ post-conditions:
   test-epilogue: null
   test-prologue: |
     rtems_status_code sc;
-- name: IdValue
+- name: IdVar
   states:
-  - name: Assigned
+  - name: Set
     test-code: |
       T_eq_ptr( ctx->id, &ctx->id_value );
       T_ne_u32( ctx->id_value, INVALID_ID );
     text: |
-      The value of the object identifier variable shall be equal to the object
-      identifier of the barrier created by the ${../if/create:/name} call.
-  - name: Unchanged
+      The value of the object referenced by the ${../if/create:/params[3]/name}
+      parameter shall be set to the object identifier of the created barrier
+      after the return of the ${../if/create:/name} call.
+  - name: Nop
     test-code: |
       T_eq_u32( ctx->id_value, INVALID_ID );
     text: |
-      The value of the object identifier variable shall be unchanged by the
+      Objects referenced by the ${../if/create:/params[3]/name} parameter in
+      past calls to ${../if/create:/name} shall not be accessed by the
       ${../if/create:/name} call.
   test-epilogue: null
   test-prologue: null
@@ -339,7 +341,7 @@ transition-map:
     Status: InvName
     Name: Invalid
     Class: NoObj
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Name:
     - Invalid
@@ -352,7 +354,7 @@ transition-map:
     Status: InvAddr
     Name: Invalid
     Class: NoObj
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Name:
     - Valid
@@ -366,7 +368,7 @@ transition-map:
     Status: Ok
     Name: Valid
     Class: Manual
-    IdValue: Assigned
+    IdVar: Set
   pre-conditions:
     Name:
     - Valid
@@ -383,7 +385,7 @@ transition-map:
     Status: InvNum
     Name: Invalid
     Class: NoObj
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Name:
     - Valid
@@ -399,7 +401,7 @@ transition-map:
     Status: Ok
     Name: Valid
     Class: Auto
-    IdValue: Assigned
+    IdVar: Set
   pre-conditions:
     Name:
     - Valid
@@ -416,7 +418,7 @@ transition-map:
     Status: TooMany
     Name: Invalid
     Class: NoObj
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Name:
     - Valid
@@ -433,7 +435,7 @@ transition-map:
     Status: TooMany
     Name: Invalid
     Class: NoObj
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Name:
     - Valid
diff --git a/spec/rtems/barrier/req/release.yml b/spec/rtems/barrier/req/release.yml
index e47a313c..9b0dffef 100644
--- a/spec/rtems/barrier/req/release.yml
+++ b/spec/rtems/barrier/req/release.yml
@@ -29,20 +29,22 @@ post-conditions:
       ${../../status/if/invalid-address:/name}.
   test-epilogue: null
   test-prologue: null
-- name: Released
+- name: ReleasedVar
   states:
-  - name: Valid
+  - name: Set
     test-code: |
       T_eq_u32( ctx->released_value, ctx->waiting_tasks );
     text: |
-      The value of the variable for the number of released tasks shall equal
-      the number of tasks released by the ${../if/release:/name} call.
-  - name: Unchanged
+      The value of the object referenced by the
+      ${../if/release:/params[1]/name} parameter shall be set to the number of
+      released tasks after the return of the ${../if/release:/name} call.
+  - name: Nop
     test-code: |
       T_eq_u32( ctx->released_value, RELEASED_INVALID_VALUE );
     text: |
-      The value of variable for the number of released tasks shall be unchanged
-      by the ${../if/release:/name} call.
+      Objects referenced by the ${../if/release:/params[1]/name} parameter in
+      past calls to ${../if/release:/name} shall not be accessed by the
+      ${../if/release:/name} call.
   test-epilogue: null
   test-prologue: null
 pre-conditions:
@@ -275,7 +277,7 @@ transition-map:
 - enabled-by: true
   post-conditions:
     Status: InvAddr
-    Released: Unchanged
+    ReleasedVar: Nop
   pre-conditions:
     Id: all
     Released:
@@ -284,7 +286,7 @@ transition-map:
 - enabled-by: true
   post-conditions:
     Status: InvId
-    Released: Unchanged
+    ReleasedVar: Nop
   pre-conditions:
     Id:
     - NoObj
@@ -294,7 +296,7 @@ transition-map:
 - enabled-by: true
   post-conditions:
     Status: Ok
-    Released: Valid
+    ReleasedVar: Set
   pre-conditions:
     Id:
     - Manual
diff --git a/spec/rtems/message/req/construct-errors.yml b/spec/rtems/message/req/construct-errors.yml
index 435792a0..8ec11a4a 100644
--- a/spec/rtems/message/req/construct-errors.yml
+++ b/spec/rtems/message/req/construct-errors.yml
@@ -74,21 +74,23 @@ post-conditions:
   test-prologue: |
     rtems_status_code sc;
     rtems_id          id;
-- name: IdValue
+- name: IdVar
   states:
-  - name: Assigned
+  - name: Set
     test-code: |
       T_eq_ptr( ctx->id, &ctx->id_value );
       T_ne_u32( ctx->id_value, INVALID_ID );
     text: |
-      The value of the object identifier variable shall be equal to the object
-      identifier of the message queue constructed by the
+      The value of the object referenced by the
+      ${../if/construct:/params[1]/name} parameter shall be set to the object
+      identifier of the constructed message queue after the return of the
       ${../if/construct:/name} call.
-  - name: Unchanged
+  - name: Nop
     test-code: |
       T_eq_u32( ctx->id_value, INVALID_ID );
     text: |
-      The value of the object identifier variable shall be unchanged by the
+      Objects referenced by the ${../if/construct:/params[1]/name} parameter in
+      past calls to ${../if/construct:/name} shall not be accessed by the
       ${../if/construct:/name} call.
   test-epilogue: null
   test-prologue: null
@@ -325,7 +327,7 @@ transition-map:
   post-conditions:
     Status: Ok
     Name: Valid
-    IdValue: Assigned
+    IdVar: Set
   pre-conditions:
     Area:
     - Valid
@@ -345,7 +347,7 @@ transition-map:
   post-conditions:
     Status: InvName
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Area: all
     AreaSize: all
@@ -359,7 +361,7 @@ transition-map:
   post-conditions:
     Status: InvAddr
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Area: all
     AreaSize: all
@@ -374,7 +376,7 @@ transition-map:
   post-conditions:
     Status: InvNum
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Area: all
     AreaSize: all
@@ -390,7 +392,7 @@ transition-map:
   post-conditions:
     Status: InvSize
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Area: all
     AreaSize: all
@@ -408,7 +410,7 @@ transition-map:
   post-conditions:
     Status: TooMany
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Area: all
     AreaSize: all
@@ -428,7 +430,7 @@ transition-map:
   post-conditions:
     Status: InvNum
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Area: all
     AreaSize: all
@@ -446,7 +448,7 @@ transition-map:
   post-conditions:
     Status: InvSize
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Area: all
     AreaSize: all
@@ -465,7 +467,7 @@ transition-map:
   post-conditions:
     Status: Unsat
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Area:
     - 'Null'
@@ -484,7 +486,7 @@ transition-map:
   post-conditions:
     Status: Unsat
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Area:
     - Valid
diff --git a/spec/rtems/part/req/create.yml b/spec/rtems/part/req/create.yml
index b76d7001..593be23c 100644
--- a/spec/rtems/part/req/create.yml
+++ b/spec/rtems/part/req/create.yml
@@ -62,9 +62,9 @@ post-conditions:
   test-prologue: |
     rtems_status_code sc;
     rtems_id          id;
-- name: IdValue
+- name: IdVar
   states:
-  - name: Assigned
+  - name: Set
     test-code: |
       T_eq_ptr( ctx->id, &ctx->id_value );
       T_ne_u32( ctx->id_value, INVALID_ID );
@@ -88,13 +88,15 @@ post-conditions:
       sc = rtems_partition_delete( ctx->id_value );
       T_rsc_success( sc );
     text: |
-      The value of the object identifier variable shall be equal to the object
-      identifier of the partition created by the ${../if/create:/name} call.
-  - name: Unchanged
+      The value of the object referenced by the ${../if/create:/params[5]/name}
+      parameter shall be set to the object identifier of the created partition
+      after the return of the ${../if/create:/name} call.
+  - name: Nop
     test-code: |
       T_eq_u32( ctx->id_value, INVALID_ID );
     text: |
-      The value of the object identifier variable shall be unchanged by the
+      Objects referenced by the ${../if/create:/params[5]/name} parameter in
+      past calls to ${../if/create:/name} shall not be accessed by the
       ${../if/create:/name} call.
   test-epilogue: null
   test-prologue: |
@@ -334,7 +336,7 @@ transition-map:
   post-conditions:
     Status: Ok
     Name: Valid
-    IdValue: Assigned
+    IdVar: Set
   pre-conditions:
     Id:
     - Id
@@ -352,7 +354,7 @@ transition-map:
   post-conditions:
     Status: InvName
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Id: all
     Length: all
@@ -365,7 +367,7 @@ transition-map:
   post-conditions:
     Status: InvAddress
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Id:
     - 'Null'
@@ -379,7 +381,7 @@ transition-map:
   post-conditions:
     Status: InvAddress
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Id:
     - Id
@@ -394,7 +396,7 @@ transition-map:
   post-conditions:
     Status: InvSize
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Id:
     - Id
@@ -412,7 +414,7 @@ transition-map:
   post-conditions:
     Status: InvSize
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Id:
     - Id
@@ -432,7 +434,7 @@ transition-map:
   post-conditions:
     Status: InvAddress
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Id:
     - Id
@@ -449,7 +451,7 @@ transition-map:
   post-conditions:
     Status: TooMany
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
   pre-conditions:
     Id:
     - Id
diff --git a/spec/rtems/part/req/get-buffer.yml b/spec/rtems/part/req/get-buffer.yml
index 53765988..8c9a73bd 100644
--- a/spec/rtems/part/req/get-buffer.yml
+++ b/spec/rtems/part/req/get-buffer.yml
@@ -38,20 +38,22 @@ post-conditions:
       ${../../status/if/unsatisfied:/name}.
   test-epilogue: null
   test-prologue: null
-- name: BufValue
+- name: BufVar
   states:
-  - name: Assigned
+  - name: Set
     test-code: |
       T_eq_ptr( ctx->buffer, &ctx->buffer_pointer );
       T_eq_ptr( ctx->buffer_pointer, buffers );
     text: |
-      The value of the buffer pointer variable shall be equal to the begin
-      address of the buffer returned by the ${../if/get-buffer:/name} call.
-  - name: Unchanged
+      The value of the object referenced by the ${../if/create:/params[1]/name}
+      parameter shall be set to the object identifier of the begin address of
+      the returned buffer after the return of the ${../if/create:/name} call.
+  - name: Nop
     test-code: |
       T_eq_ptr( ctx->buffer_pointer, (void *) (uintptr_t) 1 );
     text: |
-      The value of the buffer pointer variable shall be unchanged by the
+      Objects referenced by the ${../if/get-buffer:/params[1]/name} parameter
+      in past calls to ${../if/get-buffer:/name} shall not be accessed by the
       ${../if/get-buffer:/name} call.
   test-epilogue: null
   test-prologue: null
@@ -190,7 +192,7 @@ transition-map:
 - enabled-by: true
   post-conditions:
     Status: Ok
-    BufValue: Assigned
+    BufVar: Set
   pre-conditions:
     Avail:
     - 'Yes'
@@ -201,7 +203,7 @@ transition-map:
 - enabled-by: true
   post-conditions:
     Status: InvAddr
-    BufValue: Unchanged
+    BufVar: Nop
   pre-conditions:
     Avail: all
     Buf:
@@ -210,7 +212,7 @@ transition-map:
 - enabled-by: true
   post-conditions:
     Status: InvId
-    BufValue: Unchanged
+    BufVar: Nop
   pre-conditions:
     Avail: all
     Buf:
@@ -220,7 +222,7 @@ transition-map:
 - enabled-by: true
   post-conditions:
     Status: Unsat
-    BufValue: Unchanged
+    BufVar: Nop
   pre-conditions:
     Avail:
     - 'No'
diff --git a/spec/rtems/task/req/construct-errors.yml b/spec/rtems/task/req/construct-errors.yml
index 70ba7404..ab1fbc56 100644
--- a/spec/rtems/task/req/construct-errors.yml
+++ b/spec/rtems/task/req/construct-errors.yml
@@ -74,20 +74,23 @@ post-conditions:
   test-prologue: |
     rtems_status_code sc;
     rtems_id          id;
-- name: IdValue
+- name: IdVar
   states:
-  - name: Assigned
+  - name: Set
     test-code: |
       T_eq_ptr( ctx->id, &ctx->id_value );
       T_ne_u32( ctx->id_value, INVALID_ID );
     text: |
-      The value of the object identifier variable shall be equal to the object
-      identifier of the task constructed by the ${../if/construct:/name} call.
-  - name: Unchanged
+      The value of the object referenced by the
+      ${../if/construct:/params[1]/name} parameter shall be set to the object
+      identifier of the constructed task after the return of the
+      ${../if/construct:/name} call.
+  - name: Nop
     test-code: |
       T_eq_u32( ctx->id_value, INVALID_ID );
     text: |
-      The value of the object identifier variable shall be unchanged by the
+      Objects referenced by the ${../if/construct:/params[1]/name} parameter in
+      past calls to ${../if/construct:/name} shall not be accessed by the
       ${../if/construct:/name} call.
   test-epilogue: null
   test-prologue: null
@@ -456,7 +459,7 @@ transition-map:
   post-conditions:
     Status: Ok
     Name: Valid
-    IdValue: Assigned
+    IdVar: Set
     CreateExt: 'Yes'
     DelExt: 'No'
     StoFree: 'No'
@@ -480,7 +483,7 @@ transition-map:
   post-conditions:
     Status: Ok
     Name: Valid
-    IdValue: Assigned
+    IdVar: Set
     CreateExt: 'Yes'
     DelExt: 'No'
     StoFree: 'No'
@@ -505,7 +508,7 @@ transition-map:
   post-conditions:
     Status: InvSize
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
     StoFree: 'No'
@@ -529,7 +532,7 @@ transition-map:
   post-conditions:
     Status: InvSize
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
     StoFree: 'No'
@@ -553,7 +556,7 @@ transition-map:
   post-conditions:
     Status: InvSize
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
     StoFree: 'No'
@@ -577,7 +580,7 @@ transition-map:
   post-conditions:
     Status: InvName
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
     StoFree: 'No'
@@ -595,7 +598,7 @@ transition-map:
   post-conditions:
     Status: InvAddr
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
     StoFree: 'No'
@@ -614,7 +617,7 @@ transition-map:
   post-conditions:
     Status: InvPrio
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
     StoFree: 'No'
@@ -635,7 +638,7 @@ transition-map:
   post-conditions:
     Status: InvPrio
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
     StoFree: 'No'
@@ -657,7 +660,7 @@ transition-map:
   post-conditions:
     Status: TooMany
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
     StoFree: 'No'
@@ -678,7 +681,7 @@ transition-map:
   post-conditions:
     Status: TooMany
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
     StoFree: 'No'
@@ -700,7 +703,7 @@ transition-map:
   post-conditions:
     Status: InvSize
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
     StoFree: 'No'
@@ -722,7 +725,7 @@ transition-map:
   post-conditions:
     Status: InvSize
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
     StoFree: 'No'
@@ -745,7 +748,7 @@ transition-map:
   post-conditions:
     Status: Unsat
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'Yes'
     DelExt: 'Yes'
     StoFree: 'Yes'
@@ -769,7 +772,7 @@ transition-map:
   post-conditions:
     Status: Unsat
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'Yes'
     DelExt: 'Yes'
     StoFree: 'Yes'
diff --git a/spec/rtems/task/req/create-errors.yml b/spec/rtems/task/req/create-errors.yml
index 943d0198..3703b869 100644
--- a/spec/rtems/task/req/create-errors.yml
+++ b/spec/rtems/task/req/create-errors.yml
@@ -68,20 +68,22 @@ post-conditions:
   test-prologue: |
     rtems_status_code sc;
     rtems_id          id;
-- name: IdValue
+- name: IdVar
   states:
-  - name: Assigned
+  - name: Set
     test-code: |
       T_eq_ptr( ctx->id, &ctx->id_value );
       T_ne_u32( ctx->id_value, INVALID_ID );
     text: |
-      The value of the object identifier variable shall be equal to the object
-      identifier of the task created by the ${../if/create:/name} call.
-  - name: Unchanged
+      The value of the object referenced by the ${../if/create:/params[5]/name}
+      parameter shall be set to the object identifier of the created task after
+      the return of the ${../if/create:/name} call.
+  - name: Nop
     test-code: |
       T_eq_u32( ctx->id_value, INVALID_ID );
     text: |
-      The value of the object identifier variable shall be unchanged by the
+      Objects referenced by the ${../if/create:/params[5]/name} parameter in
+      past calls to ${../if/create:/name} shall not be accessed by the
       ${../if/create:/name} call.
   test-epilogue: null
   test-prologue: null
@@ -404,7 +406,7 @@ transition-map:
   post-conditions:
     Status: Ok
     Name: Valid
-    IdValue: Assigned
+    IdVar: Set
     CreateExt: 'Yes'
     DelExt: 'No'
   pre-conditions:
@@ -426,7 +428,7 @@ transition-map:
   post-conditions:
     Status: Ok
     Name: Valid
-    IdValue: Assigned
+    IdVar: Set
     CreateExt: 'Yes'
     DelExt: 'No'
   pre-conditions:
@@ -449,7 +451,7 @@ transition-map:
   post-conditions:
     Status: InvName
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
   pre-conditions:
@@ -465,7 +467,7 @@ transition-map:
   post-conditions:
     Status: InvAddr
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
   pre-conditions:
@@ -482,7 +484,7 @@ transition-map:
   post-conditions:
     Status: InvPrio
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
   pre-conditions:
@@ -500,7 +502,7 @@ transition-map:
   post-conditions:
     Status: InvPrio
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
   pre-conditions:
@@ -519,7 +521,7 @@ transition-map:
   post-conditions:
     Status: TooMany
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
   pre-conditions:
@@ -538,7 +540,7 @@ transition-map:
   post-conditions:
     Status: TooMany
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
   pre-conditions:
@@ -558,7 +560,7 @@ transition-map:
   post-conditions:
     Status: Unsat
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
   pre-conditions:
@@ -578,7 +580,7 @@ transition-map:
   post-conditions:
     Status: Unsat
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'No'
     DelExt: 'No'
   pre-conditions:
@@ -599,7 +601,7 @@ transition-map:
   post-conditions:
     Status: Unsat
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'Yes'
     DelExt: 'Yes'
   pre-conditions:
@@ -621,7 +623,7 @@ transition-map:
   post-conditions:
     Status: Unsat
     Name: Invalid
-    IdValue: Unchanged
+    IdVar: Nop
     CreateExt: 'Yes'
     DelExt: 'Yes'
   pre-conditions: