Merge branch 'master' into lib/threading

Author: Willem Wyndham

NOTICE

@@ -10,6 +10,8 @@ under the licensing terms detailed in LICENSE:
 * Alan Pierce <[email protected]>
 * Palmer <[email protected]>
 * Linus Unnebäck <[email protected]>
+* Joshua Tenner <[email protected]>
+* Nidin Vinayakan <[email protected]>
 
 Portions of this software are derived from third-party works licensed under
 the following terms:

README.md

@@ -57,10 +57,10 @@ $> npm link
 Examples
 --------
 
-* **[Conway's Game of Life](./examples/game-of-life)** [ [demo](https://rawgit.com/AssemblyScript/assemblyscript/master/examples/game-of-life/index.html) | [fiddle](https://webassembly.studio/?f=gvuw4enb3qk) ]<br />
+* **[Conway's Game of Life](./examples/game-of-life)** [ [demo](https://assemblyscript.github.io/assemblyscript/examples/game-of-life) | [fiddle](https://webassembly.studio/?f=gvuw4enb3qk) ]<br />
   Continuously updates the cellular automaton and visualizes its state on a canvas.
 
-* **[Mandelbrot Set](./examples/mandelbrot)** [ [demo](https://rawgit.com/AssemblyScript/assemblyscript/master/examples/mandelbrot/index.html) | [fiddle](https://webassembly.studio/?f=m6hbiw9wyq) ]<br />
+* **[Mandelbrot Set](./examples/mandelbrot)** [ [demo](https://assemblyscript.github.io/assemblyscript/examples/mandelbrot) | [fiddle](https://webassembly.studio/?f=m6hbiw9wyq) ]<br />
   Renders the Mandelbrot set to a canvas.
 
 * **[i64 polyfill](./examples/i64-polyfill)**<br />
@@ -72,7 +72,7 @@ Examples
 * **[WASM parser](./lib/parse)**<br />
   A WebAssembly binary parser in WebAssembly.
 
-* **[N-body system](./examples/n-body)** [ [demo](https://rawgit.com/AssemblyScript/assemblyscript/master/examples/n-body/index.html) ]<br />
+* **[N-body system](./examples/n-body)** [ [demo](https://assemblyscript.github.io/assemblyscript/examples/n-body) ]<br />
   An implementation of the N-body system from the [Computer Language Benchmarks Game](https://benchmarksgame-team.pages.debian.net/benchmarksgame/).
 
 Building

bin/asinit

@@ -4,7 +4,7 @@ const path = require("path");
 const colors = require("../cli/util/colors");
 const version = require("../package.json").version;
 
-if (process.argv.length < 3) printHelp();
+if (process.argv.length != 3 || process.argv[2] == "--help" || process.argv[2] == "-h") printHelp();
 
 function printHelp() {
   console.log([

cli/asc.d.ts

@@ -55,11 +55,11 @@ interface CompilerOptions {
   /** Standard error stream to use. */
   stderr?: OutputStream;
   /** Reads a file from disk (or memory). */
-  readFile?: (name: string) => string | null;
+  readFile?: (filename: string, baseDir: string) => string | null;
   /** Writes a file to disk (or memory). */
-  writeFile?: (name: string, contents: Uint8Array) => void;
+  writeFile?: (filename: string, contents: Uint8Array, baseDir: string) => void;
   /** Lists all files within a directory. */
-  listFiles?: (dir: string) => string[] | null;
+  listFiles?: (dirname: string, baseDir: string) => string[] | null;
 }
 
 /** Convenience function that parses and compiles source strings directly. */

cli/asc.js

@@ -96,9 +96,7 @@ exports.compileString = (sources, options) => {
   if (typeof sources === "string") sources = { "input.ts": sources };
   const output = Object.create({
     stdout: createMemoryStream(),
-    stderr: createMemoryStream(),
-    binary: null,
-    text: null
+    stderr: createMemoryStream()
   });
   var argv = [
     "--binaryFile", "binary",
@@ -270,7 +268,7 @@ exports.main = function main(argv, options, callback) {
       }
       for (let j = 0, l = libFiles.length; j < l; ++j) {
         let libPath = libFiles[j];
-        let libText = readFile(path.join(libDir, libPath));
+        let libText = readFile(libPath, libDir);
         if (libText === null) return callback(Error("Library file '" + libPath + "' not found."));
         stats.parseCount++;
         stats.parseTime += measure(() => {
@@ -285,33 +283,10 @@ exports.main = function main(argv, options, callback) {
     }
   }
 
-  // Include entry files
-  for (let i = 0, k = argv.length; i < k; ++i) {
-    const filename = argv[i];
-
-    let sourcePath = String(filename).replace(/\\/g, "/").replace(/(\.ts|\/)$/, "");
-
-    // Try entryPath.ts, then entryPath/index.ts
-    let sourceText = readFile(path.join(baseDir, sourcePath) + ".ts");
-    if (sourceText === null) {
-      sourceText = readFile(path.join(baseDir, sourcePath, "index.ts"));
-      if (sourceText === null) {
-        return callback(Error("Entry file '" + sourcePath + ".ts' not found."));
-      } else {
-        sourcePath += "/index.ts";
-      }
-    } else {
-      sourcePath += ".ts";
-    }
-
-    stats.parseCount++;
-    stats.parseTime += measure(() => {
-      parser = assemblyscript.parseFile(sourceText, sourcePath, true, parser);
-    });
-
-    // Process backlog
+  // Parses the backlog of imported files after including entry files
+  function parseBacklog() {
+    var sourcePath, sourceText;
     while ((sourcePath = parser.nextFile()) != null) {
-      let found = false;
 
       // Load library file if explicitly requested
       if (sourcePath.startsWith(exports.libraryPrefix)) {
@@ -325,13 +300,12 @@ exports.main = function main(argv, options, callback) {
           sourcePath = exports.libraryPrefix + indexName + ".ts";
         } else {
           for (let i = 0, k = customLibDirs.length; i < k; ++i) {
-            const dir = customLibDirs[i];
-            sourceText = readFile(path.join(dir, plainName + ".ts"));
+            sourceText = readFile(plainName + ".ts", customLibDirs[i]);
             if (sourceText !== null) {
               sourcePath = exports.libraryPrefix + plainName + ".ts";
               break;
             } else {
-              sourceText = readFile(path.join(dir, indexName + ".ts"));
+              sourceText = readFile(indexName + ".ts", customLibDirs[i]);
               if (sourceText !== null) {
                 sourcePath = exports.libraryPrefix + indexName + ".ts";
                 break;
@@ -344,11 +318,11 @@ exports.main = function main(argv, options, callback) {
       } else {
         const plainName = sourcePath;
         const indexName = sourcePath + "/index";
-        sourceText = readFile(path.join(baseDir, plainName + ".ts"));
+        sourceText = readFile(plainName + ".ts", baseDir);
         if (sourceText !== null) {
           sourcePath = plainName + ".ts";
         } else {
-          sourceText = readFile(path.join(baseDir, indexName + ".ts"));
+          sourceText = readFile(indexName + ".ts", baseDir);
           if (sourceText !== null) {
             sourcePath = indexName + ".ts";
           } else if (!plainName.startsWith(".")) {
@@ -361,12 +335,12 @@ exports.main = function main(argv, options, callback) {
             } else {
               for (let i = 0, k = customLibDirs.length; i < k; ++i) {
                 const dir = customLibDirs[i];
-                sourceText = readFile(path.join(dir, plainName + ".ts"));
+                sourceText = readFile(plainName + ".ts", customLibDirs[i]);
                 if (sourceText !== null) {
                   sourcePath = exports.libraryPrefix + plainName + ".ts";
                   break;
                 } else {
-                  sourceText = readFile(path.join(dir, indexName + ".ts"));
+                  sourceText = readFile(indexName + ".ts", customLibDirs[i]);
                   if (sourceText !== null) {
                     sourcePath = exports.libraryPrefix + indexName + ".ts";
                     break;
@@ -390,7 +364,38 @@ exports.main = function main(argv, options, callback) {
     }
   }
 
+  // Include entry files
+  for (let i = 0, k = argv.length; i < k; ++i) {
+    const filename = argv[i];
+
+    let sourcePath = String(filename).replace(/\\/g, "/").replace(/(\.ts|\/)$/, "");
+
+    // Try entryPath.ts, then entryPath/index.ts
+    let sourceText = readFile(sourcePath + ".ts", baseDir);
+    if (sourceText === null) {
+      sourceText = readFile(sourcePath + "/index.ts", baseDir);
+      if (sourceText === null) {
+        return callback(Error("Entry file '" + sourcePath + ".ts' not found."));
+      } else {
+        sourcePath += "/index.ts";
+      }
+    } else {
+      sourcePath += ".ts";
+    }
+
+    stats.parseCount++;
+    stats.parseTime += measure(() => {
+      parser = assemblyscript.parseFile(sourceText, sourcePath, true, parser);
+    });
+    let code = parseBacklog();
+    if (code) return code;
+  }
+
   applyTransform("afterParse", parser);
+  {
+    let code = parseBacklog();
+    if (code) return code;
+  }
 
   // Finish parsing
   const program = assemblyscript.finishParsing(parser);
@@ -568,7 +573,7 @@ exports.main = function main(argv, options, callback) {
       });
 
       if (args.binaryFile.length) {
-        writeFile(path.join(baseDir, args.binaryFile), wasm.output);
+        writeFile(args.binaryFile, wasm.output, baseDir);
       } else {
         writeStdout(wasm.output);
         hasStdout = true;
@@ -588,15 +593,12 @@ exports.main = function main(argv, options, callback) {
                 text = exports.libraryFiles[stdName];
               } else {
                 for (let i = 0, k = customLibDirs.length; i < k; ++i) {
-                  text = readFile(path.join(
-                    customLibDirs[i],
-                    name.substring(exports.libraryPrefix.length))
-                  );
+                  text = readFile(name.substring(exports.libraryPrefix.length), customLibDirs[i]);
                   if (text !== null) break;
                 }
               }
             } else {
-              text = readFile(path.join(baseDir, name));
+              text = readFile(name, baseDir);
             }
             if (text === null) {
               return callback(Error("Source file '" + name + "' not found."));
@@ -605,10 +607,9 @@ exports.main = function main(argv, options, callback) {
             sourceMap.sourceContents[index] = text;
           });
           writeFile(path.join(
-            baseDir,
             path.dirname(args.binaryFile),
             path.basename(sourceMapURL)
-          ), JSON.stringify(sourceMap));
+          ).replace(/^\.\//, ""), JSON.stringify(sourceMap), baseDir);
         } else {
           stderr.write("Skipped source map (stdout already occupied)" + EOL);
         }
@@ -623,7 +624,7 @@ exports.main = function main(argv, options, callback) {
         stats.emitTime += measure(() => {
           asm = module.toAsmjs();
         });
-        writeFile(path.join(baseDir, args.asmjsFile), asm);
+        writeFile(args.asmjsFile, asm, baseDir);
       } else if (!hasStdout) {
         stats.emitCount++;
         stats.emitTime += measure(() => {
@@ -643,7 +644,7 @@ exports.main = function main(argv, options, callback) {
         stats.emitTime += measure(() => {
           idl = assemblyscript.buildIDL(program);
         });
-        writeFile(path.join(baseDir, args.idlFile), idl);
+        writeFile(args.idlFile, idl, baseDir);
       } else if (!hasStdout) {
         stats.emitCount++;
         stats.emitTime += measure(() => {
@@ -663,7 +664,7 @@ exports.main = function main(argv, options, callback) {
         stats.emitTime += measure(() => {
           tsd = assemblyscript.buildTSD(program);
         });
-        writeFile(path.join(baseDir, args.tsdFile), tsd);
+        writeFile(args.tsdFile, tsd, baseDir);
       } else if (!hasStdout) {
         stats.emitCount++;
         stats.emitTime += measure(() => {
@@ -683,7 +684,7 @@ exports.main = function main(argv, options, callback) {
         stats.emitTime += measure(() => {
           wat = module.toText();
         });
-        writeFile(path.join(baseDir, args.textFile), wat);
+        writeFile(args.textFile, wat, baseDir);
       } else if (!hasStdout) {
         stats.emitCount++;
         stats.emitTime += measure(() => {
@@ -700,28 +701,28 @@ exports.main = function main(argv, options, callback) {
   }
   return callback(null);
 
-  function readFileNode(filename) {
+  function readFileNode(filename, baseDir) {
     try {
       let text;
       stats.readCount++;
       stats.readTime += measure(() => {
-        text = fs.readFileSync(filename, { encoding: "utf8" });
+        text = fs.readFileSync(path.join(baseDir, filename), { encoding: "utf8" });
       });
       return text;
     } catch (e) {
       return null;
     }
   }
 
-  function writeFileNode(filename, contents) {
+  function writeFileNode(filename, contents, baseDir) {
     try {
       stats.writeCount++;
       stats.writeTime += measure(() => {
-        mkdirp(path.dirname(filename));
+        mkdirp(path.join(baseDir, path.dirname(filename)));
         if (typeof contents === "string") {
-          fs.writeFileSync(filename, contents, { encoding: "utf8" } );
+          fs.writeFileSync(path.join(baseDir, filename), contents, { encoding: "utf8" } );
         } else {
-          fs.writeFileSync(filename, contents);
+          fs.writeFileSync(path.join(baseDir, filename), contents);
         }
       });
       return true;
@@ -730,11 +731,11 @@ exports.main = function main(argv, options, callback) {
     }
   }
 
-  function listFilesNode(dirname) {
+  function listFilesNode(dirname, baseDir) {
     var files;
     try {
       stats.readTime += measure(() => {
-        files = fs.readdirSync(dirname).filter(file => /^(?!.*\.d\.ts$).*\.ts$/.test(file));
+        files = fs.readdirSync(path.join(baseDir, dirname)).filter(file => /^(?!.*\.d\.ts$).*\.ts$/.test(file));
       });
       return files;
     } catch (e) {