Merge WebAssembly/spec/main

To bring in the wasm-latest directory in which we will update the
spectec for custom descriptors.

Author: tlively

.github/workflows/ci-spec.yml

@@ -3,16 +3,25 @@ name: CI for specs
 on:
   push:
     branches: [ main, wasm-3.0 ]
-    paths: [ .github/**, document/**, spectec/** ]
+    paths: [ .github/**, document/**, spectec/**, specification/** ]
 
   pull_request:
     branches: [ main, wasm-3.0 ]
-    paths: [ .github/**, document/**, spectec/** ]
+    paths: [ .github/**, document/**, spectec/**, specification/** ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 jobs:
+  ensure-wasm-latest:
+    if: ${{ github.repository == 'WebAssembly/spec' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Diff wasm-latest
+        run: bash .github/workflows/diff-wasm-latest.sh
+
   build-core-spec:
     runs-on: ubuntu-latest
     steps:
@@ -145,6 +154,7 @@ jobs:
   publish-spec:
     runs-on: ubuntu-latest
     needs:
+      - ensure-wasm-latest
       - build-core-spec
       - build-js-api-spec
       - build-web-api-spec

.github/workflows/diff-wasm-latest.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Identify the highest versioned directory
+HIGHEST_VER=$(ls -d specification/wasm-[0-9]* 2>/dev/null | sort -V | tail -n 1)
+
+if [ -z "$HIGHEST_VER" ]; then
+    echo "❌ Error: No wasm-X.Y versioned directories found in specification/"
+    exit 1
+fi
+
+LATEST="specification/wasm-latest"
+
+# Check that wasm-latest exists
+if [ ! -d "$LATEST" ]; then
+    echo "❌ Error: $LATEST does not exist."
+    exit 1
+fi
+
+# Diff the highest version with wasm-latest and check that the diff is empty
+echo "Checking for differences between $HIGHEST_VER and $LATEST..."
+
+if diff -qr "$HIGHEST_VER" "$LATEST" > /dev/null; then
+    echo "✅ Success: Contents match. No changes needed."
+else
+    echo "🔍 Differences detected:"
+    echo "--------------------------------"
+    diff -r "$HIGHEST_VER" "$LATEST"
+    echo "--------------------------------"
+    exit 1
+fi

.github/workflows/w3c-publish.yml

@@ -4,9 +4,9 @@ on:
   push:
     # Disable on forks!
     branches: [ main ]
-    paths: [ .github/**, document/** ]
+    paths: [ .github/**, document/**, specification/** ]
   pull_request:
-    paths: [ .github/**, document/** ]
+    paths: [ .github/**, document/**, specification/** ]
 
   # Allows you to run this workflow manually from the Actions tab, gh CLI tool,
   # or REST API. THe w3c-status options correspond to the valid options for

document/core/Makefile

@@ -8,7 +8,7 @@ SPHINXBUILD   = sphinx-build
 PAPER         = a4
 ROOTDIR       = $(shell dirname `ls -d ../core 2>/dev/null || ls -d ../../core`)/..
 SPECTECDIR    = $(ROOTDIR)/spectec
-SPECTECSPEC   = $(ROOTDIR)/specification/wasm-3.0
+SPECTECSPEC   = $(ROOTDIR)/specification/wasm-latest
 SPECTECEXT    = spectec
 SPECTEC       = $(SPECTECDIR)/spectec
 SPLICEDIR     = _spectec

document/core/appendix/index-instructions.py

@@ -359,7 +359,7 @@ def Instruction(version, name, opcode, type=None, validation=None, execution=Non
     Instruction(3.0, r'\REFI31', r'\hex{FB}~\hex{1C}', r'[\I32] \to [(\REF~\I31)]', r'valid-ref.i31', r'exec-ref.i31'),
     Instruction(3.0, r'\I31GETS', r'\hex{FB}~\hex{1D}', r'[\I31REF] \to [\I32]', r'valid-i31.get', r'exec-i31.get'),
     Instruction(3.0, r'\I31GETU', r'\hex{FB}~\hex{1E}', r'[\I31REF] \to [\I32]', r'valid-i31.get', r'exec-i31.get'),
-    Instruction(0.0, None, r'\hex{FB}~\hex{1E} \dots'),
+    Instruction(0.0, None, r'\hex{FB}~\hex{1F} \dots'),
     Instruction(2.0, r'\I32.\TRUNC\K{\_sat\_}\F32\K{\_s}', r'\hex{FC}~\hex{00}', r'[\F32] \to [\I32]', r'valid-cvtop', r'exec-cvtop', r'op-trunc_sat'),
     Instruction(2.0, r'\I32.\TRUNC\K{\_sat\_}\F32\K{\_u}', r'\hex{FC}~\hex{01}', r'[\F32] \to [\I32]', r'valid-cvtop', r'exec-cvtop', r'op-trunc_sat'),
     Instruction(2.0, r'\I32.\TRUNC\K{\_sat\_}\F64\K{\_s}', r'\hex{FC}~\hex{02}', r'[\F64] \to [\I32]', r'valid-cvtop', r'exec-cvtop', r'op-trunc_sat'),

document/core/appendix/properties.rst

@@ -270,7 +270,7 @@ Results
      \qquad
      \vdashresulttype [t^\ast] : \OKresulttype
    }{
-     S \vdashresult (\REFEXNADDR~a)~\THROWREF : [{t'}^\ast]
+     S \vdashresult (\REFEXNADDR~a)~\THROWREF : [t^\ast]
    }
 
 

document/core/exec/runtime.rst

@@ -621,7 +621,7 @@ Traps are bubbled up through nested instruction sequences, ultimately reducing t
 .. _syntax-config:
 
 Configurations
-..............
+~~~~~~~~~~~~~~
 
 A *configuration* describes the current computation.
 It consists of the computations's *state* and the sequence of :ref:`instructions <syntax-instr>` left to execute.
@@ -646,3 +646,28 @@ $${syntax: config state}
 .. note::
    The current version of WebAssembly is single-threaded,
    but configurations with multiple threads may be supported in the future.
+
+
+Conventions
+...........
+
+* The meta variable ${state: z} ranges over frame states where clear from context.
+
+* The following shorthands are defined for accessing a state ${:z = (s; f)}:
+
+  - ${definition: type}
+  - ${definition: tag}
+  - ${definition: global}
+  - ${definition: mem}
+  - ${definition: table}
+  - ${definition: func}
+  - ${definition: data}
+  - ${definition: elem}
+  - ${definition: local}
+
+* These shorthands also extend to :ref:`notation <notation-replace>` for updating state:
+
+  - ${definition: with_global}
+  - ${definition: with_mem}
+  - ${definition: with_table}
+  - ${definition: with_local}

document/core/syntax/conventions.rst

@@ -96,10 +96,10 @@ Moreover, the following conventions are employed:
   but implicitly also defines ${:i^n} to be the sequence of values ${:0} to ${:($(n-1))}.
 
 .. note::
-   For example, if ${:x^n} is the sequence ${:a b c}, then ${:($($f(x) + 1))^n} denotes the sequence ${:($($f(a) + 1)) ($($f(b) + 1)) ($($f(c) + 1))}.
+   For example, if ${:x^n} is the sequence ${:a b c}, then ${-:($($f(x) + 1))^n} denotes the sequence ${-:($($f(a) + 1)) ($($f(b) + 1)) ($($f(c) + 1))}.
 
    The form ${:e^(i<n)} additionally gives access to an index variable inside the iteration.
-   For example, ${:($($f(x) + i))^(i<n)} denotes the sequence ${:($($f(a) + 0)) ($($f(b) + 1)) ($($f(c) + 2))}.
+   For example, ${-:($($f(x) + i))^(i<n)} denotes the sequence ${-:($($f(a) + 0)) ($($f(b) + 1)) ($($f(c) + 2))}.
 
 Productions of the following form are interpreted as *records* that map a fixed set of fields ${:FIELD_ i} to "values" ${:A_i}, respectively:
 

document/core/syntax/instructions.rst

@@ -254,7 +254,7 @@ The former merely returns the result of the test,
 while the latter performs a downcast and :ref:`traps <trap>` if the operand's type does not match.
 
 .. note::
-   The ${:BR_ON_NULL} and ${:BR_ON_NON_NULL} instructions provide versions of ${:REF.AS_NULL} that branch depending on the success of failure of a null test instead of trapping.
+   The ${:BR_ON_NULL} and ${:BR_ON_NON_NULL} instructions provide versions of ${:REF.AS_NON_NULL} that branch depending on the success or failure of a null test instead of trapping.
    Similarly, the ${:BR_ON_CAST} and ${:BR_ON_CAST_FAIL} instructions provides versions of ${:REF.CAST} that branch depending on the success of the downcast instead of trapping.
 
    An additional instruction operating on function references is the :ref:`control instruction <syntax-instr-control>` ${:CALL_REF}.

document/core/syntax/modules.rst

@@ -68,7 +68,7 @@ Indices
 Definitions are referenced with zero-based *indices*.
 Each class of definition has its own *index space*, as distinguished by the following classes.
 
-$${syntax: {typeidx funcidx globalidx tableidx memidx tagidx elemidx dataidx labelidx localidx fieldidx}}
+$${syntax: {idx typeidx funcidx globalidx tableidx memidx tagidx elemidx dataidx labelidx localidx fieldidx}}
 
 The index space for
 :ref:`tags <syntax-tag>`,