Merge remote-tracking branch 'upstream/master'

Author: rossberg

.travis.yml

@@ -5,10 +5,15 @@ python:
 
 sudo: on
 
+before_install:
+  - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+  - echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+  - sudo apt-get update -qq
+
 install:
   - ./interpreter/meta/travis/install-ocaml.sh
   - sudo pip install sphinx==1.7.9
-  - sudo apt-get install texlive-full
+  - sudo apt-get install texlive-full yarn
   - git clone https://github.com/tabatkins/bikeshed.git
   - pip install --editable $PWD/bikeshed
   - bikeshed update

document/core/Makefile

@@ -147,7 +147,7 @@ bikeshed:
 	mkdir -p $(BUILDDIR)/bikeshed_mathjax/
 	bikeshed spec index.bs $(BUILDDIR)/bikeshed_mathjax/index.html
 	mkdir -p $(BUILDDIR)/html/bikeshed/
-	(cd util/katex/ && npm install --only=prod)
+	(cd util/katex/ && yarn && yarn build && npm install --only=prod)
 	python util/mathjax2katex.py $(BUILDDIR)/bikeshed_mathjax/index.html \
 		>$(BUILDDIR)/html/bikeshed/index.html
 	mkdir -p $(BUILDDIR)/html/bikeshed/katex/dist/

document/core/appendix/algorithm.rst

@@ -202,5 +202,5 @@ Other instructions are checked in a similar manner.
 
 .. note::
    It is an invariant under the current WebAssembly instruction set that an operand of :code:`Unknown` type is never duplicated on the stack.
-   This would change if the language were extended with stack operators like :code:`dup`.
+   This would change if the language were extended with stack instructions like :code:`dup`.
    Under such an extension, the above algorithm would need to be refined by replacing the :code:`Unknown` type with proper *type variables* to ensure that all uses are consistent.

document/core/appendix/custom.rst

@@ -43,7 +43,10 @@ Each subsection consists of a
    \production{name section} & \Bnamesec &::=&
      \Bsection_0(\Bnamedata) \\
    \production{name data} & \Bnamedata &::=&
-     n{:}\Bname~~\Bnamesubsection^\ast & (\iff n = \text{name}) \\
+     n{:}\Bname & (\iff n = \text{name}) \\ &&&
+     \Bmodulenamesubsec^? \\ &&&
+     \Bfuncnamesubsec^? \\ &&&
+     \Blocalnamesubsec^? \\
    \production{name subsection} & \Bnamesubsection_N(\B{B}) &::=&
      N{:}\Bbyte~~\X{size}{:}\Bu32~~\B{B}
        & (\iff \X{size} = ||\B{B}||) \\
@@ -59,6 +62,8 @@ Id  Subsection
  2  :ref:`local names <binary-localnamesec>`
 ==  ===========================================
 
+Each subsection may occur at most once, and in order of increasing id.
+
 
 .. index:: ! name map, index, index space
 .. _binary-indirectnamemap: