@@ -269,9 +269,9 @@ instances, but with an expanded component-level definition of `sort`:
269
269
instance ::= (instance <id>? <instanceexpr>)
270
270
instanceexpr ::= (instantiate <componentidx> <instantiatearg>*)
271
271
| <inlineexport>*
272
- instantiatearg ::= (with <string > <sortidx>)
273
- | (with <string > (instance <inlineexport>*))
274
- string ::= <core:name>
272
+ instantiatearg ::= (with <name > <sortidx>)
273
+ | (with <name > (instance <inlineexport>*))
274
+ name ::= <core:name>
275
275
sortidx ::= (<sort> <u32>)
276
276
sort ::= core <core:sort>
277
277
| func
@@ -290,7 +290,7 @@ future include `data`). Thus, component-level `sort` injects the full set
290
290
of ` core:sort ` , so that they may be referenced (leaving it up to validation
291
291
rules to throw out the core sorts that aren't allowed in various contexts).
292
292
293
- The ` string ` production reuses the ` core:name ` quoted-string-literal syntax of
293
+ The ` name ` production reuses the ` core:name ` quoted-string-literal syntax of
294
294
Core WebAssembly (which appears in core module imports and exports and can
295
295
contain any valid UTF-8 string).
296
296
@@ -312,14 +312,14 @@ instance, the `core export` of a core module instance and a definition of an
312
312
` outer ` component (containing the current component):
313
313
``` ebnf
314
314
alias ::= (alias <aliastarget> (<sort> <id>?))
315
- aliastarget ::= export <instanceidx> <string >
315
+ aliastarget ::= export <instanceidx> <name >
316
316
| core export <core:instanceidx> <core:name>
317
317
| outer <u32> <u32>
318
318
```
319
319
If present, the ` id ` of the alias is bound to the new index added by the alias
320
320
and can be used anywhere a normal ` id ` can be used.
321
321
322
- In the case of ` export ` aliases, validation ensures ` string ` is an export in the
322
+ In the case of ` export ` aliases, validation ensures ` name ` is an export in the
323
323
target instance and has a matching sort.
324
324
325
325
In the case of ` outer ` aliases, the ` u32 ` pair serves as a [ de Bruijn
@@ -347,7 +347,7 @@ sortidx ::= (<sort> <u32>) ;; as above
347
347
| <inlinealias>
348
348
Xidx ::= <u32> ;; as above
349
349
| <inlinealias>
350
- inlinealias ::= (<sort> <u32> <string >+)
350
+ inlinealias ::= (<sort> <u32> <name >+)
351
351
```
352
352
If ` <sort> ` refers to a ` <core:sort> ` , then the ` <u32> ` of ` inlinealias ` is a
353
353
` <core:instanceidx> ` ; otherwise it's an ` <instanceidx> ` . For example, the
0 commit comments