@amxts/core 0.1.0 → 0.2.0

package/runtime/patches/assemblyscript-0.28.20-amxts.patch

@@ -378,7 +378,7 @@ index f876049..8d02018 100644
  function builtin_isArray(ctx: BuiltinFunctionContext): ExpressionRef {
    let compiler = ctx.compiler;
 diff --git a/src/compiler.ts b/src/compiler.ts
-index f99bd5a..d9c1b77 100644
+index f99bd5a..282aa0e 100644
 --- a/src/compiler.ts
 +++ b/src/compiler.ts
 @@ -49,6 +49,7 @@ import {
@@ -499,7 +499,15 @@ index f99bd5a..d9c1b77 100644
  
        // Error if there's neither a type nor an initializer
        } else {
-@@ -1434,10 +1464,63 @@ export class Compiler extends DiagnosticEmitter {
+@@ -1412,6 +1442,7 @@ export class Compiler extends DiagnosticEmitter {
+     }
+ 
+     let internalName = global.internalName;
++    if (this.earlyGlobals.has(global)) module.removeGlobal(internalName); // amxts: its stand-in
+ 
+     if (initializeInStart) { // initialize to mutable zero and set the actual value in start
+       if (isDeclaredInline) {
+@@ -1434,10 +1465,76 @@ export class Compiler extends DiagnosticEmitter {
      } else if (!isDeclaredInline) { // compile normally
        module.addGlobal(internalName, typeRef, !isDeclaredConstant, initExpr);
      }
@@ -539,6 +547,15 @@ index f99bd5a..d9c1b77 100644
 +  }
 +
 +  /**
++   * amxts: the globals read or written above their declaration before it was
++   * compiled. Binaryen looks a global up when it weighs an expression that
++   * reads it - as an indirect call does the function it calls, `STEPS[i]()` -
++   * so each has a stand-in in the module from its first such use, which
++   * compileGlobal replaces with the global itself.
++   */
++  private earlyGlobals: Set<Global> = new Set();
++
++  /**
 +   * amxts: `expr`, a read or write of `global`, after a check that its
 +   * declaration has run - JavaScript's ReferenceError in the temporal dead
 +   * zone: an abort that says so and ends the current call. The flag it
@@ -546,6 +563,10 @@ index f99bd5a..d9c1b77 100644
 +   */
 +  private makeGlobalTdzCheck(global: Global, expr: ExpressionRef, type: Type, reportNode: Node): ExpressionRef {
 +    let module = this.module;
++    if ((!global.is(CommonFlags.Compiled) || this.pendingElements.has(global)) && !this.earlyGlobals.has(global)) {
++      this.earlyGlobals.add(global);
++      module.addGlobal(global.internalName, global.type.toRef(), true, this.makeZero(global.type));
++    }
 +    let flag = global.tdzFlag;
 +    if (!flag) {
 +      global.tdzFlag = flag = global.internalName + "~initialized";
@@ -563,7 +584,7 @@ index f99bd5a..d9c1b77 100644
    // === Enums ====================================================================================
  
    /** Compiles an enum. */
-@@ -1684,6 +1767,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -1684,6 +1781,7 @@ export class Compiler extends DiagnosticEmitter {
        }
  
        this.currentFlow = previousFlow;
@@ -571,7 +592,7 @@ index f99bd5a..d9c1b77 100644
  
        // create the function
        funcRef = module.addFunction(
-@@ -1798,9 +1882,52 @@ export class Compiler extends DiagnosticEmitter {
+@@ -1798,9 +1896,52 @@ export class Compiler extends DiagnosticEmitter {
        : null;
      let bodyStartIndex = stmts.length;
  
@@ -624,7 +645,7 @@ index f99bd5a..d9c1b77 100644
      } else {
        // must be an expression statement if not a block
        assert(bodyNode.kind == NodeKind.Expression);
-@@ -1841,6 +1968,9 @@ export class Compiler extends DiagnosticEmitter {
+@@ -1841,6 +1982,9 @@ export class Compiler extends DiagnosticEmitter {
          allocStmts.push(
            this.makeConditionalAllocation(classInstance, thisLocal.index)
          );
@@ -634,7 +655,7 @@ index f99bd5a..d9c1b77 100644
          this.makeFieldInitializationInConstructor(classInstance, allocStmts);
  
          // Insert right before the body
-@@ -1876,8 +2006,9 @@ export class Compiler extends DiagnosticEmitter {
+@@ -1876,8 +2020,9 @@ export class Compiler extends DiagnosticEmitter {
          flow.set(FlowFlags.Returns | FlowFlags.ReturnsNonNull | FlowFlags.Terminates);
        }
  
@@ -646,7 +667,7 @@ index f99bd5a..d9c1b77 100644
          this.error(
            DiagnosticCode.Constructors_for_derived_classes_must_contain_a_super_call,
            instance.prototype.declaration.range
-@@ -1893,9 +2024,67 @@ export class Compiler extends DiagnosticEmitter {
+@@ -1893,9 +2038,67 @@ export class Compiler extends DiagnosticEmitter {
        return false; // not recoverable
      }
  
@@ -714,7 +735,7 @@ index f99bd5a..d9c1b77 100644
    /** Makes a built-in getter of a property that is a field. */
    private makeBuiltinFieldGetter(property: Property): FunctionRef {
      let getterInstance = assert(property.getterInstance);
-@@ -2363,7 +2552,10 @@ export class Compiler extends DiagnosticEmitter {
+@@ -2363,7 +2566,10 @@ export class Compiler extends DiagnosticEmitter {
        stmts.length = 0;
      }
      let flow = this.currentFlow;
@@ -725,7 +746,7 @@ index f99bd5a..d9c1b77 100644
        let stmt = this.compileStatement(statements[i]);
        switch (getExpressionId(stmt)) {
          case ExpressionId.Block: {
-@@ -2418,16 +2610,17 @@ export class Compiler extends DiagnosticEmitter {
+@@ -2418,16 +2624,17 @@ export class Compiler extends DiagnosticEmitter {
    ): ExpressionRef {
      let module = this.module;
      let labelNode = statement.label;
@@ -751,7 +772,7 @@ index f99bd5a..d9c1b77 100644
      if (breakLabel == null) {
        this.error(
          DiagnosticCode.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement,
-@@ -2436,7 +2629,11 @@ export class Compiler extends DiagnosticEmitter {
+@@ -2436,7 +2643,11 @@ export class Compiler extends DiagnosticEmitter {
        return module.unreachable();
      }
      flow.set(FlowFlags.Breaks);
@@ -764,7 +785,7 @@ index f99bd5a..d9c1b77 100644
    }
  
    private compileContinueStatement(
-@@ -2444,17 +2641,18 @@ export class Compiler extends DiagnosticEmitter {
+@@ -2444,17 +2655,18 @@ export class Compiler extends DiagnosticEmitter {
    ): ExpressionRef {
      let module = this.module;
      let label = statement.label;
@@ -791,7 +812,7 @@ index f99bd5a..d9c1b77 100644
      if (continueLabel == null) {
        this.error(
          DiagnosticCode.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement,
-@@ -2463,7 +2661,11 @@ export class Compiler extends DiagnosticEmitter {
+@@ -2463,7 +2675,11 @@ export class Compiler extends DiagnosticEmitter {
        return module.unreachable();
      }
      flow.set(FlowFlags.Continues | FlowFlags.Terminates);
@@ -804,7 +825,7 @@ index f99bd5a..d9c1b77 100644
    }
  
    private compileDoStatement(
-@@ -2504,6 +2706,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -2504,6 +2720,7 @@ export class Compiler extends DiagnosticEmitter {
      flow.continueLabel = continueLabel;
      let loopLabel = `do-loop|${label}`;
      this.currentFlow = flow;
@@ -812,7 +833,7 @@ index f99bd5a..d9c1b77 100644
      let bodyStmts = new Array<ExpressionRef>();
      let body = statement.body;
      if (body.kind == NodeKind.Block) {
-@@ -2511,6 +2714,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -2511,6 +2728,7 @@ export class Compiler extends DiagnosticEmitter {
      } else {
        bodyStmts.push(this.compileStatement(body));
      }
@@ -820,7 +841,7 @@ index f99bd5a..d9c1b77 100644
      flow.popControlFlowLabel(label);
  
      let possiblyContinues = flow.isAny(FlowFlags.Continues | FlowFlags.ConditionallyContinues);
-@@ -2634,6 +2838,21 @@ export class Compiler extends DiagnosticEmitter {
+@@ -2634,6 +2852,21 @@ export class Compiler extends DiagnosticEmitter {
        stmts.push(this.compileStatement(initializer));
      }
  
@@ -842,7 +863,7 @@ index f99bd5a..d9c1b77 100644
      // Precompute the condition if present, or default to `true`
      let condExpr: ExpressionRef;
      let condExprTrueish: ExpressionRef;
-@@ -2669,6 +2888,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -2669,6 +2902,7 @@ export class Compiler extends DiagnosticEmitter {
      bodyFlow.continueLabel = continueLabel;
      let loopLabel = `for-loop|${label}`;
      this.currentFlow = bodyFlow;
@@ -850,7 +871,7 @@ index f99bd5a..d9c1b77 100644
      let bodyStmts = new Array<ExpressionRef>();
      let body = statement.body;
      if (body.kind == NodeKind.Block) {
-@@ -2676,6 +2896,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -2676,6 +2910,7 @@ export class Compiler extends DiagnosticEmitter {
      } else {
        bodyStmts.push(this.compileStatement(body));
      }
@@ -858,7 +879,7 @@ index f99bd5a..d9c1b77 100644
      bodyFlow.popControlFlowLabel(label);
      bodyFlow.breakLabel = null;
      bodyFlow.continueLabel = null;
-@@ -2700,6 +2921,19 @@ export class Compiler extends DiagnosticEmitter {
+@@ -2700,6 +2935,19 @@ export class Compiler extends DiagnosticEmitter {
      // Compile the incrementor if it possibly executes
      let possiblyLoops = possiblyContinues || possiblyFallsThrough;
      if (possiblyLoops) {
@@ -878,7 +899,7 @@ index f99bd5a..d9c1b77 100644
        let incrementor = statement.incrementor;
        if (incrementor) {
          this.currentFlow = flow;
-@@ -2802,6 +3036,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -2802,6 +3050,7 @@ export class Compiler extends DiagnosticEmitter {
      // Compile ifTrue assuming the condition turned out true
      let thenStmts = new Array<ExpressionRef>();
      let thenFlow = flow.forkThen(condExpr);
@@ -886,7 +907,7 @@ index f99bd5a..d9c1b77 100644
      this.currentFlow = thenFlow;
      if (ifTrue.kind == NodeKind.Block) {
        this.compileStatements((<BlockStatement>ifTrue).statements, thenStmts);
-@@ -2812,6 +3047,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -2812,6 +3061,7 @@ export class Compiler extends DiagnosticEmitter {
  
      // Compile ifFalse assuming the condition turned out false, if present
      let elseFlow = flow.forkElse(condExpr);
@@ -894,7 +915,7 @@ index f99bd5a..d9c1b77 100644
      if (ifFalse) {
        this.currentFlow = elseFlow;
        let elseStmts = new Array<ExpressionRef>();
-@@ -2850,6 +3086,14 @@ export class Compiler extends DiagnosticEmitter {
+@@ -2850,6 +3100,14 @@ export class Compiler extends DiagnosticEmitter {
      let flow = this.currentFlow;
      let returnType = flow.returnType;
  
@@ -909,7 +930,7 @@ index f99bd5a..d9c1b77 100644
      let valueExpression = statement.value;
      if (valueExpression) {
        let constraints = Constraints.ConvImplicit;
-@@ -2861,6 +3105,19 @@ export class Compiler extends DiagnosticEmitter {
+@@ -2861,6 +3119,19 @@ export class Compiler extends DiagnosticEmitter {
        if (flow.sourceFunction.is(CommonFlags.Constructor) && valueExpression.kind != NodeKind.This) {
          flow.set(FlowFlags.MayReturnNonThis);
        }
@@ -929,7 +950,7 @@ index f99bd5a..d9c1b77 100644
      } else if (returnType != Type.void) {
        this.error(
          DiagnosticCode.Type_0_is_not_assignable_to_type_1,
-@@ -2868,27 +3125,33 @@ export class Compiler extends DiagnosticEmitter {
+@@ -2868,27 +3139,33 @@ export class Compiler extends DiagnosticEmitter {
        );
        this.currentType = returnType;
        return module.unreachable();
@@ -971,7 +992,7 @@ index f99bd5a..d9c1b77 100644
    }
  
    private compileSwitchStatement(
-@@ -3018,12 +3281,49 @@ export class Compiler extends DiagnosticEmitter {
+@@ -3018,12 +3295,51 @@ export class Compiler extends DiagnosticEmitter {
    private compileThrowStatement(
      statement: ThrowStatement
    ): ExpressionRef {
@@ -1013,6 +1034,8 @@ index f99bd5a..d9c1b77 100644
 +        module.i32(source.lineAt(statement.range.start)),
 +        module.i32(source.columnAt())
 +      ], TypeRef.I32);
++      // amxts: a failed call's stack stops at this call - its place, in the source map
++      if (this.options.sourceMap) this.addDebugLocation(thrown, statement.range);
 +      this.currentType = Type.void;
 +      return this.unwindsIn(target)
 +        ? module.block(null, [ module.if(thrown, this.makeUnwind()), module.unreachable() ])
@@ -1022,7 +1045,7 @@ index f99bd5a..d9c1b77 100644
      let stmts = new Array<ExpressionRef>();
      let value = statement.value;
      let message: Expression | null = null;
-@@ -3037,17 +3337,685 @@ export class Compiler extends DiagnosticEmitter {
+@@ -3037,17 +3353,685 @@ export class Compiler extends DiagnosticEmitter {
      return this.module.flatten(stmts);
    }
  
@@ -1714,14 +1737,10 @@ index f99bd5a..d9c1b77 100644
    }
  
    /** Compiles a variable statement. Returns `0` if an initializer is not necessary. */
-@@ -3078,10 +4046,36 @@ export class Compiler extends DiagnosticEmitter {
+@@ -3078,6 +4062,32 @@ export class Compiler extends DiagnosticEmitter {
        // Resolve type if annotated
        let typeNode = declaration.type;
        let initializerNode = declaration.initializer;
--      if (typeNode) {
--        type = resolver.resolveType( // reports
--          typeNode, flow,
--          flow.sourceFunction,
 +      // amxts: one a hoisted function uses has its box already - see hoistFunctions.
 +      let predeclared = flow.getScopedLocal(name);
 +      if (predeclared && predeclared.closurePredeclared) {
@@ -1748,14 +1767,10 @@ index f99bd5a..d9c1b77 100644
 +          continue;
 +        }
 +      }
-+      if (typeNode) {
-+        type = resolver.resolveType( // reports
-+          typeNode, flow,
-+          flow.sourceFunction,
-           cloneMap(flow.contextualTypeArguments)
-         );
-         if (!type) continue;
-@@ -3238,7 +4232,31 @@ export class Compiler extends DiagnosticEmitter {
+       if (typeNode) {
+         type = resolver.resolveType( // reports
+           typeNode, flow,
+@@ -3238,7 +4248,31 @@ export class Compiler extends DiagnosticEmitter {
            flow.unsetLocalFlag(local.index, ~0);
            if (isConst) flow.setLocalFlag(local.index, LocalFlags.Constant);
          }
@@ -1788,7 +1803,7 @@ index f99bd5a..d9c1b77 100644
            initializers.push(
              this.makeLocalAssignment(local, initExpr, initType ? initType : type, false)
            );
-@@ -3312,6 +4330,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -3312,6 +4346,7 @@ export class Compiler extends DiagnosticEmitter {
      let continueLabel = `while-continue|${label}`;
      thenFlow.continueLabel = continueLabel;
      this.currentFlow = thenFlow;
@@ -1796,7 +1811,7 @@ index f99bd5a..d9c1b77 100644
      let bodyStmts = new Array<ExpressionRef>();
      let body = statement.body;
      if (body.kind == NodeKind.Block) {
-@@ -3319,6 +4338,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -3319,6 +4354,7 @@ export class Compiler extends DiagnosticEmitter {
      } else {
        bodyStmts.push(this.compileStatement(body));
      }
@@ -1804,7 +1819,7 @@ index f99bd5a..d9c1b77 100644
      bodyStmts.push(
        module.br(continueLabel)
      );
-@@ -3479,6 +4499,11 @@ export class Compiler extends DiagnosticEmitter {
+@@ -3479,6 +4515,11 @@ export class Compiler extends DiagnosticEmitter {
          break;
        }
        case NodeKind.Call: {
@@ -1816,7 +1831,7 @@ index f99bd5a..d9c1b77 100644
          expr = this.compileCallExpression(<CallExpression>expression, contextualType, constraints);
          break;
        }
-@@ -3487,6 +4512,10 @@ export class Compiler extends DiagnosticEmitter {
+@@ -3487,6 +4528,10 @@ export class Compiler extends DiagnosticEmitter {
          break;
        }
        case NodeKind.ElementAccess: {
@@ -1827,7 +1842,7 @@ index f99bd5a..d9c1b77 100644
          expr = this.compileElementAccessExpression(<ElementAccessExpression>expression, contextualType, constraints);
          break;
        }
-@@ -3516,6 +4545,10 @@ export class Compiler extends DiagnosticEmitter {
+@@ -3516,6 +4561,10 @@ export class Compiler extends DiagnosticEmitter {
          break;
        }
        case NodeKind.PropertyAccess: {
@@ -1838,7 +1853,7 @@ index f99bd5a..d9c1b77 100644
          expr = this.compilePropertyAccessExpression(<PropertyAccessExpression>expression, contextualType, constraints);
          break;
        }
-@@ -3571,6 +4604,20 @@ export class Compiler extends DiagnosticEmitter {
+@@ -3571,6 +4620,20 @@ export class Compiler extends DiagnosticEmitter {
      return expr;
    }
  
@@ -1859,7 +1874,7 @@ index f99bd5a..d9c1b77 100644
    /** Converts an expression's result from one type to another. */
    convertExpression(
      expr: ExpressionRef,
-@@ -3602,10 +4649,46 @@ export class Compiler extends DiagnosticEmitter {
+@@ -3602,10 +4665,46 @@ export class Compiler extends DiagnosticEmitter {
      // any to void
      if (toType.kind == TypeKind.Void) return module.drop(expr);
  
@@ -1906,7 +1921,7 @@ index f99bd5a..d9c1b77 100644
        } else if (explicit && fromType.isNullableReference && !toType.isNullableReference) {
          // explicit conversion from nullable to non-nullable requires a runtime
          // check here because nonnull state above already didn't know better
-@@ -3614,7 +4697,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -3614,7 +4713,7 @@ export class Compiler extends DiagnosticEmitter {
          }
          fromType = fromType.nonNullableType;
        }
@@ -1915,7 +1930,7 @@ index f99bd5a..d9c1b77 100644
          assert(toType.isExternalReference || fromType.kind == toType.kind);
          this.currentType = toType;
          return expr;
-@@ -3670,7 +4753,26 @@ export class Compiler extends DiagnosticEmitter {
+@@ -3670,7 +4769,26 @@ export class Compiler extends DiagnosticEmitter {
        return module.unreachable();
      }
  
@@ -1943,7 +1958,7 @@ index f99bd5a..d9c1b77 100644
        if (!explicit) {
          this.error(
            DiagnosticCode.Conversion_from_type_0_to_1_requires_an_explicit_cast,
-@@ -3845,10 +4947,14 @@ export class Compiler extends DiagnosticEmitter {
+@@ -3845,10 +4963,14 @@ export class Compiler extends DiagnosticEmitter {
          let expr = this.compileExpression(expression.expression, contextualType.exceptVoid, inheritedConstraints);
          let type = this.currentType;
          if (this.currentFlow.isNonnull(expr, type)) {
@@ -1962,7 +1977,7 @@ index f99bd5a..d9c1b77 100644
          } else if (!this.options.noAssert) {
            expr = this.makeRuntimeNonNullCheck(expr, type, expression);
          }
-@@ -3893,6 +4999,10 @@ export class Compiler extends DiagnosticEmitter {
+@@ -3893,6 +5015,10 @@ export class Compiler extends DiagnosticEmitter {
      contextualType: Type,
    ): ExpressionRef {
  
@@ -1973,7 +1988,7 @@ index f99bd5a..d9c1b77 100644
      const left = expression.left;
      const leftExpr = this.compileExpression(left, contextualType);
      const leftType = this.currentType;
-@@ -4109,6 +5219,13 @@ export class Compiler extends DiagnosticEmitter {
+@@ -4109,6 +5235,13 @@ export class Compiler extends DiagnosticEmitter {
        }
        case Token.Plus_Equals: compound = true;
        case Token.Plus: {
@@ -1987,7 +2002,7 @@ index f99bd5a..d9c1b77 100644
          leftExpr = this.compileExpression(left, contextualType);
          leftType = this.currentType;
  
-@@ -4315,6 +5432,11 @@ export class Compiler extends DiagnosticEmitter {
+@@ -4315,6 +5448,11 @@ export class Compiler extends DiagnosticEmitter {
            rightExpr = this.compileExpression(right, leftType);
            rightType = this.currentType;
            commonType = Type.commonType(leftType, rightType, contextualType);
@@ -1999,7 +2014,7 @@ index f99bd5a..d9c1b77 100644
            if (!commonType || !commonType.isNumericValue) {
              this.error(
                DiagnosticCode.Operator_0_cannot_be_applied_to_types_1_and_2,
-@@ -4390,6 +5512,13 @@ export class Compiler extends DiagnosticEmitter {
+@@ -4390,6 +5528,13 @@ export class Compiler extends DiagnosticEmitter {
              break;
            }
          }
@@ -2013,7 +2028,7 @@ index f99bd5a..d9c1b77 100644
          if (!leftType.isIntegerValue) {
            this.error(
              DiagnosticCode.The_0_operator_cannot_be_applied_to_type_1,
-@@ -4417,6 +5546,13 @@ export class Compiler extends DiagnosticEmitter {
+@@ -4417,6 +5562,13 @@ export class Compiler extends DiagnosticEmitter {
              break;
            }
          }
@@ -2027,7 +2042,7 @@ index f99bd5a..d9c1b77 100644
          if (!leftType.isIntegerValue) {
            this.error(
              DiagnosticCode.The_0_operator_cannot_be_applied_to_type_1,
-@@ -4445,6 +5581,12 @@ export class Compiler extends DiagnosticEmitter {
+@@ -4445,6 +5597,12 @@ export class Compiler extends DiagnosticEmitter {
              break;
            }
          }
@@ -2040,7 +2055,7 @@ index f99bd5a..d9c1b77 100644
          if (!leftType.isIntegerValue) {
            this.error(
              DiagnosticCode.The_0_operator_cannot_be_applied_to_type_1,
-@@ -4473,6 +5615,13 @@ export class Compiler extends DiagnosticEmitter {
+@@ -4473,6 +5631,13 @@ export class Compiler extends DiagnosticEmitter {
            }
          }
  
@@ -2054,7 +2069,7 @@ index f99bd5a..d9c1b77 100644
          if (compound) {
            if (!leftType.isIntegerValue) {
              this.error(
-@@ -4486,6 +5635,10 @@ export class Compiler extends DiagnosticEmitter {
+@@ -4486,6 +5651,10 @@ export class Compiler extends DiagnosticEmitter {
          } else {
            rightExpr = this.compileExpression(right, leftType);
            rightType = this.currentType;
@@ -2065,7 +2080,7 @@ index f99bd5a..d9c1b77 100644
            commonType = Type.commonType(leftType, rightType, contextualType);
            if (!commonType || !commonType.isIntegerValue) {
              this.error(
-@@ -4518,6 +5671,13 @@ export class Compiler extends DiagnosticEmitter {
+@@ -4518,6 +5687,13 @@ export class Compiler extends DiagnosticEmitter {
            }
          }
  
@@ -2079,7 +2094,7 @@ index f99bd5a..d9c1b77 100644
          if (compound) {
            if (!leftType.isIntegerValue) {
              this.error(
-@@ -4531,6 +5691,10 @@ export class Compiler extends DiagnosticEmitter {
+@@ -4531,6 +5707,10 @@ export class Compiler extends DiagnosticEmitter {
          } else {
            rightExpr = this.compileExpression(right, leftType);
            rightType = this.currentType;
@@ -2090,7 +2105,7 @@ index f99bd5a..d9c1b77 100644
            commonType = Type.commonType(leftType, rightType, contextualType);
            if (!commonType || !commonType.isIntegerValue) {
              this.error(
-@@ -4563,6 +5727,13 @@ export class Compiler extends DiagnosticEmitter {
+@@ -4563,6 +5743,13 @@ export class Compiler extends DiagnosticEmitter {
            }
          }
  
@@ -2104,7 +2119,7 @@ index f99bd5a..d9c1b77 100644
          if (compound) {
            if (!leftType.isIntegerValue) {
              this.error(
-@@ -4576,6 +5747,10 @@ export class Compiler extends DiagnosticEmitter {
+@@ -4576,6 +5763,10 @@ export class Compiler extends DiagnosticEmitter {
          } else {
            rightExpr = this.compileExpression(right, leftType);
            rightType = this.currentType;
@@ -2115,7 +2130,7 @@ index f99bd5a..d9c1b77 100644
            commonType = Type.commonType(leftType, rightType, contextualType);
            if (!commonType || !commonType.isIntegerValue) {
              this.error(
-@@ -4603,6 +5778,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -4603,6 +5794,7 @@ export class Compiler extends DiagnosticEmitter {
          leftType = this.currentType;
  
          let rightFlow = flow.forkThen(leftExpr);
@@ -2123,7 +2138,7 @@ index f99bd5a..d9c1b77 100644
          this.currentFlow = rightFlow;
  
          // simplify if only interested in true or false
-@@ -4782,13 +5958,160 @@ export class Compiler extends DiagnosticEmitter {
+@@ -4782,13 +5974,160 @@ export class Compiler extends DiagnosticEmitter {
          }
          break;
        }
@@ -2290,7 +2305,7 @@ index f99bd5a..d9c1b77 100644
        }
        default: {
          assert(false);
-@@ -4796,12 +6119,31 @@ export class Compiler extends DiagnosticEmitter {
+@@ -4796,12 +6135,31 @@ export class Compiler extends DiagnosticEmitter {
          break;
        }
      }
@@ -2322,7 +2337,63 @@ index f99bd5a..d9c1b77 100644
      if (!this.currentType.isStrictlyAssignableTo(targetType)) {
        this.error(
          DiagnosticCode.Type_0_is_not_assignable_to_type_1,
-@@ -5683,6 +7025,157 @@ export class Compiler extends DiagnosticEmitter {
+@@ -5455,13 +6813,54 @@ export class Compiler extends DiagnosticEmitter {
+         if (!instance || !this.compileFunction(instance)) {
+           return module.unreachable();
+         }
+-        return this.makeCallDirect(instance, [ leftExpr, rightExpr ], reportNode);
++        return this.makeIntegralRem(leftExpr, rightExpr, instance, reportNode);
+       }
+     }
+     assert(false);
+     return module.unreachable();
+   }
+ 
++  /**
++   * amxts: `x % y` of two f64s, where a plugin's whole numbers are: two whole
++   * numbers within i32 - each the same after i32.trunc_sat and back - take
++   * i32's remainder, which has the dividend's sign as JavaScript's does, and
++   * copysign keeps it on a zero (-4 % 2 is -0); anything else, NaN and a zero
++   * divisor too, is Math.mod's. In place rather than in Math.mod: the call
++   * itself was most of what a remainder cost. The top level, whose temps are
++   * not the start function's own (see makeUnwindCheck), calls Math.mod.
++   */
++  private makeIntegralRem(leftExpr: ExpressionRef, rightExpr: ExpressionRef, mod: Function, reportNode: Node): ExpressionRef {
++    let module = this.module;
++    let flow = this.currentFlow;
++    let name = flow.targetFunction.internalName;
++    if (name.startsWith("start:") || name == BuiltinNames.start) {
++      return this.makeCallDirect(mod, [ leftExpr, rightExpr ], reportNode);
++    }
++    let x = flow.getTempLocal(Type.f64).index;
++    let y = flow.getTempLocal(Type.f64).index;
++    let ix = flow.getTempLocal(Type.i32).index;
++    let iy = flow.getTempLocal(Type.i32).index;
++    let whole = (value: Index, int: Index): ExpressionRef => module.binary(BinaryOp.EqF64,
++      module.unary(UnaryOp.ConvertI32ToF64, module.local_tee(int, module.unary(UnaryOp.TruncSatF64ToI32, module.local_get(value, TypeRef.F64)), false, TypeRef.I32)),
++      module.local_get(value, TypeRef.F64)
++    );
++    return module.block(null, [
++      module.local_set(x, leftExpr, false),
++      module.local_set(y, rightExpr, false),
++      module.if(
++        module.binary(BinaryOp.AndI32,
++          module.binary(BinaryOp.AndI32, whole(x, ix), whole(y, iy)),
++          module.binary(BinaryOp.NeI32, module.local_get(iy, TypeRef.I32), module.i32(0))
++        ),
++        module.binary(BinaryOp.CopysignF64,
++          module.unary(UnaryOp.ConvertI32ToF64, module.binary(BinaryOp.RemI32, module.local_get(ix, TypeRef.I32), module.local_get(iy, TypeRef.I32))),
++          module.local_get(x, TypeRef.F64)
++        ),
++        this.makeCallDirect(mod, [ module.local_get(x, TypeRef.F64), module.local_get(y, TypeRef.F64) ], reportNode)
++      )
++    ], TypeRef.F64);
++  }
++
+   makeShl(leftExpr: ExpressionRef, rightExpr: ExpressionRef, type: Type): ExpressionRef {
+     // Cares about garbage bits on the RHS, but only for types smaller than 5 bits
+     let module = this.module;
+@@ -5683,6 +7082,166 @@ export class Compiler extends DiagnosticEmitter {
      return this.makeCallDirect(operatorInstance, [ firstExpr, secondExpr ], reportNode);
    }
  
@@ -2347,11 +2418,12 @@ index f99bd5a..d9c1b77 100644
 +  }
 +
 +  /**
-+   * amxts: a value given where `string | (...) => string` is declared - an
-+   * argument, an object literal's field, a field's initializer, an
-+   * assignment. The type is held as the function, so a string becomes one
-+   * that returns it (__textFunction in std/assembly/function.ts); a function,
-+   * or anything that is not a string, is compiled as it is.
++   * amxts: a value given where `string | (...) => string` - or `boolean |
++   * (...) => boolean` - is declared: an argument, an object literal's field,
++   * a field's initializer, an assignment. The type is held as the function,
++   * so a string becomes one that returns it (__textFunction in
++   * std/assembly/function.ts), a boolean likewise (__boolFunction); a
++   * function, or anything else, is compiled as it is.
 +   */
 +  private compileText(
 +    value: Expression,
@@ -2385,6 +2457,14 @@ index f99bd5a..d9c1b77 100644
 +          this.currentType = helper.signature.returnType;
 +          return call;
 +        }
++        if (valueType == Type.bool) {
++          let expr = this.compileExpression(inner, Type.bool, Constraints.ConvImplicit);
++          let helper = this.asyncHood("__boolFunction", value, [ type.nonNullableType ]);
++          if (!helper) return this.module.unreachable();
++          let call = this.makeCallDirect(helper, [ expr ], value);
++          this.currentType = helper.signature.returnType;
++          return call;
++        }
 +      }
 +    }
 +    return this.compileExpression(value, type, constraints);
@@ -2480,7 +2560,7 @@ index f99bd5a..d9c1b77 100644
    private compileAssignment(
      expression: Expression,
      valueExpression: Expression,
-@@ -5691,6 +7184,13 @@ export class Compiler extends DiagnosticEmitter {
+@@ -5691,6 +7250,13 @@ export class Compiler extends DiagnosticEmitter {
      let program = this.program;
      let resolver = program.resolver;
      let flow = this.currentFlow;
@@ -2494,7 +2574,7 @@ index f99bd5a..d9c1b77 100644
      let target = resolver.lookupExpression(expression, flow); // reports
      if (!target) return this.module.unreachable();
      let thisExpression = resolver.currentThisExpression;
-@@ -5698,6 +7198,8 @@ export class Compiler extends DiagnosticEmitter {
+@@ -5698,6 +7264,8 @@ export class Compiler extends DiagnosticEmitter {
  
      // to compile just the value, we need to know the target's type
      let targetType: Type;
@@ -2503,7 +2583,7 @@ index f99bd5a..d9c1b77 100644
      switch (target.kind) {
        case ElementKind.Global:
        case ElementKind.Local: {
-@@ -5705,15 +7207,8 @@ export class Compiler extends DiagnosticEmitter {
+@@ -5705,15 +7273,8 @@ export class Compiler extends DiagnosticEmitter {
            if (!this.compileGlobalLazy(<Global>target, expression)) {
              return this.module.unreachable();
            }
@@ -2520,7 +2600,7 @@ index f99bd5a..d9c1b77 100644
          if (this.pendingElements.has(target)) {
            this.error(
              DiagnosticCode.Variable_0_used_before_its_declaration,
-@@ -5756,6 +7251,9 @@ export class Compiler extends DiagnosticEmitter {
+@@ -5756,6 +7317,9 @@ export class Compiler extends DiagnosticEmitter {
          assert(setterInstance.signature.parameterTypes.length == 1); // parser must guarantee this
          targetType = setterInstance.signature.parameterTypes[0];
          if (setterInstance.hasDecorator(DecoratorFlags.Unsafe)) this.checkUnsafe(expression);
@@ -2530,7 +2610,7 @@ index f99bd5a..d9c1b77 100644
          break;
        }
        case ElementKind.IndexSignature: {
-@@ -5804,7 +7302,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -5804,7 +7368,7 @@ export class Compiler extends DiagnosticEmitter {
  
      // compile the value and do the assignment
      assert(targetType != Type.void);
@@ -2539,7 +2619,7 @@ index f99bd5a..d9c1b77 100644
      let valueType = this.currentType;
      if (targetType.isNullableReference && this.currentFlow.isNonnull(valueExpr, valueType)) targetType = targetType.nonNullableType;
      return this.makeAssignment(
-@@ -5841,7 +7339,9 @@ export class Compiler extends DiagnosticEmitter {
+@@ -5841,7 +7405,9 @@ export class Compiler extends DiagnosticEmitter {
      switch (target.kind) {
        case ElementKind.Local: {
          let local = <Local>target;
@@ -2550,7 +2630,7 @@ index f99bd5a..d9c1b77 100644
            this.error(
              DiagnosticCode.Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property,
              valueExpression.range, target.internalName
-@@ -5849,6 +7349,17 @@ export class Compiler extends DiagnosticEmitter {
+@@ -5849,6 +7415,17 @@ export class Compiler extends DiagnosticEmitter {
            this.currentType = tee ? local.type : Type.void;
            return module.unreachable();
          }
@@ -2568,15 +2648,17 @@ index f99bd5a..d9c1b77 100644
          return this.makeLocalAssignment(local, valueExpr, valueType, tee);
        }
        case ElementKind.Global: {
-@@ -5856,6 +7367,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -5856,6 +7433,9 @@ export class Compiler extends DiagnosticEmitter {
          if (!this.compileGlobalLazy(global, valueExpression)) {
            return module.unreachable();
          }
-+        flow.forgetGlobalPaths(global.internalName); // amxts: no longer narrowed
++        flow.forgetGlobalPaths(global.internalName); // amxts: no longer narrowed - or
++        // narrowed by what it was given, `client = new Client()`, as TypeScript does
++        if (global.type.isNullableReference && !valueType.isNullableReference) flow.setGlobalNonNull(global.internalName);
          if (target.isAny(CommonFlags.Const | CommonFlags.Readonly)) {
            this.error(
              DiagnosticCode.Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property,
-@@ -5865,7 +7377,14 @@ export class Compiler extends DiagnosticEmitter {
+@@ -5865,7 +7445,14 @@ export class Compiler extends DiagnosticEmitter {
            this.currentType = tee ? global.type : Type.void;
            return module.unreachable();
          }
@@ -2592,7 +2674,7 @@ index f99bd5a..d9c1b77 100644
        }
        case ElementKind.PropertyPrototype: {
          let propertyInstance = this.resolver.resolveProperty(<PropertyPrototype>target);
-@@ -5893,6 +7412,9 @@ export class Compiler extends DiagnosticEmitter {
+@@ -5893,6 +7480,9 @@ export class Compiler extends DiagnosticEmitter {
            if (isConstructor && thisExpression.kind == NodeKind.This) {
              flow.setThisFieldFlag(propertyInstance, FieldFlags.Initialized);
            }
@@ -2602,7 +2684,7 @@ index f99bd5a..d9c1b77 100644
          }
          let setterInstance = propertyInstance.setterInstance;
          if (!setterInstance) {
-@@ -5904,6 +7426,39 @@ export class Compiler extends DiagnosticEmitter {
+@@ -5904,6 +7494,39 @@ export class Compiler extends DiagnosticEmitter {
          }
          assert(setterInstance.signature.parameterTypes.length == 1);
          assert(setterInstance.signature.returnType == Type.void);
@@ -2642,7 +2724,7 @@ index f99bd5a..d9c1b77 100644
          if (propertyInstance.is(CommonFlags.Instance)) {
            let thisType = assert(setterInstance.signature.thisType);
            let thisExpr = this.compileExpression(
-@@ -6028,11 +7583,31 @@ export class Compiler extends DiagnosticEmitter {
+@@ -6028,11 +7651,31 @@ export class Compiler extends DiagnosticEmitter {
      tee: bool
    ): ExpressionRef {
      let module = this.module;
@@ -2675,7 +2757,7 @@ index f99bd5a..d9c1b77 100644
      if (type.isNullableReference) {
        if (!valueType.isNullableReference || flow.isNonnull(valueExpr, type)) flow.setLocalFlag(localIndex, LocalFlags.NonNull);
        else flow.unsetLocalFlag(localIndex, LocalFlags.NonNull);
-@@ -6042,13 +7617,6 @@ export class Compiler extends DiagnosticEmitter {
+@@ -6042,13 +7685,6 @@ export class Compiler extends DiagnosticEmitter {
        if (!flow.canOverflow(valueExpr, type)) flow.setLocalFlag(localIndex, LocalFlags.Wrapped);
        else flow.unsetLocalFlag(localIndex, LocalFlags.Wrapped);
      }
@@ -2689,7 +2771,7 @@ index f99bd5a..d9c1b77 100644
    }
  
    /** Makes an assignment to a global. */
-@@ -6146,6 +7714,42 @@ export class Compiler extends DiagnosticEmitter {
+@@ -6146,6 +7782,42 @@ export class Compiler extends DiagnosticEmitter {
        return module.local_set(thisLocal.index, superCall, classInstance.type.isManaged);
      }
  
@@ -2732,7 +2814,7 @@ index f99bd5a..d9c1b77 100644
      // otherwise resolve normally
      let target = this.resolver.lookupExpression(expression.expression, flow); // reports
      if (!target) return module.unreachable();
-@@ -6443,7 +8047,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -6443,7 +8115,7 @@ export class Compiler extends DiagnosticEmitter {
          // otherwise, the arguments may not be inlined, e.g. `abc(abc(123))`
          let args = new Array<ExpressionRef>(numArguments);
          for (let i = 0; i < numArguments; ++i) {
@@ -2741,7 +2823,7 @@ index f99bd5a..d9c1b77 100644
          }
          // make the inlined call
          inlineStack.push(instance);
-@@ -6464,7 +8068,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -6464,7 +8136,7 @@ export class Compiler extends DiagnosticEmitter {
      let parameterTypes = signature.parameterTypes;
      for (let i = 0; i < numArguments; ++i, ++index) {
        let paramType = parameterTypes[i];
@@ -2750,7 +2832,7 @@ index f99bd5a..d9c1b77 100644
        operands[index] = paramExpr;
      }
      assert(index == numArgumentsInclThis);
-@@ -6697,42 +8301,943 @@ export class Compiler extends DiagnosticEmitter {
+@@ -6697,39 +8369,940 @@ export class Compiler extends DiagnosticEmitter {
      return stub;
    }
  
@@ -2865,9 +2947,6 @@ index f99bd5a..d9c1b77 100644
 -    let usizeType = this.options.usizeType;
 -    let sizeTypeRef = usizeType.toRef();
 -    let parameterTypes = instance.signature.parameterTypes;
--    let returnType = instance.signature.returnType;
--    let numParameters = parameterTypes.length;
--    let tempIndex = 1 + parameterTypes.length; // incl. `this`
 +    let key = `${source.id}|${target.id}`;
 +    let adapter = this.valueArityAdapters.get(key);
 +    if (!adapter) {
@@ -3718,13 +3797,10 @@ index f99bd5a..d9c1b77 100644
 +    let usizeType = this.options.usizeType;
 +    let sizeTypeRef = usizeType.toRef();
 +    let parameterTypes = instance.signature.parameterTypes;
-+    let returnType = instance.signature.returnType;
-+    let numParameters = parameterTypes.length;
-+    let tempIndex = 1 + parameterTypes.length; // incl. `this`
- 
-     // Switch over this's rtId and map it to the respective overload
-     let builder = new SwitchBuilder(this.module,
-@@ -7011,7 +9516,7 @@ export class Compiler extends DiagnosticEmitter {
+     let returnType = instance.signature.returnType;
+     let numParameters = parameterTypes.length;
+     let tempIndex = 1 + parameterTypes.length; // incl. `this`
+@@ -7011,7 +9584,7 @@ export class Compiler extends DiagnosticEmitter {
            lastOperand
          ], lastOperandType.toRef());
          this.operandsTostack(instance.signature, operands);
@@ -3733,7 +3809,7 @@ index f99bd5a..d9c1b77 100644
          if (returnType != Type.void && immediatelyDropped) {
            expr = module.drop(expr);
            this.currentType = Type.void;
-@@ -7029,6 +9534,9 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7029,6 +9602,9 @@ export class Compiler extends DiagnosticEmitter {
  
      if (operands) this.operandsTostack(instance.signature, operands);
      let expr = module.call(instance.internalName, operands, returnType.toRef());
@@ -3743,7 +3819,7 @@ index f99bd5a..d9c1b77 100644
      this.currentType = returnType;
      return expr;
    }
-@@ -7122,10 +9630,19 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7122,10 +9698,19 @@ export class Compiler extends DiagnosticEmitter {
      let stmts = new Array<ExpressionRef>();
      let sizeTypeRef = this.options.sizeTypeRef;
  
@@ -3763,7 +3839,7 @@ index f99bd5a..d9c1b77 100644
        functionArg = module.local_get(functionArgLocal.index, sizeTypeRef);
      }
  
-@@ -7133,10 +9650,16 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7133,10 +9718,16 @@ export class Compiler extends DiagnosticEmitter {
      // provided, so we must set `argumentsLength` in any case. Inject setting it
      // into the index argument, which becomes executed last after any operands.
      let argumentsLength = this.ensureArgumentsLength();
@@ -3784,7 +3860,7 @@ index f99bd5a..d9c1b77 100644
  
      if (operands) this.operandsTostack(signature, operands);
      let expr = module.call_indirect(
-@@ -7146,6 +9669,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7146,6 +9737,7 @@ export class Compiler extends DiagnosticEmitter {
        signature.paramRefs,
        signature.resultRefs
      );
@@ -3792,7 +3868,7 @@ index f99bd5a..d9c1b77 100644
      this.currentType = returnType;
      stmts.push(expr);
      return module.flatten(stmts, returnType.toRef());
-@@ -7176,6 +9700,12 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7176,6 +9768,12 @@ export class Compiler extends DiagnosticEmitter {
      let module = this.module;
      let targetExpression = expression.expression;
      let resolver = this.resolver;
@@ -3805,7 +3881,7 @@ index f99bd5a..d9c1b77 100644
      let targetElement = resolver.lookupExpression(targetExpression, this.currentFlow, Type.auto, ReportMode.Swallow);
      if (targetElement && targetElement.kind == ElementKind.Enum) {
        const elementExpr = this.compileExpression(expression.elementExpression, Type.i32, Constraints.ConvImplicit);
-@@ -7202,9 +9732,11 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7202,9 +9800,11 @@ export class Compiler extends DiagnosticEmitter {
                expression.range
              );
            }
@@ -3818,7 +3894,7 @@ index f99bd5a..d9c1b77 100644
          }
        }
        this.error(
-@@ -7224,6 +9756,13 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7224,6 +9824,13 @@ export class Compiler extends DiagnosticEmitter {
      assert(!declaration.typeParameters); // function expression cannot be generic
      let flow = this.currentFlow;
      let sourceFunction = flow.sourceFunction;
@@ -3832,7 +3908,7 @@ index f99bd5a..d9c1b77 100644
      let isNamed = declaration.name.text.length > 0;
      let isSemanticallyAnonymous = !isNamed || contextualType != Type.void;
      let prototype = new FunctionPrototype(
-@@ -7237,6 +9776,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7237,6 +9844,7 @@ export class Compiler extends DiagnosticEmitter {
      let instance: Function | null;
      let contextualTypeArguments = cloneMap(flow.contextualTypeArguments);
      let module = this.module;
@@ -3840,7 +3916,7 @@ index f99bd5a..d9c1b77 100644
  
      // compile according to context. this differs from a normal function in that omitted parameter
      // and return types can be inferred and omitted arguments can be replaced with dummies.
-@@ -7280,7 +9820,18 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7280,7 +9888,18 @@ export class Compiler extends DiagnosticEmitter {
  
        // check non-omitted return type
        let returnType = contextualSignature.returnType;
@@ -3860,7 +3936,7 @@ index f99bd5a..d9c1b77 100644
          let resolvedType = this.resolver.resolveType(
            signatureNode.returnType, flow,
            sourceFunction.parent,
-@@ -7334,7 +9885,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7334,7 +9953,7 @@ export class Compiler extends DiagnosticEmitter {
          signature,
          contextualTypeArguments
        );
@@ -3869,7 +3945,7 @@ index f99bd5a..d9c1b77 100644
        let worked = this.compileFunction(instance);
        this.currentType = contextualSignature.type;
        if (!worked) return module.unreachable();
-@@ -7343,7 +9894,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7343,7 +9962,7 @@ export class Compiler extends DiagnosticEmitter {
      } else {
        instance = this.resolver.resolveFunction(prototype, null, contextualTypeArguments);
        if (!instance) return this.module.unreachable();
@@ -3878,7 +3954,7 @@ index f99bd5a..d9c1b77 100644
        let worked = this.compileFunction(instance);
        this.currentType = instance.signature.type;
        if (!worked) return module.unreachable();
-@@ -7354,6 +9905,27 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7354,6 +9973,27 @@ export class Compiler extends DiagnosticEmitter {
        ? module.i64(i64_low(offset), i64_high(offset))
        : module.i32(i64_low(offset));
  
@@ -3906,7 +3982,7 @@ index f99bd5a..d9c1b77 100644
      // add a constant local referring to the function if applicable
      if (!isSemanticallyAnonymous) {
        let fname = instance.name;
-@@ -7403,6 +9975,9 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7403,6 +10043,9 @@ export class Compiler extends DiagnosticEmitter {
      let flow = this.currentFlow;
      let sourceFunction = flow.sourceFunction;
  
@@ -3916,7 +3992,7 @@ index f99bd5a..d9c1b77 100644
      // check special keywords first
      switch (expression.kind) {
        case NodeKind.Null: {
-@@ -7439,6 +10014,15 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7439,6 +10082,15 @@ export class Compiler extends DiagnosticEmitter {
        }
        case NodeKind.This: {
          let thisType = sourceFunction.signature.thisType;
@@ -3932,7 +4008,7 @@ index f99bd5a..d9c1b77 100644
          if (!thisType) {
            this.error(
              DiagnosticCode._this_cannot_be_referenced_in_current_location,
-@@ -7466,6 +10050,17 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7466,6 +10118,17 @@ export class Compiler extends DiagnosticEmitter {
          return module.local_get(thisLocal.index, thisType.toRef());
        }
        case NodeKind.Super: {
@@ -3950,7 +4026,7 @@ index f99bd5a..d9c1b77 100644
          if (sourceFunction.is(CommonFlags.Constructor)) {
            if (flow.is(FlowFlags.CtorParamContext)) {
              this.error(
-@@ -7545,6 +10140,26 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7545,6 +10208,26 @@ export class Compiler extends DiagnosticEmitter {
            return this.compileInlineConstant(local, contextualType, constraints);
          }
          let localIndex = local.index;
@@ -3977,7 +4053,7 @@ index f99bd5a..d9c1b77 100644
          if (!flow.isLocalFlag(localIndex, LocalFlags.Initialized)) {
            this.error(
              DiagnosticCode.Variable_0_is_used_before_being_assigned,
-@@ -7559,14 +10174,12 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7559,14 +10242,12 @@ export class Compiler extends DiagnosticEmitter {
            this.currentType = localType;
          }
  
@@ -3998,7 +4074,7 @@ index f99bd5a..d9c1b77 100644
          }
          let expr = module.local_get(localIndex, localType.toRef());
          if (isNonNull && localType.isNullableExternalReference && this.options.hasFeature(Feature.GC)) {
-@@ -7582,8 +10195,10 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7582,8 +10263,10 @@ export class Compiler extends DiagnosticEmitter {
          if (!this.compileGlobalLazy(global, expression)) {
            return module.unreachable();
          }
@@ -4010,7 +4086,7 @@ index f99bd5a..d9c1b77 100644
            this.error(
              DiagnosticCode.Variable_0_used_before_its_declaration,
              expression.range,
-@@ -7603,6 +10218,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7603,6 +10286,7 @@ export class Compiler extends DiagnosticEmitter {
          if (global.is(CommonFlags.DefinitelyAssigned) && globalType.isReference && !globalType.isNullableReference) {
            expr = this.makeRuntimeNonNullCheck(expr, globalType, expression);
          }
@@ -4018,7 +4094,7 @@ index f99bd5a..d9c1b77 100644
          this.currentType = globalType;
          return expr;
        }
-@@ -7656,6 +10272,23 @@ export class Compiler extends DiagnosticEmitter {
+@@ -7656,6 +10340,23 @@ export class Compiler extends DiagnosticEmitter {
            this.currentType = Type.func;
            return module.ref_func(functionInstance.internalName, ensureType(functionInstance.type));
          }
@@ -4042,7 +4118,7 @@ index f99bd5a..d9c1b77 100644
          let offset = this.ensureRuntimeFunction(functionInstance);
          this.currentType = functionInstance.signature.type;
          return this.options.isWasm64
-@@ -8070,6 +10703,9 @@ export class Compiler extends DiagnosticEmitter {
+@@ -8070,6 +10771,9 @@ export class Compiler extends DiagnosticEmitter {
      switch (expression.literalKind) {
        case LiteralKind.Array: {
          assert(!implicitlyNegate);
@@ -4052,7 +4128,7 @@ index f99bd5a..d9c1b77 100644
          return this.compileArrayLiteral(
            <ArrayLiteralExpression>expression,
            contextualType,
-@@ -8122,14 +10758,15 @@ export class Compiler extends DiagnosticEmitter {
+@@ -8122,14 +10826,15 @@ export class Compiler extends DiagnosticEmitter {
          assert(!implicitlyNegate);
          return this.compileObjectLiteral(<ObjectLiteralExpression>expression, contextualType);
        }
@@ -4075,7 +4151,7 @@ index f99bd5a..d9c1b77 100644
        }
      }
      assert(false);
-@@ -8361,6 +10998,22 @@ export class Compiler extends DiagnosticEmitter {
+@@ -8361,6 +11066,22 @@ export class Compiler extends DiagnosticEmitter {
        return this.compileStaticArrayLiteral(expression, contextualType, constraints);
      }
  
@@ -4098,7 +4174,7 @@ index f99bd5a..d9c1b77 100644
      // handle normal arrays
      let element = this.resolver.lookupExpression(expression, flow, this.currentType);
      if (!element) return module.unreachable();
-@@ -8618,6 +11271,27 @@ export class Compiler extends DiagnosticEmitter {
+@@ -8618,6 +11339,27 @@ export class Compiler extends DiagnosticEmitter {
  
      // Check that contextual type is a class (TODO: hidden class for interfaces?)
      let classReference = contextualType.getClass();
@@ -4126,7 +4202,7 @@ index f99bd5a..d9c1b77 100644
      if (!classReference) {
        this.error(
          DiagnosticCode.Type_0_is_not_assignable_to_type_1,
-@@ -8625,9 +11299,18 @@ export class Compiler extends DiagnosticEmitter {
+@@ -8625,9 +11367,18 @@ export class Compiler extends DiagnosticEmitter {
        );
        return module.unreachable();
      }
@@ -4145,7 +4221,7 @@ index f99bd5a..d9c1b77 100644
        this.error(
          DiagnosticCode.Not_implemented_0,
          expression.range, "Interface hidden classes"
-@@ -8689,6 +11372,11 @@ export class Compiler extends DiagnosticEmitter {
+@@ -8689,6 +11440,11 @@ export class Compiler extends DiagnosticEmitter {
      let deferredProperties = new Array<Property>();
      for (let i = 0; i < numNames; ++i) {
        let memberName = names[i].text;
@@ -4157,7 +4233,7 @@ index f99bd5a..d9c1b77 100644
        let member = classReference.getMember(memberName);
        if (!member || member.kind != ElementKind.PropertyPrototype) {
          this.error(
-@@ -8736,9 +11424,55 @@ export class Compiler extends DiagnosticEmitter {
+@@ -8736,9 +11492,55 @@ export class Compiler extends DiagnosticEmitter {
        }
  
        let propertyType = propertyInstance.type;
@@ -4214,7 +4290,18 @@ index f99bd5a..d9c1b77 100644
        ], setterInstance.identifierNode, true);
        if (this.currentType != Type.void) { // in case
          expr = module.drop(expr);
-@@ -9128,6 +11862,9 @@ export class Compiler extends DiagnosticEmitter {
+@@ -8924,7 +11726,9 @@ export class Compiler extends DiagnosticEmitter {
+       let contextualTypeArguments = cloneMap(classInstance.contextualTypeArguments);
+       if (baseClass) {
+         let baseCtor = this.ensureConstructor(baseClass, reportNode);
+-        this.checkFieldInitialization(baseClass, reportNode);
++        // amxts: a class that implements an interface of fields declares them
++        // again, as TypeScript has it, and they are checked as its own
++        if (shapeBaseOf(classInstance) != baseClass) this.checkFieldInitialization(baseClass, reportNode);
+         instance = new Function(
+           CommonNames.constructor,
+           new FunctionPrototype(
+@@ -9128,6 +11932,9 @@ export class Compiler extends DiagnosticEmitter {
      let resolver = this.resolver;
      let target = resolver.lookupExpression(expression, flow, ctxType); // reports
      if (!target) return module.unreachable();
@@ -4224,7 +4311,7 @@ index f99bd5a..d9c1b77 100644
      let thisExpression = resolver.currentThisExpression;
      if (target.hasDecorator(DecoratorFlags.Unsafe)) this.checkUnsafe(expression);
  
-@@ -9209,7 +11946,12 @@ export class Compiler extends DiagnosticEmitter {
+@@ -9209,7 +12016,12 @@ export class Compiler extends DiagnosticEmitter {
              Constraints.ConvImplicit | Constraints.IsThis
            );
          }
@@ -4238,7 +4325,7 @@ index f99bd5a..d9c1b77 100644
        }
        case ElementKind.FunctionPrototype: {
          let functionPrototype = <FunctionPrototype>target;
-@@ -9236,6 +11978,18 @@ export class Compiler extends DiagnosticEmitter {
+@@ -9236,6 +12048,18 @@ export class Compiler extends DiagnosticEmitter {
            return module.unreachable();
          }
  
@@ -4257,7 +4344,7 @@ index f99bd5a..d9c1b77 100644
          let offset = this.ensureRuntimeFunction(functionInstance);
          return this.options.isWasm64
            ? module.i64(i64_low(offset), i64_high(offset))
-@@ -9258,6 +12012,11 @@ export class Compiler extends DiagnosticEmitter {
+@@ -9258,6 +12082,11 @@ export class Compiler extends DiagnosticEmitter {
      let ifThen = expression.ifThen;
      let ifElse = expression.ifElse;
  
@@ -4269,7 +4356,7 @@ index f99bd5a..d9c1b77 100644
      let condExpr = this.compileExpression(expression.condition, Type.bool);
      let condExprTrueish = this.makeIsTrueish(condExpr, this.currentType, expression.condition);
      // Try to eliminate unnecesssary branches if the condition is constant
-@@ -9272,11 +12031,13 @@ export class Compiler extends DiagnosticEmitter {
+@@ -9272,14 +12101,17 @@ export class Compiler extends DiagnosticEmitter {
  
      let outerFlow = this.currentFlow;
      let ifThenFlow = outerFlow.forkThen(condExpr);
@@ -4283,7 +4370,34 @@ index f99bd5a..d9c1b77 100644
      this.currentFlow = ifElseFlow;
      let ifElseExpr = this.compileExpression(ifElse, contextualType == Type.auto ? ifThenType : contextualType);
      let ifElseType = this.currentType;
-@@ -9828,7 +12589,7 @@ export class Compiler extends DiagnosticEmitter {
++    let lenient = false;
+ 
+     if (contextualType == Type.void) { // values, including type mismatch, are irrelevant
+       if (ifThenType != Type.void) {
+@@ -9301,6 +12133,11 @@ export class Compiler extends DiagnosticEmitter {
+         this.currentType = contextualType;
+         return module.unreachable();
+       }
++      // amxts: `map.has(key) ? map.get(key) : fallback` - null only from a
++      // lenient read is checked where it is used, as for the read alone
++      lenient = commonType.isNullableReference &&
++        (!ifThenType.isNullableReference || this.isLenientRead(ifThenExpr)) &&
++        (!ifElseType.isNullableReference || this.isLenientRead(ifElseExpr));
+       ifThenExpr = this.convertExpression(ifThenExpr, ifThenType, commonType, false, ifThen);
+       ifThenType = commonType;
+       ifElseExpr = this.convertExpression(ifElseExpr, ifElseType, commonType, false, ifElse);
+@@ -9311,7 +12148,9 @@ export class Compiler extends DiagnosticEmitter {
+     outerFlow.inheritAlternatives(ifThenFlow, ifElseFlow);
+     this.currentFlow = outerFlow;
+ 
+-    return module.if(condExprTrueish, ifThenExpr, ifElseExpr);
++    let expr = module.if(condExprTrueish, ifThenExpr, ifElseExpr);
++    if (lenient) this.recordReads.add(expr);
++    return expr;
+   }
+ 
+   private compileUnaryPostfixExpression(
+@@ -9828,7 +12667,7 @@ export class Compiler extends DiagnosticEmitter {
            contextualType == Type.void
              ? Type.i32
              : contextualType.isFloatValue
@@ -4292,7 +4406,7 @@ index f99bd5a..d9c1b77 100644
                : contextualType,
            Constraints.None
          );
-@@ -9847,7 +12608,12 @@ export class Compiler extends DiagnosticEmitter {
+@@ -9847,7 +12686,12 @@ export class Compiler extends DiagnosticEmitter {
            return module.unreachable();
          }
  
@@ -4306,7 +4420,7 @@ index f99bd5a..d9c1b77 100644
  
          switch (this.currentType.kind) {
            case TypeKind.Bool:
-@@ -9887,10 +12653,13 @@ export class Compiler extends DiagnosticEmitter {
+@@ -9887,10 +12731,13 @@ export class Compiler extends DiagnosticEmitter {
        case Token.TypeOf: {
          return this.compileTypeof(expression, contextualType, constraints);
        }
@@ -4321,7 +4435,16 @@ index f99bd5a..d9c1b77 100644
          );
          return module.unreachable();
        }
-@@ -10220,6 +12989,31 @@ export class Compiler extends DiagnosticEmitter {
+@@ -10067,6 +12914,8 @@ export class Compiler extends DiagnosticEmitter {
+   addDebugLocation(expr: ExpressionRef, range: Range): void {
+     let targetFunction = this.currentFlow.targetFunction;
+     let source = range.source;
++    // amxts: what the compiler makes itself has no file to point at
++    if (source == Source.native) return;
+     if (source.debugInfoIndex < 0) source.debugInfoIndex = this.module.addDebugInfoFile(source.normalizedPath);
+     // It's possible that an `expr` is seen multiple times, for example when
+     // first adding debug information for an inner expression and later on for
+@@ -10220,6 +13069,31 @@ export class Compiler extends DiagnosticEmitter {
        case TypeKind.U64: return module.binary(BinaryOp.NeI64, expr, module.i64(0));
        case TypeKind.Isize:
        case TypeKind.Usize: {
@@ -4353,7 +4476,7 @@ index f99bd5a..d9c1b77 100644
          return type.size == 64
            ? module.binary(BinaryOp.NeI64, expr, module.i64(0))
            : expr;
-@@ -10323,10 +13117,59 @@ export class Compiler extends DiagnosticEmitter {
+@@ -10323,10 +13197,59 @@ export class Compiler extends DiagnosticEmitter {
      }
    }
  
@@ -4413,7 +4536,7 @@ index f99bd5a..d9c1b77 100644
      if (type == stringType) {
        return expr;
      }
-@@ -10364,7 +13207,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -10364,7 +13287,7 @@ export class Compiler extends DiagnosticEmitter {
                type.nonNullableType,
                reportNode
              ),
@@ -4422,7 +4545,7 @@ index f99bd5a..d9c1b77 100644
            );
          }
          let toStringReturnType = toStringSignature.returnType;
-@@ -10436,85 +13279,664 @@ export class Compiler extends DiagnosticEmitter {
+@@ -10436,85 +13359,664 @@ export class Compiler extends DiagnosticEmitter {
      );
    }
  
@@ -5159,21 +5282,32 @@ index f99bd5a..d9c1b77 100644
    }
  
    /** Makes a call to `abort`, if present, otherwise creates a trap. */
-@@ -10555,7 +13977,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -10554,20 +14056,72 @@ export class Compiler extends DiagnosticEmitter {
+     let filenameExpr = this.ensureStaticString(codeLocation.range.source.normalizedPath);
      let range = codeLocation.range;
      let source = range.source;
++    let abortCall = module.call(
++      abortInstance.internalName, [
++        messageExpr,
++        filenameExpr,
++        module.i32(source.lineAt(range.start)),
++        module.i32(source.columnAt())
++      ],
++      TypeRef.None
++    );
++    // amxts: a failed call's stack stops at this call - its place, in the source map
++    if (this.options.sourceMap) this.addDebugLocation(abortCall, range);
      return module.block(null, [
 -      module.call(
-+      this.makeAbortReset(module.call(
-         abortInstance.internalName, [
-           messageExpr,
-           filenameExpr,
-@@ -10563,11 +13985,59 @@ export class Compiler extends DiagnosticEmitter {
-           module.i32(source.columnAt())
-         ],
-         TypeRef.None
+-        abortInstance.internalName, [
+-          messageExpr,
+-          filenameExpr,
+-          module.i32(source.lineAt(range.start)),
+-          module.i32(source.columnAt())
+-        ],
+-        TypeRef.None
 -      ),
-+      )),
++      this.makeAbortReset(abortCall),
        module.unreachable()
      ]);
    }
@@ -5188,7 +5322,7 @@ index f99bd5a..d9c1b77 100644
 +    let module = this.module;
 +    let target = this.currentFlow.targetFunction;
 +    let throwHood = this.unwindsIn(target) ? this.exceptionFunction("__throw", reportNode) : null;
-+    if (!throwHood) return this.makeStaticAbort(this.ensureStaticString(message), reportNode);
++    if (!throwHood) return this.makeStaticAbort(this.ensureStaticString(`${kind}: ${message}`), reportNode);
 +    let range = reportNode.range;
 +    let source = range.source;
 +    let previousType = this.currentType;
@@ -5203,6 +5337,7 @@ index f99bd5a..d9c1b77 100644
 +      module.i32(source.lineAt(range.start)),
 +      module.i32(source.columnAt())
 +    ], TypeRef.I32);
++    if (this.options.sourceMap) this.addDebugLocation(thrown, range);
 +    return module.block(null, [ module.if(thrown, this.makeUnwind()), module.unreachable() ]);
 +  }
 +
@@ -5229,7 +5364,7 @@ index f99bd5a..d9c1b77 100644
    /** Makes a runtime non-null check, e.g. on `<Type>possiblyNull` or `possiblyNull!`. */
    makeRuntimeNonNullCheck(
      /** Expression being checked. */
-@@ -10575,7 +14045,9 @@ export class Compiler extends DiagnosticEmitter {
+@@ -10575,7 +14129,9 @@ export class Compiler extends DiagnosticEmitter {
      /** Type of the expression. */
      type: Type,
      /** Report node. */
@@ -5240,7 +5375,7 @@ index f99bd5a..d9c1b77 100644
    ): ExpressionRef {
      let module = this.module;
      let flow = this.currentFlow;
-@@ -10584,10 +14056,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -10584,10 +14140,7 @@ export class Compiler extends DiagnosticEmitter {
      if (!flow.canOverflow(expr, type)) flow.setLocalFlag(tempIndex, LocalFlags.Wrapped);
      flow.setLocalFlag(tempIndex, LocalFlags.NonNull);
  
@@ -5252,7 +5387,7 @@ index f99bd5a..d9c1b77 100644
  
      if (type.isExternalReference) {
        let nonNullExpr = module.local_get(tempIndex, type.toRef());
-@@ -10629,10 +14098,7 @@ export class Compiler extends DiagnosticEmitter {
+@@ -10629,10 +14182,7 @@ export class Compiler extends DiagnosticEmitter {
      let temp = flow.getTempLocal(type);
      let tempIndex = temp.index;
  
@@ -5264,7 +5399,7 @@ index f99bd5a..d9c1b77 100644
  
      if (!toType.isNullableReference || flow.isNonnull(expr, type)) {
        // Simplify if the value cannot be `null`. If toType is non-nullable, a
-@@ -10725,3 +14191,505 @@ function mangleImportName(
+@@ -10725,3 +14275,505 @@ function mangleImportName(
      );
    }
  }
@@ -5802,10 +5937,18 @@ index 016ba4e..3fda5d4 100644
    "Cannot create an instance of an abstract class.": 2511,
    "Non-abstract class '{0}' does not implement inherited abstract member '{1}' from '{2}'.": 2515,
 diff --git a/src/flow.ts b/src/flow.ts
-index ddc7941..b0f883a 100644
+index ddc7941..fbe7b3b 100644
 --- a/src/flow.ts
 +++ b/src/flow.ts
-@@ -71,12 +71,15 @@ import {
+@@ -46,6 +46,7 @@ import {
+   getLocalGetIndex,
+   isLocalTee,
+   getLocalSetValue,
++  getGlobalSetValue,
+   getGlobalGetName,
+   getBinaryOp,
+   getBinaryLeft,
+@@ -71,12 +72,15 @@ import {
    getUnaryValue,
    getCallOperandAt,
    getCallOperandCount,
@@ -5822,7 +5965,7 @@ index ddc7941..b0f883a 100644
  } from "./common";
  
  import {
-@@ -88,7 +91,8 @@ import {
+@@ -88,7 +92,8 @@ import {
  } from "./diagnostics";
  
  import {
@@ -5832,7 +5975,7 @@ index ddc7941..b0f883a 100644
  } from "./ast";
  
  import {
-@@ -259,6 +263,14 @@ export class Flow {
+@@ -259,6 +264,14 @@ export class Flow {
    localFlags: LocalFlags[] = [];
    /** Field flags on `this`. Constructors only. */
    thisFieldFlags: Map<Property,FieldFlags> | null = null;
@@ -5847,7 +5990,7 @@ index ddc7941..b0f883a 100644
    /** The label we break to when encountering a return statement, when inlining. */
    inlineReturnLabel: string | null = null;
    /** Alternative flows if a compound expression is true-ish. */
-@@ -354,6 +366,8 @@ export class Flow {
+@@ -354,6 +367,8 @@ export class Flow {
        branch.continueLabel = this.continueLabel;
      }
      branch.localFlags = this.localFlags.slice();
@@ -5856,7 +5999,7 @@ index ddc7941..b0f883a 100644
      if (this.sourceFunction.is(CommonFlags.Constructor)) {
        let thisFieldFlags = assert(this.thisFieldFlags);
        branch.thisFieldFlags = cloneMap(thisFieldFlags);
-@@ -540,9 +554,33 @@ export class Flow {
+@@ -540,9 +555,33 @@ export class Flow {
    lookup(name: string): Element | null {
      let element = this.lookupLocal(name);
      if (element) return element;
@@ -5890,7 +6033,7 @@ index ddc7941..b0f883a 100644
    /** Tests if the local at the specified index has the specified flag or flags. */
    isLocalFlag(index: i32, flag: LocalFlags, defaultIfInlined: bool = true): bool {
      if (index < 0) return defaultIfInlined;
-@@ -667,6 +705,7 @@ export class Flow {
+@@ -667,6 +706,7 @@ export class Flow {
      this.flags = this.flags | otherFlags; // what happens before is still true
      this.localFlags = other.localFlags;
      this.thisFieldFlags = other.thisFieldFlags;
@@ -5898,7 +6041,7 @@ index ddc7941..b0f883a 100644
    }
  
  
-@@ -768,6 +807,9 @@ export class Flow {
+@@ -768,6 +808,9 @@ export class Flow {
  
      // field flags do not matter here since there's only INITIALIZED, which can
      // only be set if it has been observed prior to entering the branch.
@@ -5908,7 +6051,7 @@ index ddc7941..b0f883a 100644
    }
  
    /** Inherits two alternate branches to become this flow, i.e. then with else. */
-@@ -893,6 +935,15 @@ export class Flow {
+@@ -893,6 +936,15 @@ export class Flow {
        }
      }
  
@@ -5924,7 +6067,7 @@ index ddc7941..b0f883a 100644
      // field flags (currently only INITIALIZED, so can simplify)
      let leftFieldFlags = left.thisFieldFlags;
      if (leftFieldFlags) {
-@@ -944,6 +995,18 @@ export class Flow {
+@@ -944,6 +996,18 @@ export class Flow {
          }
        }
      }
@@ -5943,7 +6086,7 @@ index ddc7941..b0f883a 100644
      if (needsRecompile) {
        // Reset function locals to state before the compilation attempt
        assert(localsByIndex.length >= numLocalsBefore);
-@@ -971,10 +1034,84 @@ export class Flow {
+@@ -971,10 +1035,91 @@ export class Flow {
          let local = this.targetFunction.localsByIndex[getLocalGetIndex(expr)];
          return !local.type.isNullableReference || this.isLocalFlag(local.index, LocalFlags.NonNull, false);
        }
@@ -6000,6 +6143,13 @@ index ddc7941..b0f883a 100644
 +   * amxts: forgets the paths rooted at local `index` (it was assigned), or,
 +   * with `getter`, those that go through that field (it was assigned).
 +   */
++  /** amxts: remembers that global `name` is not null here - it was assigned an object. */
++  setGlobalNonNull(name: string): void {
++    let paths = this.nonNullPaths;
++    if (!paths) this.nonNullPaths = paths = new Set();
++    paths.add("g@" + name);
++  }
++
 +  /** amxts: forgets the paths rooted at global `name` - it was assigned. */
 +  forgetGlobalPaths(name: string): void {
 +    let paths = this.nonNullPaths;
@@ -6028,7 +6178,20 @@ index ddc7941..b0f883a 100644
    /** Updates local states to reflect that this branch is only taken when `expr` is true-ish. */
    private inheritNonnullIfTrue(
      /** Expression being true. */
-@@ -1019,6 +1156,11 @@ export class Flow {
+@@ -984,6 +1129,12 @@ export class Flow {
+   ): void {
+     // A: `expr` is true-ish -> Q: how did that happen?
+ 
++    // amxts: a call checked for an error is the call - see checkedCallValue
++    if (getExpressionId(expr) == ExpressionId.Block) {
++      let value = checkedCallValue(expr);
++      if (value) expr = value;
++    }
++
+     // The iff argument is useful in situations like
+     //
+     //  if (!ref) {
+@@ -1019,6 +1170,11 @@ export class Flow {
          }
          break;
        }
@@ -6040,7 +6203,7 @@ index ddc7941..b0f883a 100644
        case ExpressionId.Unary: {
          switch (getUnaryOp(expr)) {
            case UnaryOp.EqzI32:
-@@ -1056,7 +1198,13 @@ export class Flow {
+@@ -1056,7 +1212,13 @@ export class Flow {
          }
          break;
        }
@@ -6054,7 +6217,19 @@ index ddc7941..b0f883a 100644
          // handle string eq/ne/not overloads
          let name = getCallTarget(expr);
          if (name == BuiltinNames.String_eq) {
-@@ -1211,7 +1359,11 @@ export class Flow {
+@@ -1097,6 +1259,11 @@ export class Flow {
+     iff: Flow | null = null
+   ): void {
+     // A: `expr` is false-ish -> Q: how did that happen?
++    // amxts: a call checked for an error is the call - see checkedCallValue
++    if (getExpressionId(expr) == ExpressionId.Block) {
++      let value = checkedCallValue(expr);
++      if (value) expr = value;
++    }
+     switch (getExpressionId(expr)) {
+       case ExpressionId.Unary: {
+         switch (getUnaryOp(expr)) {
+@@ -1211,7 +1378,11 @@ export class Flow {
        // overflows if the conversion does (globals are wrapped on set)
        case ExpressionId.GlobalGet: {
          // TODO: this is inefficient because it has to read a string
@@ -6067,7 +6242,7 @@ index ddc7941..b0f883a 100644
          assert(global.kind == ElementKind.Global || global.kind == ElementKind.EnumValue);
          return canConversionOverflow((<TypedElement>global).type, type);
        }
-@@ -1477,3 +1629,42 @@ function canConversionOverflow(fromType: Type, toType: Type): bool {
+@@ -1477,3 +1648,62 @@ function canConversionOverflow(fromType: Type, toType: Type): bool {
      fromType.isSignedIntegerValue != toType.isSignedIntegerValue   // signedness mismatch
    );
  }
@@ -6091,10 +6266,30 @@ index ddc7941..b0f883a 100644
 +      let inner = fieldPathKey(getCallOperandAt(expr, 0));
 +      return inner != null ? inner + ">" + name : null;
 +    }
++    case ExpressionId.Block: {
++      let value = checkedCallValue(expr);
++      return value ? fieldPathKey(value) : null;
++    }
 +  }
 +  return null;
 +}
 +
++/**
++ * amxts: in a program with a try, a call is checked for an error it threw -
++ * (set temp (call)) (if __thrown unwind) (get temp), Compiler.makeUnwindCheck
++ * - and what it reads is still the call's. The call, or 0 for any other block.
++ */
++export function checkedCallValue(expr: ExpressionRef): ExpressionRef {
++  if (getBlockName(expr) != null || getBlockChildCount(expr) != 3) return 0;
++  if (getExpressionId(getBlockChildAt(expr, 1)) != ExpressionId.If) return 0;
++  let set = getBlockChildAt(expr, 0);
++  switch (getExpressionId(set)) {
++    case ExpressionId.LocalSet: return getLocalSetValue(set);
++    case ExpressionId.GlobalSet: return getGlobalSetValue(set);
++  }
++  return 0;
++}
++
 +function copyPaths(paths: Set<string>): Set<string> {
 +  let copy = new Set<string>();
 +  for (let _values = Set_values(paths), i = 0, k = _values.length; i < k; ++i) copy.add(_values[i]);
@@ -6110,8 +6305,24 @@ index ddc7941..b0f883a 100644
 +  }
 +  return both;
 +}
+diff --git a/src/module.ts b/src/module.ts
+index def4e78..f9cabf9 100644
+--- a/src/module.ts
++++ b/src/module.ts
+@@ -3276,6 +3276,11 @@ export function getLocalSetValue(expr: ExpressionRef): ExpressionRef {
+   return binaryen._BinaryenLocalSetGetValue(expr);
+ }
+ 
++// amxts: the value a global.set stores - see Flow's fieldPathKey
++export function getGlobalSetValue(expr: ExpressionRef): ExpressionRef {
++  return binaryen._BinaryenGlobalSetGetValue(expr);
++}
++
+ export function isLocalTee(expr: ExpressionRef): bool {
+   return binaryen._BinaryenLocalSetIsTee(expr);
+ }
 diff --git a/src/parser.ts b/src/parser.ts
-index 157351c..10c3f5c 100644
+index 157351c..11c0184 100644
 --- a/src/parser.ts
 +++ b/src/parser.ts
 @@ -31,7 +31,8 @@ import {
@@ -6767,7 +6978,7 @@ index 157351c..10c3f5c 100644
      } else {
        if (!suppressErrors) {
          this.error(
-@@ -678,11 +1212,130 @@ export class Parser extends DiagnosticEmitter {
+@@ -678,11 +1212,145 @@ export class Parser extends DiagnosticEmitter {
        return null;
      }
      // ... | type
@@ -6822,6 +7033,21 @@ index 157351c..10c3f5c 100644
 +        continue;
 +      }
 +
++      // amxts: `boolean | ((player: Player) => boolean)` - a yes or no that is
++      // fixed, or that depends on who asks. Held as the function, as text is:
++      // a boolean given where this type is declared becomes a function
++      // returning it (Compiler.compileText, __boolFunction).
++      let typeIsBoolean = type.kind == NodeKind.NamedType && isBoolName((<NamedTypeNode>type).name.identifier.text);
++      let nextIsBoolean = nextType.kind == NodeKind.NamedType && isBoolName((<NamedTypeNode>nextType).name.identifier.text);
++      if ((typeIsBoolean && nextIsFunction) || (typeIsFunction && nextIsBoolean)) {
++        let fn = <FunctionTypeNode>(typeIsFunction ? type : nextType);
++        fn.acceptsText = true;
++        fn.range = tn.range(startPos, tn.pos);
++        type = fn;
++        this.needsCallEnv = true;
++        continue;
++      }
++
 +      // amxts: `((player: Player) => boolean) | Requirement[]` - one test, or a
 +      // list of objects that each carry one. It is held as the list: a
 +      // function given where this type is declared becomes a list of one
@@ -6899,7 +7125,7 @@ index 157351c..10c3f5c 100644
        if (!typeIsNull && !nextTypeIsNull) {
          if (!suppressErrors) {
            this.error(
-@@ -705,6 +1358,26 @@ export class Parser extends DiagnosticEmitter {
+@@ -705,6 +1373,26 @@ export class Parser extends DiagnosticEmitter {
      // ... [][]
      while (tn.skip(Token.OpenBracket)) {
        let bracketStart = tn.tokenPos;
@@ -6926,7 +7152,7 @@ index 157351c..10c3f5c 100644
        if (!tn.skip(Token.CloseBracket)) {
          if (!suppressErrors) {
            this.error(
-@@ -718,9 +1391,26 @@ export class Parser extends DiagnosticEmitter {
+@@ -718,9 +1406,26 @@ export class Parser extends DiagnosticEmitter {
  
        // ...[] | null
        let nullable = false;
@@ -6953,7 +7179,7 @@ index 157351c..10c3f5c 100644
          } else {
            if (!suppressErrors) {
              this.error(
-@@ -737,9 +1427,20 @@ export class Parser extends DiagnosticEmitter {
+@@ -737,9 +1442,20 @@ export class Parser extends DiagnosticEmitter {
          nullable,
          tn.range(startPos, tn.pos)
        );
@@ -6974,7 +7200,7 @@ index 157351c..10c3f5c 100644
      return type;
    }
  
-@@ -984,6 +1685,16 @@ export class Parser extends DiagnosticEmitter {
+@@ -984,6 +1700,16 @@ export class Parser extends DiagnosticEmitter {
  
      let declarations = new Array<VariableDeclaration>();
      do {
@@ -6991,7 +7217,7 @@ index 157351c..10c3f5c 100644
        let declaration = this.parseVariableDeclaration(tn, flags, decorators, isFor);
        if (!declaration) return null;
        declaration.overriddenModuleName = this.currentModuleName;
-@@ -995,6 +1706,277 @@ export class Parser extends DiagnosticEmitter {
+@@ -995,6 +1721,277 @@ export class Parser extends DiagnosticEmitter {
      return ret;
    }
  
@@ -7269,7 +7495,7 @@ index 157351c..10c3f5c 100644
    parseVariableDeclaration(
      tn: Tokenizer,
      parentFlags: CommonFlags,
-@@ -1081,7 +2063,7 @@ export class Parser extends DiagnosticEmitter {
+@@ -1081,7 +2078,7 @@ export class Parser extends DiagnosticEmitter {
      flags: CommonFlags,
      decorators: DecoratorNode[] | null,
      startPos: i32
@@ -7278,7 +7504,7 @@ index 157351c..10c3f5c 100644
  
      // at 'enum': Identifier '{' (EnumValueDeclaration (',' EnumValueDeclaration )*)? '}' ';'?
  
-@@ -1117,6 +2099,8 @@ export class Parser extends DiagnosticEmitter {
+@@ -1117,6 +2114,8 @@ export class Parser extends DiagnosticEmitter {
          }
        }
      }
@@ -7287,7 +7513,7 @@ index 157351c..10c3f5c 100644
      let ret = Node.createEnumDeclaration(
        identifier,
        decorators,
-@@ -1125,7 +2109,34 @@ export class Parser extends DiagnosticEmitter {
+@@ -1125,7 +2124,34 @@ export class Parser extends DiagnosticEmitter {
        tn.range(startPos, tn.pos)
      );
      ret.overriddenModuleName = this.currentModuleName;
@@ -7323,7 +7549,7 @@ index 157351c..10c3f5c 100644
      return ret;
    }
  
-@@ -1235,16 +2246,41 @@ export class Parser extends DiagnosticEmitter {
+@@ -1235,16 +2261,41 @@ export class Parser extends DiagnosticEmitter {
        );
        let extendsType: NamedTypeNode | null = null;
        if (tn.skip(Token.Extends)) {
@@ -7373,7 +7599,7 @@ index 157351c..10c3f5c 100644
        }
        let defaultType: NamedTypeNode | null = null;
        if (tn.skip(Token.Equals)) {
-@@ -1413,9 +2449,21 @@ export class Parser extends DiagnosticEmitter {
+@@ -1413,9 +2464,21 @@ export class Parser extends DiagnosticEmitter {
        }
        isRest = true;
      }
@@ -7398,7 +7624,7 @@ index 157351c..10c3f5c 100644
        let type: TypeNode | null = null;
        if (isOptional = tn.skip(Token.Question)) {
          if (isRest) {
-@@ -1450,6 +2498,39 @@ export class Parser extends DiagnosticEmitter {
+@@ -1450,6 +2513,39 @@ export class Parser extends DiagnosticEmitter {
          initializer = this.parseExpression(tn, Precedence.Comma + 1);
          if (!initializer) return null;
        }
@@ -7438,7 +7664,7 @@ index 157351c..10c3f5c 100644
        let param = Node.createParameter(
          isRest
            ? ParameterKind.Rest
-@@ -1462,6 +2543,7 @@ export class Parser extends DiagnosticEmitter {
+@@ -1462,6 +2558,7 @@ export class Parser extends DiagnosticEmitter {
          Range.join(assert(startRange), tn.range())
        );
        param.flags |= accessFlags;
@@ -7446,7 +7672,7 @@ index 157351c..10c3f5c 100644
        return param;
      } else {
        this.error(
-@@ -1477,7 +2559,7 @@ export class Parser extends DiagnosticEmitter {
+@@ -1477,7 +2574,7 @@ export class Parser extends DiagnosticEmitter {
      flags: CommonFlags,
      decorators: DecoratorNode[] | null,
      startPos: i32
@@ -7455,7 +7681,7 @@ index 157351c..10c3f5c 100644
  
      // at 'function':
      //  Identifier
-@@ -1486,6 +2568,9 @@ export class Parser extends DiagnosticEmitter {
+@@ -1486,6 +2583,9 @@ export class Parser extends DiagnosticEmitter {
      //  '{' Statement* '}'
      //  ';'?
  
@@ -7465,7 +7691,7 @@ index 157351c..10c3f5c 100644
      if (!tn.skipIdentifier()) {
        this.error(
          DiagnosticCode.Identifier_expected,
-@@ -1552,16 +2637,25 @@ export class Parser extends DiagnosticEmitter {
+@@ -1552,16 +2652,25 @@ export class Parser extends DiagnosticEmitter {
        if (!returnType) return null;
      }
  
@@ -7499,7 +7725,7 @@ index 157351c..10c3f5c 100644
      }
  
      let signature = Node.createFunctionType(
-@@ -1571,6 +2665,8 @@ export class Parser extends DiagnosticEmitter {
+@@ -1571,6 +2680,8 @@ export class Parser extends DiagnosticEmitter {
        false,
        tn.range(signatureStart, tn.pos)
      );
@@ -7508,7 +7734,7 @@ index 157351c..10c3f5c 100644
  
      let body: Statement | null = null;
      if (tn.skip(Token.OpenBrace)) {
-@@ -1581,15 +2677,35 @@ export class Parser extends DiagnosticEmitter {
+@@ -1581,15 +2692,35 @@ export class Parser extends DiagnosticEmitter {
          ); // recoverable
        }
  
@@ -7544,7 +7770,7 @@ index 157351c..10c3f5c 100644
      let ret = Node.createFunctionDeclaration(
        name,
        decorators,
-@@ -1605,6 +2721,17 @@ export class Parser extends DiagnosticEmitter {
+@@ -1605,6 +2736,17 @@ export class Parser extends DiagnosticEmitter {
      return ret;
    }
  
@@ -7562,7 +7788,7 @@ index 157351c..10c3f5c 100644
    parseFunctionExpression(tn: Tokenizer): FunctionExpression | null {
      let startPos = tn.tokenPos;
      let name: IdentifierExpression;
-@@ -1641,9 +2768,13 @@ export class Parser extends DiagnosticEmitter {
+@@ -1641,9 +2783,13 @@ export class Parser extends DiagnosticEmitter {
  
      // TODO: type parameters? doesn't seem worth it.
  
@@ -7576,7 +7802,7 @@ index 157351c..10c3f5c 100644
  
      return this.parseFunctionExpressionCommon(tn, name, parameters, this.parseParametersThis, arrowKind, startPos, signatureStart);
    }
-@@ -1685,17 +2816,32 @@ export class Parser extends DiagnosticEmitter {
+@@ -1685,17 +2831,32 @@ export class Parser extends DiagnosticEmitter {
        false,
        tn.range(signatureStart, tn.pos)
      );
@@ -7610,7 +7836,7 @@ index 157351c..10c3f5c 100644
          this.error(
            DiagnosticCode._0_expected,
            tn.range(tn.pos), "{"
-@@ -1704,7 +2850,26 @@ export class Parser extends DiagnosticEmitter {
+@@ -1704,7 +2865,26 @@ export class Parser extends DiagnosticEmitter {
        }
        body = this.parseBlockStatement(tn, false);
      }
@@ -7637,7 +7863,7 @@ index 157351c..10c3f5c 100644
  
      let declaration = Node.createFunctionDeclaration(
        name,
-@@ -1724,7 +2889,7 @@ export class Parser extends DiagnosticEmitter {
+@@ -1724,7 +2904,7 @@ export class Parser extends DiagnosticEmitter {
      flags: CommonFlags,
      decorators: DecoratorNode[] | null,
      startPos: i32
@@ -7646,7 +7872,7 @@ index 157351c..10c3f5c 100644
  
      // at ('class' | 'interface'):
      //   Identifier
-@@ -1852,6 +3017,52 @@ export class Parser extends DiagnosticEmitter {
+@@ -1852,6 +3032,52 @@ export class Parser extends DiagnosticEmitter {
      }
      declaration.range.end = tn.pos;
      declaration.overriddenModuleName = this.currentModuleName;
@@ -7699,7 +7925,7 @@ index 157351c..10c3f5c 100644
      return declaration;
    }
  
-@@ -2084,6 +3295,20 @@ export class Parser extends DiagnosticEmitter {
+@@ -2084,6 +3310,20 @@ export class Parser extends DiagnosticEmitter {
        }
      }
  
@@ -7720,7 +7946,7 @@ index 157351c..10c3f5c 100644
      // check if accessor: ('get' | 'set') ^\n Identifier
      let state = tn.mark();
      let isConstructor = false;
-@@ -2093,7 +3318,7 @@ export class Parser extends DiagnosticEmitter {
+@@ -2093,7 +3333,7 @@ export class Parser extends DiagnosticEmitter {
      let isSetter = false;
      let setStart = 0;
      let setEnd = 0;
@@ -7729,7 +7955,7 @@ index 157351c..10c3f5c 100644
        if (tn.skip(Token.Get)) {
          if (tn.peek(IdentifierHandling.Prefer) == Token.Identifier && !tn.peekOnNewLine()) {
            flags |= CommonFlags.Get;
-@@ -2126,7 +3351,7 @@ export class Parser extends DiagnosticEmitter {
+@@ -2126,7 +3366,7 @@ export class Parser extends DiagnosticEmitter {
          } else {
            tn.reset(state);
          }
@@ -7738,7 +7964,7 @@ index 157351c..10c3f5c 100644
          flags |= CommonFlags.Constructor;
          isConstructor = true;
          if (!startPos) startPos = tn.tokenPos;
-@@ -2206,15 +3431,22 @@ export class Parser extends DiagnosticEmitter {
+@@ -2206,15 +3446,22 @@ export class Parser extends DiagnosticEmitter {
          tn.skip(Token.Semicolon);
          return retIndex;
        }
@@ -7769,7 +7995,7 @@ index 157351c..10c3f5c 100644
      }
      let typeParameters: TypeParameterNode[] | null = null;
      if (tn.skip(Token.LessThan)) {
-@@ -2299,6 +3531,7 @@ export class Parser extends DiagnosticEmitter {
+@@ -2299,6 +3546,7 @@ export class Parser extends DiagnosticEmitter {
        }
  
        let returnType: TypeNode | null = null;
@@ -7777,7 +8003,7 @@ index 157351c..10c3f5c 100644
        if (tn.skip(Token.Colon)) {
          if (name.kind == NodeKind.Constructor) {
            this.error(
-@@ -2313,14 +3546,20 @@ export class Parser extends DiagnosticEmitter {
+@@ -2313,14 +3561,20 @@ export class Parser extends DiagnosticEmitter {
          }
          returnType = this.parseType(tn, isSetter || name.kind == NodeKind.Constructor);
          if (!returnType) return null;
@@ -7804,7 +8030,7 @@ index 157351c..10c3f5c 100644
        }
  
        let signature = Node.createFunctionType(
-@@ -2330,6 +3569,8 @@ export class Parser extends DiagnosticEmitter {
+@@ -2330,6 +3584,8 @@ export class Parser extends DiagnosticEmitter {
          false,
          tn.range(signatureStart, tn.pos)
        );
@@ -7813,7 +8039,7 @@ index 157351c..10c3f5c 100644
  
        let body: Statement | null = null;
        if (tn.skip(Token.OpenBrace)) {
-@@ -2349,7 +3590,10 @@ export class Parser extends DiagnosticEmitter {
+@@ -2349,7 +3605,10 @@ export class Parser extends DiagnosticEmitter {
              tn.range(), ";"
            ); // recoverable
          }
@@ -7824,7 +8050,7 @@ index 157351c..10c3f5c 100644
          if (!body) return null;
        } else if (!isInterface && !(flags & (CommonFlags.Ambient | CommonFlags.Abstract))) {
          this.error(
-@@ -2358,6 +3602,9 @@ export class Parser extends DiagnosticEmitter {
+@@ -2358,6 +3617,9 @@ export class Parser extends DiagnosticEmitter {
          ); // recoverable
        }
  
@@ -7834,7 +8060,7 @@ index 157351c..10c3f5c 100644
        let retMethod = Node.createMethodDeclaration(
          name,
          decorators,
-@@ -2415,23 +3662,21 @@ export class Parser extends DiagnosticEmitter {
+@@ -2415,23 +3677,21 @@ export class Parser extends DiagnosticEmitter {
        }
  
        let type: TypeNode | null = null;
@@ -7866,7 +8092,7 @@ index 157351c..10c3f5c 100644
        }
        let initializer: Expression | null = null;
        if (tn.skip(Token.Equals)) {
-@@ -2450,6 +3695,43 @@ export class Parser extends DiagnosticEmitter {
+@@ -2450,6 +3710,43 @@ export class Parser extends DiagnosticEmitter {
            );
          }
        }
@@ -7910,7 +8136,7 @@ index 157351c..10c3f5c 100644
        let range = tn.range(startPos, tn.pos);
        if ((flags & CommonFlags.DefinitelyAssigned) != 0 && (isInterface || (flags & CommonFlags.Ambient) != 0)) {
          this.error(
-@@ -2465,6 +3747,7 @@ export class Parser extends DiagnosticEmitter {
+@@ -2465,6 +3762,7 @@ export class Parser extends DiagnosticEmitter {
          initializer,
          range
        );
@@ -7918,7 +8144,7 @@ index 157351c..10c3f5c 100644
        if (!(isInterface && tn.skip(Token.Comma))) {
          tn.skip(Token.Semicolon);
        }
-@@ -2473,6 +3756,200 @@ export class Parser extends DiagnosticEmitter {
+@@ -2473,6 +3771,208 @@ export class Parser extends DiagnosticEmitter {
      return null;
    }
  
@@ -8040,6 +8266,14 @@ index 157351c..10c3f5c 100644
 +        for (let i = 0, k = node.bodyStatements.length; i < k; ++i) this.collectReturns(node.bodyStatements[i], values, locals);
 +        let catchStatements = node.catchStatements;
 +        if (catchStatements) {
++          // amxts: `catch (error) { return error.name; }` - the caught value
++          // is an Error, as Compiler.compileTryStatement declares it.
++          let caught = node.catchVariable;
++          if (caught && !locals.has(caught.text)) {
++            let range = caught.range;
++            let type = Node.createNamedType(Node.createSimpleTypeName("Error", range), null, false, range);
++            locals.set(caught.text, Node.createVariableDeclaration(caught, null, CommonFlags.Let, type, null, range));
++          }
 +          for (let i = 0, k = catchStatements.length; i < k; ++i) this.collectReturns(catchStatements[i], values, locals);
 +        }
 +        let finallyStatements = node.finallyStatements;
@@ -8119,7 +8353,7 @@ index 157351c..10c3f5c 100644
    parseIndexSignature(
      tn: Tokenizer,
      flags: CommonFlags,
-@@ -2490,8 +3967,9 @@ export class Parser extends DiagnosticEmitter {
+@@ -2490,8 +3990,9 @@ export class Parser extends DiagnosticEmitter {
  
      let start = tn.tokenPos;
      if (tn.skipIdentifier()) {
@@ -8131,7 +8365,7 @@ index 157351c..10c3f5c 100644
          if (tn.skip(Token.Colon)) {
            let keyType = this.parseType(tn);
            if (!keyType) return null;
-@@ -2506,13 +3984,6 @@ export class Parser extends DiagnosticEmitter {
+@@ -2506,13 +4007,6 @@ export class Parser extends DiagnosticEmitter {
              if (tn.skip(Token.Colon)) {
                let valueType = this.parseType(tn);
                if (!valueType) return null;
@@ -8145,7 +8379,7 @@ index 157351c..10c3f5c 100644
                return Node.createIndexSignature(<NamedTypeNode>keyType, valueType, flags, tn.range(start, tn.pos));
              } else {
                this.error(
-@@ -2532,11 +4003,6 @@ export class Parser extends DiagnosticEmitter {
+@@ -2532,11 +4026,6 @@ export class Parser extends DiagnosticEmitter {
              tn.range(), ":"
            );
          }
@@ -8157,7 +8391,7 @@ index 157351c..10c3f5c 100644
        }
      } else {
        this.error(
-@@ -2770,6 +4236,18 @@ export class Parser extends DiagnosticEmitter {
+@@ -2770,6 +4259,18 @@ export class Parser extends DiagnosticEmitter {
      let members: ImportDeclaration[] | null = null;
      let namespaceName: IdentifierExpression | null = null;
      let skipFrom = false;
@@ -8176,7 +8410,7 @@ index 157351c..10c3f5c 100644
      if (tn.skip(Token.OpenBrace)) { // import { ... } from "file"
        members = new Array();
        while (!tn.skip(Token.CloseBrace)) {
-@@ -3026,6 +4504,15 @@ export class Parser extends DiagnosticEmitter {
+@@ -3026,6 +4527,15 @@ export class Parser extends DiagnosticEmitter {
          // fall-through
        }
        default: {
@@ -8192,7 +8426,7 @@ index 157351c..10c3f5c 100644
          tn.reset(state);
          statement = this.parseExpressionStatement(tn);
          break;
-@@ -3153,17 +4640,114 @@ export class Parser extends DiagnosticEmitter {
+@@ -3153,17 +4663,114 @@ export class Parser extends DiagnosticEmitter {
      return ret;
    }
  
@@ -8309,7 +8543,7 @@ index 157351c..10c3f5c 100644
        if (tn.skip(Token.Const)) {
          initializer = this.parseVariable(tn, CommonFlags.Const, null, tn.tokenPos, true);
        } else if (tn.skip(Token.Let)) {
-@@ -3291,7 +4875,7 @@ export class Parser extends DiagnosticEmitter {
+@@ -3291,7 +4898,7 @@ export class Parser extends DiagnosticEmitter {
      tn: Tokenizer,
      startPos: i32,
      variable: Statement,
@@ -8318,7 +8552,7 @@ index 157351c..10c3f5c 100644
  
      // at 'of': Expression ')' Statement
  
-@@ -3308,15 +4892,87 @@ export class Parser extends DiagnosticEmitter {
+@@ -3308,15 +4915,87 @@ export class Parser extends DiagnosticEmitter {
  
      let statement = this.parseStatement(tn);
      if (!statement) return null;
@@ -8407,7 +8641,7 @@ index 157351c..10c3f5c 100644
    parseIfStatement(
      tn: Tokenizer
    ): IfStatement | null {
-@@ -3496,27 +5152,27 @@ export class Parser extends DiagnosticEmitter {
+@@ -3496,27 +5175,27 @@ export class Parser extends DiagnosticEmitter {
        let catchStatements: Statement[] | null = null;
        let finallyStatements: Statement[] | null = null;
        if (tn.skip(Token.Catch)) {
@@ -8456,7 +8690,7 @@ index 157351c..10c3f5c 100644
          }
          if (!tn.skip(Token.OpenBrace)) {
            this.error(
-@@ -3561,6 +5217,9 @@ export class Parser extends DiagnosticEmitter {
+@@ -3561,6 +5240,9 @@ export class Parser extends DiagnosticEmitter {
          finallyStatements,
          tn.range(startPos, tn.pos)
        );
@@ -8466,7 +8700,7 @@ index 157351c..10c3f5c 100644
        tn.skip(Token.Semicolon);
        return ret;
      } else {
-@@ -3608,6 +5267,11 @@ export class Parser extends DiagnosticEmitter {
+@@ -3608,6 +5290,11 @@ export class Parser extends DiagnosticEmitter {
            type,
            tn.range(startPos, tn.pos)
          );
@@ -8478,7 +8712,7 @@ index 157351c..10c3f5c 100644
          tn.skip(Token.Semicolon);
          ret.overriddenModuleName = this.currentModuleName;
          return ret;
-@@ -3694,6 +5358,19 @@ export class Parser extends DiagnosticEmitter {
+@@ -3694,6 +5381,19 @@ export class Parser extends DiagnosticEmitter {
    ): Expression | null {
      let token = tn.next(IdentifierHandling.Prefer);
      let startPos = tn.tokenPos;
@@ -8498,7 +8732,7 @@ index 157351c..10c3f5c 100644
      switch (token) {
  
        // TODO: SpreadExpression, YieldExpression
-@@ -3712,6 +5389,51 @@ export class Parser extends DiagnosticEmitter {
+@@ -3712,6 +5412,51 @@ export class Parser extends DiagnosticEmitter {
          if (!operand) return null;
          return Node.createUnaryPrefixExpression(token, operand, tn.range(startPos, tn.pos));
        }
@@ -8550,7 +8784,7 @@ index 157351c..10c3f5c 100644
        case Token.Plus_Plus:
        case Token.Minus_Minus: {
          let operand = this.parseExpression(tn, Precedence.UnaryPrefix);
-@@ -3752,6 +5474,9 @@ export class Parser extends DiagnosticEmitter {
+@@ -3752,6 +5497,9 @@ export class Parser extends DiagnosticEmitter {
          } else {
            arguments_ = []; // new Type;
          }
@@ -8560,7 +8794,7 @@ index 157351c..10c3f5c 100644
          return Node.createNewExpression(
            typeName,
            typeArguments,
-@@ -3790,6 +5515,24 @@ export class Parser extends DiagnosticEmitter {
+@@ -3790,6 +5538,24 @@ export class Parser extends DiagnosticEmitter {
                tn.reset(state);
                return this.parseFunctionExpression(tn);
              }
@@ -8585,7 +8819,7 @@ index 157351c..10c3f5c 100644
              // can be both
              case Token.Identifier: {
                tn.readIdentifier();
-@@ -3896,6 +5639,25 @@ export class Parser extends DiagnosticEmitter {
+@@ -3896,6 +5662,25 @@ export class Parser extends DiagnosticEmitter {
          let values = new Array<Expression>();
          let name: IdentifierExpression;
          while (!tn.skip(Token.CloseBrace)) {
@@ -8611,7 +8845,7 @@ index 157351c..10c3f5c 100644
            if (!tn.skipIdentifier()) {
              if (!tn.skip(Token.StringLiteral)) {
                this.error(
-@@ -3914,6 +5676,17 @@ export class Parser extends DiagnosticEmitter {
+@@ -3914,6 +5699,17 @@ export class Parser extends DiagnosticEmitter {
              let value = this.parseExpression(tn, Precedence.Comma + 1);
              if (!value) return null;
              values.push(value);
@@ -8629,7 +8863,7 @@ index 157351c..10c3f5c 100644
            } else if (!name.isQuoted) {
              values.push(name);
            } else {
-@@ -3935,7 +5708,10 @@ export class Parser extends DiagnosticEmitter {
+@@ -3935,7 +5731,10 @@ export class Parser extends DiagnosticEmitter {
              }
            }
          }
@@ -8641,7 +8875,7 @@ index 157351c..10c3f5c 100644
        }
        // AssertionExpression (unary prefix)
        case Token.LessThan: {
-@@ -4129,20 +5905,32 @@ export class Parser extends DiagnosticEmitter {
+@@ -4129,20 +5928,32 @@ export class Parser extends DiagnosticEmitter {
      // see: http://www.engr.mun.ca/~theo/Misc/exp_parsing.htm#climbing
      let nextPrecedence: Precedence;
      while (
@@ -8681,7 +8915,7 @@ index 157351c..10c3f5c 100644
            } else {
              let toType = this.parseType(tn); // reports
              if (!toType) return null;
-@@ -4281,6 +6069,44 @@ export class Parser extends DiagnosticEmitter {
+@@ -4281,6 +6092,44 @@ export class Parser extends DiagnosticEmitter {
            }
            break;
          }
@@ -8726,7 +8960,7 @@ index 157351c..10c3f5c 100644
          // BinaryExpression (right associative)
          case Token.Equals:
          case Token.Plus_Equals:
-@@ -4295,6 +6121,7 @@ export class Parser extends DiagnosticEmitter {
+@@ -4295,6 +6144,7 @@ export class Parser extends DiagnosticEmitter {
          case Token.Ampersand_Equals:
          case Token.Caret_Equals:
          case Token.Bar_Equals:
@@ -8734,7 +8968,7 @@ index 157351c..10c3f5c 100644
          case Token.Asterisk_Asterisk: {
            let next = this.parseExpression(tn, nextPrecedence);
            if (!next) return null;
-@@ -4323,6 +6150,7 @@ export class Parser extends DiagnosticEmitter {
+@@ -4323,6 +6173,7 @@ export class Parser extends DiagnosticEmitter {
          case Token.Caret:
          case Token.Ampersand_Ampersand:
          case Token.Bar_Bar:
@@ -8742,7 +8976,7 @@ index 157351c..10c3f5c 100644
          case Token.In: {
            let next = this.parseExpression(tn, nextPrecedence + 1);
            if (!next) return null;
-@@ -4335,6 +6163,26 @@ export class Parser extends DiagnosticEmitter {
+@@ -4335,6 +6186,26 @@ export class Parser extends DiagnosticEmitter {
      return expr;
    }
  
@@ -8769,7 +9003,7 @@ index 157351c..10c3f5c 100644
    private parseTemplateLiteral(tn: Tokenizer, tag: Expression | null = null): Expression | null {
      // at '`': ... '`'
      let startPos = tag ? tag.range.start : tn.tokenPos;
-@@ -4569,9 +6417,11 @@ function determinePrecedence(kind: Token): Precedence {
+@@ -4569,9 +6440,11 @@ function determinePrecedence(kind: Token): Precedence {
      case Token.GreaterThan_GreaterThan_GreaterThan_Equals:
      case Token.Ampersand_Equals:
      case Token.Caret_Equals:
@@ -8783,7 +9017,7 @@ index 157351c..10c3f5c 100644
      case Token.Ampersand_Ampersand: return Precedence.LogicalAnd;
      case Token.Bar: return Precedence.BitwiseOr;
      case Token.Caret: return Precedence.BitwiseXor;
-@@ -4599,6 +6449,7 @@ function determinePrecedence(kind: Token): Precedence {
+@@ -4599,6 +6472,7 @@ function determinePrecedence(kind: Token): Precedence {
      case Token.Plus_Plus:
      case Token.Minus_Minus: return Precedence.UnaryPostfix;
      case Token.Dot:
@@ -8791,7 +9025,7 @@ index 157351c..10c3f5c 100644
      case Token.OpenBracket:
      case Token.Exclamation: return Precedence.MemberAccess;
    }
-@@ -4640,3 +6491,72 @@ function isCircularTypeAlias(name: string, type: TypeNode): bool {
+@@ -4640,3 +6514,72 @@ function isCircularTypeAlias(name: string, type: TypeNode): bool {
    }
    return false;
  }
@@ -9156,7 +9390,7 @@ index f5d9b7c..81527b0 100644
 +  }
 +}
 diff --git a/src/resolver.ts b/src/resolver.ts
-index 9576a47..d1fd13d 100644
+index 9576a47..3aa2e32 100644
 --- a/src/resolver.ts
 +++ b/src/resolver.ts
 @@ -36,7 +36,9 @@ import {
@@ -9463,7 +9697,7 @@ index 9576a47..d1fd13d 100644
        if (!argumentExpression) {
          // optional but not have initializer should be handled in the other place
          if (parameterNodes[i].parameterKind == ParameterKind.Optional) {
-@@ -743,8 +913,33 @@ export class Resolver extends DiagnosticEmitter {
+@@ -743,8 +913,43 @@ export class Resolver extends DiagnosticEmitter {
        if (parameterNodes[i].parameterKind == ParameterKind.Rest) {
          typeNode = (<NamedTypeNode> typeNode).typeArguments![0];
        }
@@ -9475,6 +9709,7 @@ index 9576a47..d1fd13d 100644
 +        (<LiteralExpression>argumentExpression).literalKind == LiteralKind.Object &&
 +        !(<ObjectLiteralExpression>argumentExpression).inferredType
 +      ) continue;
++      if (this.propagateTupleList(typeNode, argumentExpression, ctxFlow, prototype, contextualTypeArguments, typeParameterNames)) continue;
        if (typeNode.hasGenericComponent(typeParameterNodes)) {
 -        let type = this.resolveExpression(argumentExpression, ctxFlow, Type.auto, ReportMode.Swallow);
 +        // amxts: an arrow with untyped parameters needs a context to resolve
@@ -9484,9 +9719,18 @@ index 9576a47..d1fd13d 100644
 +        let argumentContext = Type.auto;
 +        if (argumentExpression.kind == NodeKind.Function && typeNode.kind == NodeKind.FunctionType) {
 +          let functionNode = <FunctionTypeNode>typeNode;
++          // amxts: a parameter typed by a generic class of what is still being
++          // inferred - `MenuContext<Data>` in `new Menu(({ player }) => ...)` -
++          // stays unknown, and the type argument takes its default: a class of
++          // `auto` is no type, and resolving it comes back to this very node
++          // through the class's own members (Menu<Data> holds
++          // MenuContext<Data>), "Recursive types".
++          let unbound = typeParameterNodes.filter(each => contextualTypeArguments.get(each.name.text) == Type.auto);
 +          let known = new Array<Type>();
 +          for (let j = 0, l = functionNode.parameters.length; j < l; ++j) {
-+            let known1 = this.resolveType(functionNode.parameters[j].type, null, prototype, contextualTypeArguments, ReportMode.Swallow);
++            let parameterType = functionNode.parameters[j].type;
++            if (parameterType.kind == NodeKind.NamedType && (<NamedTypeNode>parameterType).hasTypeArguments && parameterType.hasGenericComponent(unbound)) break;
++            let known1 = this.resolveType(parameterType, null, prototype, contextualTypeArguments, ReportMode.Swallow);
 +            if (!known1) break;
 +            known.push(known1);
 +          }
@@ -9498,7 +9742,53 @@ index 9576a47..d1fd13d 100644
          if (type) {
            this.propagateInferredGenericTypes(
              typeNode,
-@@ -915,7 +1110,11 @@ export class Resolver extends DiagnosticEmitter {
+@@ -817,6 +1022,45 @@ export class Resolver extends DiagnosticEmitter {
+   }
+ 
+   /** Updates contextual types with a possibly encapsulated inferred type. */
++  /**
++   * amxts: what an array literal of array literals says of a parameter of a
++   * list of tuples, `[K, V][]`, one element at a time: `new Map([["a", 1],
++   * ["b", 2]])` is a Map of string and number. Such a literal is a list of
++   * tuples only where one goes, and alone it has no type to infer from.
++   * False when the parameter or the argument is not of that kind.
++   */
++  private propagateTupleList(
++    typeNode: TypeNode,
++    argument: Expression,
++    ctxFlow: Flow,
++    ctxElement: Element,
++    ctxTypes: Map<string,Type>,
++    typeParameterNames: Set<string>
++  ): bool {
++    if (
++      typeNode.kind != NodeKind.NamedType ||
++      argument.kind != NodeKind.Literal ||
++      (<LiteralExpression>argument).literalKind != LiteralKind.Array
++    ) return false;
++    let list = <NamedTypeNode>typeNode;
++    let items = list.typeArguments;
++    if (list.name.identifier.text != "Array" || !items || items.length != 1 || items[0].kind != NodeKind.NamedType) return false;
++    let tuple = <NamedTypeNode>items[0];
++    let elementNodes = tuple.typeArguments;
++    if (!tuple.name.identifier.text.startsWith("__Tuple") || !elementNodes) return false;
++    let literals = (<ArrayLiteralExpression>argument).elementExpressions;
++    for (let i = 0, k = literals.length; i < k; ++i) {
++      let literal = literals[i];
++      if (literal.kind != NodeKind.Literal || (<LiteralExpression>literal).literalKind != LiteralKind.Array) continue;
++      let values = (<ArrayLiteralExpression>literal).elementExpressions;
++      for (let j = 0, l = min(values.length, elementNodes.length); j < l; ++j) {
++        let type = this.resolveExpression(values[j], ctxFlow, Type.auto, ReportMode.Swallow);
++        if (type) this.propagateInferredGenericTypes(elementNodes[j], type, ctxElement, ctxTypes, typeParameterNames);
++      }
++    }
++    return true;
++  }
++
+   private propagateInferredGenericTypes(
+     /** The inferred type node. */
+     node: TypeNode,
+@@ -915,7 +1159,11 @@ export class Resolver extends DiagnosticEmitter {
        let classReference = type.getClassOrWrapper(this.program);
        if (classReference) {
          let wrappedType = classReference.wrappedType;
@@ -9511,7 +9801,7 @@ index 9576a47..d1fd13d 100644
        }
        return type;
      }
-@@ -1067,8 +1266,10 @@ export class Resolver extends DiagnosticEmitter {
+@@ -1067,8 +1315,10 @@ export class Resolver extends DiagnosticEmitter {
      const resolvingExpressions = this.resolvingExpressions;
      if (resolvingExpressions.has(node)) return null;
      resolvingExpressions.add(node);
@@ -9523,7 +9813,7 @@ index 9576a47..d1fd13d 100644
      return resolved;
    }
  
-@@ -1253,6 +1454,19 @@ export class Resolver extends DiagnosticEmitter {
+@@ -1253,6 +1503,19 @@ export class Resolver extends DiagnosticEmitter {
      /** How to proceed with eventual diagnostics. */
      reportMode: ReportMode = ReportMode.Report
    ): Type | null {
@@ -9543,7 +9833,7 @@ index 9576a47..d1fd13d 100644
      switch (node.kind) {
        case NodeKind.True:
        case NodeKind.False: return Type.bool;
-@@ -1434,6 +1648,12 @@ export class Resolver extends DiagnosticEmitter {
+@@ -1434,6 +1697,12 @@ export class Resolver extends DiagnosticEmitter {
        }
      }
  
@@ -9556,7 +9846,7 @@ index 9576a47..d1fd13d 100644
      // Look up the member within
      switch (target.kind) {
        case ElementKind.ClassPrototype:
-@@ -1544,6 +1764,9 @@ export class Resolver extends DiagnosticEmitter {
+@@ -1544,6 +1813,9 @@ export class Resolver extends DiagnosticEmitter {
      /** How to proceed with eventual diagnostics. */
      reportMode: ReportMode = ReportMode.Report
    ): Element | null {
@@ -9566,7 +9856,7 @@ index 9576a47..d1fd13d 100644
      let targetExpression = node.expression;
      let targetType = this.resolveExpression(targetExpression, ctxFlow, ctxType, reportMode);
      if (!targetType) return null;
-@@ -1579,6 +1802,8 @@ export class Resolver extends DiagnosticEmitter {
+@@ -1579,6 +1851,8 @@ export class Resolver extends DiagnosticEmitter {
      /** How to proceed with eventual diagnostics. */
      reportMode: ReportMode = ReportMode.Report
    ): Type | null {
@@ -9575,7 +9865,7 @@ index 9576a47..d1fd13d 100644
      let element = this.lookupElementAccessExpression(node, ctxFlow, ctxType, reportMode);
      if (!element) return null;
      let type = this.getTypeOfElement(element);
-@@ -1624,6 +1849,9 @@ export class Resolver extends DiagnosticEmitter {
+@@ -1624,6 +1898,9 @@ export class Resolver extends DiagnosticEmitter {
        }
        intValue = i64_neg(intValue);
      }
@@ -9585,7 +9875,7 @@ index 9576a47..d1fd13d 100644
      if (ctxType.isValue) {
        // compile to contextual type if matching
        switch (ctxType.kind) {
-@@ -1675,6 +1903,13 @@ export class Resolver extends DiagnosticEmitter {
+@@ -1675,6 +1952,13 @@ export class Resolver extends DiagnosticEmitter {
          case TypeKind.F64: return Type.f64;
        }
      }
@@ -9599,7 +9889,7 @@ index 9576a47..d1fd13d 100644
      // otherwise compile to best fitting type
      if (i64_is_i32(intValue)) return Type.i32;
      if (i64_is_u32(intValue)) return Type.u32;
-@@ -1895,6 +2130,9 @@ export class Resolver extends DiagnosticEmitter {
+@@ -1895,6 +2179,9 @@ export class Resolver extends DiagnosticEmitter {
        case Token.TypeOf: {
          return this.program.stringInstance.type;
        }
@@ -9609,7 +9899,7 @@ index 9576a47..d1fd13d 100644
        default: assert(false);
      }
      return null;
-@@ -2018,7 +2256,8 @@ export class Resolver extends DiagnosticEmitter {
+@@ -2018,7 +2305,8 @@ export class Resolver extends DiagnosticEmitter {
        case Token.GreaterThan_GreaterThan_GreaterThan_Equals:
        case Token.Ampersand_Equals:
        case Token.Bar_Equals:
@@ -9619,7 +9909,7 @@ index 9576a47..d1fd13d 100644
          return this.resolveExpression(left, ctxFlow, ctxType, reportMode);
        }
  
-@@ -2091,6 +2330,11 @@ export class Resolver extends DiagnosticEmitter {
+@@ -2091,6 +2379,11 @@ export class Resolver extends DiagnosticEmitter {
          }
          let rightType = this.resolveExpression(right, ctxFlow, leftType, reportMode);
          if (!rightType) return null;
@@ -9631,7 +9921,7 @@ index 9576a47..d1fd13d 100644
          let commonType = Type.commonType(leftType, rightType, ctxType);
          if (!commonType) {
            if (reportMode == ReportMode.Report) {
-@@ -2100,6 +2344,14 @@ export class Resolver extends DiagnosticEmitter {
+@@ -2100,6 +2393,14 @@ export class Resolver extends DiagnosticEmitter {
              );
            }
          }
@@ -9646,7 +9936,7 @@ index 9576a47..d1fd13d 100644
          return commonType;
        }
  
-@@ -2115,6 +2367,10 @@ export class Resolver extends DiagnosticEmitter {
+@@ -2115,6 +2416,10 @@ export class Resolver extends DiagnosticEmitter {
            let overload = classReference.lookupOverload(OperatorKind.fromBinaryToken(operator));
            if (overload) return overload.signature.returnType;
          }
@@ -9657,7 +9947,7 @@ index 9576a47..d1fd13d 100644
          if (!leftType.isIntegerValue) {
            if (reportMode == ReportMode.Report) {
              this.error(
-@@ -2141,6 +2397,9 @@ export class Resolver extends DiagnosticEmitter {
+@@ -2141,6 +2446,9 @@ export class Resolver extends DiagnosticEmitter {
          }
          let rightType = this.resolveExpression(right, ctxFlow, ctxType, reportMode);
          if (!rightType) return null;
@@ -9667,7 +9957,7 @@ index 9576a47..d1fd13d 100644
          let commonType = Type.commonType(leftType, rightType, ctxType);
          if (!commonType || !commonType.isIntegerValue) {
            if (reportMode == ReportMode.Report) {
-@@ -2191,6 +2450,25 @@ export class Resolver extends DiagnosticEmitter {
+@@ -2191,6 +2499,25 @@ export class Resolver extends DiagnosticEmitter {
            ? commonType
            : commonType.nonNullableType;
        }
@@ -9693,7 +9983,7 @@ index 9576a47..d1fd13d 100644
      }
      assert(false);
      return null;
-@@ -2215,6 +2493,15 @@ export class Resolver extends DiagnosticEmitter {
+@@ -2215,6 +2542,15 @@ export class Resolver extends DiagnosticEmitter {
          return thisLocal;
        }
      }
@@ -9709,7 +9999,7 @@ index 9576a47..d1fd13d 100644
      let parent = ctxFlow.sourceFunction.parent;
      if (parent) {
        this.currentThisExpression = null;
-@@ -2274,6 +2561,16 @@ export class Resolver extends DiagnosticEmitter {
+@@ -2274,6 +2610,16 @@ export class Resolver extends DiagnosticEmitter {
          return superLocal;
        }
      }
@@ -9726,7 +10016,7 @@ index 9576a47..d1fd13d 100644
      let parent: Element | null = ctxFlow.sourceFunction.parent;
      if (parent && parent.kind == ElementKind.Class) {
        let base = (<Class>parent).base;
-@@ -2351,6 +2648,12 @@ export class Resolver extends DiagnosticEmitter {
+@@ -2351,6 +2697,12 @@ export class Resolver extends DiagnosticEmitter {
          return this.program.regexpInstance;
        }
        case LiteralKind.Array: {
@@ -9739,7 +10029,7 @@ index 9576a47..d1fd13d 100644
          let classReference = ctxType.getClass();
          if (classReference && classReference.prototype == this.program.arrayPrototype) {
            return this.getElementOfType(ctxType);
-@@ -2400,6 +2703,13 @@ export class Resolver extends DiagnosticEmitter {
+@@ -2400,6 +2752,13 @@ export class Resolver extends DiagnosticEmitter {
        }
        case LiteralKind.Object: {
          if (ctxType.isClass) return ctxType.classReference;
@@ -9753,7 +10043,7 @@ index 9576a47..d1fd13d 100644
          if (reportMode == ReportMode.Report) {
            this.error(
              DiagnosticCode.Expression_cannot_be_represented_by_a_type,
-@@ -2474,6 +2784,24 @@ export class Resolver extends DiagnosticEmitter {
+@@ -2474,6 +2833,24 @@ export class Resolver extends DiagnosticEmitter {
      /** How to proceed with eventual diagnostics. */
      reportMode: ReportMode = ReportMode.Report
    ): Type | null {
@@ -9778,7 +10068,7 @@ index 9576a47..d1fd13d 100644
      let targetExpression = node.expression;
      let target = this.lookupExpression( // reports
        targetExpression,
-@@ -2623,6 +2951,12 @@ export class Resolver extends DiagnosticEmitter {
+@@ -2623,6 +3000,12 @@ export class Resolver extends DiagnosticEmitter {
      /** How to proceed with eventual diagnostics. */
      reportMode: ReportMode = ReportMode.Report
    ): Type | null {
@@ -9791,7 +10081,7 @@ index 9576a47..d1fd13d 100644
      let thenType = this.resolveExpression(node.ifThen, ctxFlow, ctxType, reportMode);
      if (!thenType) return null;
      let elseType = this.resolveExpression(node.ifElse, ctxFlow, thenType, reportMode);
-@@ -2736,18 +3070,119 @@ export class Resolver extends DiagnosticEmitter {
+@@ -2736,18 +3119,129 @@ export class Resolver extends DiagnosticEmitter {
      const declaration = node.declaration;
      const signature = declaration.signature;
      const body = declaration.body;
@@ -9839,23 +10129,33 @@ index 9576a47..d1fd13d 100644
 +    // its untyped parameters from that type, as TypeScript's contextual typing
 +    // does - which is how game.addEventListener("x", (event) => answer) learns
 +    // what the listener returns, and from it the generic R.
++    // amxts: and an arrow's return type left out is read off its body below,
++    // `[() => log(1)]` too - no error for it here, where it is void until then.
 +    let ctxSignature = ctxType.getSignature();
 +    let untyped = false;
 +    for (let i = 0, k = signature.parameters.length; i < k; ++i) {
 +      if (isTypeOmitted(signature.parameters[i].type)) untyped = true;
 +    }
++    let returnInferred = declaration.arrowKind != ArrowKind.None && isTypeOmitted(signature.returnType);
 +    let functionType: Type | null = null;
-+    if (untyped && ctxSignature && ctxSignature.parameterTypes.length >= signature.parameters.length) {
++    if (
++      untyped ? ctxSignature != null && ctxSignature.parameterTypes.length >= signature.parameters.length : returnInferred
++    ) {
 +      let parameterTypes = new Array<Type>(signature.parameters.length);
++      let requiredParameters = 0;
++      let hasRest = false;
 +      for (let i = 0, k = signature.parameters.length; i < k; ++i) {
-+        let typeNode = signature.parameters[i].type;
++        let parameter = signature.parameters[i];
++        if (parameter.parameterKind == ParameterKind.Default) requiredParameters = i + 1;
++        else if (parameter.parameterKind == ParameterKind.Rest) hasRest = true;
++        let typeNode = parameter.type;
 +        let type = isTypeOmitted(typeNode)
-+          ? ctxSignature.parameterTypes[i]
++          ? ctxSignature!.parameterTypes[i]
 +          : this.resolveType(typeNode, null, ctxFlow.sourceFunction, ctxFlow.contextualTypeArguments, reportMode);
 +        if (!type) return null;
 +        parameterTypes[i] = type;
 +      }
-+      functionType = Signature.create(this.program, parameterTypes, Type.void, null, parameterTypes.length, false).type;
++      functionType = Signature.create(this.program, parameterTypes, Type.void, null, requiredParameters, hasRest).type;
 +    } else {
 +      functionType = this.resolveType(signature, null, ctxFlow.sourceFunction, ctxFlow.contextualTypeArguments, reportMode);
 +    }
@@ -9914,7 +10214,7 @@ index 9576a47..d1fd13d 100644
        let parameters = signature.parameters;
        // return type of resolveFunctionType should have same parameter length with signature
        assert(signatureReference.parameterTypes.length == parameters.length);
-@@ -2756,16 +3191,57 @@ export class Resolver extends DiagnosticEmitter {
+@@ -2756,16 +3250,57 @@ export class Resolver extends DiagnosticEmitter {
          const type = signatureReference.parameterTypes[i];
          tempFlow.addScopedDummyLocal(parameter.name.text, type, parameter);
        }
@@ -9975,7 +10275,7 @@ index 9576a47..d1fd13d 100644
        }
      }
      return functionType;
-@@ -2870,13 +3346,17 @@ export class Resolver extends DiagnosticEmitter {
+@@ -2870,13 +3405,17 @@ export class Resolver extends DiagnosticEmitter {
          }
          return null;
        }
@@ -10000,7 +10300,7 @@ index 9576a47..d1fd13d 100644
        if (!parameterType) return null;
        if (parameterType == Type.void) {
          if (reportMode == ReportMode.Report) {
-@@ -2891,14 +3371,73 @@ export class Resolver extends DiagnosticEmitter {
+@@ -2891,14 +3430,73 @@ export class Resolver extends DiagnosticEmitter {
      }
  
      // resolve return type
@@ -10076,7 +10376,7 @@ index 9576a47..d1fd13d 100644
          if (reportMode == ReportMode.Report) {
            this.error(
              DiagnosticCode.Type_expected,
-@@ -2906,7 +3445,7 @@ export class Resolver extends DiagnosticEmitter {
+@@ -2906,7 +3504,7 @@ export class Resolver extends DiagnosticEmitter {
            );
          }
          return null;
@@ -10085,7 +10385,7 @@ index 9576a47..d1fd13d 100644
        let type = this.resolveType(
          typeNode,
          null,
-@@ -2916,6 +3455,7 @@ export class Resolver extends DiagnosticEmitter {
+@@ -2916,6 +3514,7 @@ export class Resolver extends DiagnosticEmitter {
        );
        if (!type) return null;
        returnType = type;
@@ -10093,7 +10393,7 @@ index 9576a47..d1fd13d 100644
      }
  
      let signature = Signature.create(this.program, parameterTypes, returnType, thisType, requiredParameters, hasRest);
-@@ -3041,7 +3581,8 @@ export class Resolver extends DiagnosticEmitter {
+@@ -3041,7 +3640,8 @@ export class Resolver extends DiagnosticEmitter {
          ctxElement,
          ctxTypes, // update
          reportNode,
@@ -10103,7 +10403,7 @@ index 9576a47..d1fd13d 100644
        );
        if (!resolvedTypeArguments) return null;
  
-@@ -3089,7 +3630,7 @@ export class Resolver extends DiagnosticEmitter {
+@@ -3089,7 +3689,7 @@ export class Resolver extends DiagnosticEmitter {
        for (let _values = Map_values(classInstances), j = 0, l = _values.length; j < l; ++j) {
          let classInstance = _values[j];
          // Check if the parent class is a subtype of instance's class
@@ -10112,7 +10412,7 @@ index 9576a47..d1fd13d 100644
          let overrideInstance: Function | null = null;
          if (instance.isAny(CommonFlags.Get | CommonFlags.Set)) {
            let propertyName = instance.declaration.name.text;
-@@ -3125,6 +3666,21 @@ export class Resolver extends DiagnosticEmitter {
+@@ -3125,6 +3725,21 @@ export class Resolver extends DiagnosticEmitter {
      return Set_values(overrides);
    }
  
@@ -10134,7 +10434,7 @@ index 9576a47..d1fd13d 100644
    /** Currently resolving classes. */
    private resolveClassPending: Set<Class> = new Set();
  
-@@ -3139,6 +3695,13 @@ export class Resolver extends DiagnosticEmitter {
+@@ -3139,6 +3754,13 @@ export class Resolver extends DiagnosticEmitter {
      /** How to proceed with eventual diagnostics. */
      reportMode: ReportMode = ReportMode.Report
    ): Class | null {
@@ -10148,7 +10448,7 @@ index 9576a47..d1fd13d 100644
      let instanceKey = typeArguments ? typesToString(typeArguments) : "";
  
      // Do not attempt to resolve the same class twice. This can return a class
-@@ -3416,6 +3979,10 @@ export class Resolver extends DiagnosticEmitter {
+@@ -3416,6 +4038,10 @@ export class Resolver extends DiagnosticEmitter {
      }
  
      // Resolve instance members
@@ -10159,7 +10459,7 @@ index 9576a47..d1fd13d 100644
      let prototype = instance.prototype;
      let instanceMemberPrototypes = prototype.instanceMembers;
      if (instanceMemberPrototypes) {
-@@ -3465,18 +4032,12 @@ export class Resolver extends DiagnosticEmitter {
+@@ -3465,18 +4091,12 @@ export class Resolver extends DiagnosticEmitter {
                          break; // keep existing
                        }
                        boundInstance.memoryOffset = existingProperty.memoryOffset;
@@ -10180,7 +10480,7 @@ index 9576a47..d1fd13d 100644
                  boundPrototype.instance = boundInstance;
                  instance.add(boundPrototype.name, boundPrototype); // reports
                  // field materializes here, so check for supported type early
-@@ -3500,6 +4061,31 @@ export class Resolver extends DiagnosticEmitter {
+@@ -3500,6 +4120,31 @@ export class Resolver extends DiagnosticEmitter {
        }
      }
  
@@ -10212,7 +10512,7 @@ index 9576a47..d1fd13d 100644
      if (instance.kind != ElementKind.Interface) {
  
        // Check that all required members are implemented
-@@ -3675,7 +4261,8 @@ export class Resolver extends DiagnosticEmitter {
+@@ -3675,7 +4320,8 @@ export class Resolver extends DiagnosticEmitter {
            ctxElement,
            ctxTypes, // update
            reportNode,
@@ -10222,7 +10522,7 @@ index 9576a47..d1fd13d 100644
          );
        }
  
-@@ -3749,6 +4336,1009 @@ export class Resolver extends DiagnosticEmitter {
+@@ -3749,6 +4395,1009 @@ export class Resolver extends DiagnosticEmitter {
      return instance;
    }
  
@@ -11176,7 +11476,7 @@ index 9576a47..d1fd13d 100644
 +        let callee = (<CallExpression>value).expression;
 +        if (callee.kind == NodeKind.Identifier && (<IdentifierExpression>callee).text == prototype.name) continue;
 +      }
-+      // `if (player == null) return Player.all(); return [player];` - an
++      // `if (player == null) return server.players; return [player];` - an
 +      // array literal after another return takes that return's type, as its
 +      // elements would in TypeScript once narrowed; the body's own compile
 +      // still checks each element against it.
@@ -11232,7 +11532,7 @@ index 9576a47..d1fd13d 100644
    ensureOneTypeArgument(
      /** The type to resolve. */
      node: NamedTypeNode,
-@@ -3769,3 +5359,55 @@ export class Resolver extends DiagnosticEmitter {
+@@ -3769,3 +5418,55 @@ export class Resolver extends DiagnosticEmitter {
      return typeArgumentNodes[0];
    }
  }
@@ -11525,6 +11825,54 @@ index 85c59ff..203868e 100644
  }
  
  export declare namespace console {
+diff --git a/std/assembly/console.ts b/std/assembly/console.ts
+index 26a18a4..73426b9 100644
+--- a/std/assembly/console.ts
++++ b/std/assembly/console.ts
+@@ -8,24 +8,33 @@ export namespace console {
+     binding.assert(!!condition, message);
+   }
+ 
+-  export function log(message: string = ""): void {
+-    binding.log(message);
++  // amxts: a string, or an Error - written as its stack, as JavaScript's console does
++  export function log<T = string>(message: T = changetype<T>("")): void {
++    binding.log(text<T>(message));
+   }
+ 
+-  export function debug(message: string = ""): void {
+-    binding.debug(message);
++  export function debug<T = string>(message: T = changetype<T>("")): void {
++    binding.debug(text<T>(message));
+   }
+ 
+-  export function info(message: string = ""): void {
+-    binding.info(message);
++  export function info<T = string>(message: T = changetype<T>("")): void {
++    binding.info(text<T>(message));
+   }
+ 
+-  export function warn(message: string = ""): void {
+-    binding.warn(message);
++  export function warn<T = string>(message: T = changetype<T>("")): void {
++    binding.warn(text<T>(message));
+   }
+ 
+-  export function error(message: string = ""): void {
+-    binding.error(message);
++  export function error<T = string>(message: T = changetype<T>("")): void {
++    binding.error(text<T>(message));
++  }
++
++  // @ts-ignore: decorator
++  @inline function text<T>(message: T): string {
++    if (isString<T>()) return changetype<string>(message);
++    if (isReference<T>() && !isNullable<T>() && message instanceof Error) return changetype<Error>(message).stack;
++    ERROR("console takes a string or an Error");
++    return "";
+   }
+ 
+   export function time(label: string = "default"): void {
 diff --git a/std/assembly/date.ts b/std/assembly/date.ts
 index 7d273e1..abdb34d 100644
 --- a/std/assembly/date.ts
@@ -11787,10 +12135,60 @@ index 7d273e1..abdb34d 100644
 +  return LOCALE_GB;
 +}
 diff --git a/std/assembly/error.ts b/std/assembly/error.ts
-index f4ea058..5f6e74c 100644
+index f4ea058..a52176c 100644
 --- a/std/assembly/error.ts
 +++ b/std/assembly/error.ts
-@@ -29,6 +29,14 @@ export class TypeError extends Error {
+@@ -1,12 +1,24 @@
+ export class Error {
+ 
+   name: string  = "Error";
+-  stack: string = ""; // TODO
++
++  // amxts: the calls that made it, as the host keeps them, for `stack`
++  /** @hidden */
++  __frames: StaticArray<u32> | null = __errorStack ? changetype<ErrorStack>(__errorStack).frames() : null;
+ 
+   constructor(
+     public message: string = ""
+   ) {}
+ 
++  /** amxts: the error and where it was made, a call a line, as JavaScript writes it. */
++  get stack(): string {
++    let hook = __errorStack;
++    let frames = this.__frames;
++    if (!hook || !frames) return this.toString();
++    let calls = hook.text(frames);
++    return calls.length ? this.toString() + "\n" + calls : this.toString();
++  }
++
+   toString(): string {
+     let message = this.message;
+     return message.length
+@@ -15,6 +27,23 @@ export class Error {
+   }
+ }
+ 
++/**
++ * @hidden amxts: what an error's `stack` is made of - the frames of the calls
++ * that made it, then their words - which only the host the plugin runs on
++ * has. The hood sets it (as/facade.ts); without it `stack` is the error's
++ * first line alone.
++ */
++export abstract class ErrorStack {
++  /** The frames of the calls running now. */
++  abstract frames(): StaticArray<u32>;
++  /** `frames` as lines: "    at name (file:line:column)". */
++  abstract text(frames: StaticArray<u32>): string;
++}
++
++/** @hidden see ErrorStack. */
++// @ts-ignore: decorator
++@lazy export let __errorStack: ErrorStack | null = null;
++
+ export class RangeError extends Error {
+   constructor(message: string = "") {
+     super(message);
+@@ -29,6 +58,14 @@ export class TypeError extends Error {
    }
  }
  
@@ -11805,7 +12203,7 @@ index f4ea058..5f6e74c 100644
  export class SyntaxError extends Error {
    constructor(message: string = "") {
      super(message);
-@@ -42,3 +50,34 @@ export class URIError extends Error {
+@@ -42,3 +79,34 @@ export class URIError extends Error {
      this.name = "URIError";
    }
  }
@@ -11830,7 +12228,7 @@ index f4ea058..5f6e74c 100644
 +    __thrown = error;
 +    return true;
 +  }
-+  abort(error.message, fileName, lineNumber, columnNumber);
++  abort(error.toString(), fileName, lineNumber, columnNumber);
 +  return false;
 +}
 +
@@ -11841,7 +12239,7 @@ index f4ea058..5f6e74c 100644
 +  return error;
 +}
 diff --git a/std/assembly/function.ts b/std/assembly/function.ts
-index dd32696..5087e0d 100644
+index dd32696..5e6d083 100644
 --- a/std/assembly/function.ts
 +++ b/std/assembly/function.ts
 @@ -6,6 +6,11 @@ type auto = i32;
@@ -11856,7 +12254,7 @@ index dd32696..5087e0d 100644
      return load<u32>(changetype<usize>(this), offsetof<Function<T>>("_index"));
    }
  
-@@ -36,3 +41,115 @@ type auto = i32;
+@@ -36,3 +41,125 @@ type auto = i32;
      __visit(this._env, cookie);
    }
  }
@@ -11972,6 +12370,16 @@ index dd32696..5087e0d 100644
 +  const fn: F = () => text;
 +  return fn;
 +}
++
++/**
++ * amxts: a boolean given where `boolean | (...) => boolean` is declared - held
++ * as the function, so a boolean becomes one that returns it
++ * (Compiler.compileText).
++ */
++export function __boolFunction<F>(value: bool): F {
++  const fn: F = () => value;
++  return fn;
++}
 diff --git a/std/assembly/index.d.ts b/std/assembly/index.d.ts
 index a604397..dd80104 100644
 --- a/std/assembly/index.d.ts
@@ -12530,7 +12938,7 @@ index 0000000..7eaa4f6
 +  }
 +}
 diff --git a/std/assembly/map.ts b/std/assembly/map.ts
-index ab7302f..7e96401 100644
+index ab7302f..3f17444 100644
 --- a/std/assembly/map.ts
 +++ b/std/assembly/map.ts
 @@ -2,6 +2,7 @@
@@ -12541,7 +12949,7 @@ index ab7302f..7e96401 100644
  
  // A deterministic hash map based on CloseTable from https://github.com/jorendorff/dht
  
-@@ -61,7 +62,7 @@ export class Map<K,V> {
+@@ -61,13 +62,19 @@ export class Map<K,V> {
    private bucketsMask: u32 = INITIAL_CAPACITY - 1;
  
    // entries in insertion order, MapEntry<K,V>[entriesCapacity]
@@ -12550,7 +12958,21 @@ index ab7302f..7e96401 100644
    private entriesCapacity: i32 = INITIAL_CAPACITY;
    private entriesOffset: i32 = 0;
    private entriesCount: i32 = 0;
-@@ -77,7 +78,7 @@ export class Map<K,V> {
+ 
+-  constructor() {
+-    /* nop */
++  /** amxts: `new Map(entries)` sets the `[key, value]` entries in their order, as JavaScript's Map does. */
++  constructor(entries: __Tuple2<K,V>[] | null = null) {
++    if (entries) {
++      for (let i = 0, k = entries.length; i < k; ++i) {
++        let entry = unchecked(entries[i]);
++        this.set(entry._0, entry._1);
++      }
++    }
+   }
+ 
+   get size(): i32 {
+@@ -77,7 +84,7 @@ export class Map<K,V> {
    clear(): void {
      this.buckets = new ArrayBuffer(INITIAL_CAPACITY * <i32>BUCKET_SIZE);
      this.bucketsMask = INITIAL_CAPACITY - 1;
@@ -12559,7 +12981,7 @@ index ab7302f..7e96401 100644
      this.entriesCapacity = INITIAL_CAPACITY;
      this.entriesOffset = 0;
      this.entriesCount = 0;
-@@ -106,6 +107,17 @@ export class Map<K,V> {
+@@ -106,6 +113,17 @@ export class Map<K,V> {
      return entry.value;
    }
  
@@ -12577,7 +12999,7 @@ index ab7302f..7e96401 100644
    @operator("[]=")
    set(key: K, value: V): this {
      let hashCode = HASH<K>(key);
-@@ -125,7 +137,7 @@ export class Map<K,V> {
+@@ -125,7 +143,7 @@ export class Map<K,V> {
          );
        }
        // append new entry
@@ -12586,7 +13008,7 @@ index ab7302f..7e96401 100644
        entry = changetype<MapEntry<K,V>>(changetype<usize>(entries) + <usize>(this.entriesOffset++) * ENTRY_SIZE<K,V>());
        // link with the map
        entry.key = key;
-@@ -166,7 +178,7 @@ export class Map<K,V> {
+@@ -166,7 +184,7 @@ export class Map<K,V> {
      let newEntries = new ArrayBuffer(newEntriesCapacity * <i32>ENTRY_SIZE<K,V>());
  
      // copy old entries to new entries
@@ -12595,7 +13017,7 @@ index ab7302f..7e96401 100644
      let oldEnd = oldPtr + <usize>this.entriesOffset * ENTRY_SIZE<K,V>();
      let newPtr = changetype<usize>(newEntries);
      while (oldPtr != oldEnd) {
-@@ -187,14 +199,14 @@ export class Map<K,V> {
+@@ -187,14 +205,14 @@ export class Map<K,V> {
  
      this.buckets = newBuckets;
      this.bucketsMask = newBucketsMask;
@@ -12612,7 +13034,7 @@ index ab7302f..7e96401 100644
      let size = this.entriesOffset;
      let keys = new Array<K>(size);
      let length = 0;
-@@ -210,7 +222,7 @@ export class Map<K,V> {
+@@ -210,7 +228,7 @@ export class Map<K,V> {
  
    values(): V[] {
      // FIXME: this is preliminary, needs iterators/closures
@@ -12621,7 +13043,7 @@ index ab7302f..7e96401 100644
      let size = this.entriesOffset;
      let values = new Array<V>(size);
      let length = 0;
-@@ -224,6 +236,29 @@ export class Map<K,V> {
+@@ -224,6 +242,29 @@ export class Map<K,V> {
      return values;
    }
  
@@ -12651,7 +13073,7 @@ index ab7302f..7e96401 100644
    toString(): string {
      return "[object Map]";
    }
-@@ -232,7 +267,7 @@ export class Map<K,V> {
+@@ -232,7 +273,7 @@ export class Map<K,V> {
  
    @unsafe private __visit(cookie: u32): void {
      __visit(changetype<usize>(this.buckets), cookie);
@@ -12660,7 +13082,7 @@ index ab7302f..7e96401 100644
      if (isManaged<K>() || isManaged<V>()) {
        let cur = entries;
        let end = cur + <usize>this.entriesOffset * ENTRY_SIZE<K,V>();
-@@ -258,3 +293,92 @@ export class Map<K,V> {
+@@ -258,3 +299,92 @@ export class Map<K,V> {
      __visit(entries, cookie);
    }
  }
@@ -12754,10 +13176,30 @@ index ab7302f..7e96401 100644
 +  }
 +}
 diff --git a/std/assembly/math.ts b/std/assembly/math.ts
-index e93837b..e61947b 100644
+index e93837b..bdf5633 100644
 --- a/std/assembly/math.ts
 +++ b/std/assembly/math.ts
-@@ -3287,3 +3287,25 @@ switch (e) {
+@@ -1592,6 +1592,19 @@ export namespace NativeMath {
+   }
+ 
+   export function mod(x: f64, y: f64): f64 { // see: musl/src/math/fmod.c
++    // amxts: a plugin's whole numbers are f64, and `n % d` of two of them
++    // within i32 is i32's remainder, which takes the dividend's sign as
++    // JavaScript's does; a zero keeps the dividend's sign (-4 % 2 is -0).
++    // NaN, infinities, fractions, a zero divisor and larger numbers go on
++    // to the general remainder below.
++    if (builtin_abs<f64>(x) < 2147483648.0 && builtin_abs<f64>(y) < 2147483648.0) {
++      let ix = <i32>x;
++      let iy = <i32>y;
++      if (<f64>ix == x && <f64>iy == y && iy != 0) {
++        let r = ix % iy;
++        return r ? <f64>r : builtin_copysign<f64>(0.0, x);
++      }
++    }
+     if (builtin_abs<f64>(y) == 1.0) {
+       // x % 1, x % -1  ==>  sign(x) * abs(x - 1.0 * trunc(x / 1.0))
+       // TODO: move this rule to compiler's optimization pass.
+@@ -3287,3 +3300,25 @@ switch (e) {
    case 63:
  }
  */
@@ -13981,10 +14423,24 @@ index 8ed6063..efa6398 100644
 +  return c >= 0x30 && c <= 0x39 || c >= 0x41 && c <= 0x5A || c == 0x5F || c >= 0x61 && c <= 0x7A;
  }
 diff --git a/std/assembly/set.ts b/std/assembly/set.ts
-index ca2d6e4..49dd07a 100644
+index ca2d6e4..b8959cf 100644
 --- a/std/assembly/set.ts
 +++ b/std/assembly/set.ts
-@@ -192,6 +192,12 @@ export class Set<T> {
+@@ -63,8 +63,11 @@ export class Set<T> {
+   private entriesOffset: i32 = 0;
+   private entriesCount: i32 = 0;
+ 
+-  constructor() {
+-    /* nop */
++  /** amxts: `new Set(values)` adds the values in their order, as JavaScript's Set does. */
++  constructor(values: T[] | null = null) {
++    if (values) {
++      for (let i = 0, k = values.length; i < k; ++i) this.add(unchecked(values[i]));
++    }
+   }
+ 
+   get size(): i32 {
+@@ -192,6 +195,12 @@ export class Set<T> {
      return values;
    }