Skip to content

Commit 394d0aa

Browse files
rossbergrossberg
committed
Merge remote-tracking branch 'upstream/master'
2 parents 122e4be + 03c0770 commit 394d0aa

File tree

22 files changed

+264
-101
lines changed

22 files changed

+264
-101
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ install:
2121
- opam --version
2222
- ocaml --version
2323
- opam install --yes ocamlbuild.0.14.0
24-
- pip install Sphinx==2.4.4
24+
- pip install Sphinx==3.5.2
2525
- git clone https://github.com/tabatkins/bikeshed.git
2626
- pip install --editable $PWD/bikeshed
2727
- bikeshed update

‎document/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pipenv shell
4242
Install Python dependencies:
4343

4444
```
45-
pip install Sphinx==2.4.4
45+
pipenv install Sphinx==3.5.2
4646
```
4747

4848
### Checking out the repository
@@ -80,7 +80,7 @@ To build the [single-page W3C version](https://webassembly.github.io/spec/core/b
8080
```
8181
# cd back to root of git directory
8282
git clone https://github.com/tabatkins/bikeshed.git
83-
pip install --editable bikeshed
83+
pipenv install -e bikeshed
8484
bikeshed update
8585
```
8686

‎document/core/appendix/changes.rst

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
.. index:: ! changes
2+
.. _changes:
3+
4+
Change History
5+
--------------
6+
7+
Since the original release 1.0 of the WebAssembly specification, a number of proposals for extensions have been integrated.
8+
The following sections provide an overview of what has changed.
9+
10+
Release 1.1
11+
~~~~~~~~~~~
12+
13+
.. index:: instruction, integer
14+
15+
Sign extension instructions
16+
...........................
17+
18+
Added new numeric instructions for performing sign extension within integer representations [#proposal-signext]_.
19+
20+
* New :ref:`numeric instructions <syntax-instr-numeric>`: :math:`\K{i}\X{nn}\K{.}\EXTEND\X{N}\K{\_s}`
21+
22+
23+
.. index:: instruction, trap, floating-point, integer
24+
25+
Non-trapping float-to-int conversions
26+
.....................................
27+
28+
Added new conversion instructions that avoid trapping when converting a floating-point number to an integer [#proposal-cvtsat]_.
29+
30+
* New :ref:`numeric instructions <syntax-instr-numeric>`: :math:`\K{i}\X{nn}\K{.}\TRUNC\K{\_sat\_f}\X{mm}\K{\_}\sx`
31+
32+
33+
.. index:: block, function, value type, result type
34+
35+
Multiple values
36+
...............
37+
38+
Generalized the result type of blocks and functions to allow for multiple values; in addition, introduced the ability to have block parameters [#proposal-multivalue]_.
39+
40+
* :ref:`Function types <syntax-functype>` allow more than one result
41+
42+
* :ref:`Block types <syntax-blocktype>` can be arbitrary function types
43+
44+
45+
.. index:: value type, reference, reference type, instruction, element segment
46+
47+
Reference types
48+
...............
49+
50+
Added |FUNCREF| and |EXTERNREF| as new value types and respective instructions [#proposal-reftype]_.
51+
52+
* New :ref:`value types <syntax-valtype>`: :ref:`reference types <syntax-reftype>` |FUNCREF| and |EXTERNREF|
53+
54+
* New :ref:`reference instructions <syntax-instr-ref>`: |REFNULL|, |REFFUNC|, |REFISNULL|
55+
56+
* Enrich :ref:`parametric instruction <syntax-instr-parametric>`: |SELECT| with optional type immediate
57+
58+
* New :ref:`declarative <syntax-elemmode>` form of :ref:`element segment <syntax-elem>`
59+
60+
61+
.. index:: reference, instruction, table, table type
62+
63+
Table instructions
64+
..................
65+
66+
Added instructions to directly access and modify tables [#proposal-reftype]_.
67+
68+
* :ref:`Table types <syntax-tabletype>` allow any :ref:`reference type <syntax-reftype>` as element type
69+
70+
* New :ref:`table instructions <syntax-instr-table>`: |TABLEGET|, |TABLESET|, |TABLESIZE|, |TABLEGROW|
71+
72+
73+
.. index:: table, instruction, table index, element segment
74+
75+
Multiple tables
76+
...............
77+
78+
Added the ability to use multiple tables per module [#proposal-reftype]_.
79+
80+
* :ref:`Modules <syntax-module>` may :ref:`define <syntax-table>`, :ref:`import <syntax-import>`, and :ref:`export <syntax-export>` multiple tables
81+
82+
* :ref:`Table instructions <syntax-instr-table>` take a :ref:`table index <syntax-tableidx>` immediate: |TABLEGET|, |TABLESET|, |TABLESIZE|, |TABLEGROW|, |CALLINDIRECT|
83+
84+
* :ref:`Element segments <syntax-elem>` take a :ref:`table index <syntax-tableidx>`
85+
86+
87+
.. index:: instruction, table, memory, data segment, element segment
88+
89+
Bulk memory and table instructions
90+
..................................
91+
92+
Added instructions that modify ranges of memory or table entries [#proposal-reftype]_ [#proposal-bulk]_
93+
94+
* New :ref:`memory instructions <syntax-instr-memory>`: |MEMORYFILL|, |MEMORYINIT|, |MEMORYCOPY|, |DATADROP|
95+
96+
* New :ref:`table instructions <syntax-instr-table>`: |TABLEFILL|, |TABLEINIT|, |TABLECOPY|, |ELEMDROP|
97+
98+
* New :ref:`passive <syntax-datamode>` form of :ref:`data segment <syntax-data>`
99+
100+
* New :ref:`passive <syntax-elemmode>` form of :ref:`element segment <syntax-elem>`
101+
102+
* New :ref:`data count section <binary-datacountsec>` in binary format
103+
104+
* Active data and element segments boundaries are no longer checked at compile time but may trap instead
105+
106+
107+
.. [#proposal-signext]
108+
https://github.com/WebAssembly/spec/tree/master/proposals/sign-extension-ops/
109+
110+
.. [#proposal-cvtsat]
111+
https://github.com/WebAssembly/spec/tree/master/proposals/nontrapping-float-to-int-conversion/
112+
113+
.. [#proposal-multivalue]
114+
https://github.com/WebAssembly/spec/tree/master/proposals/multi-value/
115+
116+
.. [#proposal-reftype]
117+
https://github.com/WebAssembly/spec/tree/master/proposals/reference-types/
118+
119+
.. [#proposal-bulk]
120+
https://github.com/WebAssembly/spec/tree/master/proposals/bulk-memory-operations/

‎document/core/appendix/gen-index-instructions.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -321,18 +321,19 @@ def Instruction(name, opcode, type=None, validation=None, execution=None, operat
321321
Instruction(r'\I64.\TRUNC\K{\_sat\_}\F32\K{\_u}', r'\hex{FC}~\hex{05}', r'[\F32] \to [\I64]', r'valid-cvtop', r'exec-cvtop', r'op-trunc_sat_u'),
322322
Instruction(r'\I64.\TRUNC\K{\_sat\_}\F64\K{\_s}', r'\hex{FC}~\hex{06}', r'[\F64] \to [\I64]', r'valid-cvtop', r'exec-cvtop', r'op-trunc_sat_s'),
323323
Instruction(r'\I64.\TRUNC\K{\_sat\_}\F64\K{\_u}', r'\hex{FC}~\hex{07}', r'[\F64] \to [\I64]', r'valid-cvtop', r'exec-cvtop', r'op-trunc_sat_u'),
324-
Instruction(r'\MEMORYINIT', r'\hex{FC}~\hex{08}', r'[\I32~\I32~\I32] \to []', r'valid-memory.init', r'exec-memory.init'),
325-
Instruction(r'\DATADROP', r'\hex{FC}~\hex{09}', r'[] \to []', r'valid-data.drop', r'exec-data.drop'),
324+
Instruction(r'\MEMORYINIT~x', r'\hex{FC}~\hex{08}', r'[\I32~\I32~\I32] \to []', r'valid-memory.init', r'exec-memory.init'),
325+
Instruction(r'\DATADROP~x', r'\hex{FC}~\hex{09}', r'[] \to []', r'valid-data.drop', r'exec-data.drop'),
326326
Instruction(r'\MEMORYCOPY', r'\hex{FC}~\hex{0A}', r'[\I32~\I32~\I32] \to []', r'valid-memory.copy', r'exec-memory.copy'),
327327
Instruction(r'\MEMORYFILL', r'\hex{FC}~\hex{0B}', r'[\I32~\I32~\I32] \to []', r'valid-memory.fill', r'exec-memory.fill'),
328-
Instruction(r'\TABLEINIT', r'\hex{FC}~\hex{0C}', r'[\I32~\I32~\I32] \to []', r'valid-table.init', r'exec-table.init'),
329-
Instruction(r'\ELEMDROP', r'\hex{FC}~\hex{0D}', r'[] \to []', r'valid-elem.drop', r'exec-elem.drop'),
330-
Instruction(r'\TABLECOPY', r'\hex{FC}~\hex{0E}', r'[\I32~\I32~\I32] \to []', r'valid-table.copy', r'exec-table.copy'),
331-
Instruction(r'\TABLEGROW', r'\hex{FC}~\hex{0F}', r'[t~\I32] \to []', r'valid-table.grow', r'exec-table.grow'),
332-
Instruction(r'\TABLESIZE', r'\hex{FC}~\hex{10}', r'[] \to []', r'valid-table.size', r'exec-table.size'),
333-
Instruction(r'\TABLEFILL', r'\hex{FC}~\hex{11}', r'[\I32~t~\I32] \to []', r'valid-table.fill', r'exec-table.fill'),
328+
Instruction(r'\TABLEINIT~x~y', r'\hex{FC}~\hex{0C}', r'[\I32~\I32~\I32] \to []', r'valid-table.init', r'exec-table.init'),
329+
Instruction(r'\ELEMDROP~x', r'\hex{FC}~\hex{0D}', r'[] \to []', r'valid-elem.drop', r'exec-elem.drop'),
330+
Instruction(r'\TABLECOPY~x~y', r'\hex{FC}~\hex{0E}', r'[\I32~\I32~\I32] \to []', r'valid-table.copy', r'exec-table.copy'),
331+
Instruction(r'\TABLEGROW~x', r'\hex{FC}~\hex{0F}', r'[t~\I32] \to []', r'valid-table.grow', r'exec-table.grow'),
332+
Instruction(r'\TABLESIZE~x', r'\hex{FC}~\hex{10}', r'[] \to []', r'valid-table.size', r'exec-table.size'),
333+
Instruction(r'\TABLEFILL~x', r'\hex{FC}~\hex{11}', r'[\I32~t~\I32] \to []', r'valid-table.fill', r'exec-table.fill'),
334334
]
335335

336+
336337
def ColumnWidth(n):
337338
return max([len(instr[n]) for instr in INSTRUCTIONS])
338339

‎document/core/appendix/index-instructions.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -269,14 +269,14 @@ Instruction Binary Opcode Type
269269
:math:`\I64.\TRUNC\K{\_sat\_}\F32\K{\_u}` :math:`\hex{FC}~\hex{05}` :math:`[\F32] \to [\I64]` :ref:`validation <valid-cvtop>` :ref:`execution <exec-cvtop>`, :ref:`operator <op-trunc_sat_u>`
270270
:math:`\I64.\TRUNC\K{\_sat\_}\F64\K{\_s}` :math:`\hex{FC}~\hex{06}` :math:`[\F64] \to [\I64]` :ref:`validation <valid-cvtop>` :ref:`execution <exec-cvtop>`, :ref:`operator <op-trunc_sat_s>`
271271
:math:`\I64.\TRUNC\K{\_sat\_}\F64\K{\_u}` :math:`\hex{FC}~\hex{07}` :math:`[\F64] \to [\I64]` :ref:`validation <valid-cvtop>` :ref:`execution <exec-cvtop>`, :ref:`operator <op-trunc_sat_u>`
272-
:math:`\MEMORYINIT` :math:`\hex{FC}~\hex{08}` :math:`[\I32~\I32~\I32] \to []` :ref:`validation <valid-memory.init>` :ref:`execution <exec-memory.init>`
273-
:math:`\DATADROP` :math:`\hex{FC}~\hex{09}` :math:`[] \to []` :ref:`validation <valid-data.drop>` :ref:`execution <exec-data.drop>`
272+
:math:`\MEMORYINIT~x` :math:`\hex{FC}~\hex{08}` :math:`[\I32~\I32~\I32] \to []` :ref:`validation <valid-memory.init>` :ref:`execution <exec-memory.init>`
273+
:math:`\DATADROP~x` :math:`\hex{FC}~\hex{09}` :math:`[] \to []` :ref:`validation <valid-data.drop>` :ref:`execution <exec-data.drop>`
274274
:math:`\MEMORYCOPY` :math:`\hex{FC}~\hex{0A}` :math:`[\I32~\I32~\I32] \to []` :ref:`validation <valid-memory.copy>` :ref:`execution <exec-memory.copy>`
275275
:math:`\MEMORYFILL` :math:`\hex{FC}~\hex{0B}` :math:`[\I32~\I32~\I32] \to []` :ref:`validation <valid-memory.fill>` :ref:`execution <exec-memory.fill>`
276-
:math:`\TABLEINIT` :math:`\hex{FC}~\hex{0C}` :math:`[\I32~\I32~\I32] \to []` :ref:`validation <valid-table.init>` :ref:`execution <exec-table.init>`
277-
:math:`\ELEMDROP` :math:`\hex{FC}~\hex{0D}` :math:`[] \to []` :ref:`validation <valid-elem.drop>` :ref:`execution <exec-elem.drop>`
278-
:math:`\TABLECOPY` :math:`\hex{FC}~\hex{0E}` :math:`[\I32~\I32~\I32] \to []` :ref:`validation <valid-table.copy>` :ref:`execution <exec-table.copy>`
279-
:math:`\TABLEGROW` :math:`\hex{FC}~\hex{0F}` :math:`[t~\I32] \to []` :ref:`validation <valid-table.grow>` :ref:`execution <exec-table.grow>`
280-
:math:`\TABLESIZE` :math:`\hex{FC}~\hex{10}` :math:`[] \to []` :ref:`validation <valid-table.size>` :ref:`execution <exec-table.size>`
281-
:math:`\TABLEFILL` :math:`\hex{FC}~\hex{11}` :math:`[\I32~t~\I32] \to []` :ref:`validation <valid-table.fill>` :ref:`execution <exec-table.fill>`
276+
:math:`\TABLEINIT~x~y` :math:`\hex{FC}~\hex{0C}` :math:`[\I32~\I32~\I32] \to []` :ref:`validation <valid-table.init>` :ref:`execution <exec-table.init>`
277+
:math:`\ELEMDROP~x` :math:`\hex{FC}~\hex{0D}` :math:`[] \to []` :ref:`validation <valid-elem.drop>` :ref:`execution <exec-elem.drop>`
278+
:math:`\TABLECOPY~x~y` :math:`\hex{FC}~\hex{0E}` :math:`[\I32~\I32~\I32] \to []` :ref:`validation <valid-table.copy>` :ref:`execution <exec-table.copy>`
279+
:math:`\TABLEGROW~x` :math:`\hex{FC}~\hex{0F}` :math:`[t~\I32] \to []` :ref:`validation <valid-table.grow>` :ref:`execution <exec-table.grow>`
280+
:math:`\TABLESIZE~x` :math:`\hex{FC}~\hex{10}` :math:`[] \to []` :ref:`validation <valid-table.size>` :ref:`execution <exec-table.size>`
281+
:math:`\TABLEFILL~x` :math:`\hex{FC}~\hex{11}` :math:`[\I32~t~\I32] \to []` :ref:`validation <valid-table.fill>` :ref:`execution <exec-table.fill>`
282282
========================================= ========================= ============================================= ============================================== ===============================================================

‎document/core/appendix/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Appendix
1111
algorithm
1212
custom
1313
properties
14+
changes
1415

1516
.. only:: singlehtml
1617

‎document/core/appendix/properties.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,8 @@ Module instances are classified by *module contexts*, which are regular :ref:`co
360360

361361
* Let :math:`\globaltype^\ast` be the concatenation of all :math:`\globaltype_i` in order.
362362

363-
* Then the module instance is valid with :ref:`context <context>` :math:`\{\CTYPES~\functype^\ast, \CFUNCS~{\functype'}^\ast, \CTABLES~\tabletype^\ast, \CMEMS~\memtype^\ast, \CGLOBALS~\globaltype^\ast\}`.
363+
* | Then the module instance is valid with :ref:`context <context>`
364+
| :math:`\{\CTYPES~\functype^\ast, \CFUNCS~{\functype'}^\ast, \CTABLES~\tabletype^\ast, \CMEMS~\memtype^\ast, \CGLOBALS~\globaltype^\ast\}`.
364365
365366
.. math::
366367
~\\[-1ex]

‎document/core/binary/modules.rst

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -328,21 +328,29 @@ It decodes into a vector of :ref:`element segments <syntax-elem>` that represent
328328
\X{seg}^\ast{:}\Bsection_9(\Bvec(\Belem)) &\Rightarrow& \X{seg} \\
329329
\production{element segment} & \Belem &::=&
330330
\hex{00}~~e{:}\Bexpr~~y^\ast{:}\Bvec(\Bfuncidx)
331-
&\Rightarrow& \{ \ETYPE~\FUNCREF, \EINIT~((\REFFUNC~y)~\END)^\ast, \EMODE~\EACTIVE~\{ \ETABLE~0, \EOFFSET~e \} \} \\ &&|&
331+
&\Rightarrow& \\&&&\quad
332+
\{ \ETYPE~\FUNCREF, \EINIT~((\REFFUNC~y)~\END)^\ast, \EMODE~\EACTIVE~\{ \ETABLE~0, \EOFFSET~e \} \} \\ &&|&
332333
\hex{01}~~\X{et}:\Belemkind~~y^\ast{:}\Bvec(\Bfuncidx)
333-
&\Rightarrow& \{ \ETYPE~\X{et}, \EINIT~((\REFFUNC~y)~\END)^\ast, \EMODE~\EPASSIVE \} \\ &&|&
334+
&\Rightarrow& \\&&&\quad
335+
\{ \ETYPE~\X{et}, \EINIT~((\REFFUNC~y)~\END)^\ast, \EMODE~\EPASSIVE \} \\ &&|&
334336
\hex{02}~~x{:}\Btableidx~~e{:}\Bexpr~~\X{et}:\Belemkind~~y^\ast{:}\Bvec(\Bfuncidx)
335-
&\Rightarrow& \{ \ETYPE~\X{et}, \EINIT~((\REFFUNC~y)~\END)^\ast, \EMODE~\EACTIVE~\{ \ETABLE~x, \EOFFSET~e \} \} \\ &&|&
337+
&\Rightarrow& \\&&&\quad
338+
\{ \ETYPE~\X{et}, \EINIT~((\REFFUNC~y)~\END)^\ast, \EMODE~\EACTIVE~\{ \ETABLE~x, \EOFFSET~e \} \} \\ &&|&
336339
\hex{03}~~\X{et}:\Belemkind~~y^\ast{:}\Bvec(\Bfuncidx)
337-
&\Rightarrow& \{ \ETYPE~\X{et}, \EINIT~((\REFFUNC~y)~\END)^\ast, \EMODE~\EDECLARATIVE \} \\ &&|&
340+
&\Rightarrow& \\&&&\quad
341+
\{ \ETYPE~\X{et}, \EINIT~((\REFFUNC~y)~\END)^\ast, \EMODE~\EDECLARATIVE \} \\ &&|&
338342
\hex{04}~~e{:}\Bexpr~~\X{el}^\ast{:}\Bvec(\Bexpr)
339-
&\Rightarrow& \{ \ETYPE~\FUNCREF, \EINIT~\X{el}^\ast, \EMODE~\EACTIVE~\{ \ETABLE~0, \EOFFSET~e \} \} \\ &&|&
343+
&\Rightarrow& \\&&&\quad
344+
\{ \ETYPE~\FUNCREF, \EINIT~\X{el}^\ast, \EMODE~\EACTIVE~\{ \ETABLE~0, \EOFFSET~e \} \} \\ &&|&
340345
\hex{05}~~\X{et}:\Breftype~~\X{el}^\ast{:}\Bvec(\Bexpr)
341-
&\Rightarrow& \{ \ETYPE~et, \EINIT~\X{el}^\ast, \EMODE~\EPASSIVE \} \\ &&|&
346+
&\Rightarrow& \\&&&\quad
347+
\{ \ETYPE~et, \EINIT~\X{el}^\ast, \EMODE~\EPASSIVE \} \\ &&|&
342348
\hex{06}~~x{:}\Btableidx~~e{:}\Bexpr~~\X{et}:\Breftype~~\X{el}^\ast{:}\Bvec(\Bexpr)
343-
&\Rightarrow& \{ \ETYPE~et, \EINIT~\X{el}^\ast, \EMODE~\EACTIVE~\{ \ETABLE~x, \EOFFSET~e \} \} \\ &&|&
349+
&\Rightarrow& \\&&&\quad
350+
\{ \ETYPE~et, \EINIT~\X{el}^\ast, \EMODE~\EACTIVE~\{ \ETABLE~x, \EOFFSET~e \} \} \\ &&|&
344351
\hex{07}~~\X{et}:\Breftype~~\X{el}^\ast{:}\Bvec(\Bexpr)
345-
&\Rightarrow& \{ \ETYPE~et, \EINIT~\X{el}^\ast, \EMODE~\EDECLARATIVE \} \\
352+
&\Rightarrow& \\&&&\quad
353+
\{ \ETYPE~et, \EINIT~\X{el}^\ast, \EMODE~\EDECLARATIVE \} \\
346354
\production{element kind} & \Belemkind &::=&
347355
\hex{00} &\Rightarrow& \FUNCREF \\
348356
\end{array}

‎document/core/conf.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
# documentation root, use os.path.abspath to make it absolute, like shown here.
1818
import os
1919
import sys
20+
from datetime import date
2021
pwd = os.path.abspath('.')
2122
sys.path.insert(0, pwd + '/util')
2223

@@ -63,14 +64,23 @@
6364
editor = u'Andreas Rossberg (editor)'
6465
logo = 'static/webassembly.png'
6566

67+
# The name of the GitHub repository this resides in
68+
repo = 'tail-call'
69+
70+
# The name of the proposal it represents, if any
71+
proposal = 'tail-call'
72+
73+
# The draft version string (clear out for release cuts)
74+
draft = ' (Draft ' + date.today().strftime("%Y-%m-%d") + ')'
75+
6676
# The version info for the project you're documenting, acts as replacement for
6777
# |version| and |release|, also used in various other places throughout the
6878
# built documents.
6979
#
7080
# The short X.Y version.
7181
version = u'1.1'
7282
# The full version, including alpha/beta/rc tags.
73-
release = version + ''
83+
release = version + ('' if proposal == '' else ' + ') + proposal + draft
7484

7585
# The language for content autogenerated by Sphinx. Refer to documentation
7686
# for a list of supported languages.
@@ -186,7 +196,7 @@
186196
# Add any paths that contain custom static files (such as style sheets) here,
187197
# relative to this directory. They are copied after the builtin static files,
188198
# so a file named "default.css" will overwrite the builtin "default.css".
189-
html_static_path = ['_static', 'static/custom.css']
199+
html_static_path = ['static/custom.css']
190200

191201
# Add any extra paths that contain custom files (such as robots.txt or
192202
# .htaccess) here, relative to this directory. These files are copied
@@ -476,6 +486,8 @@
476486

477487
# Macros
478488
rst_prolog = """
489+
.. |issuelink| replace:: https://github.com/webassembly/""" + repo + """/issues/
490+
.. |pagelink| replace:: https://webassembly.github.io/""" + repo + """/core/
479491
.. include:: /""" + pwd + """/util/macros.def
480492
"""
481493

0 commit comments

Comments
 (0)