Skip to content

Commit ad28811

Browse files
committed
Merge remote-tracking branch 'origin/master' into release
2 parents e99ccf8 + 899e97a commit ad28811

File tree

294 files changed

+9028
-8473
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

294 files changed

+9028
-8473
lines changed

NOTICE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ under the licensing terms detailed in LICENSE:
2020
* Jay Phelps <hello@jayphelps.com>
2121
* jhwgh1968 <jhwgh1968@protonmail.com>
2222
* Jeffrey Charles <jeffreycharles@gmail.com>
23+
* Vladimir Tikhonov <reg@tikhonov.by>
2324

2425
Portions of this software are derived from third-party works licensed under
2526
the following terms:

cli/asc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ exports.main = function main(argv, options, callback) {
217217
assemblyscript.setImportMemory(compilerOptions, args.importMemory);
218218
assemblyscript.setSharedMemory(compilerOptions, args.sharedMemory);
219219
assemblyscript.setImportTable(compilerOptions, args.importTable);
220+
assemblyscript.setExportTable(compilerOptions, args.exportTable);
220221
assemblyscript.setExplicitStart(compilerOptions, args.explicitStart);
221222
assemblyscript.setMemoryBase(compilerOptions, args.memoryBase >>> 0);
222223
assemblyscript.setSourceMap(compilerOptions, args.sourceMap != null);

cli/asc.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
"default": false
124124
},
125125
"importMemory": {
126-
"description": "Imports the memory instance provided by the embedder.",
126+
"description": "Imports the memory provided as 'env.memory'.",
127127
"type": "b",
128128
"default": false
129129
},
@@ -138,7 +138,12 @@
138138
"default": 0
139139
},
140140
"importTable": {
141-
"description": "Imports the function table instance provided by the embedder.",
141+
"description": "Imports the function table provided as 'env.table'.",
142+
"type": "b",
143+
"default": false
144+
},
145+
"exportTable": {
146+
"description": "Exports the function table as 'table'.",
142147
"type": "b",
143148
"default": false
144149
},

0 commit comments

Comments
 (0)