spec: Remove superfluous ';'

43 files changed, 102 insertions, 106 deletions

diff --git a/spec/c/req/clock-nanosleep.yml b/spec/c/req/clock-nanosleep.yml
index aea335b1..d6f5fc45 100644
--- a/spec/c/req/clock-nanosleep.yml
+++ b/spec/c/req/clock-nanosleep.yml
@@ -276,29 +276,29 @@ test-context:
     This member provides the scheduler operation records.
   description: null
   member: |
-    T_scheduler_log_4 scheduler_log;
+    T_scheduler_log_4 scheduler_log
 - brief: |
     This member contains the CLOCK_REALTIME value before the
     ${../if/clock-nanosleep:/name} call.
   description: null
   member: |
-    struct timespec now_realtime;
+    struct timespec now_realtime
 - brief: |
     This member contains the CLOCK_MONOTONIC value before the
     ${../if/clock-nanosleep:/name} call.
   description: null
   member: |
-    struct timespec now_monotonic;
+    struct timespec now_monotonic
 - brief: |
     This member contains the worker task identifier.
   description: null
   member: |
-    rtems_id worker_id;
+    rtems_id worker_id
 - brief: |
     This member contains the timer information of the worker task.
   description: null
   member: |
-    TaskTimerInfo timer_info;
+    TaskTimerInfo timer_info
 - brief: |
     This member provides the object referenced by the ``rqtp`` parameter.
   description: null
diff --git a/spec/c/req/posix-memalign.yml b/spec/c/req/posix-memalign.yml
index d1b1ee66..9df0a489 100644
--- a/spec/c/req/posix-memalign.yml
+++ b/spec/c/req/posix-memalign.yml
@@ -169,7 +169,7 @@ test-context:
     This member provides a memory support context.
   description: null
   member: |
-    MemoryContext mem_ctx;
+    MemoryContext mem_ctx
 - brief: |
     This member provides the object referenced by the memptr parameter.
   description: null
diff --git a/spec/newlib/req/futex-wait.yml b/spec/newlib/req/futex-wait.yml
index 2e5bda5a..863ad274 100644
--- a/spec/newlib/req/futex-wait.yml
+++ b/spec/newlib/req/futex-wait.yml
@@ -68,14 +68,14 @@ skip-reasons: {}
 test-action: |
   /* The action is performed in the post-conditions. */
 test-brief: null
-test-cleanup:
+test-cleanup: |
   _Futex_Destroy( &ctx->futex );
 test-context:
 - brief: |
     This member contains the thread queue test context.
   description: null
   member: |
-    TQContext tq_ctx;
+    TQContext tq_ctx
 - brief: |
     This member specifies the expected futex state value.
   description: null
diff --git a/spec/newlib/req/futex-wake.yml b/spec/newlib/req/futex-wake.yml
index c02f381f..c78164ff 100644
--- a/spec/newlib/req/futex-wake.yml
+++ b/spec/newlib/req/futex-wake.yml
@@ -59,14 +59,14 @@ skip-reasons: {}
 test-action: |
   /* The action is performed in the ``Flush`` post-condition ``All`` state. */
 test-brief: null
-test-cleanup:
+test-cleanup: |
   _Futex_Destroy( &ctx->futex );
 test-context:
 - brief: |
     This member contains the thread queue test context.
   description: null
   member: |
-    TQContext tq_ctx;
+    TQContext tq_ctx
 - brief: |
     This member provides the futex object.
   description: null
diff --git a/spec/rtems/intr/req/entry-install.yml b/spec/rtems/intr/req/entry-install.yml
index c1fa587c..c5639387 100644
--- a/spec/rtems/intr/req/entry-install.yml
+++ b/spec/rtems/intr/req/entry-install.yml
@@ -418,7 +418,7 @@ test-context:
     This member provides a counter snapshot for each entry.
   description: null
   member: |
-    uint32_t counter_by_entry[ 3 ];
+    uint32_t counter_by_entry[ 3 ]
 - brief: |
     This member provides the vector number of a testable interrupt vector.
   description: null
@@ -511,7 +511,7 @@ test-context:
     parameter value.
   description: null
   member: |
-    rtems_interrupt_entry *entry;
+    rtems_interrupt_entry *entry
 - brief: |
     This member contains the return value of the ${../if/entry-install:/name}
     call.
diff --git a/spec/rtems/intr/req/entry-remove.yml b/spec/rtems/intr/req/entry-remove.yml
index 4279ec3c..b7f810f9 100644
--- a/spec/rtems/intr/req/entry-remove.yml
+++ b/spec/rtems/intr/req/entry-remove.yml
@@ -423,7 +423,7 @@ test-context:
     This member provides a counter incremented by EntryRoutine().
   description: null
   member: |
-    uint32_t entry_counter;
+    uint32_t entry_counter
 - brief: |
     This member provides another ${../if/entry:/name} object.
   description: null
@@ -525,7 +525,7 @@ test-context:
     parameter value.
   description: null
   member: |
-    rtems_interrupt_entry *entry;
+    rtems_interrupt_entry *entry
 - brief: |
     This member contains the return value of the ${../if/entry-remove:/name}
     call.
diff --git a/spec/rtems/intr/req/get-affinity.yml b/spec/rtems/intr/req/get-affinity.yml
index 8a52dff4..57b3ac6d 100644
--- a/spec/rtems/intr/req/get-affinity.yml
+++ b/spec/rtems/intr/req/get-affinity.yml
@@ -239,7 +239,7 @@ test-context:
     ${../if/get-affinity:/params[2]/name} parameter.
   description: null
   member: |
-    cpu_set_t cpuset_obj[ 2 ];
+    cpu_set_t cpuset_obj[ 2 ]
 - brief: |
     This member contains the return value of the ${../if/get-affinity:/name}
     call.
diff --git a/spec/rtems/intr/req/get-attributes.yml b/spec/rtems/intr/req/get-attributes.yml
index a1c193d0..9e99a273 100644
--- a/spec/rtems/intr/req/get-attributes.yml
+++ b/spec/rtems/intr/req/get-attributes.yml
@@ -153,7 +153,7 @@ test-context:
     parameter value.
   description: null
   member: |
-    rtems_interrupt_attributes *attributes;
+    rtems_interrupt_attributes *attributes
 - brief: |
     This member contains the return value of the ${../if/get-attributes:/name}
     call.
diff --git a/spec/rtems/intr/req/is-pending.yml b/spec/rtems/intr/req/is-pending.yml
index 0ef55b2b..6e42827f 100644
--- a/spec/rtems/intr/req/is-pending.yml
+++ b/spec/rtems/intr/req/is-pending.yml
@@ -181,7 +181,7 @@ test-context:
     parameter value.
   description: null
   member: |
-    bool *pending;
+    bool *pending
 - brief: |
     This member contains the return value of the ${../if/is-pending:/name}
     call.
diff --git a/spec/rtems/intr/req/vector-is-enabled.yml b/spec/rtems/intr/req/vector-is-enabled.yml
index 54af6237..3c0b69fa 100644
--- a/spec/rtems/intr/req/vector-is-enabled.yml
+++ b/spec/rtems/intr/req/vector-is-enabled.yml
@@ -188,7 +188,7 @@ test-context:
     parameter value.
   description: null
   member: |
-    bool *enabled;
+    bool *enabled
 - brief: |
     This member contains the return value of the ${../if/vector-is-enabled:/name}
     call.
diff --git a/spec/rtems/malloc/req/calloc.yml b/spec/rtems/malloc/req/calloc.yml
index 6a2bcb53..ddff4844 100644
--- a/spec/rtems/malloc/req/calloc.yml
+++ b/spec/rtems/malloc/req/calloc.yml
@@ -121,7 +121,7 @@ test-context:
     This member provides a memory support context.
   description: null
   member: |
-    MemoryContext mem_ctx;
+    MemoryContext mem_ctx
 - brief: |
     This member contains the return value of the ${../if/calloc:/name} call.
   description: null
diff --git a/spec/rtems/malloc/req/malloc.yml b/spec/rtems/malloc/req/malloc.yml
index 82ae500a..742009fd 100644
--- a/spec/rtems/malloc/req/malloc.yml
+++ b/spec/rtems/malloc/req/malloc.yml
@@ -90,7 +90,7 @@ test-context:
     This member provides a memory support context.
   description: null
   member: |
-    MemoryContext mem_ctx;
+    MemoryContext mem_ctx
 - brief: |
     This member contains the return value of the ${../if/malloc:/name} call.
   description: null
diff --git a/spec/rtems/message/req/receive.yml b/spec/rtems/message/req/receive.yml
index af1491bb..ca95d9e6 100644
--- a/spec/rtems/message/req/receive.yml
+++ b/spec/rtems/message/req/receive.yml
@@ -243,7 +243,7 @@ pre-conditions:
 - name: TaskQueue
   states:
   - name: Fifo
-    test-code:  |
+    test-code: |
       ctx->attribute_set = RTEMS_LOCAL | RTEMS_FIFO;
     text: |
       While the member ${../if/config:/definition[6]/default/name} of type
@@ -373,7 +373,7 @@ test-context:
   description: |
     It is used for run-time type checking.
   member: |
-    uint32_t magic;
+    uint32_t magic
 - brief: |
     This member contains a number which is sent as next message.
   description: null
diff --git a/spec/rtems/message/req/urgent-send.yml b/spec/rtems/message/req/urgent-send.yml
index 1805fd26..ed4dc5ab 100644
--- a/spec/rtems/message/req/urgent-send.yml
+++ b/spec/rtems/message/req/urgent-send.yml
@@ -274,7 +274,7 @@ test-action: |
   }
 test-brief: null
 test-cleanup: |
-    T_rsc_success( rtems_message_queue_delete( ctx->message_queue_id ) );
+  T_rsc_success( rtems_message_queue_delete( ctx->message_queue_id ) );
 test-context:
 - brief: |
     This member contains a valid ${/glossary/id:/term} of a
@@ -294,7 +294,7 @@ test-context:
   description: |
     It is used for run-time type checking.
   member: |
-    uint32_t magic;
+    uint32_t magic
 - brief: |
     This member contains a number which is sent as next message.
   description: null
@@ -331,7 +331,7 @@ test-context:
     This member specifies the directive to be called as action.
   description: |
     This is either ${../if/send:/name} or ${../if/urgent:/name}.
-  member:
+  member: |
     rtems_status_code (*action)( rtems_id id, const void *buffer, size_t size )
 - brief: |
     This member specifies the ${../if/send:/params[0]/name} parameter
@@ -578,7 +578,6 @@ test-support: |
     T_rsc_success( status );
     ++ctx->send_msg_counter;
   }
-
 test-target: testsuites/validation/tc-message-urgent-send.c
 test-teardown:
   brief: null
diff --git a/spec/rtems/scheduler/req/add-processor.yml b/spec/rtems/scheduler/req/add-processor.yml
index 73e13fd5..f655f047 100644
--- a/spec/rtems/scheduler/req/add-processor.yml
+++ b/spec/rtems/scheduler/req/add-processor.yml
@@ -257,18 +257,18 @@ test-context:
     ${../if/add-processor:/name} call is prepared.
   description: null
   member: |
-    bool online;
+    bool online
 - brief: |
     If this member is true, then the processor should be added to the scheduler
     B during cleanup.
   description: null
   member: |
-    bool add_cpu_to_scheduler_b;
+    bool add_cpu_to_scheduler_b
 - brief: |
     This member provides the scheduler operation records.
   description: null
   member: |
-    T_scheduler_log_2 scheduler_log;
+    T_scheduler_log_2 scheduler_log
 - brief: |
     This member contains the return value of the
     ${../if/add-processor:/name} call.
diff --git a/spec/rtems/scheduler/req/remove-processor.yml b/spec/rtems/scheduler/req/remove-processor.yml
index 58993b53..f5d3d9a2 100644
--- a/spec/rtems/scheduler/req/remove-processor.yml
+++ b/spec/rtems/scheduler/req/remove-processor.yml
@@ -388,12 +388,12 @@ test-context:
     This member contains the worker busy status.
   description: null
   member: |
-    volatile bool busy[ WORKER_COUNT ];
+    volatile bool busy[ WORKER_COUNT ]
 - brief: |
     This member contains the worker busy status.
   description: null
   member: |
-    volatile uint32_t busy_counter[ WORKER_COUNT ];
+    volatile uint32_t busy_counter[ WORKER_COUNT ]
 - brief: |
     This member contains the barrier to synchronize the runner and the workers.
   description: null
@@ -403,7 +403,7 @@ test-context:
     This member contains the call within ISR request.
   description: null
   member: |
-    CallWithinISRRequest request;
+    CallWithinISRRequest request
 - brief: |
     This member provides the context to wrap thread queue operations.
   description: null
@@ -455,7 +455,7 @@ test-context:
     This member provides the scheduler operation records.
   description: null
   member: |
-    T_scheduler_log_4 scheduler_log;
+    T_scheduler_log_4 scheduler_log
 - brief: |
     This member contains the return value of the
     ${../if/remove-processor:/name} call.
diff --git a/spec/rtems/sem/req/create.yml b/spec/rtems/sem/req/create.yml
index 307a47b2..7e033473 100644
--- a/spec/rtems/sem/req/create.yml
+++ b/spec/rtems/sem/req/create.yml
@@ -427,23 +427,23 @@ test-context:
 - brief: null
   description: null
   member: |
-    Semaphore_Variant variant;
+    Semaphore_Variant variant
 - brief: null
   description: null
   member: |
-    Semaphore_Discipline discipline;
+    Semaphore_Discipline discipline
 - brief: null
   description: null
   member: |
-    uint32_t sem_count;
+    uint32_t sem_count
 - brief: null
   description: null
   member: |
-    Thread_Control *executing;
+    Thread_Control *executing
 - brief: null
   description: null
   member: |
-    Thread_Control *owner;
+    Thread_Control *owner
 - brief: null
   description: null
   member: |
diff --git a/spec/rtems/sem/req/flush.yml b/spec/rtems/sem/req/flush.yml
index 4194b929..4d013d46 100644
--- a/spec/rtems/sem/req/flush.yml
+++ b/spec/rtems/sem/req/flush.yml
@@ -164,7 +164,7 @@ test-action: |
   );
   T_rsc_success( sc );
 test-brief: null
-test-cleanup:
+test-cleanup: |
   rtems_status_code sc;
 
   sc = rtems_semaphore_delete( ctx->tq_ctx.thread_queue_id );
@@ -174,7 +174,7 @@ test-context:
     This member contains the thread queue test context.
   description: null
   member: |
-    TQContext tq_ctx;
+    TQContext tq_ctx
 - brief: |
     This member specifies if the attribute set of the semaphore.
   description: null
diff --git a/spec/rtems/sem/req/timeout.yml b/spec/rtems/sem/req/timeout.yml
index fa2d9250..5f7ca768 100644
--- a/spec/rtems/sem/req/timeout.yml
+++ b/spec/rtems/sem/req/timeout.yml
@@ -118,7 +118,7 @@ test-action: |
   );
   T_rsc_success( sc );
 test-brief: null
-test-cleanup:
+test-cleanup: |
   if ( ctx->tq_ctx.thread_queue_id != 0 ) {
     rtems_status_code sc;
 
@@ -130,7 +130,7 @@ test-context:
     This member contains the thread queue test context.
   description: null
   member: |
-    TQContext tq_ctx;
+    TQContext tq_ctx
 - brief: |
     This member specifies if the attribute set of the semaphore.
   description: null
diff --git a/spec/rtems/sem/val/smp.yml b/spec/rtems/sem/val/smp.yml
index cc8a887f..624350df 100644
--- a/spec/rtems/sem/val/smp.yml
+++ b/spec/rtems/sem/val/smp.yml
@@ -234,12 +234,12 @@ test-context:
     This member contains the mutex identifier.
   description: null
   member: |
-    rtems_id mutex_id;
+    rtems_id mutex_id
 - brief: |
     This member contains the second mutex identifier.
   description: null
   member: |
-    rtems_id mutex_2_id;
+    rtems_id mutex_2_id
 - brief: |
     If this member is true, then the worker is done.
   description: null
diff --git a/spec/rtems/signal/req/send.yml b/spec/rtems/signal/req/send.yml
index 10a1e97a..06b6fa58 100644
--- a/spec/rtems/signal/req/send.yml
+++ b/spec/rtems/signal/req/send.yml
@@ -273,11 +273,11 @@ test-context:
 - brief: null
   description: null
   member: |
-    uintptr_t stack_pointers[ 2 ];
+    uintptr_t stack_pointers[ 2 ]
 - brief: null
   description: null
   member: |
-    rtems_mode mode;
+    rtems_mode mode
 - brief: null
   description: null
   member: |
diff --git a/spec/rtems/task/req/construct.yml b/spec/rtems/task/req/construct.yml
index 6ee7480a..e5e1e4ab 100644
--- a/spec/rtems/task/req/construct.yml
+++ b/spec/rtems/task/req/construct.yml
@@ -557,7 +557,7 @@ test-context:
     If this member is true, then the zombie thread is ready to get killed.
   description: null
   member: |
-    volatile bool zombie_ready;
+    volatile bool zombie_ready
 - brief: |
     This member contains the actual modes of the constructed task.
   description: null
diff --git a/spec/rtems/task/req/delete.yml b/spec/rtems/task/req/delete.yml
index adae9793..e4560b28 100644
--- a/spec/rtems/task/req/delete.yml
+++ b/spec/rtems/task/req/delete.yml
@@ -488,7 +488,7 @@ test-context:
     This member provides a jump context to resume a thread dispatch.
   description: null
   member: |
-    jmp_buf thread_dispatch_context;
+    jmp_buf thread_dispatch_context
 - brief: |
     This member contains the identifier of the runner scheduler.
   description: null
@@ -536,13 +536,13 @@ test-context:
     ${../if/delete:/name} call.
   description: null
   member: |
-    TaskTimerInfo worker_timer_info;
+    TaskTimerInfo worker_timer_info
 - brief: |
     This member contains the worker thread queue at the end of the
     ${../if/delete:/name} call.
   description: null
   member: |
-    const Thread_queue_Queue *worker_wait_queue;
+    const Thread_queue_Queue *worker_wait_queue
 - brief: |
     This member contains the worker thread life state at the end of the
     ${../if/delete:/name} call.
@@ -584,12 +584,12 @@ test-context:
     This member contains extension calls.
   description: null
   member: |
-    ExtensionCalls calls;
+    ExtensionCalls calls
 - brief: |
     This member contains extension calls after the ${../if/delete:/name} call.
   description: null
   member: |
-    ExtensionCalls calls_after_restart;
+    ExtensionCalls calls_after_restart
 - brief: |
     This member contains the delete counter.
   description: null
diff --git a/spec/rtems/task/req/restart.yml b/spec/rtems/task/req/restart.yml
index 7e3ae5d4..1555e29a 100644
--- a/spec/rtems/task/req/restart.yml
+++ b/spec/rtems/task/req/restart.yml
@@ -669,7 +669,7 @@ test-context:
     This member provides a jump context to resume a thread dispatch.
   description: null
   member: |
-    jmp_buf thread_dispatch_context;
+    jmp_buf thread_dispatch_context
 - brief: |
     This member provides the context to wrap thread queue operations.
   description: null
@@ -737,12 +737,12 @@ test-context:
     This member contains extension calls.
   description: null
   member: |
-    ExtensionCalls calls;
+    ExtensionCalls calls
 - brief: |
     This member contains extension calls after the ${../if/restart:/name} call.
   description: null
   member: |
-    ExtensionCalls calls_after_restart;
+    ExtensionCalls calls_after_restart
 - brief: |
     This member contains the actual argument passed to the entry point.
   description: null
diff --git a/spec/rtems/task/req/set-affinity.yml b/spec/rtems/task/req/set-affinity.yml
index 82f80893..df07cf5f 100644
--- a/spec/rtems/task/req/set-affinity.yml
+++ b/spec/rtems/task/req/set-affinity.yml
@@ -211,7 +211,7 @@ test-context:
     This member provides the scheduler operation records.
   description: null
   member: |
-    T_scheduler_log_2 scheduler_log;
+    T_scheduler_log_2 scheduler_log
 - brief: |
     This member provides the object referenced by the
     ${../if/set-affinity:/params[2]/name} parameter.
diff --git a/spec/rtems/task/req/set-scheduler.yml b/spec/rtems/task/req/set-scheduler.yml
index f149e418..5767c119 100644
--- a/spec/rtems/task/req/set-scheduler.yml
+++ b/spec/rtems/task/req/set-scheduler.yml
@@ -503,7 +503,7 @@ test-context:
     This member contains the identifier of the new scheduler.
   description: null
   member: |
-    rtems_id new_scheduler;
+    rtems_id new_scheduler
 - brief: |
     This member contains the new priorities of the task.
   description: null
diff --git a/spec/rtems/task/req/wake-after.yml b/spec/rtems/task/req/wake-after.yml
index ec8ffc4d..4124f4d9 100644
--- a/spec/rtems/task/req/wake-after.yml
+++ b/spec/rtems/task/req/wake-after.yml
@@ -127,29 +127,29 @@ test-context:
     This member provides the scheduler operation records.
   description: null
   member: |
-    T_scheduler_log_4 scheduler_log;
+    T_scheduler_log_4 scheduler_log
 - brief: |
     This member contains the ${/glossary/clock-tick:/term} value before the
     ${../if/wake-after:/name} call.
   description: null
   member: |
-    uint64_t now;
+    uint64_t now
 - brief: |
     This member contains the worker task identifier.
   description: null
   member: |
-    rtems_id worker_id;
+    rtems_id worker_id
 - brief: |
     If this member is true, then the worker shall be suspended during the
     ${../if/wake-after:/name} call.
   description: null
   member: |
-    bool suspended;
+    bool suspended
 - brief: |
     This member contains the timer information of the worker task.
   description: null
   member: |
-    TaskTimerInfo timer_info;
+    TaskTimerInfo timer_info
 - brief: |
     This member contains the return value of the ${../if/wake-after:/name}
     call.
diff --git a/spec/rtems/task/req/wake-when.yml b/spec/rtems/task/req/wake-when.yml
index 91ae4709..e5c5253e 100644
--- a/spec/rtems/task/req/wake-when.yml
+++ b/spec/rtems/task/req/wake-when.yml
@@ -155,23 +155,23 @@ test-context:
     This member provides the scheduler operation records.
   description: null
   member: |
-    T_scheduler_log_4 scheduler_log;
+    T_scheduler_log_4 scheduler_log
 - brief: |
     This member contains the CLOCK_REALTIME value before the
     ${../if/wake-when:/name} call.
   description: null
   member: |
-    struct timespec now;
+    struct timespec now
 - brief: |
     This member contains the worker task identifier.
   description: null
   member: |
-    rtems_id worker_id;
+    rtems_id worker_id
 - brief: |
     This member contains the timer information of the worker task.
   description: null
   member: |
-    TaskTimerInfo timer_info;
+    TaskTimerInfo timer_info
 - brief: |
     This member provides the object referenced by the
     ${../if/wake-when:/params[0]/name} parameter.
diff --git a/spec/rtems/timer/req/reset.yml b/spec/rtems/timer/req/reset.yml
index 909f71f8..2ce67864 100644
--- a/spec/rtems/timer/req/reset.yml
+++ b/spec/rtems/timer/req/reset.yml
@@ -57,8 +57,8 @@ post-conditions:
       See also ${../glossary/nop:/term}.
   test-epilogue: null
   test-prologue: |
-      Timer_Classes class;
-      class = GetTimerClass( ctx->timer_id );
+    Timer_Classes class;
+    class = GetTimerClass( ctx->timer_id );
 - name: Clock
   states:
   - name: None
@@ -88,8 +88,8 @@ post-conditions:
       accessed by the ${../if/reset:/name} call.
   test-epilogue: null
   test-prologue: |
-      Timer_Classes class;
-      class = GetTimerClass( ctx->timer_id );
+    Timer_Classes class;
+    class = GetTimerClass( ctx->timer_id );
 - name: State
   states:
   - name: Scheduled
@@ -388,7 +388,7 @@ test-context:
     in the next call to the ${../glossary/timerserviceroutine:/term}.
   description: null
   member: |
-    void **scheduled_user_data;
+    void **scheduled_user_data
 - brief: |
     This member contains 1 if the ${../glossary/timerserviceroutine:/term}
     "A" has been ${../glossary/scheduled:/term} otherwise 0.
diff --git a/spec/rtems/userext/req/create.yml b/spec/rtems/userext/req/create.yml
index bfac495e..f3143c36 100644
--- a/spec/rtems/userext/req/create.yml
+++ b/spec/rtems/userext/req/create.yml
@@ -178,7 +178,7 @@ test-context:
 - brief: null
   description: null
   member: |
-    rtems_extensions_table table_variable;
+    rtems_extensions_table table_variable
 - brief: null
   description: null
   member: |
@@ -190,7 +190,7 @@ test-context:
 - brief: null
   description: null
   member: |
-    rtems_extensions_table *table;
+    rtems_extensions_table *table
 - brief: null
   description: null
   member: |
diff --git a/spec/score/mtx/req/seize-try.yml b/spec/score/mtx/req/seize-try.yml
index c4bff291..7be7e706 100644
--- a/spec/score/mtx/req/seize-try.yml
+++ b/spec/score/mtx/req/seize-try.yml
@@ -222,19 +222,19 @@ test-context:
     mutex.
   description: null
   member: |
-    bool owner_caller;
+    bool owner_caller
 - brief: |
     If this member is true, then a thread other than the calling thread shall
     be the owner of the mutex.
   description: null
   member: |
-    bool owner_other;
+    bool owner_other
 - brief: |
     This member contains the current priority of the calling thread before the
     directive call.
   description: null
   member: |
-    rtems_task_priority priority_before;
+    rtems_task_priority priority_before
 - brief: |
     This member contains the owner of the mutex after the directive call.
   description: null
@@ -245,7 +245,7 @@ test-context:
     directive call.
   description: null
   member: |
-    rtems_task_priority priority_after;
+    rtems_task_priority priority_after
 test-context-support: null
 test-description: null
 test-header:
diff --git a/spec/score/mtx/req/seize-wait.yml b/spec/score/mtx/req/seize-wait.yml
index c9ffe552..1fb8020e 100644
--- a/spec/score/mtx/req/seize-wait.yml
+++ b/spec/score/mtx/req/seize-wait.yml
@@ -129,7 +129,6 @@ post-conditions:
 pre-conditions:
 - name: Protocol
   states:
-  states:
   - name: None
     test-code: |
       if ( ctx->tq_ctx->protocol != TQ_MTX_NO_PROTOCOL ) {
@@ -292,24 +291,24 @@ test-context:
     mutex.
   description: null
   member: |
-    bool owner_caller;
+    bool owner_caller
 - brief: |
     If this member is true, then a thread other than the calling thread shall
     be the owner of the mutex.
   description: null
   member: |
-    bool owner_other;
+    bool owner_other
 - brief: |
     If this member is true, then a deadlock shall occur.
   description: null
   member: |
-    bool deadlock;
+    bool deadlock
 - brief: |
     This member contains the current priority of the calling thread before the
     directive call.
   description: null
   member: |
-    rtems_task_priority priority_before;
+    rtems_task_priority priority_before
 - brief: |
     This member contains the owner of the mutex after the directive call.
   description: null
@@ -320,7 +319,7 @@ test-context:
     directive call.
   description: null
   member: |
-    rtems_task_priority priority_after;
+    rtems_task_priority priority_after
 test-context-support: null
 test-description: null
 test-header:
diff --git a/spec/score/sched/smp/val/smp.yml b/spec/score/sched/smp/val/smp.yml
index be5d7996..610b30f9 100644
--- a/spec/score/sched/smp/val/smp.yml
+++ b/spec/score/sched/smp/val/smp.yml
@@ -522,7 +522,7 @@ test-context:
     If this member is true, then the worker shall be in the busy loop.
   description: null
   member: |
-    volatile bool is_busy[ WORKER_COUNT ];
+    volatile bool is_busy[ WORKER_COUNT ]
 - brief: |
     This member contains the per-CPU jobs.
   description: null
@@ -537,7 +537,7 @@ test-context:
     This member contains the call within ISR request.
   description: null
   member: |
-    CallWithinISRRequest request;
+    CallWithinISRRequest request
 test-context-support: |
   typedef enum {
     WORKER_A,
diff --git a/spec/score/thread/val/idle-body-no-return.yml b/spec/score/thread/val/idle-body-no-return.yml
index 6cee6ef3..39820640 100644
--- a/spec/score/thread/val/idle-body-no-return.yml
+++ b/spec/score/thread/val/idle-body-no-return.yml
@@ -41,7 +41,7 @@ test-context:
     This member contains a counter.
   description: null
   member: |
-    uint32_t counter;
+    uint32_t counter
 test-context-support: null
 test-description: null
 test-header: null
diff --git a/spec/score/tq/req/enqueue-ceiling.yml b/spec/score/tq/req/enqueue-ceiling.yml
index 079c7e4e..27361379 100644
--- a/spec/score/tq/req/enqueue-ceiling.yml
+++ b/spec/score/tq/req/enqueue-ceiling.yml
@@ -239,7 +239,7 @@ test-context:
     equal to an eligible scheduler of the enqueueing thread.
   description: null
   member: |
-    rtems_task_priority priority;
+    rtems_task_priority priority
 - brief: |
     If this member is true, then a thread those eligible schedulers are
     ineligible scheduler to the enqueueing task should be enqueued before a
@@ -247,7 +247,7 @@ test-context:
     enqueueing thread.
   description: null
   member: |
-    size_t other_before;
+    size_t other_before
 - brief: |
     If this member is true, then a thread those eligible schedulers are
     ineligible scheduler to the enqueueing task should be enqueued after a
@@ -255,7 +255,7 @@ test-context:
     enqueueing thread.
   description: null
   member: |
-    size_t other_after;
+    size_t other_after
 test-context-support: null
 test-description: null
 test-header:
@@ -274,7 +274,7 @@ test-header:
 test-includes: []
 test-local-includes:
 - tr-tq-enqueue-ceiling.h
-test-prepare:
+test-prepare: |
   ctx->priority = PRIO_PSEUDO_ISR;
   ctx->other_before = false;
   ctx->other_after = false;
diff --git a/spec/score/tq/req/enqueue-mrsp.yml b/spec/score/tq/req/enqueue-mrsp.yml
index 84aed3c5..fa69ac1d 100644
--- a/spec/score/tq/req/enqueue-mrsp.yml
+++ b/spec/score/tq/req/enqueue-mrsp.yml
@@ -139,7 +139,6 @@ pre-conditions:
       ctx->other_before = true;
       ctx->other_after = false;
     text: |
-    text: |
       While exactly one priority queue of the thread queue exists which is not
       associated with an eligible scheduler of the enqueueing thread.
   - name: Before
@@ -147,7 +146,6 @@ pre-conditions:
       ctx->other_before = true;
       ctx->other_after = false;
     text: |
-    text: |
       While a priority queue of the thread queue exists which is not
       associated with an eligible scheduler of the enqueueing thread, while
       this priority queue is positioned before all priority queues which are
@@ -270,7 +268,7 @@ test-context:
     eligible scheduler equal to an eligible scheduler of the enqueueing thread.
   description: null
   member: |
-    rtems_task_priority priority;
+    rtems_task_priority priority
 - brief: |
     If this member is true, then a thread those eligible schedulers are
     ineligible scheduler to the enqueueing task should be enqueued before a
@@ -278,7 +276,7 @@ test-context:
     enqueueing thread.
   description: null
   member: |
-    size_t other_before;
+    size_t other_before
 - brief: |
     If this member is true, then a thread those eligible schedulers are
     ineligible scheduler to the enqueueing task should be enqueued after a
@@ -286,7 +284,7 @@ test-context:
     enqueueing thread.
   description: null
   member: |
-    size_t other_after;
+    size_t other_after
 test-context-support: null
 test-description: null
 test-header:
diff --git a/spec/score/tq/req/enqueue-priority.yml b/spec/score/tq/req/enqueue-priority.yml
index edfd42ab..932c44f0 100644
--- a/spec/score/tq/req/enqueue-priority.yml
+++ b/spec/score/tq/req/enqueue-priority.yml
@@ -274,7 +274,7 @@ test-context:
     equal to an eligible scheduler of the enqueueing thread.
   description: null
   member: |
-    rtems_task_priority priority;
+    rtems_task_priority priority
 - brief: |
     If this member is true, then a thread those eligible schedulers are
     ineligible scheduler to the enqueueing task should be enqueued before a
@@ -282,7 +282,7 @@ test-context:
     enqueueing thread.
   description: null
   member: |
-    size_t other_before;
+    size_t other_before
 - brief: |
     If this member is true, then a thread those eligible schedulers are
     ineligible scheduler to the enqueueing task should be enqueued after a
@@ -290,7 +290,7 @@ test-context:
     enqueueing thread.
   description: null
   member: |
-    size_t other_after;
+    size_t other_after
 test-context-support: null
 test-description: null
 test-header:
@@ -309,7 +309,7 @@ test-header:
 test-includes: []
 test-local-includes:
 - tr-tq-enqueue-priority.h
-test-prepare:
+test-prepare: |
   ctx->tq_ctx->how_many = 1;
 test-setup:
   brief: null
diff --git a/spec/score/tq/req/flush-priority-inherit.yml b/spec/score/tq/req/flush-priority-inherit.yml
index 6c0f84d4..117c93c2 100644
--- a/spec/score/tq/req/flush-priority-inherit.yml
+++ b/spec/score/tq/req/flush-priority-inherit.yml
@@ -172,7 +172,7 @@ test-context:
     This member contains the call within ISR request.
   description: null
   member: |
-    CallWithinISRRequest request;
+    CallWithinISRRequest request
 - brief: |
     If this member is true, then a minimum priority of the owner of the thread
     queue shall be inherited from a thread enqueued on the thread queue.
diff --git a/spec/score/tq/req/flush-priority.yml b/spec/score/tq/req/flush-priority.yml
index 3657f058..ce020c5f 100644
--- a/spec/score/tq/req/flush-priority.yml
+++ b/spec/score/tq/req/flush-priority.yml
@@ -42,7 +42,7 @@ post-conditions:
       ${/glossary/priority:/term} order for each priority queue associated with
       a scheduler.  The priority queues of the thread queue shall be accessed
       in ${/glossary/fifo:/term} order.
-  test-epilogue: |
+  test-epilogue: null
   test-prologue: |
     size_t                   i;
     const T_scheduler_event *event;
@@ -93,7 +93,7 @@ test-context:
     This member contains the call within ISR request.
   description: null
   member: |
-    CallWithinISRRequest request;
+    CallWithinISRRequest request
 test-context-support: null
 test-description: null
 test-header:
diff --git a/spec/score/tq/req/surrender-priority-inherit.yml b/spec/score/tq/req/surrender-priority-inherit.yml
index 153c3444..33efd4ce 100644
--- a/spec/score/tq/req/surrender-priority-inherit.yml
+++ b/spec/score/tq/req/surrender-priority-inherit.yml
@@ -371,7 +371,7 @@ test-context:
     This member contains the call within ISR request.
   description: null
   member: |
-    CallWithinISRRequest request;
+    CallWithinISRRequest request
 - brief: |
     This member contains the barrier to synchronize the runner and the worker.
   description: null
diff --git a/spec/score/tq/req/surrender.yml b/spec/score/tq/req/surrender.yml
index 79f6317c..7645bde1 100644
--- a/spec/score/tq/req/surrender.yml
+++ b/spec/score/tq/req/surrender.yml
@@ -192,7 +192,7 @@ test-context:
     This member contains the call within ISR request.
   description: null
   member: |
-    CallWithinISRRequest request;
+    CallWithinISRRequest request
 - brief: |
     This member contains the barrier to synchronize the runner and the worker.
   description: null
diff --git a/spec/score/tq/req/timeout-priority-inherit.yml b/spec/score/tq/req/timeout-priority-inherit.yml
index d7931d90..b324acb9 100644
--- a/spec/score/tq/req/timeout-priority-inherit.yml
+++ b/spec/score/tq/req/timeout-priority-inherit.yml
@@ -437,7 +437,7 @@ test-context:
     This member contains the call within ISR request.
   description: null
   member: |
-    CallWithinISRRequest request;
+    CallWithinISRRequest request
 - brief: |
     This member specifies the scheduler of the thread.
   description: null
diff --git a/spec/score/tq/req/timeout.yml b/spec/score/tq/req/timeout.yml
index 800f50b3..2d3783da 100644
--- a/spec/score/tq/req/timeout.yml
+++ b/spec/score/tq/req/timeout.yml
@@ -99,7 +99,7 @@ test-context:
     This member contains the call within ISR request.
   description: null
   member: |
-    CallWithinISRRequest request;
+    CallWithinISRRequest request
 test-context-support: null
 test-description: null
 test-header: