metadata.code: rename type->format

Author: yuri91

document/metadata/code/binary.rst

@@ -8,10 +8,10 @@ Binary Format
 Code Metadata
 -------------
 
-All code metadata items of a given type *T* are grouped under a custom section
+All code metadata items of a given format *T* are grouped under a custom section
 named *'metadata.code.T'*.
 The following parametrized grammar rules define the generic structure of a code metadata
-section of type *T*.
+section of format *T*.
 
 .. math::
    \begin{array}{llcll}
@@ -28,7 +28,7 @@ section of type *T*.
    \end{array}
 .. index:: ! code metadata section
 
-Where *funcpos* is the byte offset of the annotation starting from the beginning of the function body, and *data* is a further payload, whose content depends on the type *T*.
+Where *funcpos* is the byte offset of the annotation starting from the beginning of the function body, and *data* is a further payload, whose content depends on the format *T*.
 
 *code metadata function* entries must appear in order of increasing *function id*, and duplicate id values are not allowed. *code metadata item* entries must appear in order of increasing *instruction offset*, and duplicate offset values are not allowed.
 
@@ -37,7 +37,7 @@ Where *funcpos* is the byte offset of the annotation starting from the beginning
 Branch Hints
 ~~~~~~~~~~~~
 
-A Branch Hint is code metadata item with type *branch_hint*.
+A Branch Hint is code metadata item with format *branch_hint*.
 All branch hints for a module are contained in a single code metadata section
 with name *'metadata.code.branch_hint'*.
 

document/metadata/code/intro.rst

@@ -4,7 +4,7 @@ Introduction
 ============
 
 This document defines a generic mechanism for attaching arbitrary metadata to WebAssembly instructions.
-Additionally, it defines specific metadata types using this mechanism.
+Additionally, it defines specific metadata formats using this mechanism.
 
 Such metadata do not contribute to, or otherwise affect, the WebAssembly semantics, and may be ignored by an implementation.
 

document/metadata/code/syntax.rst

@@ -8,14 +8,14 @@ Code Metadata
 
 A Code Metadata item is a piece of information logically attached to an instruction.
 
-An item has a type and a paylod, whose format is defined by its type.
+An item is associated with a format, which defines the item's payload.
 
 TODO: can this be expressed with the math notation?
 
 Branch Hints
 ~~~~~~~~~~~~
 
-A Branch Hint is a type of Code Metadata that can be attached to `br_if` and `if` instructions.
+A Branch Hint is a Code Metadata format that can be attached to `br_if` and `if` instructions.
 Its payload indicates whether the branch is likely or unlikely to be taken.
 
 TODO: math definition

document/metadata/code/text.rst

@@ -19,6 +19,6 @@ attached to the first instruction that follows them.
    \end{array}
 .. index:: ! code metadata annotation
 
-Where `T` is the type of the item, and `data` is a byte string containing the same
+Where `T` is the format of the item, and `data` is a byte string containing the same
 payload as in the binary format.