Rename lib prefix to '~lib' (parens aren't valid); Add built-in alignof<T>; Prepare for ArrayBufferView

Author: dcodeIO

bin/asc.js

@@ -93,7 +93,7 @@ exports.compileString = (source, extraArgs={}) => new Promise((resolve, reject)
     const libDir = path.join(__dirname, "../std", "assembly");
     const libFiles = require("glob").sync("**/*.ts", { cwd: libDir });
     libFiles.forEach(file =>
-      exports.libraryFiles["(lib)/" + file.replace(/\.ts$/, "")] = readFileNode(path.join(libDir, file), { encoding: "utf8" })
+      exports.libraryFiles["~lib/" + file.replace(/\.ts$/, "")] = readFileNode(path.join(libDir, file), { encoding: "utf8" })
     );
   }
 
@@ -265,7 +265,7 @@ exports.main = function main(argv, options, callback) {
           }
         }
 
-      // Otherwise try nextFile.ts, nextFile/index.ts, (lib)/nextFile.ts
+      // Otherwise try nextFile.ts, nextFile/index.ts, ~lib/nextFile.ts
       } else {
         sourceText = readFile(path.join(baseDir, sourcePath + ".ts"));
         if (sourceText !== null) {

dist/asc.js

@@ -534,7 +534,7 @@ export abstract class Node {
     identifier: IdentifierExpression,
     typeParameters: TypeParameterNode[],
     extendsType: TypeNode | null, // can't be a function
-    implementsTypes: TypeNode[], // can't be a function
+    implementsTypes: TypeNode[] | null, // can't be functions
     members: DeclarationStatement[],
     decorators: DecoratorNode[] | null,
     flags: CommonFlags,
@@ -546,7 +546,7 @@ export abstract class Node {
     stmt.name = identifier; identifier.parent = stmt;
     stmt.typeParameters = typeParameters; setParent(typeParameters, stmt);
     stmt.extendsType = extendsType; if (extendsType) extendsType.parent = stmt;
-    stmt.implementsTypes = implementsTypes; setParent(implementsTypes, stmt);
+    stmt.implementsTypes = implementsTypes; if (implementsTypes) setParent(implementsTypes, stmt);
     stmt.members = members; setParent(members, stmt);
     stmt.decorators = decorators; if (decorators) setParent(decorators, stmt);
     return stmt;
@@ -756,17 +756,21 @@ export abstract class Node {
 
   static createInterfaceDeclaration(
     name: IdentifierExpression,
+    typeParameters: TypeParameterNode[],
     extendsType: TypeNode | null, // can't be a function
     members: DeclarationStatement[],
+    decorators: DecoratorNode[] | null,
     flags: CommonFlags,
     range: Range
   ): InterfaceDeclaration {
     var stmt = new InterfaceDeclaration();
     stmt.range = range;
     stmt.flags = flags;
     stmt.name = name; name.parent = stmt;
+    stmt.typeParameters = typeParameters; if (typeParameters) setParent(typeParameters, stmt);
     stmt.extendsType = extendsType; if (extendsType) extendsType.parent = stmt;
     stmt.members = members; setParent(members, stmt);
+    stmt.decorators = decorators; if (decorators) setParent(decorators, stmt);
     return stmt;
   }
 
@@ -1487,10 +1491,10 @@ export class ClassDeclaration extends DeclarationStatement {
 
   /** Accepted type parameters. */
   typeParameters: TypeParameterNode[];
-  /** Base class type being extended. */
+  /** Base class type being extended, if any. */
   extendsType: TypeNode | null; // can't be a function
-  /** Interface types being implemented. */
-  implementsTypes: TypeNode[]; // can't be a function
+  /** Interface types being implemented, if any. */
+  implementsTypes: TypeNode[] | null; // can't be functions
   /** Class member declarations. */
   members: DeclarationStatement[];
 

dist/asc.js.map

@@ -1790,6 +1790,55 @@ export function compileCall(
       }
       return ret;
     }
+    case "alignof": { // alignof<T!>() -> usize
+      compiler.currentType = compiler.options.usizeType;
+      if (operands.length != 0) {
+        if (!(typeArguments && typeArguments.length == 1)) {
+          compiler.error(
+            DiagnosticCode.Expected_0_type_arguments_but_got_1,
+            reportNode.range, "1", typeArguments ? typeArguments.length.toString(10) : "0"
+          );
+        }
+        compiler.error(
+          DiagnosticCode.Expected_0_arguments_but_got_1,
+          reportNode.range, "0", operands.length.toString(10)
+        );
+        return module.createUnreachable();
+      }
+      if (!(typeArguments && typeArguments.length == 1)) {
+        compiler.error(
+          DiagnosticCode.Expected_0_type_arguments_but_got_1,
+          reportNode.range, "1", typeArguments ? typeArguments.length.toString(10) : "0"
+        );
+      }
+      let byteSize = (<Type[]>typeArguments)[0].byteSize;
+      let alignLog2: i32;
+      switch (byteSize) {
+        case 1: { alignLog2 = 0; break; }
+        case 2: { alignLog2 = 1; break; }
+        case 4: { alignLog2 = 2; break; }
+        case 8: { alignLog2 = 3; break; }
+        default: { assert(false); return module.createUnreachable(); }
+      }
+      if (compiler.options.isWasm64) {
+        // implicitly wrap if contextual type is a 32-bit integer
+        if (contextualType.is(TypeFlags.INTEGER) && contextualType.size <= 32) {
+          compiler.currentType = Type.u32;
+          ret = module.createI32(alignLog2);
+        } else {
+          ret = module.createI64(alignLog2, 0);
+        }
+      } else {
+        // implicitly extend if contextual type is a 64-bit integer
+        if (contextualType.is(TypeFlags.INTEGER) && contextualType.size == 64) {
+          compiler.currentType = Type.u64;
+          ret = module.createI64(alignLog2, 0);
+        } else {
+          ret = module.createI32(alignLog2);
+        }
+      }
+      return ret;
+    }
     case "offsetof": { // offsetof<T!>(fieldName?: string) -> usize
       compiler.currentType = compiler.options.usizeType;
       if (operands.length > 1) {

dist/assemblyscript.js

@@ -367,7 +367,7 @@ export class Compiler extends DiagnosticEmitter {
       }
     }
 
-    // try (lib)/file.ts
+    // try ~lib/file.ts
     expected = LIBRARY_PREFIX + normalizedPathWithoutExtension + ".ts";
     for (let i = 0, k = sources.length; i < k; ++i) {
       let source = sources[i];

dist/assemblyscript.js.map

@@ -64,6 +64,7 @@ export enum DiagnosticCode {
   Declaration_expected = 1146,
   _const_declarations_must_be_initialized = 1155,
   Unterminated_regular_expression_literal = 1161,
+  Interface_declaration_cannot_have_implements_clause = 1176,
   Binary_digit_expected = 1177,
   Octal_digit_expected = 1178,
   An_implementation_cannot_be_declared_in_ambient_contexts = 1183,
@@ -169,6 +170,7 @@ export function diagnosticCodeToString(code: DiagnosticCode): string {
     case 1146: return "Declaration expected.";
     case 1155: return "'const' declarations must be initialized.";
     case 1161: return "Unterminated regular expression literal.";
+    case 1176: return "Interface declaration cannot have 'implements' clause.";
     case 1177: return "Binary digit expected.";
     case 1178: return "Octal digit expected.";
     case 1183: return "An implementation cannot be declared in ambient contexts.";

src/ast.ts

@@ -57,6 +57,7 @@
   "Declaration expected.": 1146,
   "'const' declarations must be initialized.": 1155,
   "Unterminated regular expression literal.": 1161,
+  "Interface declaration cannot have 'implements' clause.": 1176,
   "Binary digit expected.": 1177,
   "Octal digit expected.": 1178,
   "An implementation cannot be declared in ambient contexts.": 1183,