Skip to content

Commit a5e3120

Browse files
committed
Fix memory imports, see #36
1 parent eef8ef2 commit a5e3120

File tree

5 files changed

+10
-269
lines changed

5 files changed

+10
-269
lines changed

dist/assemblyscript.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/assemblyscript.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 0 additions & 263 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
},
2020
"devDependencies": {
2121
"@types/node": "^9.4.6",
22-
"babel-minify-webpack-plugin": "^0.3.0",
2322
"browser-process-hrtime": "^0.1.2",
2423
"chalk": "^2.3.1",
2524
"diff": "^3.4.0",

src/compiler.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ export class Compiler extends DiagnosticEmitter {
303303

304304
// import memory if requested
305305
if (this.options.importMemory) {
306-
this.module.addMemoryImport("memory", "env", "memory");
306+
this.module.addMemoryImport("0", "env", "memory");
307307
}
308308

309309
// set up function table
@@ -4266,7 +4266,7 @@ export class Compiler extends DiagnosticEmitter {
42664266
break;
42674267

42684268
case TypeKind.VOID:
4269-
break;
4269+
break; // compiles to best fitting type below, being dropped
42704270

42714271
default:
42724272
assert(false);
@@ -4290,7 +4290,12 @@ export class Compiler extends DiagnosticEmitter {
42904290
// case LiteralKind.OBJECT:
42914291
// case LiteralKind.REGEXP:
42924292
}
4293-
throw new Error("not implemented");
4293+
this.error(
4294+
DiagnosticCode.Operation_not_supported,
4295+
expression.range
4296+
);
4297+
this.currentType = contextualType;
4298+
return this.module.createUnreachable();
42944299
}
42954300

42964301
compileStaticString(stringValue: string): ExpressionRef {

0 commit comments

Comments
 (0)