Some thoughts on an initial stdlib to get things going

README.md

@@ -26,6 +26,11 @@ Side effects:
 - Good benchmark when comparing both versions
 - Benefits standard library design ideas
 
+How does it work?
+-----------------
+
+AssemblyScript NEXT compiles a subset (or variant) of TypeScript to Binaryen IR. The resulting module can then be optimized, emitted in text or binary format, or even be converted to asm.js as a polyfill.
+
 Getting started
 ---------------
 
@@ -38,7 +43,7 @@ $> npm install
 $> node bin\asc yourModule.ts
 ```
 
-Building an UMD bundle to `dist/assemblyscript.js` (does not bundle [binaryen.js](https://github.com/AssemblyScript/binaryen.js):
+Building an UMD bundle to `dist/assemblyscript.js` (does not bundle [binaryen.js](https://github.com/AssemblyScript/binaryen.js)):
 
 ```
 $> npm run build

assembly.d.ts

@@ -87,17 +87,10 @@ declare function assert(isTrue: bool): void;
 
 // internal decorators
 
-declare function global(name?: string): any;
-declare function struct(): any
+declare function global(): any;
 declare function inline(): any;
-declare function allocates(): any;
-declare function operator(token: string, fn: any): any;
 
 // standard library
 
-/// <reference path="./std/array.d.ts" />
-/// <reference path="./std/map.d.ts" />
-/// <reference path="./std/math.d.ts" />
-/// <reference path="./std/memory.d.ts" />
-/// <reference path="./std/set.d.ts" />
-/// <reference path="./std/string.d.ts" />
+/// <reference path="./std/carray.d.ts" />
+/// <reference path="./std/cstring.d.ts" />

src/compiler.ts

@@ -1624,59 +1624,54 @@ export class Compiler extends DiagnosticEmitter {
   }
 
   compileIdentifierExpression(expression: IdentifierExpression, contextualType: Type): ExpressionRef {
+    switch (expression.kind) {
 
-    // null
-    if (expression.kind == NodeKind.NULL) {
-      if (contextualType.classType) // keep contextualType
-        return this.options.target == Target.WASM64 ? this.module.createI64(0, 0) : this.module.createI32(0);
-      if (this.options.target == Target.WASM64) {
-        this.currentType = Type.u64;
-        return this.module.createI64(0, 0);
-      } else {
-        this.currentType = Type.u32;
+      case NodeKind.NULL:
+        if (this.options.target == Target.WASM64) {
+          if (!contextualType.classType) {
+            assert(contextualType.kind == TypeKind.USIZE);
+            this.currentType = Type.usize64;
+          }
+          return this.module.createI64(0, 0);
+        }
+        if (!contextualType.classType) {
+          assert(contextualType.kind == TypeKind.USIZE);
+          this.currentType = Type.usize32;
+        }
         return this.module.createI32(0);
-      }
 
-    // true
-    } else if (expression.kind == NodeKind.TRUE) {
-      this.currentType = Type.bool;
-      return this.module.createI32(1);
+      case NodeKind.TRUE:
+        this.currentType = Type.bool;
+        return this.module.createI32(1);
 
-    // false
-    } else if (expression.kind == NodeKind.FALSE) {
-      this.currentType = Type.bool;
-      return this.module.createI32(0);
+      case NodeKind.FALSE:
+        this.currentType = Type.bool;
+        return this.module.createI32(0);
 
-    // this
-    } else if (expression.kind == NodeKind.THIS) {
-      if (this.currentFunction.instanceMethodOf) {
-        this.currentType = this.currentFunction.instanceMethodOf.type;
-        return this.module.createGetLocal(0, this.options.target == Target.WASM64 ? NativeType.I64 : NativeType.I32);
-      }
-      this.error(DiagnosticCode._this_cannot_be_referenced_in_current_location, expression.range);
-      this.currentType = this.options.target == Target.WASM64 ? Type.u64 : Type.u32;
-      return this.module.createUnreachable();
-    }
+      case NodeKind.THIS:
+        if (this.currentFunction.instanceMethodOf) {
+          this.currentType = this.currentFunction.instanceMethodOf.type;
+          return this.module.createGetLocal(0, this.options.target == Target.WASM64 ? NativeType.I64 : NativeType.I32);
+        }
+        this.error(DiagnosticCode._this_cannot_be_referenced_in_current_location, expression.range);
+        this.currentType = this.options.target == Target.WASM64 ? Type.u64 : Type.u32;
+        return this.module.createUnreachable();
 
-    if (expression.kind == NodeKind.IDENTIFIER) {
-
-      // NaN
-      if ((<IdentifierExpression>expression).name == "NaN")
-        if (this.currentType.kind == TypeKind.F32)
-          return this.module.createF32(NaN);
-        else {
+      case NodeKind.IDENTIFIER:
+        // TODO: some sort of resolveIdentifier maybe
+        if ((<IdentifierExpression>expression).name == "NaN") {
+          if (this.currentType == Type.f32)
+            return this.module.createF32(NaN);
           this.currentType = Type.f64;
           return this.module.createF64(NaN);
         }
-
-      // Infinity
-      if ((<IdentifierExpression>expression).name == "Infinity")
-        if (this.currentType.kind == TypeKind.F32)
-          return this.module.createF32(Infinity);
-        else {
+        if ((<IdentifierExpression>expression).name == "Infinity") {
+          if (this.currentType == Type.f32)
+            return this.module.createF32(Infinity);
           this.currentType = Type.f64;
           return this.module.createF64(Infinity);
         }
+        break;
     }
 
     const element: Element | null = this.program.resolveElement(expression, this.currentFunction); // reports

src/glue/js.d.ts

@@ -14,6 +14,7 @@ declare type bool = boolean;
 // Raw memory access (here: Binaryen memory)
 declare function store<T = u8>(ptr: usize, val: T): void;
 declare function load<T = u8>(ptr: usize): T;
+declare function assert(isTrue: bool): void;
 
 // Other things that might or might not be useful
 declare function select<T>(ifTrue: T, ifFalse: T, condition: bool): T;

std/array.d.ts

@@ -1,17 +0,0 @@
-/// <reference path="../assembly.d.ts" />
-
-declare class Array<T> {
-  length: i32;
-  readonly capacity: i32;
-  readonly data: usize;
-  constructor(capacity: i32);
-}
-
-declare class Int8Array extends Array<i8> {}
-declare class Int16Array extends Array<i16> {}
-declare class Int32Array extends Array<i32> {}
-declare class Uint8Array extends Array<u8> {}
-declare class Uint16Array extends Array<u16> {}
-declare class Uint32Array extends Array<u32> {}
-declare class Float32Array extends Array<f32> {}
-declare class Float64Array extends Array<f64> {}

std/carray.d.ts

@@ -0,0 +1,6 @@
+/// <reference path="../assembly.d.ts" />
+
+declare class CArray<T> {
+  [key: number]: T;
+  constructor(capacity: usize);
+}

std/cstring.d.ts

@@ -0,0 +1,5 @@
+/// <reference path="../assembly.d.ts" />
+
+declare class CString extends CArray<u8> {
+  constructor(text: string);
+}

std/error.d.ts

@@ -1,10 +0,0 @@
-/// <reference path="../assembly.d.ts" />
-
-declare class Error {
-  message: string;
-  constructor(message: string);
-}
-
-declare class RangeError extends Error {}
-declare class ReferenceError extends Error {}
-declare class TypeError extends Error {}

std/impl/array.ts

@@ -1,17 +0,0 @@
-/// <reference path="../../assembly.d.ts" />
-
-@global()
-class Array<T> {
-
-  length: i32;
-  readonly capacity: i32;
-  readonly data: usize;
-
-  constructor(capacity: i32) {
-    if (capacity < 0)
-      throw new RangeError("capacity out of bounds");
-    this.length = capacity;
-    this.capacity = capacity;
-    this.data = Memory.allocate(sizeof<T>() * capacity);
-  }
-}

std/impl/carray.ts

@@ -0,0 +1,29 @@
+/// <reference path="../../assembly.d.ts" />
+
+/** A C-compatible Array class. */
+@global()
+class CArray<T> {
+
+  /** Constructs a new C-Array of the specified capacity. */
+  constructor(capacity: usize) {
+    return unsafe_cast<usize,this>(Memory.allocate(capacity * sizeof<T>()));
+  }
+
+  /** Gets the element at the specified index using bracket notation. */
+  @inline()
+  "[]"(index: usize): T {
+    return load<T>(unsafe_cast<this,usize>(this) + index * sizeof<T>());
+  }
+
+  /** Sets the element at the specified index using bracket notation. */
+  @inline()
+  "[]="(index: usize, value: T): T {
+    store<T>(unsafe_cast<this,usize>(this) + index * sizeof<T>(), value);
+    return value;
+  }
+
+  /** Disposes this instance and the memory associated with it. */
+  dispose(): void {
+    Memory.dispose(unsafe_cast<this,usize>(this));
+  }
+}

std/impl/cstring.ts

@@ -0,0 +1,47 @@
+/// <reference path="../../assembly.d.ts" />
+
+/** A C-compatible string class. */
+@global()
+class CString extends CArray<u8> {
+
+  /** Constructs a new C-String from a String. */
+  constructor(text: string) {
+    super(text.length * 2 + 1);
+    let idx: usize = unsafe_cast<this,usize>(this);
+    for (let i: usize = 0, k: usize = (<string>str).length; i < k; ++i) {
+      let u: i32 = text.charCodeAt(i);
+      if (u >= 0xD800 && u <= 0xDFFF && i + 1 < k)
+        u = 0x10000 + ((u & 0x3FF) << 10) | (text.charCodeAt(++i) & 0x3FF);
+      if (u <= 0x7F)
+        store<u8>(idx++, u as u8);
+      else if (u <= 0x7FF) {
+        // TODO: maybe combine multiple stores into the next larger one
+        store<u8>(idx++, (0xC0 |  (u >>> 6)       ) as u8);
+        store<u8>(idx++, (0x80 | ( u         & 63)) as u8);
+      } else if (u <= 0xFFFF) {
+        store<u8>(idx++, (0xE0 |  (u >>> 12)      ) as u8);
+        store<u8>(idx++, (0x80 | ((u >>>  6) & 63)) as u8);
+        store<u8>(idx++, (0x80 | ( u         & 63)) as u8);
+      } else if (u <= 0x1FFFFF) {
+        store<u8>(idx++, (0xF0 |  (u >>> 18)      ) as u8);
+        store<u8>(idx++, (0x80 | ((u >>> 12) & 63)) as u8);
+        store<u8>(idx++, (0x80 | ((u >>>  6) & 63)) as u8);
+        store<u8>(idx++, (0x80 | ( u         & 63)) as u8);
+      } else if (u <= 0x3FFFFFF) {
+        store<u8>(idx++, (0xF8 |  (u >>> 24)      ) as u8);
+        store<u8>(idx++, (0x80 | ((u >>> 18) & 63)) as u8);
+        store<u8>(idx++, (0x80 | ((u >>> 12) & 63)) as u8);
+        store<u8>(idx++, (0x80 | ((u >>>  6) & 63)) as u8);
+        store<u8>(idx++, (0x80 | ( u         & 63)) as u8);
+      } else {
+        store<u8>(idx++, (0xFC |  (u >>> 30)      ) as u8);
+        store<u8>(idx++, (0x80 | ((u >>> 24) & 63)) as u8);
+        store<u8>(idx++, (0x80 | ((u >>> 18) & 63)) as u8);
+        store<u8>(idx++, (0x80 | ((u >>> 12) & 63)) as u8);
+        store<u8>(idx++, (0x80 | ((u >>>  6) & 63)) as u8);
+        store<u8>(idx++, (0x80 | ( u         & 63)) as u8);
+      }
+    }
+    store<u8>(idx, 0);
+  }
+}

std/impl/error.ts

@@ -1,20 +0,0 @@
-/// <reference path="../../assembly.d.ts" />
-
-@global()
-class Error {
-
-  message: string;
-
-  constructor(message: string) {
-    this.message = message;
-  }
-}
-
-@global()
-class RangeError extends Error {}
-
-@global()
-class ReferenceError extends Error {}
-
-@global()
-class TypeError extends Error {}

std/impl/map.ts

@@ -1,22 +0,0 @@
-/// <reference path="../../assembly.d.ts" />
-
-@global()
-class Map<K,V> {
-  private keys: K[];
-  private values: V[];
-
-  constructor() {
-    this.keys = [];
-    this.values = [];
-  }
-
-  has(key: K): bool {
-    return false;
-  }
-
-  set(key: K, value: V): void {
-  }
-
-  clear(): void {
-  }
-}

std/impl/math.ts

@@ -1,5 +0,0 @@
-/// <reference path="../../assembly.d.ts" />
-
-@global()
-class Math {
-}

std/impl/memory.ts

@@ -1,27 +1,21 @@
 /// <reference path="../../assembly.d.ts" />
 
+const MEMORY_ALIGN_LOG2: usize = 3;
+const MEMORY_ALIGN_SIZE: usize = 1 << MEMORY_ALIGN_LOG2;
+const MEMORY_ALIGN_MASK: usize = MEMORY_ALIGN_SIZE - 1;
+
 @global()
 class Memory {
 
   static allocate(size: usize): usize {
-    const ptr: usize = load<usize>(sizeof<usize>());
-    store<usize>(sizeof<usize>(), ptr + size);
+    const ptr: usize = HEAP_OFFSET;
+    HEAP_OFFSET += size;
+    if ((HEAP_OFFSET & MEMORY_ALIGN_MASK) != 0)
+      HEAP_OFFSET = (HEAP_OFFSET | MEMORY_ALIGN_MASK) + 1;
     return ptr;
   }
 
-  static free(ptr: usize): void {
-  }
-
-  static copy(src: usize, dst: usize, count: usize): void {
-    for (let i: usize = 0; i < count; ++i)
-      store<u8>(dst + i, load<u8>(src + i));
-  }
-
-  static compare(src: usize, dst: usize, count: usize): i32 {
-    for (let i: usize = 0; i < count; ++i) {
-      const d: i32 = (load<u8>(src + i) as i32) - (load<u8>(dst + i) as i32);
-      if (d) return d;
-    }
-    return 0;
+  static dispose(ptr: usize): void {
+    // just a big chunk of non-disposable memory for now
   }
 }

std/impl/set.ts

@@ -1,5 +0,0 @@
-/// <reference path="../../assembly.d.ts" />
-
-@global()
-class Set<T> {
-}

std/impl/string.ts

@@ -1,58 +0,0 @@
-/// <reference path="../../assembly.d.ts" />
-
-@global()
-@allocates()
-@operator("==", String.equals)
-@operator("!=", String.notEquals)
-@operator("+", String.concat)
-class String {
-
-  readonly length: i32;
-
-  constructor(length: i32) {
-    if (length < 0)
-      throw new RangeError("invalid length");
-    const data: usize = Memory.allocate(4 + length);
-    store<i32>(data, length);
-    return classof<String>(data);
-  }
-
-  static fromCharCode(c1: i32 /* sic */, c2: i32 = -1): String {
-    throw new Error("not implemented");
-  }
-
-  static equals(a: String, b: String): bool {
-    const aLength: i32 = a.length;
-    return aLength == b.length && !Memory.compare(pointerof(a) + 4, pointerof(b) + 4, aLength << 1);
-  }
-
-  static notEquals(a: String, b: String): bool {
-    const aLength: i32 = a.length;
-    return aLength != b.length || Memory.compare(pointerof(a) + 4, pointerof(b) + 4, aLength << 1);
-  }
-
-  static concat(a: String, b: String): String {
-    const aLength: i32 = a.length;
-    const bLength: i32 = b.length;
-    const combinedLength: i32 = aLength + bLength;
-    if (combinedLength < 0)
-      throw new RangeError("invalid length");
-    const aByteLength: i32 = aLength << 1;
-    const bByteLength: i32 = bLength << 1;
-    const data: usize = Memory.allocate(4 + combinedLength);
-    store<i32>(data, combinedLength);
-    Memory.copy(pointerof(a) + 4, data + 4, aByteLength);
-    Memory.copy(pointerof(b) + 4, data + 4 + aByteLength, bByteLength);
-    return classof<String>(data);
-  }
-
-  charCodeAt(index: i32): u16 {
-    if (index < 0 || index > this.length)
-      throw new RangeError("index out of bounds");
-    return load<u32>(pointerof(this) + 4 + index << 1);
-  }
-
-  concat(other: String): String {
-    return String.concat(this, other);
-  }
-}

std/impl/tsconfig.json

@@ -4,12 +4,8 @@
     "experimentalDecorators": true
   },
   "files": [
-    "array.ts",
-    "error.ts",
-    "map.ts",
-    "math.ts",
-    "memory.ts",
-    "set.ts",
-    "string.ts"
+    "carray.ts",
+    "cstring.ts",
+    "memory.ts"
   ]
 }

std/map.d.ts

@@ -1 +0,0 @@
-/// <reference path="../assembly.d.ts" />

std/math.d.ts

@@ -1,4 +0,0 @@
-/// <reference path="../assembly.d.ts" />
-
-declare class Math {
-}

std/memory.d.ts

@@ -2,7 +2,5 @@
 
 declare class Memory {
   static allocate(size: usize): usize;
-  static free(ptr: usize): void;
-  static copy(src: usize, dst: usize, count: usize): void;
-  static compare(src: usize, dst: usize, count: usize): i32;
+  static dispose(ptr: usize): void;
 }

std/set.d.ts

@@ -1,4 +0,0 @@
-/// <reference path="../assembly.d.ts" />
-
-declare class Set<T> {
-}

std/string.d.ts

@@ -1,11 +0,0 @@
-/// <reference path="../assembly.d.ts" />
-
-declare class String {
-  readonly length: i32;
-  constructor(length: i32);
-  static fromCharCode(c1: i32, c2?: i32);
-  static equals(a: string, b: string): bool;
-  static concat(a: string, b: string): string;
-  charCodeAt(index: i32): u16;
-  concat(other: string): string;
-}

std/tsconfig.json

@@ -4,12 +4,8 @@
     "experimentalDecorators": true
   },
   "files": [
-    "array.d.ts",
-    "error.d.ts",
-    "map.d.ts",
-    "math.d.ts",
-    "memory.d.ts",
-    "set.d.ts",
-    "string.d.ts"
+    "carray.d.ts",
+    "cstring.d.ts",
+    "memory.d.ts"
   ]
 }

tests/compiler/game-of-life.html

@@ -1,36 +1,61 @@
 <canvas id="canvas" width="640" height="480"></canvas>
-<script src="../../node_modules/binaryen/index.js"></script>
-<script>
-fetch("game-of-life.optimized.wast").then(response =>
-  response.text()
-).then(text => {
-  let buffer = Binaryen.parseText(text).emitBinary();
+<script src="../../node_modules/binaryen/index.js"></script><script>
+
+// Fetch the .wast (just because we dont's store the .wasm in git)
+fetch("game-of-life.optimized.wast").then(response => response.text()).then(text => {
+
+  // Convert it to binary format
+  var buffer = Binaryen.parseText(text).emitBinary();
+
+  // Instantiate the module
   return WebAssembly.instantiate(buffer, {});
+
 }).then(result => {
-  let cnv = document.getElementById("canvas");
-  let ctx = cnv.getContext("2d");
-  let w = cnv.width, h = cnv.height, s = w * h, S = s + s;
-  if (result.instance.exports.memory.buffer.byteLength < S)
-    result.instance.exports.memory.grow(Math.ceil(S / 65536) - 1);
-  let mem = new Uint8Array(result.instance.exports.memory.buffer);
-  for (let y = 0; y < h; ++y)
-    for (let x = 0; x < w; ++x)
+  var module = result.instance;
+
+  // Set up the canvas with a 2D rendering context
+  var cnv = document.getElementById("canvas");
+  var ctx = cnv.getContext("2d");
+  var w = cnv.width,
+      h = cnv.height,
+      s = w * h, // memory required to store either input or output
+      S = s + s; // total memory required to store input and output
+
+  // Grow the (exported) memory if it's size isn't sufficient
+  var memory = module.exports.memory;
+  if (memory.buffer.byteLength < S)
+    memory.grow(Math.ceil((S - memory.buffer.byteLength) / 65536));
+
+  // Fill input at [0, s-1] with random cells
+  var mem = new Uint8Array(memory.buffer);
+  for (var y = 0; y < h; ++y)
+    for (var x = 0; x < w; ++x)
       mem[y * w + x] = Math.random() > 0.1 ? 0 : 1;
-  result.instance.exports.init(w, h);
-  setInterval(function() {
-    result.instance.exports.step();
-    mem.set(mem.subarray(s, S), 0);
-  }, 33);
+
+  // Initialize with width and height
+  module.exports.init(w, h);
+
+  // Update about 30 times a second
+  function update() {
+    setTimeout(update, 33);
+    module.exports.step();
+    mem.set(mem.subarray(s, S), 0); // copy output -> input
+  }
+
+  // Keep rendering the output at [s, 2*s-1]
   function render() {
     requestAnimationFrame(render);
     ctx.clearRect(0, 0, w, h);
     ctx.fillStyle = "#333";
-    for (let y = 0; y < h; ++y)
-      for (let x = 0; x < w; ++x)
+    for (var y = 0; y < h; ++y)
+      for (var x = 0; x < w; ++x)
         if (mem[s + y * w + x])
           ctx.fillRect(x, y, 1, 1);
   }
+
+  update();
   render();
+
 }).catch(err => {
   throw err;
 });