Merge remote-tracking branch 'origin/master' into release

Author: actions-user

bin/asinit

@@ -6,8 +6,26 @@ const fs = require("fs");
 const path = require("path");
 const colors = require("../cli/util/colors");
 const version = require("../package.json").version;
+const options = require("../cli/util/options");
 
-if (process.argv.length != 3 || process.argv[2] == "--help" || process.argv[2] == "-h") printHelp();
+const asinitOptions = {
+  "help": {
+    "category": "General",
+    "description": "Prints a help message.",
+    "type": "b",
+    "alias": "h"
+  },
+  "yes": {
+    "category": "General",
+    "description": "Answers all questions with their default option for non-interactive usage.",
+    "type": "b",
+    "alias": "y"
+  }
+};
+
+const cliOptions = options.parse(process.argv.slice(2), asinitOptions);
+
+if (cliOptions.options.help || cliOptions.arguments.length === 0) printHelp();
 
 function printHelp() {
   console.log([
@@ -19,12 +37,7 @@ function printHelp() {
   process.exit(0);
 }
 
-const rl = require("readline").createInterface({
-  input: process.stdin,
-  output: process.stdout
-});
-
-const projectDir = path.resolve(process.argv[2]);
+const projectDir = path.resolve(cliOptions.arguments[0]);
 const compilerDir = path.join(__dirname, "..");
 const compilerVersion = require(path.join(compilerDir, "package.json")).version;
 const assemblyDir = path.join(projectDir, "assembly");
@@ -75,7 +88,7 @@ console.log([
   ""
 ].join("\n"));
 
-rl.question(colors.white("Do you want to proceed?") + " [Y/n] ", answer => {
+function createProject(answer) {
   if (!/^y?$/i.test(answer)) {
     process.exit(1);
     return;
@@ -132,8 +145,20 @@ rl.question(colors.white("Do you want to proceed?") + " [Y/n] ", answer => {
     "",
     "Have a nice day!"
   ].join("\n"));
-  rl.close();
-});
+}
+
+if (cliOptions.options.yes) {
+  createProject("y");
+} else {
+  const rl = require("readline").createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  rl.question(colors.white("Do you want to proceed?") + " [Y/n] ", result => {
+    rl.close();
+    createProject(result);
+  });
+}
 
 function ensureProjectDirectory() {
   console.log("- Making sure that the project directory exists...");

src/ast.ts

@@ -685,7 +685,7 @@ export abstract class Node {
 
   static createEnumValueDeclaration(
     name: IdentifierExpression,
-    value: Expression | null,
+    initializer: Expression | null,
     flags: CommonFlags,
     range: Range
   ): EnumValueDeclaration {
@@ -694,7 +694,7 @@ export abstract class Node {
     node.range = range;
     node.flags = flags;
     node.name = name;
-    node.value = value;
+    node.initializer = initializer;
     return node;
   }
 
@@ -1848,8 +1848,6 @@ export class EnumDeclaration extends DeclarationStatement {
 
 /** Represents a value of an `enum` declaration. */
 export class EnumValueDeclaration extends VariableLikeDeclarationStatement {
-  /** Value expression. */
-  value: Expression | null;
 }
 
 /** Represents an `export import` statement of an interface. */

src/extra/ast.ts

@@ -1000,9 +1000,9 @@ export class ASTBuilder {
 
   visitEnumValueDeclaration(node: EnumValueDeclaration): void {
     this.visitIdentifierExpression(node.name);
-    if (node.value) {
+    if (node.initializer) {
       this.sb.push(" = ");
-      this.visitNode(node.value);
+      this.visitNode(node.initializer);
     }
   }
 

src/parser.ts

@@ -13,10 +13,6 @@ import {
   PATH_DELIMITER
 } from "./common";
 
-import {
-  Program
-} from "./program";
-
 import {
   Tokenizer,
   Token,
@@ -28,7 +24,8 @@ import {
 
 import {
   DiagnosticCode,
-  DiagnosticEmitter
+  DiagnosticEmitter,
+  DiagnosticMessage
 } from "./diagnostics";
 
 import {
@@ -95,8 +92,6 @@ import {
 /** Parser interface. */
 export class Parser extends DiagnosticEmitter {
 
-  /** Program being created. */
-  program: Program;
   /** Source file names to be requested next. */
   backlog: string[] = new Array();
   /** Source file names already seen, that is processed or backlogged. */
@@ -109,11 +104,16 @@ export class Parser extends DiagnosticEmitter {
   currentSource: Source;
   /** Dependency map **/
   dependees: Map<string, Source> = new Map();
+  /** An array of parsed sources. */
+  sources: Source[];
 
   /** Constructs a new parser. */
-  constructor(program: Program) {
-    super(program.diagnostics);
-    this.program = program;
+  constructor(
+    diagnostics: DiagnosticMessage[] | null = null,
+    sources: Source[] | null = null
+  ) {
+    super(diagnostics);
+    this.sources = sources ? sources : new Array<Source>();
   }
 
   /** Parses a file and adds its definitions to the program. */
@@ -145,12 +145,12 @@ export class Parser extends DiagnosticEmitter {
             : SourceKind.LIBRARY
           : SourceKind.USER
     );
-    var program = this.program;
-    program.sources.push(source);
+
+    this.sources.push(source);
     this.currentSource = source;
 
     // tokenize and parse
-    var tn = new Tokenizer(source, program.diagnostics);
+    var tn = new Tokenizer(source, this.diagnostics);
     tn.onComment = this.onComment;
     var statements = source.statements;
     while (!tn.skip(Token.ENDOFFILE)) {

src/program.ts

@@ -537,7 +537,7 @@ export class Program extends DiagnosticEmitter {
     var nativeFile = new File(this, nativeSource);
     this.nativeFile = nativeFile;
     this.filesByName.set(nativeFile.internalName, nativeFile);
-    this.parser = new Parser(this);
+    this.parser = new Parser(this.diagnostics, this.sources);
     this.resolver = new Resolver(this);
   }
 
@@ -2789,7 +2789,7 @@ export class EnumValue extends VariableLikeElement {
 
   /** Gets the associated value node. */
   get valueNode(): Expression | null {
-    return (<EnumValueDeclaration>this.declaration).value;
+    return (<EnumValueDeclaration>this.declaration).initializer;
   }
 
   /* @override */

std/assembly/array.ts

@@ -493,6 +493,64 @@ export class Array<T> {
     return <string>unreachable();
   }
 
+  flat(): T {
+    if (!isArray<T>()) {
+      ERROR("Cannot call flat() on Array<T> where T is not an Array.");
+    }
+    // Get the length and data start values
+    var length = this.length_;
+    var selfDataStart = this.dataStart;
+
+    // calculate the end size with an initial pass
+    var size = 0;
+    for (let i = 0; i < length; i++) {
+      let child = load<usize>(selfDataStart + (i << alignof<T>()));
+      size += child == 0 ? 0 : load<i32>(child, offsetof<T>("length_"));
+    }
+
+    // calculate the byteLength of the resulting backing ArrayBuffer
+    var byteLength = <usize>size << usize(alignof<valueof<T>>());
+    var dataStart = __alloc(byteLength, idof<ArrayBuffer>());
+
+    // create the return value and initialize it
+    var result = __alloc(offsetof<T>(), idof<T>());
+    store<i32>(result, size, offsetof<T>("length_"));
+
+    // byteLength, dataStart, and buffer are all readonly
+    store<i32>(result, byteLength, offsetof<T>("byteLength"));
+    store<usize>(result, dataStart, offsetof<T>("dataStart"));
+    store<usize>(result, __retain(dataStart), offsetof<T>("buffer"));
+
+    // set the elements
+    var resultOffset: usize = 0;
+    for (let i = 0; i < length; i++) { // for each child
+      let child = load<usize>(selfDataStart + (<usize>i << alignof<T>()));
+
+      // ignore null arrays
+      if (child == 0) continue;
+
+      // copy the underlying buffer data to the result buffer
+      let childDataLength = load<i32>(child, offsetof<T>("byteLength"));
+      memory.copy(
+        dataStart + resultOffset,
+        load<usize>(child, offsetof<T>("dataStart")),
+        <usize>childDataLength
+      );
+
+      // advance the result length
+      resultOffset += childDataLength;
+    }
+
+    // if the `valueof<T>` type is managed, we must call __retain() on each reference
+    if (isManaged<valueof<T>>()) {
+      for (let i = 0; i < size; i++) {
+        __retain(load<usize>(dataStart + (<usize>i << usize(alignof<valueof<T>>()))));
+      }
+    }
+
+    return changetype<T>(result);
+  }
+
   toString(): string {
     return this.join();
   }

std/assembly/index.d.ts

@@ -1399,6 +1399,8 @@ declare class Array<T> {
   sort(comparator?: (a: T, b: T) => i32): this;
   join(separator?: string): string;
   reverse(): T[];
+  /** Flattens an array of arrays. If any null entries exist in the array, they are ignored, unlike JavaScript's version of Array#flat(). */
+  flat(): valueof<T>[];
   toString(): string;
 }