From 8ea5ed649331aab7d701654ad60ea6de214d46a6 Mon Sep 17 00:00:00 2001 From: Guido Zuidhof Date: Mon, 8 Jun 2020 20:52:53 +0100 Subject: [PATCH 1/3] Add name to NOTICE, also update assembly/index.d.ts --- NOTICE | 1 + std/assembly/index.d.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index 2a65be1bbd..2d41975541 100644 --- a/NOTICE +++ b/NOTICE @@ -22,6 +22,7 @@ under the licensing terms detailed in LICENSE: * Duncan Uszkay * Surma * Julien Letellier +* Guido Zuidhof Portions of this software are derived from third-party works licensed under the following terms: diff --git a/std/assembly/index.d.ts b/std/assembly/index.d.ts index b2161353d3..4df3ba5e2d 100644 --- a/std/assembly/index.d.ts +++ b/std/assembly/index.d.ts @@ -40,7 +40,7 @@ declare type anyref = object; // Compiler hints -/** Compiler target. 0 = JS, 1 = WASM32, 2 = WASM64. */ +/** Compiler target. 0 = WASM32, 1 = WASM64, 2 = JS. */ declare const ASC_TARGET: i32; /** Provided noAssert option. */ declare const ASC_NO_ASSERT: bool; From 2ed39726c92b78096b79c4bcc971d2d76eafdf21 Mon Sep 17 00:00:00 2001 From: Guido Zuidhof Date: Mon, 8 Jun 2020 20:54:13 +0100 Subject: [PATCH 2/3] Update portable typedef --- std/portable/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/std/portable/index.d.ts b/std/portable/index.d.ts index bc4587db3d..a8fe3d3f53 100644 --- a/std/portable/index.d.ts +++ b/std/portable/index.d.ts @@ -33,7 +33,7 @@ declare type valueof = T[0]; // Compiler hints -/** Compiler target. 0 = JS, 1 = WASM32, 2 = WASM64. */ +/** Compiler target. 0 = WASM32, 1 = WASM64, 2 = JS. */ declare const ASC_TARGET: i32; /** Provided noAssert option. */ declare const ASC_NO_ASSERT: bool; From 570776556216720cf4e3314e72277a378a81651f Mon Sep 17 00:00:00 2001 From: Guido Zuidhof Date: Mon, 8 Jun 2020 21:27:07 +0100 Subject: [PATCH 3/3] Add explicit values to target enum --- std/assembly/shared/target.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/std/assembly/shared/target.ts b/std/assembly/shared/target.ts index 8aecd4705e..d6d0a3a086 100644 --- a/std/assembly/shared/target.ts +++ b/std/assembly/shared/target.ts @@ -3,9 +3,9 @@ /** Compilation target. */ export enum Target { /** WebAssembly with 32-bit pointers. */ - WASM32, + WASM32 = 0, /** WebAssembly with 64-bit pointers. Experimental and not supported by any runtime yet. */ - WASM64, + WASM64 = 1, /** Portable. */ - JS + JS = 2 }