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

bin/asc.js

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

src/ast.ts

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

src/builtins.ts

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

src/compiler.ts

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

src/diagnosticMessages.generated.ts

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

src/diagnosticMessages.json

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

src/extra/ast.ts

@@ -784,13 +784,15 @@ export class ASTBuilder {
       this.visitTypeNode(extendsType);
     }
     var implementsTypes = node.implementsTypes;
-    var numImplementsTypes = implementsTypes.length;
-    if (numImplementsTypes) {
-      sb.push(" implements ");
-      this.visitTypeNode(implementsTypes[0]);
-      for (let i = 1; i < numImplementsTypes; ++i) {
-        sb.push(", ");
-        this.visitTypeNode(implementsTypes[i]);
+    if (implementsTypes) {
+      let numImplementsTypes = implementsTypes.length;
+      if (numImplementsTypes) {
+        sb.push(" implements ");
+        this.visitTypeNode(implementsTypes[0]);
+        for (let i = 1; i < numImplementsTypes; ++i) {
+          sb.push(", ");
+          this.visitTypeNode(implementsTypes[i]);
+        }
       }
     }
     var members = node.members;
@@ -1123,6 +1125,7 @@ export class ASTBuilder {
       sb.push(" extends ");
       this.visitTypeNode(extendsType);
     }
+    // must not have implementsTypes
     sb.push(" {\n");
     var indentLevel = ++this.indentLevel;
     var members = node.members;

src/parser.ts

@@ -262,9 +262,10 @@ export class Parser extends DiagnosticEmitter {
         }
         // fall through
       }
-      case Token.CLASS: {
+      case Token.CLASS:
+      case Token.INTERFACE: {
         tn.next();
-        statement = this.parseClass(tn, flags, decorators, startPos);
+        statement = this.parseClassOrInterface(tn, flags, decorators, startPos);
         decorators = null;
         break;
       }
@@ -1381,20 +1382,22 @@ export class Parser extends DiagnosticEmitter {
     return Node.createFunctionExpression(declaration);
   }
 
-  parseClass(
+  parseClassOrInterface(
     tn: Tokenizer,
     flags: CommonFlags,
     decorators: DecoratorNode[] | null,
     startPos: i32
   ): ClassDeclaration | null {
 
-    // at 'class':
+    // at ('class' | 'interface'):
     //   Identifier
     //   ('<' TypeParameters)?
     //   ('extends' Type)?
     //   ('implements' Type (',' Type)*)?
     //   '{' ClassMember* '}'
 
+    var isInterface = tn.token == Token.INTERFACE;
+
     if (!tn.skip(Token.IDENTIFIER)) {
       this.error(
         DiagnosticCode.Identifier_expected,
@@ -1431,12 +1434,21 @@ export class Parser extends DiagnosticEmitter {
       extendsType = <TypeNode>t;
     }
 
-    var implementsTypes = new Array<TypeNode>();
+    var implementsTypes: TypeNode[] | null = null;
     if (tn.skip(Token.IMPLEMENTS)) {
+      if (isInterface) {
+        this.error(
+          DiagnosticCode.Interface_declaration_cannot_have_implements_clause,
+          tn.range()
+        ); // recoverable
+      }
       do {
         let type = this.parseType(tn);
         if (!type) return null;
-        implementsTypes.push(<TypeNode>type);
+        if (!isInterface) {
+          if (!implementsTypes) implementsTypes = [];
+          implementsTypes.push(<TypeNode>type);
+        }
       } while (tn.skip(Token.COMMA));
     }
 
@@ -1449,16 +1461,30 @@ export class Parser extends DiagnosticEmitter {
     }
 
     var members = new Array<DeclarationStatement>();
-    var declaration = Node.createClassDeclaration(
-      identifier,
-      typeParameters,
-      extendsType,
-      implementsTypes,
-      members,
-      decorators,
-      flags,
-      tn.range(startPos, tn.pos)
-    );
+    var declaration: ClassDeclaration;
+    if (isInterface) {
+      assert(!implementsTypes);
+      declaration = Node.createInterfaceDeclaration(
+        identifier,
+        typeParameters,
+        extendsType,
+        members,
+        decorators,
+        flags,
+        tn.range(startPos, tn.pos)
+      );
+    } else {
+      declaration = Node.createClassDeclaration(
+        identifier,
+        typeParameters,
+        extendsType,
+        implementsTypes,
+        members,
+        decorators,
+        flags,
+        tn.range(startPos, tn.pos)
+      );
+    }
     if (!tn.skip(Token.CLOSEBRACE)) {
       do {
         let member = this.parseClassMember(tn, declaration);

src/program.ts

@@ -85,7 +85,7 @@ export const INSTANCE_DELIMITER = "#";
 /** Delimiter used between class and namespace names and static members. */
 export const STATIC_DELIMITER = ".";
 /** Substitution used to indicate a library directory. */
-export const LIBRARY_SUBST = "(lib)";
+export const LIBRARY_SUBST = "~lib";
 /** Library directory prefix. */
 export const LIBRARY_PREFIX = LIBRARY_SUBST + PATH_DELIMITER;
 
@@ -417,23 +417,25 @@ export class Program extends DiagnosticEmitter {
     this.elementsLookup.set(internalName, prototype);
 
     var implementsTypes = declaration.implementsTypes;
-    var numImplementsTypes = implementsTypes.length;
-    if (prototype.is(CommonFlags.UNMANAGED)) {
-      if (implementsTypes && numImplementsTypes) {
-        this.error(
-          DiagnosticCode.Structs_cannot_implement_interfaces,
-          Range.join(
-            declaration.name.range,
-            implementsTypes[numImplementsTypes - 1].range
-          )
-        );
-      }
-    } else if (numImplementsTypes) {
-      for (let i = 0; i < numImplementsTypes; ++i) {
-        this.error(
-          DiagnosticCode.Operation_not_supported,
-          implementsTypes[i].range
-        );
+    if (implementsTypes) {
+      let numImplementsTypes = implementsTypes.length;
+      if (prototype.is(CommonFlags.UNMANAGED)) {
+        if (implementsTypes && numImplementsTypes) {
+          this.error(
+            DiagnosticCode.Structs_cannot_implement_interfaces,
+            Range.join(
+              declaration.name.range,
+              implementsTypes[numImplementsTypes - 1].range
+            )
+          );
+        }
+      } else if (numImplementsTypes) {
+        for (let i = 0; i < numImplementsTypes; ++i) {
+          this.error(
+            DiagnosticCode.Operation_not_supported,
+            implementsTypes[i].range
+          );
+        }
       }
     }
 

std/assembly.d.ts

@@ -223,8 +223,10 @@ declare const NaN: f32 | f64;
 declare const Infinity: f32 | f64;
 /** Heap base offset. */
 declare const HEAP_BASE: usize;
-/** Determines the byte size of the specified core or class type. Compiles to a constant. */
+/** Determines the byte size of the specified underlying core type. Compiles to a constant. */
 declare function sizeof<T>(): usize;
+/** Determines the alignment (log2) of the specified underlying core type. Compiles to a constant. */
+declare function alignof<T>(): usize;
 /** Determines the offset of the specified field within the given class type. Returns the class type's end offset if field name has been omitted. Compiles to a constant. */
 declare function offsetof<T>(fieldName?: string): usize;
 /** Changes the type of any value of `usize` kind to another one of `usize` kind. Useful for casting class instances to their pointer values and vice-versa. Beware that this is unsafe.*/
@@ -270,6 +272,17 @@ declare class ArrayBuffer {
   slice(begin?: i32, end?: i32): ArrayBuffer;
 }
 
+/** Interface for a typed view on an array buffer. */
+declare interface ArrayBufferView<T> {
+  [key: number]: T;
+  /** The {@link ArrayBuffer} referenced by this view. */
+  readonly buffer: ArrayBuffer;
+  /** The offset in bytes from the start of the referenced {@link ArrayBuffer}. */
+  readonly byteOffset: i32;
+  /** The length in bytes from the start of the referenced {@link ArrayBuffer}. */
+  readonly byteLength: i32;
+}
+
 /** Class representing a sequence of values of type `T`. */
 declare class Array<T> {
   [key: number]: T;

std/assembly/arraybuffer.ts

@@ -3,7 +3,7 @@ const HEADER_SIZE: usize = sizeof<i32>();
 @sealed
 export class ArrayBuffer {
 
-  readonly byteLength: i32;
+  readonly byteLength: i32; // capped to [0, 0x7fffffff]
 
   constructor(length: i32) {
     if (<u32>length > 0x7fffffff) throw new RangeError("Invalid array buffer length");
@@ -19,21 +19,20 @@ export class ArrayBuffer {
     if (end < 0) end = max(len + end, 0);
     else end = min(end, len);
     var newLen = max(end - begin, 0);
-    if (newLen) {
-      let buffer = allocate_memory(HEADER_SIZE + <usize>newLen);
-      store<i32>(buffer, newLen);
-      move_memory(buffer + HEADER_SIZE, changetype<usize>(this) + HEADER_SIZE + begin, newLen);
-      return changetype<ArrayBuffer>(buffer);
-    } else if (ArrayBuffer.EMPTY) {
-      return ArrayBuffer.EMPTY;
-    } else {
-      let buffer = allocate_memory(HEADER_SIZE);
-      store<i32>(buffer, 0);
-      ArrayBuffer.EMPTY = changetype<ArrayBuffer>(buffer);
-      return changetype<ArrayBuffer>(buffer);
-    }
+    var buffer = allocate_memory(HEADER_SIZE + <usize>newLen);
+    store<i32>(buffer, newLen);
+    move_memory(buffer + HEADER_SIZE, changetype<usize>(this) + HEADER_SIZE + begin, newLen);
+    return changetype<ArrayBuffer>(buffer);
   }
 
-  /** @internal */
-  static EMPTY: ArrayBuffer | null = null;
+  // TODO: built-in isView?
+  // TODO: built-in transfer?
+}
+
+/** @internal */
+export declare interface ArrayBufferView<T> {
+  readonly buffer: ArrayBuffer;
+  readonly byteOffset: i32;
+  readonly byteLength: i32;
+  readonly length: i32;
 }

std/assembly/builtins.ts

@@ -52,6 +52,8 @@ export declare function store<T>(offset: usize, value: void, constantOffset?: us
 
 export declare function sizeof<T>(): usize; // | u32 / u64
 
+export declare function alignof<T>(): usize; // | u32 / u64
+
 export declare function offsetof<T>(fieldName?: string): usize; // | u32 / u64
 
 export declare function select<T>(ifTrue: T, ifFalse: T, condition: bool): T;

std/assembly/typedarray.ts

@@ -1,30 +1,19 @@
-class TypedArray<T> {
+/** @internal */
+abstract class TypedArray<T> /* implements ArrayBufferView<T> */ {
 
   readonly buffer: ArrayBuffer;
   readonly byteOffset: i32;
   readonly byteLength: i32;
-  get length(): i32 { return this.byteLength / sizeof<T>(); }
+  get length(): i32 { return this.byteLength >> alignof<T>(); }
 
   constructor(length: i32) {
-    var byteLength = length * sizeof<T>();
+    const maxLength = <u32>0x7fffffff >> alignof<T>();
+    if (<u32>length > maxLength) throw new RangeError("Invalid typed array length");
+    var byteLength = length << alignof<T>();
     this.buffer = new ArrayBuffer(byteLength);
     this.byteOffset = 0;
     this.byteLength = byteLength;
   }
-
-  @operator("[]")
-  private __get(index: i32): T {
-    var offset = this.byteOffset;
-    assert(<u32>index < <u32>this.byteLength / sizeof<T>());
-    return load<T>(changetype<usize>(this.buffer) + (offset + index) * sizeof<T>(), 4);
-  }
-
-  @operator("[]=")
-  private __set(index: i32, value: T): void {
-    var offset = this.byteOffset;
-    assert(<u32>index < <u32>(this.byteLength / sizeof<T>()));
-    store<T>(changetype<usize>(this.buffer) + (offset + index) * sizeof<T>(), value, 4);
-  }
 }
 
 // export class Int8Array extends TypedArray<i8> {

tests/binaryen/inline-export.js

@@ -0,0 +1,39 @@
+var binaryen = require("binaryen");
+
+var mod = new binaryen.Module();
+var funcType = mod.addFunctionType("iii", binaryen.i32, [ binaryen.i32, binaryen.i32 ]);
+
+mod.addFunction("exported_add", funcType, [],
+  mod.i32.add(
+    mod.get_local(0, binaryen.i32),
+    mod.get_local(1, binaryen.i32)
+  )
+);
+mod.addFunctionExport("exported_add", "add");
+
+mod.addFunction("internal_sub", funcType, [],
+  mod.i32.sub(
+    mod.get_local(0, binaryen.i32),
+    mod.get_local(1, binaryen.i32)
+  )
+);
+
+mod.addFunction("test", funcType, [],
+  mod.i32.add(
+    mod.call("exported_add", [ // should become inlined but doesn't
+      mod.get_local(0, binaryen.i32),
+      mod.get_local(1, binaryen.i32)
+    ], binaryen.i32),
+    mod.call("internal_sub", [ // just like this one becomes inlined
+      mod.get_local(0, binaryen.i32),
+      mod.get_local(1, binaryen.i32)
+    ], binaryen.i32)
+  )
+);
+mod.addFunctionExport("test", "test");
+
+// binaryen.setOptimizeLevel(3);
+// binaryen.setShrinkLevel(0);
+mod.optimize();
+if (!mod.validate()) throw Error();
+console.log(mod.emitText());

tests/compiler/binary.optimized.wat

@@ -12,7 +12,7 @@
  (memory $0 1)
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/math/NativeMath.scalbn" (; 0 ;) (type $FiF) (param $0 f64) (param $1 i32) (result f64)
+ (func $~lib/math/NativeMath.scalbn (; 0 ;) (type $FiF) (param $0 f64) (param $1 i32) (result f64)
   (local $2 f64)
   (set_local $2
    (get_local $0)
@@ -126,7 +126,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMath.pow" (; 1 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.pow (; 1 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (local $2 f64)
   (local $3 f64)
   (local $4 i32)
@@ -1482,7 +1482,7 @@
          )
          (i32.const 0)
         )
-        (call "$(lib)/math/NativeMath.scalbn"
+        (call $~lib/math/NativeMath.scalbn
          (get_local $2)
          (get_local $4)
         )
@@ -1525,7 +1525,7 @@
    (f64.const 1.e+300)
   )
  )
- (func "$(lib)/math/NativeMathf.mod" (; 2 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
+ (func $~lib/math/NativeMathf.mod (; 2 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1877,7 +1877,7 @@
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMathf.scalbn" (; 3 ;) (type $fif) (param $0 f32) (param $1 i32) (result f32)
+ (func $~lib/math/NativeMathf.scalbn (; 3 ;) (type $fif) (param $0 f32) (param $1 i32) (result f32)
   (local $2 f32)
   (set_local $2
    (get_local $0)
@@ -1989,7 +1989,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMathf.pow" (; 4 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
+ (func $~lib/math/NativeMathf.pow (; 4 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
   (local $2 f32)
   (local $3 f32)
   (local $4 i32)
@@ -3124,7 +3124,7 @@
          )
          (i32.const 0)
         )
-        (call "$(lib)/math/NativeMathf.scalbn"
+        (call $~lib/math/NativeMathf.scalbn
          (get_local $2)
          (get_local $4)
         )
@@ -3154,7 +3154,7 @@
    (f32.const 1000000015047466219876688e6)
   )
  )
- (func "$(lib)/math/NativeMath.mod" (; 5 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.mod (; 5 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (local $2 i64)
   (local $3 i32)
   (local $4 i64)
@@ -3540,7 +3540,7 @@
    )
   )
   (drop
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (f64.convert_s/i32
      (get_global $binary/i)
     )
@@ -3609,7 +3609,7 @@
   )
   (set_global $binary/i
    (i32.trunc_s/f64
-    (call "$(lib)/math/NativeMath.pow"
+    (call $~lib/math/NativeMath.pow
      (f64.convert_s/i32
       (get_global $binary/i)
      )
@@ -3720,7 +3720,7 @@
    )
   )
   (drop
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (f64.convert_s/i64
      (get_global $binary/I)
     )
@@ -3795,7 +3795,7 @@
   )
   (set_global $binary/I
    (i64.trunc_s/f64
-    (call "$(lib)/math/NativeMath.pow"
+    (call $~lib/math/NativeMath.pow
      (f64.convert_s/i64
       (get_global $binary/I)
      )
@@ -3900,13 +3900,13 @@
    )
   )
   (drop
-   (call "$(lib)/math/NativeMathf.mod"
+   (call $~lib/math/NativeMathf.mod
     (get_global $binary/f)
     (f32.const 1)
    )
   )
   (drop
-   (call "$(lib)/math/NativeMathf.pow"
+   (call $~lib/math/NativeMathf.pow
     (get_global $binary/f)
     (f32.const 1)
    )
@@ -3972,13 +3972,13 @@
    )
   )
   (set_global $binary/f
-   (call "$(lib)/math/NativeMathf.mod"
+   (call $~lib/math/NativeMathf.mod
     (get_global $binary/f)
     (f32.const 1)
    )
   )
   (set_global $binary/f
-   (call "$(lib)/math/NativeMathf.pow"
+   (call $~lib/math/NativeMathf.pow
     (get_global $binary/f)
     (f32.const 1)
    )
@@ -4002,25 +4002,25 @@
    )
   )
   (set_global $binary/f
-   (call "$(lib)/math/NativeMathf.mod"
+   (call $~lib/math/NativeMathf.mod
     (get_global $binary/f)
     (f32.const 1)
    )
   )
   (set_global $binary/f
-   (call "$(lib)/math/NativeMathf.pow"
+   (call $~lib/math/NativeMathf.pow
     (get_global $binary/f)
     (f32.const 1)
    )
   )
   (drop
-   (call "$(lib)/math/NativeMath.mod"
+   (call $~lib/math/NativeMath.mod
     (get_global $binary/F)
     (f64.const 1)
    )
   )
   (drop
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (get_global $binary/F)
     (f64.const 1)
    )
@@ -4086,13 +4086,13 @@
    )
   )
   (set_global $binary/F
-   (call "$(lib)/math/NativeMath.mod"
+   (call $~lib/math/NativeMath.mod
     (get_global $binary/F)
     (f64.const 1)
    )
   )
   (set_global $binary/F
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (get_global $binary/F)
     (f64.const 1)
    )
@@ -4116,13 +4116,13 @@
    )
   )
   (set_global $binary/F
-   (call "$(lib)/math/NativeMath.mod"
+   (call $~lib/math/NativeMath.mod
     (get_global $binary/F)
     (f64.const 1)
    )
   )
   (set_global $binary/F
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (get_global $binary/F)
     (f64.const 1)
    )

tests/compiler/binary.untouched.wat

@@ -15,7 +15,7 @@
  (memory $0 1)
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/math/NativeMath.scalbn" (; 0 ;) (type $FiF) (param $0 f64) (param $1 i32) (result f64)
+ (func $~lib/math/NativeMath.scalbn (; 0 ;) (type $FiF) (param $0 f64) (param $1 i32) (result f64)
   (local $2 f64)
   (nop)
   (set_local $2
@@ -136,7 +136,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMath.pow" (; 1 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.pow (; 1 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (local $2 i64)
   (local $3 i32)
   (local $4 i32)
@@ -1684,7 +1684,7 @@
     (i32.const 0)
    )
    (set_local $13
-    (call "$(lib)/math/NativeMath.scalbn"
+    (call $~lib/math/NativeMath.scalbn
      (get_local $13)
      (get_local $25)
     )
@@ -1715,7 +1715,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMathf.mod" (; 2 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
+ (func $~lib/math/NativeMathf.mod (; 2 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2151,7 +2151,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMathf.scalbn" (; 3 ;) (type $fif) (param $0 f32) (param $1 i32) (result f32)
+ (func $~lib/math/NativeMathf.scalbn (; 3 ;) (type $fif) (param $0 f32) (param $1 i32) (result f32)
   (local $2 f32)
   (nop)
   (set_local $2
@@ -2270,7 +2270,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMathf.pow" (; 4 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
+ (func $~lib/math/NativeMathf.pow (; 4 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3583,7 +3583,7 @@
     (i32.const 0)
    )
    (set_local $11
-    (call "$(lib)/math/NativeMathf.scalbn"
+    (call $~lib/math/NativeMathf.scalbn
      (get_local $11)
      (get_local $23)
     )
@@ -3601,7 +3601,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMath.mod" (; 5 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.mod (; 5 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (local $2 i64)
   (local $3 i64)
   (local $4 i32)
@@ -4124,7 +4124,7 @@
    )
   )
   (drop
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (f64.convert_s/i32
      (get_global $binary/i)
     )
@@ -4235,7 +4235,7 @@
   )
   (set_global $binary/i
    (i32.trunc_s/f64
-    (call "$(lib)/math/NativeMath.pow"
+    (call $~lib/math/NativeMath.pow
      (f64.convert_s/i32
       (get_global $binary/i)
      )
@@ -4406,7 +4406,7 @@
    )
   )
   (drop
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (f64.convert_s/i64
      (get_global $binary/I)
     )
@@ -4517,7 +4517,7 @@
   )
   (set_global $binary/I
    (i64.trunc_s/f64
-    (call "$(lib)/math/NativeMath.pow"
+    (call $~lib/math/NativeMath.pow
      (f64.convert_s/i64
       (get_global $binary/I)
      )
@@ -4682,13 +4682,13 @@
    )
   )
   (drop
-   (call "$(lib)/math/NativeMathf.mod"
+   (call $~lib/math/NativeMathf.mod
     (get_global $binary/f)
     (f32.const 1)
    )
   )
   (drop
-   (call "$(lib)/math/NativeMathf.pow"
+   (call $~lib/math/NativeMathf.pow
     (get_global $binary/f)
     (f32.const 1)
    )
@@ -4754,13 +4754,13 @@
    )
   )
   (set_global $binary/f
-   (call "$(lib)/math/NativeMathf.mod"
+   (call $~lib/math/NativeMathf.mod
     (get_global $binary/f)
     (f32.const 1)
    )
   )
   (set_global $binary/f
-   (call "$(lib)/math/NativeMathf.pow"
+   (call $~lib/math/NativeMathf.pow
     (get_global $binary/f)
     (f32.const 1)
    )
@@ -4784,13 +4784,13 @@
    )
   )
   (set_global $binary/f
-   (call "$(lib)/math/NativeMathf.mod"
+   (call $~lib/math/NativeMathf.mod
     (get_global $binary/f)
     (f32.const 1)
    )
   )
   (set_global $binary/f
-   (call "$(lib)/math/NativeMathf.pow"
+   (call $~lib/math/NativeMathf.pow
     (get_global $binary/f)
     (f32.const 1)
    )
@@ -4856,13 +4856,13 @@
    )
   )
   (drop
-   (call "$(lib)/math/NativeMath.mod"
+   (call $~lib/math/NativeMath.mod
     (get_global $binary/F)
     (f64.const 1)
    )
   )
   (drop
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (get_global $binary/F)
     (f64.const 1)
    )
@@ -4928,13 +4928,13 @@
    )
   )
   (set_global $binary/F
-   (call "$(lib)/math/NativeMath.mod"
+   (call $~lib/math/NativeMath.mod
     (get_global $binary/F)
     (f64.const 1)
    )
   )
   (set_global $binary/F
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (get_global $binary/F)
     (f64.const 1)
    )
@@ -4958,13 +4958,13 @@
    )
   )
   (set_global $binary/F
-   (call "$(lib)/math/NativeMath.mod"
+   (call $~lib/math/NativeMath.mod
     (get_global $binary/F)
     (f64.const 1)
    )
   )
   (set_global $binary/F
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (get_global $binary/F)
     (f64.const 1)
    )

tests/compiler/showcase.optimized.wat

@@ -61,7 +61,7 @@
  (export "anExportedFunction" (func $showcase/anExportedFunction))
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/math/NativeMath.scalbn" (; 1 ;) (type $FiF) (param $0 f64) (param $1 i32) (result f64)
+ (func $~lib/math/NativeMath.scalbn (; 1 ;) (type $FiF) (param $0 f64) (param $1 i32) (result f64)
   (local $2 f64)
   (set_local $2
    (get_local $0)
@@ -175,7 +175,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMath.pow" (; 2 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.pow (; 2 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (local $2 f64)
   (local $3 f64)
   (local $4 i32)
@@ -1531,7 +1531,7 @@
          )
          (i32.const 0)
         )
-        (call "$(lib)/math/NativeMath.scalbn"
+        (call $~lib/math/NativeMath.scalbn
          (get_local $2)
          (get_local $4)
         )
@@ -1574,7 +1574,7 @@
    (f64.const 1.e+300)
   )
  )
- (func "$(lib)/math/NativeMathf.mod" (; 3 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
+ (func $~lib/math/NativeMathf.mod (; 3 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1926,7 +1926,7 @@
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMathf.scalbn" (; 4 ;) (type $fif) (param $0 f32) (param $1 i32) (result f32)
+ (func $~lib/math/NativeMathf.scalbn (; 4 ;) (type $fif) (param $0 f32) (param $1 i32) (result f32)
   (local $2 f32)
   (set_local $2
    (get_local $0)
@@ -2038,7 +2038,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMathf.pow" (; 5 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
+ (func $~lib/math/NativeMathf.pow (; 5 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
   (local $2 f32)
   (local $3 f32)
   (local $4 i32)
@@ -3173,7 +3173,7 @@
          )
          (i32.const 0)
         )
-        (call "$(lib)/math/NativeMathf.scalbn"
+        (call $~lib/math/NativeMathf.scalbn
          (get_local $2)
          (get_local $4)
         )
@@ -3203,7 +3203,7 @@
    (f32.const 1000000015047466219876688e6)
   )
  )
- (func "$(lib)/math/NativeMath.mod" (; 6 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.mod (; 6 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (local $2 i64)
   (local $3 i32)
   (local $4 i64)
@@ -5603,7 +5603,7 @@
    )
   )
   (drop
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (f64.convert_s/i32
      (get_global $binary/i)
     )
@@ -5672,7 +5672,7 @@
   )
   (set_global $binary/i
    (i32.trunc_s/f64
-    (call "$(lib)/math/NativeMath.pow"
+    (call $~lib/math/NativeMath.pow
      (f64.convert_s/i32
       (get_global $binary/i)
      )
@@ -5783,7 +5783,7 @@
    )
   )
   (drop
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (f64.convert_s/i64
      (get_global $binary/I)
     )
@@ -5858,7 +5858,7 @@
   )
   (set_global $binary/I
    (i64.trunc_s/f64
-    (call "$(lib)/math/NativeMath.pow"
+    (call $~lib/math/NativeMath.pow
      (f64.convert_s/i64
       (get_global $binary/I)
      )
@@ -5963,13 +5963,13 @@
    )
   )
   (drop
-   (call "$(lib)/math/NativeMathf.mod"
+   (call $~lib/math/NativeMathf.mod
     (get_global $binary/f)
     (f32.const 1)
    )
   )
   (drop
-   (call "$(lib)/math/NativeMathf.pow"
+   (call $~lib/math/NativeMathf.pow
     (get_global $binary/f)
     (f32.const 1)
    )
@@ -6035,13 +6035,13 @@
    )
   )
   (set_global $binary/f
-   (call "$(lib)/math/NativeMathf.mod"
+   (call $~lib/math/NativeMathf.mod
     (get_global $binary/f)
     (f32.const 1)
    )
   )
   (set_global $binary/f
-   (call "$(lib)/math/NativeMathf.pow"
+   (call $~lib/math/NativeMathf.pow
     (get_global $binary/f)
     (f32.const 1)
    )
@@ -6065,25 +6065,25 @@
    )
   )
   (set_global $binary/f
-   (call "$(lib)/math/NativeMathf.mod"
+   (call $~lib/math/NativeMathf.mod
     (get_global $binary/f)
     (f32.const 1)
    )
   )
   (set_global $binary/f
-   (call "$(lib)/math/NativeMathf.pow"
+   (call $~lib/math/NativeMathf.pow
     (get_global $binary/f)
     (f32.const 1)
    )
   )
   (drop
-   (call "$(lib)/math/NativeMath.mod"
+   (call $~lib/math/NativeMath.mod
     (get_global $binary/F)
     (f64.const 1)
    )
   )
   (drop
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (get_global $binary/F)
     (f64.const 1)
    )
@@ -6149,13 +6149,13 @@
    )
   )
   (set_global $binary/F
-   (call "$(lib)/math/NativeMath.mod"
+   (call $~lib/math/NativeMath.mod
     (get_global $binary/F)
     (f64.const 1)
    )
   )
   (set_global $binary/F
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (get_global $binary/F)
     (f64.const 1)
    )
@@ -6179,13 +6179,13 @@
    )
   )
   (set_global $binary/F
-   (call "$(lib)/math/NativeMath.mod"
+   (call $~lib/math/NativeMath.mod
     (get_global $binary/F)
     (f64.const 1)
    )
   )
   (set_global $binary/F
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (get_global $binary/F)
     (f64.const 1)
    )

tests/compiler/showcase.untouched.wat

@@ -71,7 +71,7 @@
  (export "anExportedFunction" (func $showcase/anExportedFunction))
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/math/NativeMath.scalbn" (; 1 ;) (type $FiF) (param $0 f64) (param $1 i32) (result f64)
+ (func $~lib/math/NativeMath.scalbn (; 1 ;) (type $FiF) (param $0 f64) (param $1 i32) (result f64)
   (local $2 f64)
   (nop)
   (set_local $2
@@ -192,7 +192,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMath.pow" (; 2 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.pow (; 2 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (local $2 i64)
   (local $3 i32)
   (local $4 i32)
@@ -1740,7 +1740,7 @@
     (i32.const 0)
    )
    (set_local $13
-    (call "$(lib)/math/NativeMath.scalbn"
+    (call $~lib/math/NativeMath.scalbn
      (get_local $13)
      (get_local $25)
     )
@@ -1771,7 +1771,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMathf.mod" (; 3 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
+ (func $~lib/math/NativeMathf.mod (; 3 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2207,7 +2207,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMathf.scalbn" (; 4 ;) (type $fif) (param $0 f32) (param $1 i32) (result f32)
+ (func $~lib/math/NativeMathf.scalbn (; 4 ;) (type $fif) (param $0 f32) (param $1 i32) (result f32)
   (local $2 f32)
   (nop)
   (set_local $2
@@ -2326,7 +2326,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMathf.pow" (; 5 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
+ (func $~lib/math/NativeMathf.pow (; 5 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3639,7 +3639,7 @@
     (i32.const 0)
    )
    (set_local $11
-    (call "$(lib)/math/NativeMathf.scalbn"
+    (call $~lib/math/NativeMathf.scalbn
      (get_local $11)
      (get_local $23)
     )
@@ -3657,7 +3657,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMath.mod" (; 6 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.mod (; 6 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (local $2 i64)
   (local $3 i64)
   (local $4 i32)
@@ -6563,7 +6563,7 @@
    )
   )
   (drop
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (f64.convert_s/i32
      (get_global $binary/i)
     )
@@ -6674,7 +6674,7 @@
   )
   (set_global $binary/i
    (i32.trunc_s/f64
-    (call "$(lib)/math/NativeMath.pow"
+    (call $~lib/math/NativeMath.pow
      (f64.convert_s/i32
       (get_global $binary/i)
      )
@@ -6845,7 +6845,7 @@
    )
   )
   (drop
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (f64.convert_s/i64
      (get_global $binary/I)
     )
@@ -6956,7 +6956,7 @@
   )
   (set_global $binary/I
    (i64.trunc_s/f64
-    (call "$(lib)/math/NativeMath.pow"
+    (call $~lib/math/NativeMath.pow
      (f64.convert_s/i64
       (get_global $binary/I)
      )
@@ -7121,13 +7121,13 @@
    )
   )
   (drop
-   (call "$(lib)/math/NativeMathf.mod"
+   (call $~lib/math/NativeMathf.mod
     (get_global $binary/f)
     (f32.const 1)
    )
   )
   (drop
-   (call "$(lib)/math/NativeMathf.pow"
+   (call $~lib/math/NativeMathf.pow
     (get_global $binary/f)
     (f32.const 1)
    )
@@ -7193,13 +7193,13 @@
    )
   )
   (set_global $binary/f
-   (call "$(lib)/math/NativeMathf.mod"
+   (call $~lib/math/NativeMathf.mod
     (get_global $binary/f)
     (f32.const 1)
    )
   )
   (set_global $binary/f
-   (call "$(lib)/math/NativeMathf.pow"
+   (call $~lib/math/NativeMathf.pow
     (get_global $binary/f)
     (f32.const 1)
    )
@@ -7223,13 +7223,13 @@
    )
   )
   (set_global $binary/f
-   (call "$(lib)/math/NativeMathf.mod"
+   (call $~lib/math/NativeMathf.mod
     (get_global $binary/f)
     (f32.const 1)
    )
   )
   (set_global $binary/f
-   (call "$(lib)/math/NativeMathf.pow"
+   (call $~lib/math/NativeMathf.pow
     (get_global $binary/f)
     (f32.const 1)
    )
@@ -7295,13 +7295,13 @@
    )
   )
   (drop
-   (call "$(lib)/math/NativeMath.mod"
+   (call $~lib/math/NativeMath.mod
     (get_global $binary/F)
     (f64.const 1)
    )
   )
   (drop
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (get_global $binary/F)
     (f64.const 1)
    )
@@ -7367,13 +7367,13 @@
    )
   )
   (set_global $binary/F
-   (call "$(lib)/math/NativeMath.mod"
+   (call $~lib/math/NativeMath.mod
     (get_global $binary/F)
     (f64.const 1)
    )
   )
   (set_global $binary/F
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (get_global $binary/F)
     (f64.const 1)
    )
@@ -7397,13 +7397,13 @@
    )
   )
   (set_global $binary/F
-   (call "$(lib)/math/NativeMath.mod"
+   (call $~lib/math/NativeMath.mod
     (get_global $binary/F)
     (f64.const 1)
    )
   )
   (set_global $binary/F
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (get_global $binary/F)
     (f64.const 1)
    )

tests/compiler/std/allocator_arena.optimized.wat

@@ -6,8 +6,8 @@
  (type $iv (func (param i32)))
  (type $v (func))
  (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
- (global "$(lib)/allocator/arena/startOffset" (mut i32) (i32.const 0))
- (global "$(lib)/allocator/arena/offset" (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $std/allocator_arena/ptr1 (mut i32) (i32.const 0))
  (global $std/allocator_arena/ptr2 (mut i32) (i32.const 0))
  (global $std/allocator_arena/i (mut i32) (i32.const 0))
@@ -16,7 +16,7 @@
  (data (i32.const 4) "\16\00\00\00s\00t\00d\00/\00a\00l\00l\00o\00c\00a\00t\00o\00r\00_\00a\00r\00e\00n\00a\00.\00t\00s")
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/allocator/arena/allocate_memory" (; 1 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/allocator/arena/allocate_memory (; 1 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -36,7 +36,7 @@
       (i32.add
        (i32.add
         (tee_local $1
-         (get_global "$(lib)/allocator/arena/offset")
+         (get_global $~lib/allocator/arena/offset)
         )
         (get_local $0)
        )
@@ -93,12 +93,12 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
+  (set_global $~lib/allocator/arena/offset
    (get_local $2)
   )
   (get_local $1)
  )
- (func "$(lib)/memory/set_memory" (; 2 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/set_memory (; 2 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i64)
   (local $4 i32)
   (if
@@ -431,7 +431,7 @@
    )
   )
  )
- (func "$(lib)/memory/copy_memory" (; 3 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/copy_memory (; 3 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (loop $continue|0
@@ -2007,7 +2007,7 @@
    )
   )
  )
- (func "$(lib)/memory/move_memory" (; 4 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/move_memory (; 4 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (if
    (i32.eq
@@ -2040,7 +2040,7 @@
     (i32.const 1)
    )
    (block
-    (call "$(lib)/memory/copy_memory"
+    (call $~lib/memory/copy_memory
      (get_local $0)
      (get_local $1)
      (get_local $2)
@@ -2297,7 +2297,7 @@
    )
   )
  )
- (func "$(lib)/memory/compare_memory" (; 5 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/memory/compare_memory (; 5 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (if
    (i32.eq
     (get_local $0)
@@ -2357,16 +2357,16 @@
    (i32.const 0)
   )
  )
- (func "$(lib)/allocator/arena/free_memory" (; 6 ;) (type $iv) (param $0 i32)
+ (func $~lib/allocator/arena/free_memory (; 6 ;) (type $iv) (param $0 i32)
   (nop)
  )
- (func "$(lib)/allocator/arena/reset_memory" (; 7 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/offset"
-   (get_global "$(lib)/allocator/arena/startOffset")
+ (func $~lib/allocator/arena/reset_memory (; 7 ;) (type $v)
+  (set_global $~lib/allocator/arena/offset
+   (get_global $~lib/allocator/arena/startOffset)
   )
  )
  (func $start (; 8 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/startOffset"
+  (set_global $~lib/allocator/arena/startOffset
    (i32.and
     (i32.add
      (get_global $HEAP_BASE)
@@ -2375,16 +2375,16 @@
     (i32.const -8)
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
-   (get_global "$(lib)/allocator/arena/startOffset")
+  (set_global $~lib/allocator/arena/offset
+   (get_global $~lib/allocator/arena/startOffset)
   )
   (set_global $std/allocator_arena/ptr1
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.const 42)
    )
   )
   (set_global $std/allocator_arena/ptr2
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.const 42)
    )
   )
@@ -2403,7 +2403,7 @@
     (unreachable)
    )
   )
-  (call "$(lib)/memory/set_memory"
+  (call $~lib/memory/set_memory
    (get_global $std/allocator_arena/ptr1)
    (i32.const 18)
    (i32.const 42)
@@ -2448,7 +2448,7 @@
     )
    )
   )
-  (call "$(lib)/memory/move_memory"
+  (call $~lib/memory/move_memory
    (get_global $std/allocator_arena/ptr2)
    (get_global $std/allocator_arena/ptr1)
    (i32.const 42)
@@ -2494,7 +2494,7 @@
    )
   )
   (if
-   (call "$(lib)/memory/compare_memory"
+   (call $~lib/memory/compare_memory
     (get_global $std/allocator_arena/ptr1)
     (get_global $std/allocator_arena/ptr2)
     (i32.const 42)
@@ -2509,15 +2509,15 @@
     (unreachable)
    )
   )
-  (call "$(lib)/allocator/arena/free_memory"
+  (call $~lib/allocator/arena/free_memory
    (get_global $std/allocator_arena/ptr1)
   )
-  (call "$(lib)/allocator/arena/free_memory"
+  (call $~lib/allocator/arena/free_memory
    (get_global $std/allocator_arena/ptr2)
   )
-  (call "$(lib)/allocator/arena/reset_memory")
+  (call $~lib/allocator/arena/reset_memory)
   (set_global $std/allocator_arena/ptr1
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.const 42)
    )
   )

tests/compiler/std/allocator_arena.untouched.wat

@@ -7,11 +7,11 @@
  (type $iv (func (param i32)))
  (type $v (func))
  (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
- (global "$(lib)/allocator/common/alignment/BITS" i32 (i32.const 3))
- (global "$(lib)/allocator/common/alignment/SIZE" i32 (i32.const 8))
- (global "$(lib)/allocator/common/alignment/MASK" i32 (i32.const 7))
- (global "$(lib)/allocator/arena/startOffset" (mut i32) (i32.const 0))
- (global "$(lib)/allocator/arena/offset" (mut i32) (i32.const 0))
+ (global $~lib/allocator/common/alignment/BITS i32 (i32.const 3))
+ (global $~lib/allocator/common/alignment/SIZE i32 (i32.const 8))
+ (global $~lib/allocator/common/alignment/MASK i32 (i32.const 7))
+ (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $std/allocator_arena/size i32 (i32.const 42))
  (global $std/allocator_arena/ptr1 (mut i32) (i32.const 0))
  (global $std/allocator_arena/ptr2 (mut i32) (i32.const 0))
@@ -21,7 +21,7 @@
  (data (i32.const 4) "\16\00\00\00s\00t\00d\00/\00a\00l\00l\00o\00c\00a\00t\00o\00r\00_\00a\00r\00e\00n\00a\00.\00t\00s\00")
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/allocator/arena/allocate_memory" (; 1 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/allocator/arena/allocate_memory (; 1 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -37,7 +37,7 @@
    )
   )
   (set_local $1
-   (get_global "$(lib)/allocator/arena/offset")
+   (get_global $~lib/allocator/arena/offset)
   )
   (set_local $2
    (i32.and
@@ -117,14 +117,14 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
+  (set_global $~lib/allocator/arena/offset
    (get_local $2)
   )
   (return
    (get_local $1)
   )
  )
- (func "$(lib)/memory/set_memory" (; 2 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/set_memory (; 2 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i64)
@@ -473,7 +473,7 @@
    )
   )
  )
- (func "$(lib)/memory/copy_memory" (; 3 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/copy_memory (; 3 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -2276,7 +2276,7 @@
    )
   )
  )
- (func "$(lib)/memory/move_memory" (; 4 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/move_memory (; 4 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (if
    (i32.eq
@@ -2309,7 +2309,7 @@
     (i32.const 1)
    )
    (block
-    (call "$(lib)/memory/copy_memory"
+    (call $~lib/memory/copy_memory
      (get_local $0)
      (get_local $1)
      (get_local $2)
@@ -2599,7 +2599,7 @@
    )
   )
  )
- (func "$(lib)/memory/compare_memory" (; 5 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/memory/compare_memory (; 5 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (if
    (i32.eq
     (get_local $0)
@@ -2665,15 +2665,15 @@
    )
   )
  )
- (func "$(lib)/allocator/arena/free_memory" (; 6 ;) (type $iv) (param $0 i32)
+ (func $~lib/allocator/arena/free_memory (; 6 ;) (type $iv) (param $0 i32)
  )
- (func "$(lib)/allocator/arena/reset_memory" (; 7 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/offset"
-   (get_global "$(lib)/allocator/arena/startOffset")
+ (func $~lib/allocator/arena/reset_memory (; 7 ;) (type $v)
+  (set_global $~lib/allocator/arena/offset
+   (get_global $~lib/allocator/arena/startOffset)
   )
  )
  (func $start (; 8 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/startOffset"
+  (set_global $~lib/allocator/arena/startOffset
    (i32.and
     (i32.add
      (get_global $HEAP_BASE)
@@ -2685,16 +2685,16 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
-   (get_global "$(lib)/allocator/arena/startOffset")
+  (set_global $~lib/allocator/arena/offset
+   (get_global $~lib/allocator/arena/startOffset)
   )
   (set_global $std/allocator_arena/ptr1
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.const 42)
    )
   )
   (set_global $std/allocator_arena/ptr2
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.const 42)
    )
   )
@@ -2715,7 +2715,7 @@
     (unreachable)
    )
   )
-  (call "$(lib)/memory/set_memory"
+  (call $~lib/memory/set_memory
    (get_global $std/allocator_arena/ptr1)
    (i32.const 18)
    (i32.const 42)
@@ -2764,7 +2764,7 @@
     )
    )
   )
-  (call "$(lib)/memory/move_memory"
+  (call $~lib/memory/move_memory
    (get_global $std/allocator_arena/ptr2)
    (get_global $std/allocator_arena/ptr1)
    (i32.const 42)
@@ -2816,7 +2816,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/memory/compare_memory"
+     (call $~lib/memory/compare_memory
       (get_global $std/allocator_arena/ptr1)
       (get_global $std/allocator_arena/ptr2)
       (i32.const 42)
@@ -2834,15 +2834,15 @@
     (unreachable)
    )
   )
-  (call "$(lib)/allocator/arena/free_memory"
+  (call $~lib/allocator/arena/free_memory
    (get_global $std/allocator_arena/ptr1)
   )
-  (call "$(lib)/allocator/arena/free_memory"
+  (call $~lib/allocator/arena/free_memory
    (get_global $std/allocator_arena/ptr2)
   )
-  (call "$(lib)/allocator/arena/reset_memory")
+  (call $~lib/allocator/arena/reset_memory)
   (set_global $std/allocator_arena/ptr1
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.const 42)
    )
   )

tests/compiler/std/arraybuffer.optimized.wat

@@ -6,10 +6,9 @@
  (type $iiiv (func (param i32 i32 i32)))
  (type $v (func))
  (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
- (global "$(lib)/allocator/arena/startOffset" (mut i32) (i32.const 0))
- (global "$(lib)/allocator/arena/offset" (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $std/arraybuffer/buffer (mut i32) (i32.const 0))
- (global "$(lib)/arraybuffer/ArrayBuffer.EMPTY" (mut i32) (i32.const 0))
  (global $argumentCount (mut i32) (i32.const 0))
  (global $std/arraybuffer/sliced (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 44))
@@ -17,7 +16,7 @@
  (data (i32.const 4) "\12\00\00\00s\00t\00d\00/\00a\00r\00r\00a\00y\00b\00u\00f\00f\00e\00r\00.\00t\00s")
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/allocator/arena/allocate_memory" (; 1 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/allocator/arena/allocate_memory (; 1 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -37,7 +36,7 @@
       (i32.add
        (i32.add
         (tee_local $1
-         (get_global "$(lib)/allocator/arena/offset")
+         (get_global $~lib/allocator/arena/offset)
         )
         (get_local $0)
        )
@@ -94,12 +93,12 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
+  (set_global $~lib/allocator/arena/offset
    (get_local $2)
   )
   (get_local $1)
  )
- (func "$(lib)/arraybuffer/ArrayBuffer#constructor" (; 2 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#constructor (; 2 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (if
    (i32.gt_u
@@ -110,7 +109,7 @@
   )
   (i32.store
    (tee_local $2
-    (call "$(lib)/allocator/arena/allocate_memory"
+    (call $~lib/allocator/arena/allocate_memory
      (i32.add
       (get_local $1)
       (i32.const 4)
@@ -121,7 +120,7 @@
   )
   (get_local $2)
  )
- (func "$(lib)/memory/copy_memory" (; 3 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/copy_memory (; 3 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (loop $continue|0
@@ -1697,7 +1696,7 @@
    )
   )
  )
- (func "$(lib)/memory/move_memory" (; 4 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/move_memory (; 4 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (if
    (i32.eq
@@ -1730,7 +1729,7 @@
     (i32.const 1)
    )
    (block
-    (call "$(lib)/memory/copy_memory"
+    (call $~lib/memory/copy_memory
      (get_local $0)
      (get_local $1)
      (get_local $2)
@@ -1987,7 +1986,7 @@
    )
   )
  )
- (func "$(lib)/arraybuffer/ArrayBuffer#slice" (; 5 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#slice (; 5 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -2029,107 +2028,84 @@
     )
    )
   )
-  (if (result i32)
-   (tee_local $2
-    (select
-     (tee_local $3
-      (i32.sub
-       (tee_local $2
-        (if (result i32)
-         (i32.lt_s
-          (get_local $2)
-          (i32.const 0)
-         )
-         (select
-          (tee_local $3
-           (i32.add
-            (get_local $5)
-            (get_local $2)
+  (i32.store
+   (tee_local $3
+    (call $~lib/allocator/arena/allocate_memory
+     (i32.add
+      (tee_local $2
+       (select
+        (tee_local $3
+         (i32.sub
+          (tee_local $2
+           (if (result i32)
+            (i32.lt_s
+             (get_local $2)
+             (i32.const 0)
+            )
+            (select
+             (tee_local $3
+              (i32.add
+               (get_local $5)
+               (get_local $2)
+              )
+             )
+             (tee_local $4
+              (i32.const 0)
+             )
+             (i32.gt_s
+              (get_local $3)
+              (get_local $4)
+             )
+            )
+            (select
+             (tee_local $3
+              (get_local $2)
+             )
+             (tee_local $4
+              (get_local $5)
+             )
+             (i32.lt_s
+              (get_local $3)
+              (get_local $4)
+             )
+            )
            )
           )
-          (tee_local $4
-           (i32.const 0)
-          )
-          (i32.gt_s
-           (get_local $3)
-           (get_local $4)
-          )
-         )
-         (select
-          (tee_local $3
-           (get_local $2)
-          )
-          (tee_local $4
-           (get_local $5)
-          )
-          (i32.lt_s
-           (get_local $3)
-           (get_local $4)
-          )
+          (get_local $1)
          )
         )
-       )
-       (get_local $1)
-      )
-     )
-     (tee_local $4
-      (i32.const 0)
-     )
-     (i32.gt_s
-      (get_local $3)
-      (get_local $4)
-     )
-    )
-   )
-   (block (result i32)
-    (i32.store
-     (tee_local $3
-      (call "$(lib)/allocator/arena/allocate_memory"
-       (i32.add
-        (get_local $2)
-        (i32.const 4)
+        (tee_local $4
+         (i32.const 0)
+        )
+        (i32.gt_s
+         (get_local $3)
+         (get_local $4)
+        )
        )
       )
-     )
-     (get_local $2)
-    )
-    (call "$(lib)/memory/move_memory"
-     (i32.add
-      (get_local $3)
       (i32.const 4)
      )
-     (i32.add
-      (i32.add
-       (get_local $0)
-       (i32.const 4)
-      )
-      (get_local $1)
-     )
-     (get_local $2)
-    )
-    (get_local $3)
-   )
-   (if (result i32)
-    (get_global "$(lib)/arraybuffer/ArrayBuffer.EMPTY")
-    (get_global "$(lib)/arraybuffer/ArrayBuffer.EMPTY")
-    (block (result i32)
-     (i32.store
-      (tee_local $3
-       (call "$(lib)/allocator/arena/allocate_memory"
-        (i32.const 4)
-       )
-      )
-      (i32.const 0)
-     )
-     (set_global "$(lib)/arraybuffer/ArrayBuffer.EMPTY"
-      (get_local $3)
-     )
-     (get_local $3)
     )
    )
+   (get_local $2)
   )
+  (call $~lib/memory/move_memory
+   (i32.add
+    (get_local $3)
+    (i32.const 4)
+   )
+   (i32.add
+    (i32.add
+     (get_local $0)
+     (i32.const 4)
+    )
+    (get_local $1)
+   )
+   (get_local $2)
+  )
+  (get_local $3)
  )
- (func "$(lib)/arraybuffer/ArrayBuffer#slice|trampoline" (; 6 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#slice|trampoline (; 6 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (block $2of2
    (block $1of2
     (block $0of2
@@ -2148,14 +2124,14 @@
     (i32.const 2147483647)
    )
   )
-  (call "$(lib)/arraybuffer/ArrayBuffer#slice"
+  (call $~lib/arraybuffer/ArrayBuffer#slice
    (get_local $0)
    (get_local $1)
    (get_local $2)
   )
  )
  (func $start (; 7 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/startOffset"
+  (set_global $~lib/allocator/arena/startOffset
    (i32.and
     (i32.add
      (get_global $HEAP_BASE)
@@ -2164,11 +2140,11 @@
     (i32.const -8)
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
-   (get_global "$(lib)/allocator/arena/startOffset")
+  (set_global $~lib/allocator/arena/offset
+   (get_global $~lib/allocator/arena/startOffset)
   )
   (set_global $std/arraybuffer/buffer
-   (call "$(lib)/arraybuffer/ArrayBuffer#constructor"
+   (call $~lib/arraybuffer/ArrayBuffer#constructor
     (i32.const 0)
     (i32.const 8)
    )
@@ -2195,7 +2171,7 @@
     (set_global $argumentCount
      (i32.const 0)
     )
-    (call "$(lib)/arraybuffer/ArrayBuffer#slice|trampoline"
+    (call $~lib/arraybuffer/ArrayBuffer#slice|trampoline
      (get_global $std/arraybuffer/buffer)
      (i32.const 0)
      (i32.const 0)
@@ -2239,7 +2215,7 @@
     (set_global $argumentCount
      (i32.const 1)
     )
-    (call "$(lib)/arraybuffer/ArrayBuffer#slice|trampoline"
+    (call $~lib/arraybuffer/ArrayBuffer#slice|trampoline
      (get_global $std/arraybuffer/buffer)
      (i32.const 1)
      (i32.const 0)
@@ -2268,7 +2244,7 @@
     (set_global $argumentCount
      (i32.const 1)
     )
-    (call "$(lib)/arraybuffer/ArrayBuffer#slice|trampoline"
+    (call $~lib/arraybuffer/ArrayBuffer#slice|trampoline
      (get_global $std/arraybuffer/buffer)
      (i32.const -1)
      (i32.const 0)
@@ -2293,7 +2269,7 @@
    )
   )
   (set_global $std/arraybuffer/sliced
-   (call "$(lib)/arraybuffer/ArrayBuffer#slice"
+   (call $~lib/arraybuffer/ArrayBuffer#slice
     (get_global $std/arraybuffer/buffer)
     (i32.const 1)
     (i32.const 3)
@@ -2317,7 +2293,7 @@
    )
   )
   (set_global $std/arraybuffer/sliced
-   (call "$(lib)/arraybuffer/ArrayBuffer#slice"
+   (call $~lib/arraybuffer/ArrayBuffer#slice
     (get_global $std/arraybuffer/buffer)
     (i32.const 1)
     (i32.const -1)
@@ -2341,7 +2317,7 @@
    )
   )
   (set_global $std/arraybuffer/sliced
-   (call "$(lib)/arraybuffer/ArrayBuffer#slice"
+   (call $~lib/arraybuffer/ArrayBuffer#slice
     (get_global $std/arraybuffer/buffer)
     (i32.const -3)
     (i32.const -1)
@@ -2365,7 +2341,7 @@
    )
   )
   (set_global $std/arraybuffer/sliced
-   (call "$(lib)/arraybuffer/ArrayBuffer#slice"
+   (call $~lib/arraybuffer/ArrayBuffer#slice
     (get_global $std/arraybuffer/buffer)
     (i32.const -4)
     (i32.const 42)
@@ -2393,7 +2369,7 @@
     (set_global $argumentCount
      (i32.const 1)
     )
-    (call "$(lib)/arraybuffer/ArrayBuffer#slice|trampoline"
+    (call $~lib/arraybuffer/ArrayBuffer#slice|trampoline
      (get_global $std/arraybuffer/buffer)
      (i32.const 42)
      (i32.const 0)

tests/compiler/std/arraybuffer.untouched.wat

@@ -7,14 +7,13 @@
  (type $iiiv (func (param i32 i32 i32)))
  (type $v (func))
  (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
- (global "$(lib)/allocator/common/alignment/BITS" i32 (i32.const 3))
- (global "$(lib)/allocator/common/alignment/SIZE" i32 (i32.const 8))
- (global "$(lib)/allocator/common/alignment/MASK" i32 (i32.const 7))
- (global "$(lib)/allocator/arena/startOffset" (mut i32) (i32.const 0))
- (global "$(lib)/allocator/arena/offset" (mut i32) (i32.const 0))
- (global "$(lib)/arraybuffer/HEADER_SIZE" i32 (i32.const 4))
+ (global $~lib/allocator/common/alignment/BITS i32 (i32.const 3))
+ (global $~lib/allocator/common/alignment/SIZE i32 (i32.const 8))
+ (global $~lib/allocator/common/alignment/MASK i32 (i32.const 7))
+ (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
+ (global $~lib/arraybuffer/HEADER_SIZE i32 (i32.const 4))
  (global $std/arraybuffer/buffer (mut i32) (i32.const 0))
- (global "$(lib)/arraybuffer/ArrayBuffer.EMPTY" (mut i32) (i32.const 0))
  (global $argumentCount (mut i32) (i32.const 0))
  (global $std/arraybuffer/sliced (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 44))
@@ -22,7 +21,7 @@
  (data (i32.const 4) "\12\00\00\00s\00t\00d\00/\00a\00r\00r\00a\00y\00b\00u\00f\00f\00e\00r\00.\00t\00s\00")
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/allocator/arena/allocate_memory" (; 1 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/allocator/arena/allocate_memory (; 1 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -38,7 +37,7 @@
    )
   )
   (set_local $1
-   (get_global "$(lib)/allocator/arena/offset")
+   (get_global $~lib/allocator/arena/offset)
   )
   (set_local $2
    (i32.and
@@ -118,14 +117,14 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
+  (set_global $~lib/allocator/arena/offset
    (get_local $2)
   )
   (return
    (get_local $1)
   )
  )
- (func "$(lib)/arraybuffer/ArrayBuffer#constructor" (; 2 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#constructor (; 2 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (if
    (i32.gt_u
@@ -135,7 +134,7 @@
    (unreachable)
   )
   (set_local $2
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.add
      (i32.const 4)
      (get_local $1)
@@ -150,7 +149,7 @@
    (get_local $2)
   )
  )
- (func "$(lib)/memory/copy_memory" (; 3 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/copy_memory (; 3 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -1953,7 +1952,7 @@
    )
   )
  )
- (func "$(lib)/memory/move_memory" (; 4 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/move_memory (; 4 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (if
    (i32.eq
@@ -1986,7 +1985,7 @@
     (i32.const 1)
    )
    (block
-    (call "$(lib)/memory/copy_memory"
+    (call $~lib/memory/copy_memory
      (get_local $0)
      (get_local $1)
      (get_local $2)
@@ -2276,11 +2275,12 @@
    )
   )
  )
- (func "$(lib)/arraybuffer/ArrayBuffer#slice" (; 5 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#slice (; 5 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
+  (local $7 i32)
   (set_local $3
    (i32.load
     (get_local $0)
@@ -2377,65 +2377,37 @@
     )
    )
   )
-  (if
-   (get_local $6)
-   (block
-    (set_local $4
-     (call "$(lib)/allocator/arena/allocate_memory"
-      (i32.add
-       (i32.const 4)
-       (get_local $6)
-      )
-     )
-    )
-    (i32.store
-     (get_local $4)
+  (set_local $7
+   (call $~lib/allocator/arena/allocate_memory
+    (i32.add
+     (i32.const 4)
      (get_local $6)
     )
-    (call "$(lib)/memory/move_memory"
-     (i32.add
-      (get_local $4)
-      (i32.const 4)
-     )
-     (i32.add
-      (i32.add
-       (get_local $0)
-       (i32.const 4)
-      )
-      (get_local $1)
-     )
-     (get_local $6)
-    )
-    (return
-     (get_local $4)
-    )
-   )
-   (if
-    (get_global "$(lib)/arraybuffer/ArrayBuffer.EMPTY")
-    (return
-     (get_global "$(lib)/arraybuffer/ArrayBuffer.EMPTY")
-    )
-    (block
-     (set_local $4
-      (call "$(lib)/allocator/arena/allocate_memory"
-       (i32.const 4)
-      )
-     )
-     (i32.store
-      (get_local $4)
-      (i32.const 0)
-     )
-     (set_global "$(lib)/arraybuffer/ArrayBuffer.EMPTY"
-      (get_local $4)
-     )
-     (return
-      (get_local $4)
-     )
-    )
    )
   )
+  (i32.store
+   (get_local $7)
+   (get_local $6)
+  )
+  (call $~lib/memory/move_memory
+   (i32.add
+    (get_local $7)
+    (i32.const 4)
+   )
+   (i32.add
+    (i32.add
+     (get_local $0)
+     (i32.const 4)
+    )
+    (get_local $1)
+   )
+   (get_local $6)
+  )
+  (return
+   (get_local $7)
+  )
  )
- (func "$(lib)/arraybuffer/ArrayBuffer#slice|trampoline" (; 6 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#slice|trampoline (; 6 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (block $2of2
    (block $1of2
     (block $0of2
@@ -2454,14 +2426,14 @@
     (i32.const 2147483647)
    )
   )
-  (call "$(lib)/arraybuffer/ArrayBuffer#slice"
+  (call $~lib/arraybuffer/ArrayBuffer#slice
    (get_local $0)
    (get_local $1)
    (get_local $2)
   )
  )
  (func $start (; 7 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/startOffset"
+  (set_global $~lib/allocator/arena/startOffset
    (i32.and
     (i32.add
      (get_global $HEAP_BASE)
@@ -2473,11 +2445,11 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
-   (get_global "$(lib)/allocator/arena/startOffset")
+  (set_global $~lib/allocator/arena/offset
+   (get_global $~lib/allocator/arena/startOffset)
   )
   (set_global $std/arraybuffer/buffer
-   (call "$(lib)/arraybuffer/ArrayBuffer#constructor"
+   (call $~lib/arraybuffer/ArrayBuffer#constructor
     (i32.const 0)
     (i32.const 8)
    )
@@ -2506,7 +2478,7 @@
     (set_global $argumentCount
      (i32.const 0)
     )
-    (call "$(lib)/arraybuffer/ArrayBuffer#slice|trampoline"
+    (call $~lib/arraybuffer/ArrayBuffer#slice|trampoline
      (get_global $std/arraybuffer/buffer)
      (i32.const 0)
      (i32.const 0)
@@ -2554,7 +2526,7 @@
     (set_global $argumentCount
      (i32.const 1)
     )
-    (call "$(lib)/arraybuffer/ArrayBuffer#slice|trampoline"
+    (call $~lib/arraybuffer/ArrayBuffer#slice|trampoline
      (get_global $std/arraybuffer/buffer)
      (i32.const 1)
      (i32.const 0)
@@ -2585,7 +2557,7 @@
     (set_global $argumentCount
      (i32.const 1)
     )
-    (call "$(lib)/arraybuffer/ArrayBuffer#slice|trampoline"
+    (call $~lib/arraybuffer/ArrayBuffer#slice|trampoline
      (get_global $std/arraybuffer/buffer)
      (i32.const -1)
      (i32.const 0)
@@ -2612,7 +2584,7 @@
    )
   )
   (set_global $std/arraybuffer/sliced
-   (call "$(lib)/arraybuffer/ArrayBuffer#slice"
+   (call $~lib/arraybuffer/ArrayBuffer#slice
     (get_global $std/arraybuffer/buffer)
     (i32.const 1)
     (i32.const 3)
@@ -2638,7 +2610,7 @@
    )
   )
   (set_global $std/arraybuffer/sliced
-   (call "$(lib)/arraybuffer/ArrayBuffer#slice"
+   (call $~lib/arraybuffer/ArrayBuffer#slice
     (get_global $std/arraybuffer/buffer)
     (i32.const 1)
     (i32.const -1)
@@ -2664,7 +2636,7 @@
    )
   )
   (set_global $std/arraybuffer/sliced
-   (call "$(lib)/arraybuffer/ArrayBuffer#slice"
+   (call $~lib/arraybuffer/ArrayBuffer#slice
     (get_global $std/arraybuffer/buffer)
     (i32.const -3)
     (i32.const -1)
@@ -2690,7 +2662,7 @@
    )
   )
   (set_global $std/arraybuffer/sliced
-   (call "$(lib)/arraybuffer/ArrayBuffer#slice"
+   (call $~lib/arraybuffer/ArrayBuffer#slice
     (get_global $std/arraybuffer/buffer)
     (i32.const -4)
     (i32.const 42)
@@ -2720,7 +2692,7 @@
     (set_global $argumentCount
      (i32.const 1)
     )
-    (call "$(lib)/arraybuffer/ArrayBuffer#slice|trampoline"
+    (call $~lib/arraybuffer/ArrayBuffer#slice|trampoline
      (get_global $std/arraybuffer/buffer)
      (i32.const 42)
      (i32.const 0)

tests/compiler/std/carray.optimized.wat

@@ -10,7 +10,7 @@
  (data (i32.const 4) "\0d\00\00\00s\00t\00d\00/\00c\00a\00r\00r\00a\00y\00.\00t\00s")
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/array/CArray<i32>#__get" (; 1 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/CArray<i32>#__get (; 1 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (if
    (i32.lt_s
     (get_local $1)
@@ -28,7 +28,7 @@
    )
   )
  )
- (func "$(lib)/array/CArray<i32>#__set" (; 2 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/CArray<i32>#__set (; 2 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (if
    (i32.lt_s
     (get_local $1)
@@ -85,7 +85,7 @@
    )
   )
   (if
-   (call "$(lib)/array/CArray<i32>#__get"
+   (call $~lib/array/CArray<i32>#__get
     (get_global $std/carray/arr)
     (i32.const 0)
    )
@@ -100,7 +100,7 @@
    )
   )
   (if
-   (call "$(lib)/array/CArray<i32>#__get"
+   (call $~lib/array/CArray<i32>#__get
     (get_global $std/carray/arr)
     (i32.const 1)
    )
@@ -114,12 +114,12 @@
     (unreachable)
    )
   )
-  (call "$(lib)/array/CArray<i32>#__set"
+  (call $~lib/array/CArray<i32>#__set
    (get_global $std/carray/arr)
    (i32.const 0)
    (i32.const 42)
   )
-  (call "$(lib)/array/CArray<i32>#__set"
+  (call $~lib/array/CArray<i32>#__set
    (get_global $std/carray/arr)
    (i32.const 1)
    (i32.const 24)
@@ -163,7 +163,7 @@
   )
   (if
    (i32.ne
-    (call "$(lib)/array/CArray<i32>#__get"
+    (call $~lib/array/CArray<i32>#__get
      (get_global $std/carray/arr)
      (i32.const 0)
     )
@@ -181,7 +181,7 @@
   )
   (if
    (i32.ne
-    (call "$(lib)/array/CArray<i32>#__get"
+    (call $~lib/array/CArray<i32>#__get
      (get_global $std/carray/arr)
      (i32.const 1)
     )
@@ -199,7 +199,7 @@
   )
   (if
    (block (result i32)
-    (call "$(lib)/array/CArray<i32>#__set"
+    (call $~lib/array/CArray<i32>#__set
      (tee_local $0
       (get_global $std/carray/arr)
      )
@@ -209,7 +209,7 @@
      (i32.const 9000)
     )
     (i32.ne
-     (call "$(lib)/array/CArray<i32>#__get"
+     (call $~lib/array/CArray<i32>#__get
       (get_local $0)
       (get_local $1)
      )
@@ -248,7 +248,7 @@
   )
   (if
    (i32.ne
-    (call "$(lib)/array/CArray<i32>#__get"
+    (call $~lib/array/CArray<i32>#__get
      (get_global $std/carray/arr)
      (i32.const 3)
     )

tests/compiler/std/carray.untouched.wat

@@ -11,7 +11,7 @@
  (data (i32.const 4) "\0d\00\00\00s\00t\00d\00/\00c\00a\00r\00r\00a\00y\00.\00t\00s\00")
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/array/CArray<i32>#__get" (; 1 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/CArray<i32>#__get (; 1 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (if
    (i32.lt_s
     (get_local $1)
@@ -31,7 +31,7 @@
    )
   )
  )
- (func "$(lib)/array/CArray<i32>#__set" (; 2 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/CArray<i32>#__set (; 2 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (if
    (i32.lt_s
     (get_local $1)
@@ -100,7 +100,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/array/CArray<i32>#__get"
+     (call $~lib/array/CArray<i32>#__get
       (get_global $std/carray/arr)
       (i32.const 0)
      )
@@ -120,7 +120,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/array/CArray<i32>#__get"
+     (call $~lib/array/CArray<i32>#__get
       (get_global $std/carray/arr)
       (i32.const 1)
      )
@@ -137,12 +137,12 @@
     (unreachable)
    )
   )
-  (call "$(lib)/array/CArray<i32>#__set"
+  (call $~lib/array/CArray<i32>#__set
    (get_global $std/carray/arr)
    (i32.const 0)
    (i32.const 42)
   )
-  (call "$(lib)/array/CArray<i32>#__set"
+  (call $~lib/array/CArray<i32>#__set
    (get_global $std/carray/arr)
    (i32.const 1)
    (i32.const 24)
@@ -191,7 +191,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/array/CArray<i32>#__get"
+     (call $~lib/array/CArray<i32>#__get
       (get_global $std/carray/arr)
       (i32.const 0)
      )
@@ -211,7 +211,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/array/CArray<i32>#__get"
+     (call $~lib/array/CArray<i32>#__get
       (get_global $std/carray/arr)
       (i32.const 1)
      )
@@ -232,7 +232,7 @@
    (i32.eqz
     (i32.eq
      (block (result i32)
-      (call "$(lib)/array/CArray<i32>#__set"
+      (call $~lib/array/CArray<i32>#__set
        (tee_local $0
         (get_global $std/carray/arr)
        )
@@ -241,7 +241,7 @@
        )
        (i32.const 9000)
       )
-      (call "$(lib)/array/CArray<i32>#__get"
+      (call $~lib/array/CArray<i32>#__get
        (get_local $0)
        (get_local $1)
       )
@@ -284,7 +284,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/array/CArray<i32>#__get"
+     (call $~lib/array/CArray<i32>#__get
       (get_global $std/carray/arr)
       (i32.const 3)
      )

tests/compiler/std/constructor.optimized.wat

@@ -1,8 +1,8 @@
 (module
  (type $ii (func (param i32) (result i32)))
  (type $v (func))
- (global "$(lib)/allocator/arena/startOffset" (mut i32) (i32.const 0))
- (global "$(lib)/allocator/arena/offset" (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $std/constructor/emptyCtor (mut i32) (i32.const 0))
  (global $std/constructor/emptyCtorWithFieldInit (mut i32) (i32.const 0))
  (global $std/constructor/emptyCtorWithFieldNoInit (mut i32) (i32.const 0))
@@ -18,7 +18,7 @@
  (memory $0 1)
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/allocator/arena/allocate_memory" (; 0 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/allocator/arena/allocate_memory (; 0 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -38,7 +38,7 @@
       (i32.add
        (i32.add
         (tee_local $1
-         (get_global "$(lib)/allocator/arena/offset")
+         (get_global $~lib/allocator/arena/offset)
         )
         (get_local $0)
        )
@@ -95,7 +95,7 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
+  (set_global $~lib/allocator/arena/offset
    (get_local $2)
   )
   (get_local $1)
@@ -104,7 +104,7 @@
   (if (result i32)
    (get_local $0)
    (get_local $0)
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.const 0)
    )
   )
@@ -117,7 +117,7 @@
    (block (result i32)
     (i32.store
      (tee_local $1
-      (call "$(lib)/allocator/arena/allocate_memory"
+      (call $~lib/allocator/arena/allocate_memory
        (i32.const 4)
       )
      )
@@ -135,7 +135,7 @@
    (block (result i32)
     (i32.store
      (tee_local $1
-      (call "$(lib)/allocator/arena/allocate_memory"
+      (call $~lib/allocator/arena/allocate_memory
        (i32.const 4)
       )
      )
@@ -146,7 +146,7 @@
   )
  )
  (func $std/constructor/CtorReturns#constructor (; 4 ;) (type $ii) (param $0 i32) (result i32)
-  (call "$(lib)/allocator/arena/allocate_memory"
+  (call $~lib/allocator/arena/allocate_memory
    (i32.const 0)
   )
  )
@@ -154,7 +154,7 @@
   (if
    (get_global $std/constructor/b)
    (return
-    (call "$(lib)/allocator/arena/allocate_memory"
+    (call $~lib/allocator/arena/allocate_memory
      (i32.const 0)
     )
    )
@@ -162,7 +162,7 @@
   (if (result i32)
    (get_local $0)
    (get_local $0)
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.const 0)
    )
   )
@@ -175,7 +175,7 @@
      (get_local $0)
     )
     (set_local $0
-     (call "$(lib)/allocator/arena/allocate_memory"
+     (call $~lib/allocator/arena/allocate_memory
       (i32.const 0)
      )
     )
@@ -184,14 +184,14 @@
   (if (result i32)
    (get_local $0)
    (get_local $0)
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.const 0)
    )
   )
  )
  (func $start (; 7 ;) (type $v)
   (local $0 i32)
-  (set_global "$(lib)/allocator/arena/startOffset"
+  (set_global $~lib/allocator/arena/startOffset
    (i32.and
     (i32.add
      (get_global $HEAP_BASE)
@@ -200,8 +200,8 @@
     (i32.const -8)
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
-   (get_global "$(lib)/allocator/arena/startOffset")
+  (set_global $~lib/allocator/arena/offset
+   (get_global $~lib/allocator/arena/startOffset)
   )
   (set_global $std/constructor/emptyCtor
    (call $std/constructor/EmptyCtor#constructor
@@ -219,7 +219,7 @@
    )
   )
   (set_global $std/constructor/none
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.const 0)
    )
   )
@@ -227,7 +227,7 @@
    (block (result i32)
     (i32.store
      (tee_local $0
-      (call "$(lib)/allocator/arena/allocate_memory"
+      (call $~lib/allocator/arena/allocate_memory
        (i32.const 4)
       )
      )
@@ -240,7 +240,7 @@
    (block (result i32)
     (i32.store
      (tee_local $0
-      (call "$(lib)/allocator/arena/allocate_memory"
+      (call $~lib/allocator/arena/allocate_memory
        (i32.const 4)
       )
      )

tests/compiler/std/constructor.untouched.wat

@@ -2,11 +2,11 @@
  (type $i (func (result i32)))
  (type $ii (func (param i32) (result i32)))
  (type $v (func))
- (global "$(lib)/allocator/common/alignment/BITS" i32 (i32.const 3))
- (global "$(lib)/allocator/common/alignment/SIZE" i32 (i32.const 8))
- (global "$(lib)/allocator/common/alignment/MASK" i32 (i32.const 7))
- (global "$(lib)/allocator/arena/startOffset" (mut i32) (i32.const 0))
- (global "$(lib)/allocator/arena/offset" (mut i32) (i32.const 0))
+ (global $~lib/allocator/common/alignment/BITS i32 (i32.const 3))
+ (global $~lib/allocator/common/alignment/SIZE i32 (i32.const 8))
+ (global $~lib/allocator/common/alignment/MASK i32 (i32.const 7))
+ (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $std/constructor/emptyCtor (mut i32) (i32.const 0))
  (global $std/constructor/emptyCtorWithFieldInit (mut i32) (i32.const 0))
  (global $std/constructor/emptyCtorWithFieldNoInit (mut i32) (i32.const 0))
@@ -22,7 +22,7 @@
  (memory $0 1)
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/allocator/arena/allocate_memory" (; 0 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/allocator/arena/allocate_memory (; 0 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -38,7 +38,7 @@
    )
   )
   (set_local $1
-   (get_global "$(lib)/allocator/arena/offset")
+   (get_global $~lib/allocator/arena/offset)
   )
   (set_local $2
    (i32.and
@@ -118,7 +118,7 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
+  (set_global $~lib/allocator/arena/offset
    (get_local $2)
   )
   (return
@@ -136,7 +136,7 @@
     (tee_local $0
      (block (result i32)
       (set_local $1
-       (call "$(lib)/allocator/arena/allocate_memory"
+       (call $~lib/allocator/arena/allocate_memory
         (i32.const 0)
        )
       )
@@ -157,7 +157,7 @@
     (tee_local $0
      (block (result i32)
       (set_local $1
-       (call "$(lib)/allocator/arena/allocate_memory"
+       (call $~lib/allocator/arena/allocate_memory
         (i32.const 4)
        )
       )
@@ -182,7 +182,7 @@
     (tee_local $0
      (block (result i32)
       (set_local $1
-       (call "$(lib)/allocator/arena/allocate_memory"
+       (call $~lib/allocator/arena/allocate_memory
         (i32.const 4)
        )
       )
@@ -198,7 +198,7 @@
  )
  (func $std/constructor/CtorReturns#constructor (; 4 ;) (type $ii) (param $0 i32) (result i32)
   (return
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.const 0)
    )
   )
@@ -209,7 +209,7 @@
    (if
     (get_global $std/constructor/b)
     (return
-     (call "$(lib)/allocator/arena/allocate_memory"
+     (call $~lib/allocator/arena/allocate_memory
       (i32.const 0)
      )
     )
@@ -222,7 +222,7 @@
     (tee_local $0
      (block (result i32)
       (set_local $1
-       (call "$(lib)/allocator/arena/allocate_memory"
+       (call $~lib/allocator/arena/allocate_memory
         (i32.const 0)
        )
       )
@@ -243,7 +243,7 @@
       (tee_local $0
        (block (result i32)
         (set_local $1
-         (call "$(lib)/allocator/arena/allocate_memory"
+         (call $~lib/allocator/arena/allocate_memory
           (i32.const 0)
          )
         )
@@ -269,7 +269,7 @@
        (tee_local $0
         (block (result i32)
          (set_local $1
-          (call "$(lib)/allocator/arena/allocate_memory"
+          (call $~lib/allocator/arena/allocate_memory
            (i32.const 0)
           )
          )
@@ -288,7 +288,7 @@
     (tee_local $0
      (block (result i32)
       (set_local $1
-       (call "$(lib)/allocator/arena/allocate_memory"
+       (call $~lib/allocator/arena/allocate_memory
         (i32.const 0)
        )
       )
@@ -300,7 +300,7 @@
  )
  (func $start (; 8 ;) (type $v)
   (local $0 i32)
-  (set_global "$(lib)/allocator/arena/startOffset"
+  (set_global $~lib/allocator/arena/startOffset
    (i32.and
     (i32.add
      (get_global $HEAP_BASE)
@@ -312,8 +312,8 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
-   (get_global "$(lib)/allocator/arena/startOffset")
+  (set_global $~lib/allocator/arena/offset
+   (get_global $~lib/allocator/arena/startOffset)
   )
   (set_global $std/constructor/emptyCtor
    (call $std/constructor/EmptyCtor#constructor
@@ -333,7 +333,7 @@
   (set_global $std/constructor/none
    (block (result i32)
     (set_local $0
-     (call "$(lib)/allocator/arena/allocate_memory"
+     (call $~lib/allocator/arena/allocate_memory
       (i32.const 0)
      )
     )
@@ -343,7 +343,7 @@
   (set_global $std/constructor/justFieldInit
    (block (result i32)
     (set_local $0
-     (call "$(lib)/allocator/arena/allocate_memory"
+     (call $~lib/allocator/arena/allocate_memory
       (i32.const 4)
      )
     )
@@ -357,7 +357,7 @@
   (set_global $std/constructor/justFieldNoInit
    (block (result i32)
     (set_local $0
-     (call "$(lib)/allocator/arena/allocate_memory"
+     (call $~lib/allocator/arena/allocate_memory
       (i32.const 4)
      )
     )

tests/compiler/std/libm.optimized.wat

@@ -55,17 +55,17 @@
  (export "tanh" (func $std/libm/tanh))
  (export "trunc" (func $std/libm/trunc))
  (export "memory" (memory $0))
- (func "$(lib)/math/NativeMath.abs" (; 0 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.abs (; 0 ;) (type $FF) (param $0 f64) (result f64)
   (f64.abs
    (get_local $0)
   )
  )
  (func $std/libm/abs (; 1 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.abs"
+  (call $~lib/math/NativeMath.abs
    (get_local $0)
   )
  )
- (func "$(lib)/math/R" (; 2 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/R (; 2 ;) (type $FF) (param $0 f64) (result f64)
   (f64.div
    (f64.mul
     (get_local $0)
@@ -128,7 +128,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMath.acos" (; 3 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.acos (; 3 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 f64)
   (local $2 i32)
   (local $3 f64)
@@ -217,7 +217,7 @@
         (f64.const 6.123233995736766e-17)
         (f64.mul
          (get_local $0)
-         (call "$(lib)/math/R"
+         (call $~lib/math/R
           (f64.mul
            (get_local $0)
            (get_local $0)
@@ -256,7 +256,7 @@
        )
        (f64.sub
         (f64.mul
-         (call "$(lib)/math/R"
+         (call $~lib/math/R
           (get_local $0)
          )
          (get_local $1)
@@ -295,7 +295,7 @@
     )
     (f64.add
      (f64.mul
-      (call "$(lib)/math/R"
+      (call $~lib/math/R
        (get_local $0)
       )
       (get_local $1)
@@ -318,11 +318,11 @@
   )
  )
  (func $std/libm/acos (; 4 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.acos"
+  (call $~lib/math/NativeMath.acos
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.log1p" (; 5 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.log1p (; 5 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 f64)
   (local $2 i32)
   (local $3 i32)
@@ -617,7 +617,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMath.log" (; 6 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.log (; 6 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i32)
   (local $2 i32)
   (local $3 i64)
@@ -882,7 +882,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMath.acosh" (; 7 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.acosh (; 7 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i64)
   (if
    (i64.lt_u
@@ -900,7 +900,7 @@
     (i64.const 1024)
    )
    (return
-    (call "$(lib)/math/NativeMath.log1p"
+    (call $~lib/math/NativeMath.log1p
      (f64.add
       (f64.sub
        (get_local $0)
@@ -937,7 +937,7 @@
     (i64.const 1049)
    )
    (return
-    (call "$(lib)/math/NativeMath.log"
+    (call $~lib/math/NativeMath.log
      (f64.sub
       (f64.mul
        (f64.const 2)
@@ -963,18 +963,18 @@
    )
   )
   (f64.add
-   (call "$(lib)/math/NativeMath.log"
+   (call $~lib/math/NativeMath.log
     (get_local $0)
    )
    (f64.const 0.6931471805599453)
   )
  )
  (func $std/libm/acosh (; 8 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.acosh"
+  (call $~lib/math/NativeMath.acosh
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.asin" (; 9 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.asin (; 9 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 f64)
   (local $2 i32)
   (local $3 i32)
@@ -1066,7 +1066,7 @@
       (get_local $0)
       (f64.mul
        (get_local $0)
-       (call "$(lib)/math/R"
+       (call $~lib/math/R
         (f64.mul
          (get_local $0)
          (get_local $0)
@@ -1093,7 +1093,7 @@
    )
   )
   (set_local $4
-   (call "$(lib)/math/R"
+   (call $~lib/math/R
     (get_local $1)
    )
   )
@@ -1184,11 +1184,11 @@
   (get_local $0)
  )
  (func $std/libm/asin (; 10 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.asin"
+  (call $~lib/math/NativeMath.asin
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.asinh" (; 11 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.asinh (; 11 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i64)
   (local $2 i64)
   (local $3 i64)
@@ -1226,7 +1226,7 @@
    )
    (set_local $0
     (f64.add
-     (call "$(lib)/math/NativeMath.log"
+     (call $~lib/math/NativeMath.log
       (get_local $0)
      )
      (f64.const 0.6931471805599453)
@@ -1238,7 +1238,7 @@
      (i64.const 1024)
     )
     (set_local $0
-     (call "$(lib)/math/NativeMath.log"
+     (call $~lib/math/NativeMath.log
       (f64.add
        (f64.mul
         (f64.const 2)
@@ -1268,7 +1268,7 @@
       (i64.const 997)
      )
      (set_local $0
-      (call "$(lib)/math/NativeMath.log1p"
+      (call $~lib/math/NativeMath.log1p
        (f64.add
         (get_local $0)
         (f64.div
@@ -1307,11 +1307,11 @@
   )
  )
  (func $std/libm/asinh (; 12 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.asinh"
+  (call $~lib/math/NativeMath.asinh
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.atan" (; 13 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.atan (; 13 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 f64)
   (local $2 f64)
   (local $3 i32)
@@ -1672,11 +1672,11 @@
   )
  )
  (func $std/libm/atan (; 14 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.atan"
+  (call $~lib/math/NativeMath.atan
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.atanh" (; 15 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.atanh (; 15 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i64)
   (local $2 i64)
   (local $3 i64)
@@ -1720,7 +1720,7 @@
     (set_local $0
      (f64.mul
       (f64.const 0.5)
-      (call "$(lib)/math/NativeMath.log1p"
+      (call $~lib/math/NativeMath.log1p
        (f64.add
         (f64.mul
          (f64.const 2)
@@ -1747,7 +1747,7 @@
    (set_local $0
     (f64.mul
      (f64.const 0.5)
-     (call "$(lib)/math/NativeMath.log1p"
+     (call $~lib/math/NativeMath.log1p
       (f64.mul
        (f64.const 2)
        (f64.div
@@ -1774,11 +1774,11 @@
   )
  )
  (func $std/libm/atanh (; 16 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.atanh"
+  (call $~lib/math/NativeMath.atanh
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.atan2" (; 17 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.atan2 (; 17 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1855,7 +1855,7 @@
      )
     )
     (return
-     (call "$(lib)/math/NativeMath.atan"
+     (call $~lib/math/NativeMath.atan
       (get_local $0)
      )
     )
@@ -2057,7 +2057,7 @@
       (get_local $2)
      )
      (f64.const 0)
-     (call "$(lib)/math/NativeMath.atan"
+     (call $~lib/math/NativeMath.atan
       (f64.abs
        (f64.div
         (get_local $0)
@@ -2121,12 +2121,12 @@
   )
  )
  (func $std/libm/atan2 (; 18 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
-  (call "$(lib)/math/NativeMath.atan2"
+  (call $~lib/math/NativeMath.atan2
    (get_local $0)
    (get_local $1)
   )
  )
- (func "$(lib)/math/NativeMath.cbrt" (; 19 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.cbrt (; 19 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 f64)
   (local $2 f64)
   (local $3 i32)
@@ -2310,21 +2310,21 @@
   )
  )
  (func $std/libm/cbrt (; 20 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.cbrt"
+  (call $~lib/math/NativeMath.cbrt
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.ceil" (; 21 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.ceil (; 21 ;) (type $FF) (param $0 f64) (result f64)
   (f64.ceil
    (get_local $0)
   )
  )
  (func $std/libm/ceil (; 22 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.ceil"
+  (call $~lib/math/NativeMath.ceil
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.clz32" (; 23 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.clz32 (; 23 ;) (type $FF) (param $0 f64) (result f64)
   (f64.convert_s/i32
    (i32.clz
     (i32.trunc_s/f64
@@ -2334,19 +2334,19 @@
   )
  )
  (func $std/libm/clz32 (; 24 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.clz32"
+  (call $~lib/math/NativeMath.clz32
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.cos" (; 25 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.cos (; 25 ;) (type $FF) (param $0 f64) (result f64)
   (unreachable)
  )
  (func $std/libm/cos (; 26 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.cos"
+  (call $~lib/math/NativeMath.cos
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.expm1" (; 27 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.expm1 (; 27 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 f64)
   (local $2 i32)
   (local $3 f64)
@@ -2789,7 +2789,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMath.scalbn" (; 28 ;) (type $FiF) (param $0 f64) (param $1 i32) (result f64)
+ (func $~lib/math/NativeMath.scalbn (; 28 ;) (type $FiF) (param $0 f64) (param $1 i32) (result f64)
   (local $2 f64)
   (set_local $2
    (get_local $0)
@@ -2903,7 +2903,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMath.exp" (; 29 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.exp (; 29 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i32)
   (local $2 f64)
   (local $3 i32)
@@ -3105,16 +3105,16 @@
     (get_local $0)
    )
   )
-  (call "$(lib)/math/NativeMath.scalbn"
+  (call $~lib/math/NativeMath.scalbn
    (get_local $0)
    (get_local $3)
   )
  )
- (func "$(lib)/math/expo2" (; 30 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/expo2 (; 30 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 f64)
   (f64.mul
    (f64.mul
-    (call "$(lib)/math/NativeMath.exp"
+    (call $~lib/math/NativeMath.exp
      (f64.sub
       (get_local $0)
       (f64.const 1416.0996898839683)
@@ -3127,7 +3127,7 @@
    (get_local $1)
   )
  )
- (func "$(lib)/math/NativeMath.cosh" (; 31 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.cosh (; 31 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i32)
   (local $2 i64)
   (set_local $0
@@ -3170,7 +3170,7 @@
       (f64.div
        (f64.mul
         (tee_local $0
-         (call "$(lib)/math/NativeMath.expm1"
+         (call $~lib/math/NativeMath.expm1
           (get_local $0)
          )
         )
@@ -3198,7 +3198,7 @@
      (f64.const 0.5)
      (f64.add
       (tee_local $0
-       (call "$(lib)/math/NativeMath.exp"
+       (call $~lib/math/NativeMath.exp
         (get_local $0)
        )
       )
@@ -3210,46 +3210,46 @@
     )
    )
   )
-  (call "$(lib)/math/expo2"
+  (call $~lib/math/expo2
    (get_local $0)
   )
  )
  (func $std/libm/cosh (; 32 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.cosh"
+  (call $~lib/math/NativeMath.cosh
    (get_local $0)
   )
  )
  (func $std/libm/exp (; 33 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.exp"
+  (call $~lib/math/NativeMath.exp
    (get_local $0)
   )
  )
  (func $std/libm/expm1 (; 34 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.expm1"
+  (call $~lib/math/NativeMath.expm1
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.floor" (; 35 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.floor (; 35 ;) (type $FF) (param $0 f64) (result f64)
   (f64.floor
    (get_local $0)
   )
  )
  (func $std/libm/floor (; 36 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.floor"
+  (call $~lib/math/NativeMath.floor
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.fround" (; 37 ;) (type $Ff) (param $0 f64) (result f32)
+ (func $~lib/math/NativeMath.fround (; 37 ;) (type $Ff) (param $0 f64) (result f32)
   (f32.demote/f64
    (get_local $0)
   )
  )
  (func $std/libm/fround (; 38 ;) (type $Ff) (param $0 f64) (result f32)
-  (call "$(lib)/math/NativeMath.fround"
+  (call $~lib/math/NativeMath.fround
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.hypot" (; 39 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.hypot (; 39 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (local $2 f64)
   (local $3 f64)
   (local $4 i64)
@@ -3519,12 +3519,12 @@
   )
  )
  (func $std/libm/hypot (; 40 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
-  (call "$(lib)/math/NativeMath.hypot"
+  (call $~lib/math/NativeMath.hypot
    (get_local $0)
    (get_local $1)
   )
  )
- (func "$(lib)/math/NativeMath.imul" (; 41 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.imul (; 41 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (f64.convert_s/i32
    (i32.mul
     (i32.trunc_s/f64
@@ -3537,17 +3537,17 @@
   )
  )
  (func $std/libm/imul (; 42 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
-  (call "$(lib)/math/NativeMath.imul"
+  (call $~lib/math/NativeMath.imul
    (get_local $0)
    (get_local $1)
   )
  )
  (func $std/libm/log (; 43 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.log"
+  (call $~lib/math/NativeMath.log
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.log10" (; 44 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.log10 (; 44 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 f64)
   (local $2 i32)
   (local $3 i32)
@@ -3866,16 +3866,16 @@
   )
  )
  (func $std/libm/log10 (; 45 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.log10"
+  (call $~lib/math/NativeMath.log10
    (get_local $0)
   )
  )
  (func $std/libm/log1p (; 46 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.log1p"
+  (call $~lib/math/NativeMath.log1p
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.log2" (; 47 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.log2 (; 47 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 f64)
   (local $2 i32)
   (local $3 f64)
@@ -4182,35 +4182,35 @@
   )
  )
  (func $std/libm/log2 (; 48 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.log2"
+  (call $~lib/math/NativeMath.log2
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.max" (; 49 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.max (; 49 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (f64.max
    (get_local $0)
    (get_local $1)
   )
  )
  (func $std/libm/max (; 50 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
-  (call "$(lib)/math/NativeMath.max"
+  (call $~lib/math/NativeMath.max
    (get_local $0)
    (get_local $1)
   )
  )
- (func "$(lib)/math/NativeMath.min" (; 51 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.min (; 51 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (f64.min
    (get_local $0)
    (get_local $1)
   )
  )
  (func $std/libm/min (; 52 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
-  (call "$(lib)/math/NativeMath.min"
+  (call $~lib/math/NativeMath.min
    (get_local $0)
    (get_local $1)
   )
  )
- (func "$(lib)/math/NativeMath.pow" (; 53 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.pow (; 53 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (local $2 f64)
   (local $3 f64)
   (local $4 i32)
@@ -5566,7 +5566,7 @@
          )
          (i32.const 0)
         )
-        (call "$(lib)/math/NativeMath.scalbn"
+        (call $~lib/math/NativeMath.scalbn
          (get_local $2)
          (get_local $4)
         )
@@ -5610,12 +5610,12 @@
   )
  )
  (func $std/libm/pow (; 54 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
-  (call "$(lib)/math/NativeMath.pow"
+  (call $~lib/math/NativeMath.pow
    (get_local $0)
    (get_local $1)
   )
  )
- (func "$(lib)/math/NativeMath.round" (; 55 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.round (; 55 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 f64)
   (local $2 i64)
   (local $3 i32)
@@ -5749,11 +5749,11 @@
   )
  )
  (func $std/libm/round (; 56 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.round"
+  (call $~lib/math/NativeMath.round
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.sign" (; 57 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.sign (; 57 ;) (type $FF) (param $0 f64) (result f64)
   (select
    (f64.const 1)
    (select
@@ -5771,11 +5771,11 @@
   )
  )
  (func $std/libm/sign (; 58 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.sign"
+  (call $~lib/math/NativeMath.sign
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.sinh" (; 59 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.sinh (; 59 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 f64)
   (local $2 f64)
   (local $3 i64)
@@ -5825,7 +5825,7 @@
    )
    (block
     (set_local $1
-     (call "$(lib)/math/NativeMath.expm1"
+     (call $~lib/math/NativeMath.expm1
       (get_local $1)
      )
     )
@@ -5889,27 +5889,27 @@
     (f64.const 2)
     (get_local $2)
    )
-   (call "$(lib)/math/expo2"
+   (call $~lib/math/expo2
     (get_local $1)
    )
   )
  )
  (func $std/libm/sinh (; 60 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.sinh"
+  (call $~lib/math/NativeMath.sinh
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.sqrt" (; 61 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.sqrt (; 61 ;) (type $FF) (param $0 f64) (result f64)
   (f64.sqrt
    (get_local $0)
   )
  )
  (func $std/libm/sqrt (; 62 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.sqrt"
+  (call $~lib/math/NativeMath.sqrt
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.tanh" (; 63 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.tanh (; 63 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i64)
   (local $2 i32)
   (local $3 i32)
@@ -5965,7 +5965,7 @@
       (f64.div
        (f64.const 2)
        (f64.add
-        (call "$(lib)/math/NativeMath.expm1"
+        (call $~lib/math/NativeMath.expm1
          (f64.mul
           (f64.const 2)
           (get_local $0)
@@ -5985,7 +5985,7 @@
     (set_local $0
      (f64.div
       (tee_local $0
-       (call "$(lib)/math/NativeMath.expm1"
+       (call $~lib/math/NativeMath.expm1
         (f64.mul
          (f64.const 2)
          (get_local $0)
@@ -6007,7 +6007,7 @@
       (f64.div
        (f64.neg
         (tee_local $0
-         (call "$(lib)/math/NativeMath.expm1"
+         (call $~lib/math/NativeMath.expm1
           (f64.mul
            (f64.const -2)
            (get_local $0)
@@ -6033,17 +6033,17 @@
   )
  )
  (func $std/libm/tanh (; 64 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.tanh"
+  (call $~lib/math/NativeMath.tanh
    (get_local $0)
   )
  )
- (func "$(lib)/math/NativeMath.trunc" (; 65 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.trunc (; 65 ;) (type $FF) (param $0 f64) (result f64)
   (f64.trunc
    (get_local $0)
   )
  )
  (func $std/libm/trunc (; 66 ;) (type $FF) (param $0 f64) (result f64)
-  (call "$(lib)/math/NativeMath.trunc"
+  (call $~lib/math/NativeMath.trunc
    (get_local $0)
   )
  )

tests/compiler/std/libm.untouched.wat

@@ -59,7 +59,7 @@
  (export "tanh" (func $std/libm/tanh))
  (export "trunc" (func $std/libm/trunc))
  (export "memory" (memory $0))
- (func "$(lib)/math/NativeMath.abs" (; 0 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.abs (; 0 ;) (type $FF) (param $0 f64) (result f64)
   (return
    (f64.abs
     (get_local $0)
@@ -68,12 +68,12 @@
  )
  (func $std/libm/abs (; 1 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.abs"
+   (call $~lib/math/NativeMath.abs
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/R" (; 2 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/R (; 2 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 f64)
   (local $2 f64)
   (nop)
@@ -147,7 +147,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMath.acos" (; 3 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.acos (; 3 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -260,7 +260,7 @@
         (f64.const 6.123233995736766e-17)
         (f64.mul
          (get_local $0)
-         (call "$(lib)/math/R"
+         (call $~lib/math/R
           (f64.mul
            (get_local $0)
            (get_local $0)
@@ -297,7 +297,7 @@
     (set_local $5
      (f64.sub
       (f64.mul
-       (call "$(lib)/math/R"
+       (call $~lib/math/R
         (get_local $6)
        )
        (get_local $4)
@@ -361,7 +361,7 @@
   (set_local $5
    (f64.add
     (f64.mul
-     (call "$(lib)/math/R"
+     (call $~lib/math/R
       (get_local $6)
      )
      (get_local $4)
@@ -381,12 +381,12 @@
  )
  (func $std/libm/acos (; 4 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.acos"
+   (call $~lib/math/NativeMath.acos
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.log1p" (; 5 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.log1p (; 5 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i64)
   (local $2 i32)
   (local $3 i32)
@@ -748,7 +748,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMath.log" (; 6 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.log (; 6 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i64)
   (local $2 i32)
   (local $3 i32)
@@ -1061,7 +1061,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMath.acosh" (; 7 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.acosh (; 7 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i64)
   (nop)
   (set_local $1
@@ -1084,7 +1084,7 @@
     )
    )
    (return
-    (call "$(lib)/math/NativeMath.log1p"
+    (call $~lib/math/NativeMath.log1p
      (f64.add
       (f64.sub
        (get_local $0)
@@ -1124,7 +1124,7 @@
     )
    )
    (return
-    (call "$(lib)/math/NativeMath.log"
+    (call $~lib/math/NativeMath.log
      (f64.sub
       (f64.mul
        (f64.const 2)
@@ -1151,7 +1151,7 @@
   )
   (return
    (f64.add
-    (call "$(lib)/math/NativeMath.log"
+    (call $~lib/math/NativeMath.log
      (get_local $0)
     )
     (f64.const 0.6931471805599453)
@@ -1160,12 +1160,12 @@
  )
  (func $std/libm/acosh (; 8 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.acosh"
+   (call $~lib/math/NativeMath.acosh
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.asin" (; 9 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.asin (; 9 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1270,7 +1270,7 @@
       (get_local $0)
       (f64.mul
        (get_local $0)
-       (call "$(lib)/math/R"
+       (call $~lib/math/R
         (f64.mul
          (get_local $0)
          (get_local $0)
@@ -1298,7 +1298,7 @@
    )
   )
   (set_local $6
-   (call "$(lib)/math/R"
+   (call $~lib/math/R
     (get_local $4)
    )
   )
@@ -1406,12 +1406,12 @@
  )
  (func $std/libm/asin (; 10 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.asin"
+   (call $~lib/math/NativeMath.asin
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.asinh" (; 11 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.asinh (; 11 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i64)
   (local $2 i64)
   (local $3 i64)
@@ -1457,7 +1457,7 @@
    )
    (set_local $0
     (f64.add
-     (call "$(lib)/math/NativeMath.log"
+     (call $~lib/math/NativeMath.log
       (get_local $0)
      )
      (f64.const 0.6931471805599453)
@@ -1472,7 +1472,7 @@
      )
     )
     (set_local $0
-     (call "$(lib)/math/NativeMath.log"
+     (call $~lib/math/NativeMath.log
       (f64.add
        (f64.mul
         (f64.const 2)
@@ -1505,7 +1505,7 @@
       )
      )
      (set_local $0
-      (call "$(lib)/math/NativeMath.log1p"
+      (call $~lib/math/NativeMath.log1p
        (f64.add
         (get_local $0)
         (f64.div
@@ -1547,12 +1547,12 @@
  )
  (func $std/libm/asinh (; 12 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.asinh"
+   (call $~lib/math/NativeMath.asinh
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.atan" (; 13 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.atan (; 13 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i32)
   (local $2 i32)
   (local $3 f64)
@@ -1969,12 +1969,12 @@
  )
  (func $std/libm/atan (; 14 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.atan"
+   (call $~lib/math/NativeMath.atan
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.atanh" (; 15 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.atanh (; 15 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i64)
   (local $2 i64)
   (local $3 i64)
@@ -2029,7 +2029,7 @@
     (set_local $4
      (f64.mul
       (f64.const 0.5)
-      (call "$(lib)/math/NativeMath.log1p"
+      (call $~lib/math/NativeMath.log1p
        (f64.add
         (f64.mul
          (f64.const 2)
@@ -2056,7 +2056,7 @@
    (set_local $4
     (f64.mul
      (f64.const 0.5)
-     (call "$(lib)/math/NativeMath.log1p"
+     (call $~lib/math/NativeMath.log1p
       (f64.mul
        (f64.const 2)
        (f64.div
@@ -2086,12 +2086,12 @@
  )
  (func $std/libm/atanh (; 16 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.atanh"
+   (call $~lib/math/NativeMath.atanh
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.atan2" (; 17 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.atan2 (; 17 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (local $2 f64)
   (local $3 i32)
   (local $4 i64)
@@ -2178,7 +2178,7 @@
     (i32.const 0)
    )
    (return
-    (call "$(lib)/math/NativeMath.atan"
+    (call $~lib/math/NativeMath.atan
      (get_local $0)
     )
    )
@@ -2499,7 +2499,7 @@
     (f64.const 0)
    )
    (set_local $10
-    (call "$(lib)/math/NativeMath.atan"
+    (call $~lib/math/NativeMath.atan
      (f64.abs
       (f64.div
        (get_local $0)
@@ -2580,13 +2580,13 @@
  )
  (func $std/libm/atan2 (; 18 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.atan2"
+   (call $~lib/math/NativeMath.atan2
     (get_local $0)
     (get_local $1)
    )
   )
  )
- (func "$(lib)/math/NativeMath.cbrt" (; 19 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.cbrt (; 19 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i64)
   (local $2 i32)
   (local $3 f64)
@@ -2807,12 +2807,12 @@
  )
  (func $std/libm/cbrt (; 20 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.cbrt"
+   (call $~lib/math/NativeMath.cbrt
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.ceil" (; 21 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.ceil (; 21 ;) (type $FF) (param $0 f64) (result f64)
   (return
    (f64.ceil
     (get_local $0)
@@ -2821,12 +2821,12 @@
  )
  (func $std/libm/ceil (; 22 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.ceil"
+   (call $~lib/math/NativeMath.ceil
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.clz32" (; 23 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.clz32 (; 23 ;) (type $FF) (param $0 f64) (result f64)
   (return
    (f64.convert_s/i32
     (i32.clz
@@ -2839,12 +2839,12 @@
  )
  (func $std/libm/clz32 (; 24 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.clz32"
+   (call $~lib/math/NativeMath.clz32
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.cos" (; 25 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.cos (; 25 ;) (type $FF) (param $0 f64) (result f64)
   (unreachable)
   (return
    (f64.const 0)
@@ -2852,12 +2852,12 @@
  )
  (func $std/libm/cos (; 26 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.cos"
+   (call $~lib/math/NativeMath.cos
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.expm1" (; 27 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.expm1 (; 27 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i64)
   (local $2 i32)
   (local $3 i32)
@@ -3351,7 +3351,7 @@
    (get_local $14)
   )
  )
- (func "$(lib)/math/NativeMath.scalbn" (; 28 ;) (type $FiF) (param $0 f64) (param $1 i32) (result f64)
+ (func $~lib/math/NativeMath.scalbn (; 28 ;) (type $FiF) (param $0 f64) (param $1 i32) (result f64)
   (local $2 f64)
   (nop)
   (set_local $2
@@ -3472,7 +3472,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMath.exp" (; 29 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.exp (; 29 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i32)
   (local $2 i32)
   (local $3 f64)
@@ -3703,13 +3703,13 @@
    )
   )
   (return
-   (call "$(lib)/math/NativeMath.scalbn"
+   (call $~lib/math/NativeMath.scalbn
     (get_local $9)
     (get_local $6)
    )
   )
  )
- (func "$(lib)/math/expo2" (; 30 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/expo2 (; 30 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 f64)
   (nop)
   (set_local $1
@@ -3734,7 +3734,7 @@
   (return
    (f64.mul
     (f64.mul
-     (call "$(lib)/math/NativeMath.exp"
+     (call $~lib/math/NativeMath.exp
       (f64.sub
        (get_local $0)
        (f64.const 1416.0996898839683)
@@ -3746,7 +3746,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMath.cosh" (; 31 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.cosh (; 31 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i64)
   (local $2 i32)
   (local $3 f64)
@@ -3797,7 +3797,7 @@
      )
     )
     (set_local $3
-     (call "$(lib)/math/NativeMath.expm1"
+     (call $~lib/math/NativeMath.expm1
       (get_local $0)
      )
     )
@@ -3828,7 +3828,7 @@
    )
    (block
     (set_local $3
-     (call "$(lib)/math/NativeMath.exp"
+     (call $~lib/math/NativeMath.exp
       (get_local $0)
      )
     )
@@ -3847,7 +3847,7 @@
    )
   )
   (set_local $3
-   (call "$(lib)/math/expo2"
+   (call $~lib/math/expo2
     (get_local $0)
    )
   )
@@ -3857,26 +3857,26 @@
  )
  (func $std/libm/cosh (; 32 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.cosh"
+   (call $~lib/math/NativeMath.cosh
     (get_local $0)
    )
   )
  )
  (func $std/libm/exp (; 33 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.exp"
+   (call $~lib/math/NativeMath.exp
     (get_local $0)
    )
   )
  )
  (func $std/libm/expm1 (; 34 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.expm1"
+   (call $~lib/math/NativeMath.expm1
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.floor" (; 35 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.floor (; 35 ;) (type $FF) (param $0 f64) (result f64)
   (return
    (f64.floor
     (get_local $0)
@@ -3885,12 +3885,12 @@
  )
  (func $std/libm/floor (; 36 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.floor"
+   (call $~lib/math/NativeMath.floor
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.fround" (; 37 ;) (type $Ff) (param $0 f64) (result f32)
+ (func $~lib/math/NativeMath.fround (; 37 ;) (type $Ff) (param $0 f64) (result f32)
   (return
    (f32.demote/f64
     (get_local $0)
@@ -3899,12 +3899,12 @@
  )
  (func $std/libm/fround (; 38 ;) (type $Ff) (param $0 f64) (result f32)
   (return
-   (call "$(lib)/math/NativeMath.fround"
+   (call $~lib/math/NativeMath.fround
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.hypot" (; 39 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.hypot (; 39 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (local $2 i64)
   (local $3 i64)
   (local $4 i64)
@@ -4207,13 +4207,13 @@
  )
  (func $std/libm/hypot (; 40 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.hypot"
+   (call $~lib/math/NativeMath.hypot
     (get_local $0)
     (get_local $1)
    )
   )
  )
- (func "$(lib)/math/NativeMath.imul" (; 41 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.imul (; 41 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (return
    (f64.convert_s/i32
     (i32.mul
@@ -4229,7 +4229,7 @@
  )
  (func $std/libm/imul (; 42 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.imul"
+   (call $~lib/math/NativeMath.imul
     (get_local $0)
     (get_local $1)
    )
@@ -4237,12 +4237,12 @@
  )
  (func $std/libm/log (; 43 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.log"
+   (call $~lib/math/NativeMath.log
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.log10" (; 44 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.log10 (; 44 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i64)
   (local $2 i32)
   (local $3 i32)
@@ -4633,19 +4633,19 @@
  )
  (func $std/libm/log10 (; 45 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.log10"
+   (call $~lib/math/NativeMath.log10
     (get_local $0)
    )
   )
  )
  (func $std/libm/log1p (; 46 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.log1p"
+   (call $~lib/math/NativeMath.log1p
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.log2" (; 47 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.log2 (; 47 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i64)
   (local $2 i32)
   (local $3 i32)
@@ -5023,12 +5023,12 @@
  )
  (func $std/libm/log2 (; 48 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.log2"
+   (call $~lib/math/NativeMath.log2
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.max" (; 49 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.max (; 49 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (return
    (f64.max
     (get_local $0)
@@ -5038,13 +5038,13 @@
  )
  (func $std/libm/max (; 50 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.max"
+   (call $~lib/math/NativeMath.max
     (get_local $0)
     (get_local $1)
    )
   )
  )
- (func "$(lib)/math/NativeMath.min" (; 51 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.min (; 51 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (return
    (f64.min
     (get_local $0)
@@ -5054,13 +5054,13 @@
  )
  (func $std/libm/min (; 52 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.min"
+   (call $~lib/math/NativeMath.min
     (get_local $0)
     (get_local $1)
    )
   )
  )
- (func "$(lib)/math/NativeMath.pow" (; 53 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.pow (; 53 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (local $2 i64)
   (local $3 i32)
   (local $4 i32)
@@ -6608,7 +6608,7 @@
     (i32.const 0)
    )
    (set_local $13
-    (call "$(lib)/math/NativeMath.scalbn"
+    (call $~lib/math/NativeMath.scalbn
      (get_local $13)
      (get_local $25)
     )
@@ -6641,13 +6641,13 @@
  )
  (func $std/libm/pow (; 54 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.pow"
+   (call $~lib/math/NativeMath.pow
     (get_local $0)
     (get_local $1)
    )
   )
  )
- (func "$(lib)/math/NativeMath.round" (; 55 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.round (; 55 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i64)
   (local $2 i32)
   (local $3 f64)
@@ -6811,12 +6811,12 @@
  )
  (func $std/libm/round (; 56 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.round"
+   (call $~lib/math/NativeMath.round
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.sign" (; 57 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.sign (; 57 ;) (type $FF) (param $0 f64) (result f64)
   (return
    (if (result f64)
     (f64.gt
@@ -6837,12 +6837,12 @@
  )
  (func $std/libm/sign (; 58 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.sign"
+   (call $~lib/math/NativeMath.sign
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.sin" (; 59 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.sin (; 59 ;) (type $FF) (param $0 f64) (result f64)
   (unreachable)
   (return
    (f64.const 0)
@@ -6850,12 +6850,12 @@
  )
  (func $std/libm/sin (; 60 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.sin"
+   (call $~lib/math/NativeMath.sin
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.sinh" (; 61 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.sinh (; 61 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i64)
   (local $2 f64)
   (local $3 f64)
@@ -6910,7 +6910,7 @@
    )
    (block
     (set_local $5
-     (call "$(lib)/math/NativeMath.expm1"
+     (call $~lib/math/NativeMath.expm1
       (get_local $3)
      )
     )
@@ -6981,7 +6981,7 @@
      (f64.const 2)
      (get_local $2)
     )
-    (call "$(lib)/math/expo2"
+    (call $~lib/math/expo2
      (get_local $3)
     )
    )
@@ -6992,12 +6992,12 @@
  )
  (func $std/libm/sinh (; 62 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.sinh"
+   (call $~lib/math/NativeMath.sinh
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.sqrt" (; 63 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.sqrt (; 63 ;) (type $FF) (param $0 f64) (result f64)
   (return
    (f64.sqrt
     (get_local $0)
@@ -7006,12 +7006,12 @@
  )
  (func $std/libm/sqrt (; 64 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.sqrt"
+   (call $~lib/math/NativeMath.sqrt
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.tan" (; 65 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.tan (; 65 ;) (type $FF) (param $0 f64) (result f64)
   (unreachable)
   (return
    (f64.const 0)
@@ -7019,12 +7019,12 @@
  )
  (func $std/libm/tan (; 66 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.tan"
+   (call $~lib/math/NativeMath.tan
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.tanh" (; 67 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.tanh (; 67 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i64)
   (local $2 i32)
   (local $3 i32)
@@ -7083,7 +7083,7 @@
     )
     (block
      (set_local $4
-      (call "$(lib)/math/NativeMath.expm1"
+      (call $~lib/math/NativeMath.expm1
        (f64.mul
         (f64.const 2)
         (get_local $0)
@@ -7111,7 +7111,7 @@
     )
     (block
      (set_local $4
-      (call "$(lib)/math/NativeMath.expm1"
+      (call $~lib/math/NativeMath.expm1
        (f64.mul
         (f64.const 2)
         (get_local $0)
@@ -7135,7 +7135,7 @@
      )
      (block
       (set_local $4
-       (call "$(lib)/math/NativeMath.expm1"
+       (call $~lib/math/NativeMath.expm1
         (f64.mul
          (f64.const -2)
          (get_local $0)
@@ -7172,12 +7172,12 @@
  )
  (func $std/libm/tanh (; 68 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.tanh"
+   (call $~lib/math/NativeMath.tanh
     (get_local $0)
    )
   )
  )
- (func "$(lib)/math/NativeMath.trunc" (; 69 ;) (type $FF) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.trunc (; 69 ;) (type $FF) (param $0 f64) (result f64)
   (return
    (f64.trunc
     (get_local $0)
@@ -7186,7 +7186,7 @@
  )
  (func $std/libm/trunc (; 70 ;) (type $FF) (param $0 f64) (result f64)
   (return
-   (call "$(lib)/math/NativeMath.trunc"
+   (call $~lib/math/NativeMath.trunc
     (get_local $0)
    )
   )

tests/compiler/std/mod.optimized.wat

@@ -13,7 +13,7 @@
  (data (i32.const 4) "\n\00\00\00s\00t\00d\00/\00m\00o\00d\00.\00t\00s")
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/math/NativeMath.mod" (; 2 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.mod (; 2 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (local $2 i64)
   (local $3 i32)
   (local $4 i64)
@@ -432,7 +432,7 @@
    (if (result i32)
     (tee_local $3
      (call $std/mod/check<f64>
-      (call "$(lib)/math/NativeMath.mod"
+      (call $~lib/math/NativeMath.mod
        (get_local $0)
        (get_local $1)
       )
@@ -457,7 +457,7 @@
    (i32.const 1)
   )
  )
- (func "$(lib)/math/NativeMathf.mod" (; 5 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
+ (func $~lib/math/NativeMathf.mod (; 5 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -852,7 +852,7 @@
  )
  (func $std/mod/test_fmodf (; 7 ;) (type $fffi) (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
   (call $std/mod/check<f32>
-   (call "$(lib)/math/NativeMathf.mod"
+   (call $~lib/math/NativeMathf.mod
     (get_local $0)
     (get_local $1)
    )

tests/compiler/std/mod.untouched.wat

@@ -16,7 +16,7 @@
  (data (i32.const 4) "\n\00\00\00s\00t\00d\00/\00m\00o\00d\00.\00t\00s\00")
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/math/NativeMath.mod" (; 2 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.mod (; 2 ;) (type $FFF) (param $0 f64) (param $1 f64) (result f64)
   (local $2 i64)
   (local $3 i64)
   (local $4 i32)
@@ -523,7 +523,7 @@
     (if (result i32)
      (tee_local $3
       (call $std/mod/check<f64>
-       (call "$(lib)/math/NativeMath.mod"
+       (call $~lib/math/NativeMath.mod
         (get_local $0)
         (get_local $1)
        )
@@ -551,7 +551,7 @@
    )
   )
  )
- (func "$(lib)/math/NativeMathf.mod" (; 5 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
+ (func $~lib/math/NativeMathf.mod (; 5 ;) (type $fff) (param $0 f32) (param $1 f32) (result f32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1035,7 +1035,7 @@
  (func $std/mod/test_fmodf (; 7 ;) (type $fffi) (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
   (return
    (call $std/mod/check<f32>
-    (call "$(lib)/math/NativeMathf.mod"
+    (call $~lib/math/NativeMathf.mod
      (get_local $0)
      (get_local $1)
     )

tests/compiler/std/new.optimized.wat

@@ -2,14 +2,14 @@
  (type $ifi (func (param i32 f32) (result i32)))
  (type $ii (func (param i32) (result i32)))
  (type $v (func))
- (global "$(lib)/allocator/arena/startOffset" (mut i32) (i32.const 0))
- (global "$(lib)/allocator/arena/offset" (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $std/new/aClass (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 4))
  (memory $0 1)
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/allocator/arena/allocate_memory" (; 0 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/allocator/arena/allocate_memory (; 0 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -29,7 +29,7 @@
       (i32.add
        (i32.add
         (tee_local $1
-         (get_global "$(lib)/allocator/arena/offset")
+         (get_global $~lib/allocator/arena/offset)
         )
         (get_local $0)
        )
@@ -86,7 +86,7 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
+  (set_global $~lib/allocator/arena/offset
    (get_local $2)
   )
   (get_local $1)
@@ -103,7 +103,7 @@
       (block (result i32)
        (i32.store
         (tee_local $2
-         (call "$(lib)/allocator/arena/allocate_memory"
+         (call $~lib/allocator/arena/allocate_memory
           (i32.const 8)
          )
         )
@@ -129,7 +129,7 @@
   (get_local $0)
  )
  (func $start (; 2 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/startOffset"
+  (set_global $~lib/allocator/arena/startOffset
    (i32.and
     (i32.add
      (get_global $HEAP_BASE)
@@ -138,8 +138,8 @@
     (i32.const -8)
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
-   (get_global "$(lib)/allocator/arena/startOffset")
+  (set_global $~lib/allocator/arena/offset
+   (get_global $~lib/allocator/arena/startOffset)
   )
   (set_global $std/new/aClass
    (call $std/new/AClass#constructor

tests/compiler/std/new.untouched.wat

@@ -3,17 +3,17 @@
  (type $ifi (func (param i32 f32) (result i32)))
  (type $ii (func (param i32) (result i32)))
  (type $v (func))
- (global "$(lib)/allocator/common/alignment/BITS" i32 (i32.const 3))
- (global "$(lib)/allocator/common/alignment/SIZE" i32 (i32.const 8))
- (global "$(lib)/allocator/common/alignment/MASK" i32 (i32.const 7))
- (global "$(lib)/allocator/arena/startOffset" (mut i32) (i32.const 0))
- (global "$(lib)/allocator/arena/offset" (mut i32) (i32.const 0))
+ (global $~lib/allocator/common/alignment/BITS i32 (i32.const 3))
+ (global $~lib/allocator/common/alignment/SIZE i32 (i32.const 8))
+ (global $~lib/allocator/common/alignment/MASK i32 (i32.const 7))
+ (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $std/new/aClass (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 4))
  (memory $0 1)
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/allocator/arena/allocate_memory" (; 0 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/allocator/arena/allocate_memory (; 0 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -29,7 +29,7 @@
    )
   )
   (set_local $1
-   (get_global "$(lib)/allocator/arena/offset")
+   (get_global $~lib/allocator/arena/offset)
   )
   (set_local $2
    (i32.and
@@ -109,7 +109,7 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
+  (set_global $~lib/allocator/arena/offset
    (get_local $2)
   )
   (return
@@ -130,7 +130,7 @@
         (tee_local $0
          (block (result i32)
           (set_local $2
-           (call "$(lib)/allocator/arena/allocate_memory"
+           (call $~lib/allocator/arena/allocate_memory
             (i32.const 8)
            )
           )
@@ -159,7 +159,7 @@
   (get_local $0)
  )
  (func $start (; 2 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/startOffset"
+  (set_global $~lib/allocator/arena/startOffset
    (i32.and
     (i32.add
      (get_global $HEAP_BASE)
@@ -171,8 +171,8 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
-   (get_global "$(lib)/allocator/arena/startOffset")
+  (set_global $~lib/allocator/arena/offset
+   (get_global $~lib/allocator/arena/startOffset)
   )
   (set_global $std/new/aClass
    (call $std/new/AClass#constructor

tests/compiler/std/operator-overloading.optimized.wat

@@ -5,8 +5,8 @@
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
  (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
- (global "$(lib)/allocator/arena/startOffset" (mut i32) (i32.const 0))
- (global "$(lib)/allocator/arena/offset" (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $std/operator-overloading/a1 (mut i32) (i32.const 0))
  (global $std/operator-overloading/a2 (mut i32) (i32.const 0))
  (global $std/operator-overloading/a (mut i32) (i32.const 0))
@@ -42,7 +42,7 @@
  (data (i32.const 4) "\1b\00\00\00s\00t\00d\00/\00o\00p\00e\00r\00a\00t\00o\00r\00-\00o\00v\00e\00r\00l\00o\00a\00d\00i\00n\00g\00.\00t\00s")
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/allocator/arena/allocate_memory" (; 1 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/allocator/arena/allocate_memory (; 1 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -62,7 +62,7 @@
       (i32.add
        (i32.add
         (tee_local $1
-         (get_global "$(lib)/allocator/arena/offset")
+         (get_global $~lib/allocator/arena/offset)
         )
         (get_local $0)
        )
@@ -119,7 +119,7 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
+  (set_global $~lib/allocator/arena/offset
    (get_local $2)
   )
   (get_local $1)
@@ -132,7 +132,7 @@
    (block (result i32)
     (i32.store
      (tee_local $3
-      (call "$(lib)/allocator/arena/allocate_memory"
+      (call $~lib/allocator/arena/allocate_memory
        (i32.const 8)
       )
      )
@@ -343,7 +343,7 @@
  )
  (func $start (; 12 ;) (type $v)
   (local $0 i32)
-  (set_global "$(lib)/allocator/arena/startOffset"
+  (set_global $~lib/allocator/arena/startOffset
    (i32.and
     (i32.add
      (get_global $HEAP_BASE)
@@ -352,8 +352,8 @@
     (i32.const -8)
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
-   (get_global "$(lib)/allocator/arena/startOffset")
+  (set_global $~lib/allocator/arena/offset
+   (get_global $~lib/allocator/arena/startOffset)
   )
   (set_global $std/operator-overloading/a1
    (call $std/operator-overloading/Tester#constructor

tests/compiler/std/operator-overloading.untouched.wat

@@ -6,11 +6,11 @@
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
  (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
- (global "$(lib)/allocator/common/alignment/BITS" i32 (i32.const 3))
- (global "$(lib)/allocator/common/alignment/SIZE" i32 (i32.const 8))
- (global "$(lib)/allocator/common/alignment/MASK" i32 (i32.const 7))
- (global "$(lib)/allocator/arena/startOffset" (mut i32) (i32.const 0))
- (global "$(lib)/allocator/arena/offset" (mut i32) (i32.const 0))
+ (global $~lib/allocator/common/alignment/BITS i32 (i32.const 3))
+ (global $~lib/allocator/common/alignment/SIZE i32 (i32.const 8))
+ (global $~lib/allocator/common/alignment/MASK i32 (i32.const 7))
+ (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $std/operator-overloading/a1 (mut i32) (i32.const 0))
  (global $std/operator-overloading/a2 (mut i32) (i32.const 0))
  (global $std/operator-overloading/a (mut i32) (i32.const 0))
@@ -46,7 +46,7 @@
  (data (i32.const 4) "\1b\00\00\00s\00t\00d\00/\00o\00p\00e\00r\00a\00t\00o\00r\00-\00o\00v\00e\00r\00l\00o\00a\00d\00i\00n\00g\00.\00t\00s\00")
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/allocator/arena/allocate_memory" (; 1 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/allocator/arena/allocate_memory (; 1 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -62,7 +62,7 @@
    )
   )
   (set_local $1
-   (get_global "$(lib)/allocator/arena/offset")
+   (get_global $~lib/allocator/arena/offset)
   )
   (set_local $2
    (i32.and
@@ -142,7 +142,7 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
+  (set_global $~lib/allocator/arena/offset
    (get_local $2)
   )
   (return
@@ -160,7 +160,7 @@
     (tee_local $0
      (block (result i32)
       (set_local $3
-       (call "$(lib)/allocator/arena/allocate_memory"
+       (call $~lib/allocator/arena/allocate_memory
         (i32.const 8)
        )
       )
@@ -393,7 +393,7 @@
  )
  (func $start (; 12 ;) (type $v)
   (local $0 i32)
-  (set_global "$(lib)/allocator/arena/startOffset"
+  (set_global $~lib/allocator/arena/startOffset
    (i32.and
     (i32.add
      (get_global $HEAP_BASE)
@@ -405,8 +405,8 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
-   (get_global "$(lib)/allocator/arena/startOffset")
+  (set_global $~lib/allocator/arena/offset
+   (get_global $~lib/allocator/arena/startOffset)
   )
   (set_global $std/operator-overloading/a1
    (call $std/operator-overloading/Tester#constructor

tests/compiler/std/polyfills.optimized.wat

@@ -5,11 +5,11 @@
  (type $v (func))
  (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
  (memory $0 1)
- (data (i32.const 4) "\12\00\00\00(\00l\00i\00b\00)\00/\00p\00o\00l\00y\00f\00i\00l\00l\00s\00.\00t\00s")
+ (data (i32.const 4) "\11\00\00\00~\00l\00i\00b\00/\00p\00o\00l\00y\00f\00i\00l\00l\00s\00.\00t\00s")
  (data (i32.const 44) "\10\00\00\00s\00t\00d\00/\00p\00o\00l\00y\00f\00i\00l\00l\00s\00.\00t\00s")
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/polyfills/bswap16<u16>" (; 1 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/polyfills/bswap16<u16> (; 1 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.eqz
@@ -69,7 +69,7 @@
   )
   (get_local $0)
  )
- (func "$(lib)/polyfills/bswap<u16>" (; 2 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/polyfills/bswap<u16> (; 2 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.eqz
@@ -106,11 +106,11 @@
     (unreachable)
    )
   )
-  (call "$(lib)/polyfills/bswap16<u16>"
+  (call $~lib/polyfills/bswap16<u16>
    (get_local $0)
   )
  )
- (func "$(lib)/polyfills/bswap16<i16>" (; 3 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/polyfills/bswap16<i16> (; 3 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.eqz
@@ -176,7 +176,7 @@
   )
   (get_local $0)
  )
- (func "$(lib)/polyfills/bswap<i16>" (; 4 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/polyfills/bswap<i16> (; 4 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.eqz
@@ -213,11 +213,11 @@
     (unreachable)
    )
   )
-  (call "$(lib)/polyfills/bswap16<i16>"
+  (call $~lib/polyfills/bswap16<i16>
    (get_local $0)
   )
  )
- (func "$(lib)/polyfills/bswap<u32>" (; 5 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/polyfills/bswap<u32> (; 5 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.eqz
@@ -271,7 +271,7 @@
    )
   )
  )
- (func "$(lib)/polyfills/bswap<u64>" (; 6 ;) (type $II) (param $0 i64) (result i64)
+ (func $~lib/polyfills/bswap<u64> (; 6 ;) (type $II) (param $0 i64) (result i64)
   (local $1 i32)
   (if
    (i32.eqz
@@ -345,7 +345,7 @@
    (i64.const 32)
   )
  )
- (func "$(lib)/polyfills/bswap16<u32>" (; 7 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/polyfills/bswap16<u32> (; 7 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.eqz
@@ -411,7 +411,7 @@
   )
   (get_local $0)
  )
- (func "$(lib)/polyfills/bswap16<i32>" (; 8 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/polyfills/bswap16<i32> (; 8 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.eqz
@@ -480,7 +480,7 @@
  (func $start (; 9 ;) (type $v)
   (if
    (i32.ne
-    (call "$(lib)/polyfills/bswap<u16>"
+    (call $~lib/polyfills/bswap<u16>
      (i32.const 43707)
     )
     (i32.const 48042)
@@ -497,7 +497,7 @@
   )
   (if
    (i32.ne
-    (call "$(lib)/polyfills/bswap<i16>"
+    (call $~lib/polyfills/bswap<i16>
      (i32.const -21829)
     )
     (i32.const -17494)
@@ -514,7 +514,7 @@
   )
   (if
    (i32.ne
-    (call "$(lib)/polyfills/bswap<u32>"
+    (call $~lib/polyfills/bswap<u32>
      (i32.const -1430532899)
     )
     (i32.const -573785174)
@@ -531,7 +531,7 @@
   )
   (if
    (i32.ne
-    (call "$(lib)/polyfills/bswap<u32>"
+    (call $~lib/polyfills/bswap<u32>
      (i32.const -1430532899)
     )
     (i32.const -573785174)
@@ -548,7 +548,7 @@
   )
   (if
    (i64.ne
-    (call "$(lib)/polyfills/bswap<u64>"
+    (call $~lib/polyfills/bswap<u64>
      (i64.const 4822679907192029)
     )
     (i64.const -2464388556401798912)
@@ -565,7 +565,7 @@
   )
   (if
    (i64.ne
-    (call "$(lib)/polyfills/bswap<u64>"
+    (call $~lib/polyfills/bswap<u64>
      (i64.const 4822679907192029)
     )
     (i64.const -2464388556401798912)
@@ -582,7 +582,7 @@
   )
   (if
    (i32.ne
-    (call "$(lib)/polyfills/bswap<u32>"
+    (call $~lib/polyfills/bswap<u32>
      (i32.const -1430532899)
     )
     (i32.const -573785174)
@@ -599,7 +599,7 @@
   )
   (if
    (i32.ne
-    (call "$(lib)/polyfills/bswap<u32>"
+    (call $~lib/polyfills/bswap<u32>
      (i32.const -1430532899)
     )
     (i32.const -573785174)
@@ -616,7 +616,7 @@
   )
   (if
    (i32.ne
-    (call "$(lib)/polyfills/bswap16<u16>"
+    (call $~lib/polyfills/bswap16<u16>
      (i32.const 43707)
     )
     (i32.const 48042)
@@ -633,7 +633,7 @@
   )
   (if
    (i32.ne
-    (call "$(lib)/polyfills/bswap16<i16>"
+    (call $~lib/polyfills/bswap16<i16>
      (i32.const -21829)
     )
     (i32.const -17494)
@@ -650,7 +650,7 @@
   )
   (if
    (i32.ne
-    (call "$(lib)/polyfills/bswap16<u32>"
+    (call $~lib/polyfills/bswap16<u32>
      (i32.const -7820613)
     )
     (i32.const -7816278)
@@ -667,7 +667,7 @@
   )
   (if
    (i32.ne
-    (call "$(lib)/polyfills/bswap16<i32>"
+    (call $~lib/polyfills/bswap16<i32>
      (i32.const -7820613)
     )
     (i32.const -7816278)

tests/compiler/std/polyfills.untouched.wat

@@ -7,11 +7,11 @@
  (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
  (global $HEAP_BASE i32 (i32.const 80))
  (memory $0 1)
- (data (i32.const 4) "\12\00\00\00(\00l\00i\00b\00)\00/\00p\00o\00l\00y\00f\00i\00l\00l\00s\00.\00t\00s\00")
+ (data (i32.const 4) "\11\00\00\00~\00l\00i\00b\00/\00p\00o\00l\00y\00f\00i\00l\00l\00s\00.\00t\00s\00")
  (data (i32.const 44) "\10\00\00\00s\00t\00d\00/\00p\00o\00l\00y\00f\00i\00l\00l\00s\00.\00t\00s\00")
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/polyfills/bswap16<u16>" (; 1 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/polyfills/bswap16<u16> (; 1 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.eqz
@@ -102,7 +102,7 @@
    (get_local $0)
   )
  )
- (func "$(lib)/polyfills/bswap<u16>" (; 2 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/polyfills/bswap<u16> (; 2 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.eqz
@@ -159,7 +159,7 @@
   )
   (block
    (return
-    (call "$(lib)/polyfills/bswap16<u16>"
+    (call $~lib/polyfills/bswap16<u16>
      (get_local $0)
     )
    )
@@ -168,7 +168,7 @@
    (get_local $0)
   )
  )
- (func "$(lib)/polyfills/bswap16<i16>" (; 3 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/polyfills/bswap16<i16> (; 3 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.eqz
@@ -271,7 +271,7 @@
    (get_local $0)
   )
  )
- (func "$(lib)/polyfills/bswap<i16>" (; 4 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/polyfills/bswap<i16> (; 4 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.eqz
@@ -328,7 +328,7 @@
   )
   (block
    (return
-    (call "$(lib)/polyfills/bswap16<i16>"
+    (call $~lib/polyfills/bswap16<i16>
      (get_local $0)
     )
    )
@@ -337,7 +337,7 @@
    (get_local $0)
   )
  )
- (func "$(lib)/polyfills/bswap<u32>" (; 5 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/polyfills/bswap<u32> (; 5 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.eqz
@@ -416,7 +416,7 @@
    (get_local $0)
   )
  )
- (func "$(lib)/polyfills/bswap<i32>" (; 6 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/polyfills/bswap<i32> (; 6 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.eqz
@@ -495,7 +495,7 @@
    (get_local $0)
   )
  )
- (func "$(lib)/polyfills/bswap<u64>" (; 7 ;) (type $II) (param $0 i64) (result i64)
+ (func $~lib/polyfills/bswap<u64> (; 7 ;) (type $II) (param $0 i64) (result i64)
   (local $1 i32)
   (local $2 i64)
   (local $3 i64)
@@ -610,7 +610,7 @@
    (get_local $0)
   )
  )
- (func "$(lib)/polyfills/bswap<i64>" (; 8 ;) (type $II) (param $0 i64) (result i64)
+ (func $~lib/polyfills/bswap<i64> (; 8 ;) (type $II) (param $0 i64) (result i64)
   (local $1 i32)
   (local $2 i64)
   (local $3 i64)
@@ -725,7 +725,7 @@
    (get_local $0)
   )
  )
- (func "$(lib)/polyfills/bswap<usize>" (; 9 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/polyfills/bswap<usize> (; 9 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.eqz
@@ -804,7 +804,7 @@
    (get_local $0)
   )
  )
- (func "$(lib)/polyfills/bswap<isize>" (; 10 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/polyfills/bswap<isize> (; 10 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.eqz
@@ -883,7 +883,7 @@
    (get_local $0)
   )
  )
- (func "$(lib)/polyfills/bswap16<u32>" (; 11 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/polyfills/bswap16<u32> (; 11 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.eqz
@@ -966,7 +966,7 @@
    (get_local $0)
   )
  )
- (func "$(lib)/polyfills/bswap16<i32>" (; 12 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/polyfills/bswap16<i32> (; 12 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.eqz
@@ -1053,7 +1053,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/polyfills/bswap<u16>"
+     (call $~lib/polyfills/bswap<u16>
       (i32.const 43707)
      )
      (i32.const 48042)
@@ -1072,7 +1072,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/polyfills/bswap<i16>"
+     (call $~lib/polyfills/bswap<i16>
       (i32.shr_s
        (i32.shl
         (i32.const 43707)
@@ -1103,7 +1103,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/polyfills/bswap<u32>"
+     (call $~lib/polyfills/bswap<u32>
       (i32.const -1430532899)
      )
      (i32.const -573785174)
@@ -1122,7 +1122,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/polyfills/bswap<i32>"
+     (call $~lib/polyfills/bswap<i32>
       (i32.const -1430532899)
      )
      (i32.const -573785174)
@@ -1141,7 +1141,7 @@
   (if
    (i32.eqz
     (i64.eq
-     (call "$(lib)/polyfills/bswap<u64>"
+     (call $~lib/polyfills/bswap<u64>
       (i64.const 4822679907192029)
      )
      (i64.const -2464388556401798912)
@@ -1160,7 +1160,7 @@
   (if
    (i32.eqz
     (i64.eq
-     (call "$(lib)/polyfills/bswap<i64>"
+     (call $~lib/polyfills/bswap<i64>
       (i64.const 4822679907192029)
      )
      (i64.const -2464388556401798912)
@@ -1179,7 +1179,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/polyfills/bswap<usize>"
+     (call $~lib/polyfills/bswap<usize>
       (i32.const -1430532899)
      )
      (i32.const -573785174)
@@ -1198,7 +1198,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/polyfills/bswap<isize>"
+     (call $~lib/polyfills/bswap<isize>
       (i32.const -1430532899)
      )
      (i32.const -573785174)
@@ -1217,7 +1217,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/polyfills/bswap16<u16>"
+     (call $~lib/polyfills/bswap16<u16>
       (i32.const 43707)
      )
      (i32.const 48042)
@@ -1236,7 +1236,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/polyfills/bswap16<i16>"
+     (call $~lib/polyfills/bswap16<i16>
       (i32.shr_s
        (i32.shl
         (i32.const 43707)
@@ -1267,7 +1267,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/polyfills/bswap16<u32>"
+     (call $~lib/polyfills/bswap16<u32>
       (i32.const -7820613)
      )
      (i32.const -7816278)
@@ -1286,7 +1286,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/polyfills/bswap16<i32>"
+     (call $~lib/polyfills/bswap16<i32>
       (i32.const -7820613)
      )
      (i32.const -7816278)

tests/compiler/std/set.optimized.wat

@@ -6,16 +6,16 @@
  (type $iv (func (param i32)))
  (type $v (func))
  (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
- (global "$(lib)/allocator/arena/startOffset" (mut i32) (i32.const 0))
- (global "$(lib)/allocator/arena/offset" (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $std/set/set (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 56))
  (memory $0 1)
  (data (i32.const 4) "\n\00\00\00s\00t\00d\00/\00s\00e\00t\00.\00t\00s")
- (data (i32.const 28) "\0c\00\00\00(\00l\00i\00b\00)\00/\00s\00e\00t\00.\00t\00s")
+ (data (i32.const 28) "\0b\00\00\00~\00l\00i\00b\00/\00s\00e\00t\00.\00t\00s")
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/allocator/arena/allocate_memory" (; 1 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/allocator/arena/allocate_memory (; 1 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -35,7 +35,7 @@
       (i32.add
        (i32.add
         (tee_local $1
-         (get_global "$(lib)/allocator/arena/offset")
+         (get_global $~lib/allocator/arena/offset)
         )
         (get_local $0)
        )
@@ -92,17 +92,17 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
+  (set_global $~lib/allocator/arena/offset
    (get_local $2)
   )
   (get_local $1)
  )
- (func "$(lib)/set/Set<i32>#get:size" (; 2 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/set/Set<i32>#get:size (; 2 ;) (type $ii) (param $0 i32) (result i32)
   (i32.load offset=8
    (get_local $0)
   )
  )
- (func "$(lib)/memory/copy_memory" (; 3 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/copy_memory (; 3 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (loop $continue|0
@@ -1678,7 +1678,7 @@
    )
   )
  )
- (func "$(lib)/memory/move_memory" (; 4 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/move_memory (; 4 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (if
    (i32.eq
@@ -1711,7 +1711,7 @@
     (i32.const 1)
    )
    (block
-    (call "$(lib)/memory/copy_memory"
+    (call $~lib/memory/copy_memory
      (get_local $0)
      (get_local $1)
      (get_local $2)
@@ -1968,10 +1968,10 @@
    )
   )
  )
- (func "$(lib)/allocator/arena/free_memory" (; 5 ;) (type $iv) (param $0 i32)
+ (func $~lib/allocator/arena/free_memory (; 5 ;) (type $iv) (param $0 i32)
   (nop)
  )
- (func "$(lib)/set/Set<i32>#add" (; 6 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/set/Set<i32>#add (; 6 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (if
@@ -1999,7 +1999,7 @@
    )
    (block
     (set_local $2
-     (call "$(lib)/allocator/arena/allocate_memory"
+     (call $~lib/allocator/arena/allocate_memory
       (i32.shl
        (tee_local $3
         (select
@@ -2029,7 +2029,7 @@
       (get_local $0)
      )
      (block
-      (call "$(lib)/memory/move_memory"
+      (call $~lib/memory/move_memory
        (get_local $2)
        (i32.load
         (get_local $0)
@@ -2041,7 +2041,7 @@
         (i32.const 2)
        )
       )
-      (call "$(lib)/allocator/arena/free_memory"
+      (call $~lib/allocator/arena/free_memory
        (i32.load
         (get_local $0)
        )
@@ -2083,7 +2083,7 @@
   )
   (get_local $0)
  )
- (func "$(lib)/set/Set<i32>#has" (; 7 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/set/Set<i32>#has (; 7 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (if
@@ -2143,7 +2143,7 @@
   )
   (i32.const 0)
  )
- (func "$(lib)/set/Set<i32>#delete" (; 8 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/set/Set<i32>#delete (; 8 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (if
@@ -2196,7 +2196,7 @@
          )
          (get_local $3)
         )
-        (call "$(lib)/memory/move_memory"
+        (call $~lib/memory/move_memory
          (i32.add
           (i32.load
            (get_local $0)
@@ -2253,7 +2253,7 @@
   )
   (i32.const 0)
  )
- (func "$(lib)/set/Set<i32>#clear" (; 9 ;) (type $iv) (param $0 i32)
+ (func $~lib/set/Set<i32>#clear (; 9 ;) (type $iv) (param $0 i32)
   (if
    (i32.eqz
     (get_local $0)
@@ -2274,7 +2274,7 @@
   )
  )
  (func $start (; 10 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/startOffset"
+  (set_global $~lib/allocator/arena/startOffset
    (i32.and
     (i32.add
      (get_global $HEAP_BASE)
@@ -2283,16 +2283,16 @@
     (i32.const -8)
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
-   (get_global "$(lib)/allocator/arena/startOffset")
+  (set_global $~lib/allocator/arena/offset
+   (get_global $~lib/allocator/arena/startOffset)
   )
   (set_global $std/set/set
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.const 12)
    )
   )
   (if
-   (call "$(lib)/set/Set<i32>#get:size"
+   (call $~lib/set/Set<i32>#get:size
     (get_global $std/set/set)
    )
    (block
@@ -2306,26 +2306,26 @@
    )
   )
   (drop
-   (call "$(lib)/set/Set<i32>#add"
+   (call $~lib/set/Set<i32>#add
     (get_global $std/set/set)
     (i32.const 1)
    )
   )
   (drop
-   (call "$(lib)/set/Set<i32>#add"
+   (call $~lib/set/Set<i32>#add
     (get_global $std/set/set)
     (i32.const 0)
    )
   )
   (drop
-   (call "$(lib)/set/Set<i32>#add"
+   (call $~lib/set/Set<i32>#add
     (get_global $std/set/set)
     (i32.const 2)
    )
   )
   (if
    (i32.ne
-    (call "$(lib)/set/Set<i32>#get:size"
+    (call $~lib/set/Set<i32>#get:size
      (get_global $std/set/set)
     )
     (i32.const 3)
@@ -2342,7 +2342,7 @@
   )
   (if
    (i32.eqz
-    (call "$(lib)/set/Set<i32>#has"
+    (call $~lib/set/Set<i32>#has
      (get_global $std/set/set)
      (i32.const 1)
     )
@@ -2359,7 +2359,7 @@
   )
   (if
    (i32.eqz
-    (call "$(lib)/set/Set<i32>#has"
+    (call $~lib/set/Set<i32>#has
      (get_global $std/set/set)
      (i32.const 0)
     )
@@ -2376,7 +2376,7 @@
   )
   (if
    (i32.eqz
-    (call "$(lib)/set/Set<i32>#has"
+    (call $~lib/set/Set<i32>#has
      (get_global $std/set/set)
      (i32.const 2)
     )
@@ -2392,7 +2392,7 @@
    )
   )
   (if
-   (call "$(lib)/set/Set<i32>#has"
+   (call $~lib/set/Set<i32>#has
     (get_global $std/set/set)
     (i32.const 3)
    )
@@ -2407,14 +2407,14 @@
    )
   )
   (drop
-   (call "$(lib)/set/Set<i32>#delete"
+   (call $~lib/set/Set<i32>#delete
     (get_global $std/set/set)
     (i32.const 0)
    )
   )
   (if
    (i32.ne
-    (call "$(lib)/set/Set<i32>#get:size"
+    (call $~lib/set/Set<i32>#get:size
      (get_global $std/set/set)
     )
     (i32.const 2)
@@ -2431,7 +2431,7 @@
   )
   (if
    (i32.eqz
-    (call "$(lib)/set/Set<i32>#has"
+    (call $~lib/set/Set<i32>#has
      (get_global $std/set/set)
      (i32.const 1)
     )
@@ -2447,7 +2447,7 @@
    )
   )
   (if
-   (call "$(lib)/set/Set<i32>#has"
+   (call $~lib/set/Set<i32>#has
     (get_global $std/set/set)
     (i32.const 0)
    )
@@ -2463,7 +2463,7 @@
   )
   (if
    (i32.eqz
-    (call "$(lib)/set/Set<i32>#has"
+    (call $~lib/set/Set<i32>#has
      (get_global $std/set/set)
      (i32.const 2)
     )
@@ -2478,11 +2478,11 @@
     (unreachable)
    )
   )
-  (call "$(lib)/set/Set<i32>#clear"
+  (call $~lib/set/Set<i32>#clear
    (get_global $std/set/set)
   )
   (if
-   (call "$(lib)/set/Set<i32>#get:size"
+   (call $~lib/set/Set<i32>#get:size
     (get_global $std/set/set)
    )
    (block
@@ -2496,7 +2496,7 @@
    )
   )
   (if
-   (call "$(lib)/set/Set<i32>#has"
+   (call $~lib/set/Set<i32>#has
     (get_global $std/set/set)
     (i32.const 1)
    )

tests/compiler/std/set.untouched.wat

@@ -7,19 +7,19 @@
  (type $iv (func (param i32)))
  (type $v (func))
  (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
- (global "$(lib)/allocator/common/alignment/BITS" i32 (i32.const 3))
- (global "$(lib)/allocator/common/alignment/SIZE" i32 (i32.const 8))
- (global "$(lib)/allocator/common/alignment/MASK" i32 (i32.const 7))
- (global "$(lib)/allocator/arena/startOffset" (mut i32) (i32.const 0))
- (global "$(lib)/allocator/arena/offset" (mut i32) (i32.const 0))
+ (global $~lib/allocator/common/alignment/BITS i32 (i32.const 3))
+ (global $~lib/allocator/common/alignment/SIZE i32 (i32.const 8))
+ (global $~lib/allocator/common/alignment/MASK i32 (i32.const 7))
+ (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $std/set/set (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 56))
  (memory $0 1)
  (data (i32.const 4) "\n\00\00\00s\00t\00d\00/\00s\00e\00t\00.\00t\00s\00")
- (data (i32.const 28) "\0c\00\00\00(\00l\00i\00b\00)\00/\00s\00e\00t\00.\00t\00s\00")
+ (data (i32.const 28) "\0b\00\00\00~\00l\00i\00b\00/\00s\00e\00t\00.\00t\00s\00")
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/allocator/arena/allocate_memory" (; 1 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/allocator/arena/allocate_memory (; 1 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -35,7 +35,7 @@
    )
   )
   (set_local $1
-   (get_global "$(lib)/allocator/arena/offset")
+   (get_global $~lib/allocator/arena/offset)
   )
   (set_local $2
    (i32.and
@@ -115,21 +115,21 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
+  (set_global $~lib/allocator/arena/offset
    (get_local $2)
   )
   (return
    (get_local $1)
   )
  )
- (func "$(lib)/set/Set<i32>#get:size" (; 2 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/set/Set<i32>#get:size (; 2 ;) (type $ii) (param $0 i32) (result i32)
   (return
    (i32.load offset=8
     (get_local $0)
    )
   )
  )
- (func "$(lib)/memory/copy_memory" (; 3 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/copy_memory (; 3 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -1932,7 +1932,7 @@
    )
   )
  )
- (func "$(lib)/memory/move_memory" (; 4 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/move_memory (; 4 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (if
    (i32.eq
@@ -1965,7 +1965,7 @@
     (i32.const 1)
    )
    (block
-    (call "$(lib)/memory/copy_memory"
+    (call $~lib/memory/copy_memory
      (get_local $0)
      (get_local $1)
      (get_local $2)
@@ -2255,9 +2255,9 @@
    )
   )
  )
- (func "$(lib)/allocator/arena/free_memory" (; 5 ;) (type $iv) (param $0 i32)
+ (func $~lib/allocator/arena/free_memory (; 5 ;) (type $iv) (param $0 i32)
  )
- (func "$(lib)/set/Set<i32>#add" (; 6 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/set/Set<i32>#add (; 6 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (if
@@ -2307,7 +2307,7 @@
      )
     )
     (set_local $3
-     (call "$(lib)/allocator/arena/allocate_memory"
+     (call $~lib/allocator/arena/allocate_memory
       (i32.mul
        (get_local $2)
        (i32.const 4)
@@ -2319,7 +2319,7 @@
       (get_local $0)
      )
      (block
-      (call "$(lib)/memory/move_memory"
+      (call $~lib/memory/move_memory
        (get_local $3)
        (i32.load
         (get_local $0)
@@ -2331,7 +2331,7 @@
         (i32.const 4)
        )
       )
-      (call "$(lib)/allocator/arena/free_memory"
+      (call $~lib/allocator/arena/free_memory
        (i32.load
         (get_local $0)
        )
@@ -2375,7 +2375,7 @@
    (get_local $0)
   )
  )
- (func "$(lib)/set/Set<i32>#has" (; 7 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/set/Set<i32>#has (; 7 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (if
@@ -2449,7 +2449,7 @@
    (i32.const 0)
   )
  )
- (func "$(lib)/set/Set<i32>#delete" (; 8 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/set/Set<i32>#delete (; 8 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (if
@@ -2512,7 +2512,7 @@
            )
            (get_local $3)
           )
-          (call "$(lib)/memory/move_memory"
+          (call $~lib/memory/move_memory
            (i32.add
             (i32.load
              (get_local $0)
@@ -2573,7 +2573,7 @@
    (i32.const 0)
   )
  )
- (func "$(lib)/set/Set<i32>#clear" (; 9 ;) (type $iv) (param $0 i32)
+ (func $~lib/set/Set<i32>#clear (; 9 ;) (type $iv) (param $0 i32)
   (if
    (i32.eqz
     (i32.ne
@@ -2597,7 +2597,7 @@
   )
  )
  (func $start (; 10 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/startOffset"
+  (set_global $~lib/allocator/arena/startOffset
    (i32.and
     (i32.add
      (get_global $HEAP_BASE)
@@ -2609,11 +2609,11 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
-   (get_global "$(lib)/allocator/arena/startOffset")
+  (set_global $~lib/allocator/arena/offset
+   (get_global $~lib/allocator/arena/startOffset)
   )
   (set_global $std/set/set
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.add
      (i32.const 4)
      (i32.mul
@@ -2626,7 +2626,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/set/Set<i32>#get:size"
+     (call $~lib/set/Set<i32>#get:size
       (get_global $std/set/set)
      )
      (i32.const 0)
@@ -2643,19 +2643,19 @@
    )
   )
   (drop
-   (call "$(lib)/set/Set<i32>#add"
+   (call $~lib/set/Set<i32>#add
     (get_global $std/set/set)
     (i32.const 1)
    )
   )
   (drop
-   (call "$(lib)/set/Set<i32>#add"
+   (call $~lib/set/Set<i32>#add
     (get_global $std/set/set)
     (i32.const 0)
    )
   )
   (drop
-   (call "$(lib)/set/Set<i32>#add"
+   (call $~lib/set/Set<i32>#add
     (get_global $std/set/set)
     (i32.const 2)
    )
@@ -2663,7 +2663,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/set/Set<i32>#get:size"
+     (call $~lib/set/Set<i32>#get:size
       (get_global $std/set/set)
      )
      (i32.const 3)
@@ -2681,7 +2681,7 @@
   )
   (if
    (i32.eqz
-    (call "$(lib)/set/Set<i32>#has"
+    (call $~lib/set/Set<i32>#has
      (get_global $std/set/set)
      (i32.const 1)
     )
@@ -2698,7 +2698,7 @@
   )
   (if
    (i32.eqz
-    (call "$(lib)/set/Set<i32>#has"
+    (call $~lib/set/Set<i32>#has
      (get_global $std/set/set)
      (i32.const 0)
     )
@@ -2715,7 +2715,7 @@
   )
   (if
    (i32.eqz
-    (call "$(lib)/set/Set<i32>#has"
+    (call $~lib/set/Set<i32>#has
      (get_global $std/set/set)
      (i32.const 2)
     )
@@ -2733,7 +2733,7 @@
   (if
    (i32.eqz
     (i32.eqz
-     (call "$(lib)/set/Set<i32>#has"
+     (call $~lib/set/Set<i32>#has
       (get_global $std/set/set)
       (i32.const 3)
      )
@@ -2750,7 +2750,7 @@
    )
   )
   (drop
-   (call "$(lib)/set/Set<i32>#delete"
+   (call $~lib/set/Set<i32>#delete
     (get_global $std/set/set)
     (i32.const 0)
    )
@@ -2758,7 +2758,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/set/Set<i32>#get:size"
+     (call $~lib/set/Set<i32>#get:size
       (get_global $std/set/set)
      )
      (i32.const 2)
@@ -2776,7 +2776,7 @@
   )
   (if
    (i32.eqz
-    (call "$(lib)/set/Set<i32>#has"
+    (call $~lib/set/Set<i32>#has
      (get_global $std/set/set)
      (i32.const 1)
     )
@@ -2794,7 +2794,7 @@
   (if
    (i32.eqz
     (i32.eqz
-     (call "$(lib)/set/Set<i32>#has"
+     (call $~lib/set/Set<i32>#has
       (get_global $std/set/set)
       (i32.const 0)
      )
@@ -2812,7 +2812,7 @@
   )
   (if
    (i32.eqz
-    (call "$(lib)/set/Set<i32>#has"
+    (call $~lib/set/Set<i32>#has
      (get_global $std/set/set)
      (i32.const 2)
     )
@@ -2827,13 +2827,13 @@
     (unreachable)
    )
   )
-  (call "$(lib)/set/Set<i32>#clear"
+  (call $~lib/set/Set<i32>#clear
    (get_global $std/set/set)
   )
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/set/Set<i32>#get:size"
+     (call $~lib/set/Set<i32>#get:size
       (get_global $std/set/set)
      )
      (i32.const 0)
@@ -2852,7 +2852,7 @@
   (if
    (i32.eqz
     (i32.eqz
-     (call "$(lib)/set/Set<i32>#has"
+     (call $~lib/set/Set<i32>#has
       (get_global $std/set/set)
       (i32.const 1)
      )

tests/compiler/std/static-array.optimized.wat

@@ -13,8 +13,8 @@
  (type $iiFv (func (param i32 i32 f64)))
  (type $v (func))
  (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
- (global "$(lib)/allocator/arena/startOffset" (mut i32) (i32.const 0))
- (global "$(lib)/allocator/arena/offset" (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 192))
  (memory $0 1)
  (data (i32.const 8) "\14\00\00\00\02\00\00\00\02\00\00\00\01\00\00\00\02")
@@ -23,15 +23,15 @@
  (data (i32.const 88) "d\00\00\00\02\00\00\00\02")
  (data (i32.const 106) "\f4?\00\00\00\00\00\00\02@")
  (data (i32.const 116) "\13\00\00\00s\00t\00d\00/\00s\00t\00a\00t\00i\00c\00-\00a\00r\00r\00a\00y\00.\00t\00s")
- (data (i32.const 160) "\0e\00\00\00(\00l\00i\00b\00)\00/\00a\00r\00r\00a\00y\00.\00t\00s")
+ (data (i32.const 160) "\0d\00\00\00~\00l\00i\00b\00/\00a\00r\00r\00a\00y\00.\00t\00s")
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/array/Array<i32>#get:length" (; 1 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length (; 1 ;) (type $ii) (param $0 i32) (result i32)
   (i32.load offset=8
    (get_local $0)
   )
  )
- (func "$(lib)/array/Array<i32>#__get" (; 2 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (; 2 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (if
    (i32.ge_u
     (get_local $1)
@@ -53,7 +53,7 @@
    )
   )
  )
- (func "$(lib)/allocator/arena/allocate_memory" (; 3 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/allocator/arena/allocate_memory (; 3 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -73,7 +73,7 @@
       (i32.add
        (i32.add
         (tee_local $1
-         (get_global "$(lib)/allocator/arena/offset")
+         (get_global $~lib/allocator/arena/offset)
         )
         (get_local $0)
        )
@@ -130,12 +130,12 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
+  (set_global $~lib/allocator/arena/offset
    (get_local $2)
   )
   (get_local $1)
  )
- (func "$(lib)/memory/copy_memory" (; 4 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/copy_memory (; 4 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (loop $continue|0
@@ -1711,7 +1711,7 @@
    )
   )
  )
- (func "$(lib)/memory/move_memory" (; 5 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/move_memory (; 5 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (if
    (i32.eq
@@ -1744,7 +1744,7 @@
     (i32.const 1)
    )
    (block
-    (call "$(lib)/memory/copy_memory"
+    (call $~lib/memory/copy_memory
      (get_local $0)
      (get_local $1)
      (get_local $2)
@@ -2001,10 +2001,10 @@
    )
   )
  )
- (func "$(lib)/allocator/arena/free_memory" (; 6 ;) (type $iv) (param $0 i32)
+ (func $~lib/allocator/arena/free_memory (; 6 ;) (type $iv) (param $0 i32)
   (nop)
  )
- (func "$(lib)/array/Array<i32>#__grow" (; 7 ;) (type $iiv) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>#__grow (; 7 ;) (type $iiv) (param $0 i32) (param $1 i32)
   (local $2 i32)
   (if
    (i32.le_s
@@ -2024,7 +2024,7 @@
    )
   )
   (set_local $2
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.shl
      (get_local $1)
      (i32.const 2)
@@ -2036,7 +2036,7 @@
     (get_local $0)
    )
    (block
-    (call "$(lib)/memory/move_memory"
+    (call $~lib/memory/move_memory
      (get_local $2)
      (i32.load
       (get_local $0)
@@ -2048,7 +2048,7 @@
       (i32.const 2)
      )
     )
-    (call "$(lib)/allocator/arena/free_memory"
+    (call $~lib/allocator/arena/free_memory
      (i32.load
       (get_local $0)
      )
@@ -2064,7 +2064,7 @@
    (get_local $1)
   )
  )
- (func "$(lib)/array/Array<i32>#__set" (; 8 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<i32>#__set (; 8 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (if
@@ -2081,7 +2081,7 @@
      (get_local $0)
     )
    )
-   (call "$(lib)/array/Array<i32>#__grow"
+   (call $~lib/array/Array<i32>#__grow
     (get_local $0)
     (select
      (tee_local $3
@@ -2118,7 +2118,7 @@
    (get_local $2)
   )
  )
- (func "$(lib)/array/Array<i64>#__get" (; 9 ;) (type $iiI) (param $0 i32) (param $1 i32) (result i64)
+ (func $~lib/array/Array<i64>#__get (; 9 ;) (type $iiI) (param $0 i32) (param $1 i32) (result i64)
   (if
    (i32.ge_u
     (get_local $1)
@@ -2140,7 +2140,7 @@
    )
   )
  )
- (func "$(lib)/array/Array<i64>#__grow" (; 10 ;) (type $iiv) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i64>#__grow (; 10 ;) (type $iiv) (param $0 i32) (param $1 i32)
   (local $2 i32)
   (if
    (i32.le_s
@@ -2160,7 +2160,7 @@
    )
   )
   (set_local $2
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.shl
      (get_local $1)
      (i32.const 3)
@@ -2172,7 +2172,7 @@
     (get_local $0)
    )
    (block
-    (call "$(lib)/memory/move_memory"
+    (call $~lib/memory/move_memory
      (get_local $2)
      (i32.load
       (get_local $0)
@@ -2184,7 +2184,7 @@
       (i32.const 3)
      )
     )
-    (call "$(lib)/allocator/arena/free_memory"
+    (call $~lib/allocator/arena/free_memory
      (i32.load
       (get_local $0)
      )
@@ -2200,7 +2200,7 @@
    (get_local $1)
   )
  )
- (func "$(lib)/array/Array<i64>#__set" (; 11 ;) (type $iiIv) (param $0 i32) (param $1 i32) (param $2 i64)
+ (func $~lib/array/Array<i64>#__set (; 11 ;) (type $iiIv) (param $0 i32) (param $1 i32) (param $2 i64)
   (local $3 i32)
   (local $4 i32)
   (if
@@ -2217,7 +2217,7 @@
      (get_local $0)
     )
    )
-   (call "$(lib)/array/Array<i64>#__grow"
+   (call $~lib/array/Array<i64>#__grow
     (get_local $0)
     (select
      (tee_local $3
@@ -2254,7 +2254,7 @@
    (get_local $2)
   )
  )
- (func "$(lib)/array/Array<f32>#__get" (; 12 ;) (type $iif) (param $0 i32) (param $1 i32) (result f32)
+ (func $~lib/array/Array<f32>#__get (; 12 ;) (type $iif) (param $0 i32) (param $1 i32) (result f32)
   (if
    (i32.ge_u
     (get_local $1)
@@ -2276,7 +2276,7 @@
    )
   )
  )
- (func "$(lib)/array/Array<f32>#__set" (; 13 ;) (type $iifv) (param $0 i32) (param $1 i32) (param $2 f32)
+ (func $~lib/array/Array<f32>#__set (; 13 ;) (type $iifv) (param $0 i32) (param $1 i32) (param $2 f32)
   (local $3 i32)
   (local $4 i32)
   (if
@@ -2293,7 +2293,7 @@
      (get_local $0)
     )
    )
-   (call "$(lib)/array/Array<i32>#__grow"
+   (call $~lib/array/Array<i32>#__grow
     (get_local $0)
     (select
      (tee_local $3
@@ -2330,7 +2330,7 @@
    (get_local $2)
   )
  )
- (func "$(lib)/array/Array<f64>#__get" (; 14 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
+ (func $~lib/array/Array<f64>#__get (; 14 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
   (if
    (i32.ge_u
     (get_local $1)
@@ -2352,7 +2352,7 @@
    )
   )
  )
- (func "$(lib)/array/Array<f64>#__set" (; 15 ;) (type $iiFv) (param $0 i32) (param $1 i32) (param $2 f64)
+ (func $~lib/array/Array<f64>#__set (; 15 ;) (type $iiFv) (param $0 i32) (param $1 i32) (param $2 f64)
   (local $3 i32)
   (local $4 i32)
   (if
@@ -2369,7 +2369,7 @@
      (get_local $0)
     )
    )
-   (call "$(lib)/array/Array<i64>#__grow"
+   (call $~lib/array/Array<i64>#__grow
     (get_local $0)
     (select
      (tee_local $3
@@ -2407,7 +2407,7 @@
   )
  )
  (func $start (; 16 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/startOffset"
+  (set_global $~lib/allocator/arena/startOffset
    (i32.and
     (i32.add
      (get_global $HEAP_BASE)
@@ -2416,12 +2416,12 @@
     (i32.const -8)
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
-   (get_global "$(lib)/allocator/arena/startOffset")
+  (set_global $~lib/allocator/arena/offset
+   (get_global $~lib/allocator/arena/startOffset)
   )
   (if
    (i32.ne
-    (call "$(lib)/array/Array<i32>#get:length"
+    (call $~lib/array/Array<i32>#get:length
      (i32.const 8)
     )
     (i32.const 2)
@@ -2438,7 +2438,7 @@
   )
   (if
    (i32.ne
-    (call "$(lib)/array/Array<i32>#__get"
+    (call $~lib/array/Array<i32>#__get
      (i32.const 8)
      (i32.const 0)
     )
@@ -2456,7 +2456,7 @@
   )
   (if
    (i32.ne
-    (call "$(lib)/array/Array<i32>#__get"
+    (call $~lib/array/Array<i32>#__get
      (i32.const 8)
      (i32.const 1)
     )
@@ -2472,14 +2472,14 @@
     (unreachable)
    )
   )
-  (call "$(lib)/array/Array<i32>#__set"
+  (call $~lib/array/Array<i32>#__set
    (i32.const 8)
    (i32.const 0)
    (i32.const 2)
   )
   (if
    (i32.ne
-    (call "$(lib)/array/Array<i32>#__get"
+    (call $~lib/array/Array<i32>#__get
      (i32.const 8)
      (i32.const 0)
     )
@@ -2497,7 +2497,7 @@
   )
   (if
    (i32.ne
-    (call "$(lib)/array/Array<i32>#get:length"
+    (call $~lib/array/Array<i32>#get:length
      (i32.const 32)
     )
     (i32.const 2)
@@ -2514,7 +2514,7 @@
   )
   (if
    (i64.ne
-    (call "$(lib)/array/Array<i64>#__get"
+    (call $~lib/array/Array<i64>#__get
      (i32.const 32)
      (i32.const 0)
     )
@@ -2532,7 +2532,7 @@
   )
   (if
    (i64.ne
-    (call "$(lib)/array/Array<i64>#__get"
+    (call $~lib/array/Array<i64>#__get
      (i32.const 32)
      (i32.const 1)
     )
@@ -2548,14 +2548,14 @@
     (unreachable)
    )
   )
-  (call "$(lib)/array/Array<i64>#__set"
+  (call $~lib/array/Array<i64>#__set
    (i32.const 32)
    (i32.const 0)
    (i64.const 4)
   )
   (if
    (i64.ne
-    (call "$(lib)/array/Array<i64>#__get"
+    (call $~lib/array/Array<i64>#__get
      (i32.const 32)
      (i32.const 0)
     )
@@ -2573,7 +2573,7 @@
   )
   (if
    (i32.ne
-    (call "$(lib)/array/Array<i32>#get:length"
+    (call $~lib/array/Array<i32>#get:length
      (i32.const 64)
     )
     (i32.const 2)
@@ -2590,7 +2590,7 @@
   )
   (if
    (f32.ne
-    (call "$(lib)/array/Array<f32>#__get"
+    (call $~lib/array/Array<f32>#__get
      (i32.const 64)
      (i32.const 0)
     )
@@ -2608,7 +2608,7 @@
   )
   (if
    (f32.ne
-    (call "$(lib)/array/Array<f32>#__get"
+    (call $~lib/array/Array<f32>#__get
      (i32.const 64)
      (i32.const 1)
     )
@@ -2624,14 +2624,14 @@
     (unreachable)
    )
   )
-  (call "$(lib)/array/Array<f32>#__set"
+  (call $~lib/array/Array<f32>#__set
    (i32.const 64)
    (i32.const 0)
    (f32.const 2.5)
   )
   (if
    (f32.ne
-    (call "$(lib)/array/Array<f32>#__get"
+    (call $~lib/array/Array<f32>#__get
      (i32.const 64)
      (i32.const 0)
     )
@@ -2649,7 +2649,7 @@
   )
   (if
    (i32.ne
-    (call "$(lib)/array/Array<i32>#get:length"
+    (call $~lib/array/Array<i32>#get:length
      (i32.const 88)
     )
     (i32.const 2)
@@ -2666,7 +2666,7 @@
   )
   (if
    (f64.ne
-    (call "$(lib)/array/Array<f64>#__get"
+    (call $~lib/array/Array<f64>#__get
      (i32.const 88)
      (i32.const 0)
     )
@@ -2684,7 +2684,7 @@
   )
   (if
    (f64.ne
-    (call "$(lib)/array/Array<f64>#__get"
+    (call $~lib/array/Array<f64>#__get
      (i32.const 88)
      (i32.const 1)
     )
@@ -2700,14 +2700,14 @@
     (unreachable)
    )
   )
-  (call "$(lib)/array/Array<f64>#__set"
+  (call $~lib/array/Array<f64>#__set
    (i32.const 88)
    (i32.const 0)
    (f64.const 2.25)
   )
   (if
    (f64.ne
-    (call "$(lib)/array/Array<f64>#__get"
+    (call $~lib/array/Array<f64>#__get
      (i32.const 88)
      (i32.const 0)
     )

tests/compiler/std/static-array.untouched.wat

@@ -17,11 +17,11 @@
  (type $iiFv (func (param i32 i32 f64)))
  (type $v (func))
  (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
- (global "$(lib)/allocator/common/alignment/BITS" i32 (i32.const 3))
- (global "$(lib)/allocator/common/alignment/SIZE" i32 (i32.const 8))
- (global "$(lib)/allocator/common/alignment/MASK" i32 (i32.const 7))
- (global "$(lib)/allocator/arena/startOffset" (mut i32) (i32.const 0))
- (global "$(lib)/allocator/arena/offset" (mut i32) (i32.const 0))
+ (global $~lib/allocator/common/alignment/BITS i32 (i32.const 3))
+ (global $~lib/allocator/common/alignment/SIZE i32 (i32.const 8))
+ (global $~lib/allocator/common/alignment/MASK i32 (i32.const 7))
+ (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $std/static-array/i i32 (i32.const 8))
  (global $std/static-array/I i32 (i32.const 32))
  (global $std/static-array/f i32 (i32.const 64))
@@ -33,17 +33,17 @@
  (data (i32.const 64) "L\00\00\00\02\00\00\00\02\00\00\00\00\00\c0?\00\00 @")
  (data (i32.const 88) "d\00\00\00\02\00\00\00\02\00\00\00\00\00\00\00\00\00\f4?\00\00\00\00\00\00\02@")
  (data (i32.const 116) "\13\00\00\00s\00t\00d\00/\00s\00t\00a\00t\00i\00c\00-\00a\00r\00r\00a\00y\00.\00t\00s\00")
- (data (i32.const 160) "\0e\00\00\00(\00l\00i\00b\00)\00/\00a\00r\00r\00a\00y\00.\00t\00s\00")
+ (data (i32.const 160) "\0d\00\00\00~\00l\00i\00b\00/\00a\00r\00r\00a\00y\00.\00t\00s\00")
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/array/Array<i32>#get:length" (; 1 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length (; 1 ;) (type $ii) (param $0 i32) (result i32)
   (return
    (i32.load offset=8
     (get_local $0)
    )
   )
  )
- (func "$(lib)/array/Array<i32>#__get" (; 2 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (; 2 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (if
    (i32.ge_u
     (get_local $1)
@@ -67,7 +67,7 @@
    )
   )
  )
- (func "$(lib)/allocator/arena/allocate_memory" (; 3 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/allocator/arena/allocate_memory (; 3 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -83,7 +83,7 @@
    )
   )
   (set_local $1
-   (get_global "$(lib)/allocator/arena/offset")
+   (get_global $~lib/allocator/arena/offset)
   )
   (set_local $2
    (i32.and
@@ -163,14 +163,14 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
+  (set_global $~lib/allocator/arena/offset
    (get_local $2)
   )
   (return
    (get_local $1)
   )
  )
- (func "$(lib)/memory/copy_memory" (; 4 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/copy_memory (; 4 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -1973,7 +1973,7 @@
    )
   )
  )
- (func "$(lib)/memory/move_memory" (; 5 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/move_memory (; 5 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (if
    (i32.eq
@@ -2006,7 +2006,7 @@
     (i32.const 1)
    )
    (block
-    (call "$(lib)/memory/copy_memory"
+    (call $~lib/memory/copy_memory
      (get_local $0)
      (get_local $1)
      (get_local $2)
@@ -2296,9 +2296,9 @@
    )
   )
  )
- (func "$(lib)/allocator/arena/free_memory" (; 6 ;) (type $iv) (param $0 i32)
+ (func $~lib/allocator/arena/free_memory (; 6 ;) (type $iv) (param $0 i32)
  )
- (func "$(lib)/array/Array<i32>#__grow" (; 7 ;) (type $iiv) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>#__grow (; 7 ;) (type $iiv) (param $0 i32) (param $1 i32)
   (local $2 i32)
   (if
    (i32.eqz
@@ -2320,7 +2320,7 @@
    )
   )
   (set_local $2
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.mul
      (get_local $1)
      (i32.const 4)
@@ -2332,7 +2332,7 @@
     (get_local $0)
    )
    (block
-    (call "$(lib)/memory/move_memory"
+    (call $~lib/memory/move_memory
      (get_local $2)
      (i32.load
       (get_local $0)
@@ -2344,7 +2344,7 @@
       (i32.const 4)
      )
     )
-    (call "$(lib)/allocator/arena/free_memory"
+    (call $~lib/allocator/arena/free_memory
      (i32.load
       (get_local $0)
      )
@@ -2360,7 +2360,7 @@
    (get_local $1)
   )
  )
- (func "$(lib)/array/Array<i32>#__set" (; 8 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<i32>#__set (; 8 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (if
@@ -2377,7 +2377,7 @@
      (get_local $0)
     )
    )
-   (call "$(lib)/array/Array<i32>#__grow"
+   (call $~lib/array/Array<i32>#__grow
     (get_local $0)
     (select
      (tee_local $3
@@ -2414,14 +2414,14 @@
    (get_local $2)
   )
  )
- (func "$(lib)/array/Array<i64>#get:length" (; 9 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/array/Array<i64>#get:length (; 9 ;) (type $ii) (param $0 i32) (result i32)
   (return
    (i32.load offset=8
     (get_local $0)
    )
   )
  )
- (func "$(lib)/array/Array<i64>#__get" (; 10 ;) (type $iiI) (param $0 i32) (param $1 i32) (result i64)
+ (func $~lib/array/Array<i64>#__get (; 10 ;) (type $iiI) (param $0 i32) (param $1 i32) (result i64)
   (if
    (i32.ge_u
     (get_local $1)
@@ -2445,7 +2445,7 @@
    )
   )
  )
- (func "$(lib)/array/Array<i64>#__grow" (; 11 ;) (type $iiv) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i64>#__grow (; 11 ;) (type $iiv) (param $0 i32) (param $1 i32)
   (local $2 i32)
   (if
    (i32.eqz
@@ -2467,7 +2467,7 @@
    )
   )
   (set_local $2
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.mul
      (get_local $1)
      (i32.const 8)
@@ -2479,7 +2479,7 @@
     (get_local $0)
    )
    (block
-    (call "$(lib)/memory/move_memory"
+    (call $~lib/memory/move_memory
      (get_local $2)
      (i32.load
       (get_local $0)
@@ -2491,7 +2491,7 @@
       (i32.const 8)
      )
     )
-    (call "$(lib)/allocator/arena/free_memory"
+    (call $~lib/allocator/arena/free_memory
      (i32.load
       (get_local $0)
      )
@@ -2507,7 +2507,7 @@
    (get_local $1)
   )
  )
- (func "$(lib)/array/Array<i64>#__set" (; 12 ;) (type $iiIv) (param $0 i32) (param $1 i32) (param $2 i64)
+ (func $~lib/array/Array<i64>#__set (; 12 ;) (type $iiIv) (param $0 i32) (param $1 i32) (param $2 i64)
   (local $3 i32)
   (local $4 i32)
   (if
@@ -2524,7 +2524,7 @@
      (get_local $0)
     )
    )
-   (call "$(lib)/array/Array<i64>#__grow"
+   (call $~lib/array/Array<i64>#__grow
     (get_local $0)
     (select
      (tee_local $3
@@ -2561,14 +2561,14 @@
    (get_local $2)
   )
  )
- (func "$(lib)/array/Array<f32>#get:length" (; 13 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/array/Array<f32>#get:length (; 13 ;) (type $ii) (param $0 i32) (result i32)
   (return
    (i32.load offset=8
     (get_local $0)
    )
   )
  )
- (func "$(lib)/array/Array<f32>#__get" (; 14 ;) (type $iif) (param $0 i32) (param $1 i32) (result f32)
+ (func $~lib/array/Array<f32>#__get (; 14 ;) (type $iif) (param $0 i32) (param $1 i32) (result f32)
   (if
    (i32.ge_u
     (get_local $1)
@@ -2592,7 +2592,7 @@
    )
   )
  )
- (func "$(lib)/array/Array<f32>#__grow" (; 15 ;) (type $iiv) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<f32>#__grow (; 15 ;) (type $iiv) (param $0 i32) (param $1 i32)
   (local $2 i32)
   (if
    (i32.eqz
@@ -2614,7 +2614,7 @@
    )
   )
   (set_local $2
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.mul
      (get_local $1)
      (i32.const 4)
@@ -2626,7 +2626,7 @@
     (get_local $0)
    )
    (block
-    (call "$(lib)/memory/move_memory"
+    (call $~lib/memory/move_memory
      (get_local $2)
      (i32.load
       (get_local $0)
@@ -2638,7 +2638,7 @@
       (i32.const 4)
      )
     )
-    (call "$(lib)/allocator/arena/free_memory"
+    (call $~lib/allocator/arena/free_memory
      (i32.load
       (get_local $0)
      )
@@ -2654,7 +2654,7 @@
    (get_local $1)
   )
  )
- (func "$(lib)/array/Array<f32>#__set" (; 16 ;) (type $iifv) (param $0 i32) (param $1 i32) (param $2 f32)
+ (func $~lib/array/Array<f32>#__set (; 16 ;) (type $iifv) (param $0 i32) (param $1 i32) (param $2 f32)
   (local $3 i32)
   (local $4 i32)
   (if
@@ -2671,7 +2671,7 @@
      (get_local $0)
     )
    )
-   (call "$(lib)/array/Array<f32>#__grow"
+   (call $~lib/array/Array<f32>#__grow
     (get_local $0)
     (select
      (tee_local $3
@@ -2708,14 +2708,14 @@
    (get_local $2)
   )
  )
- (func "$(lib)/array/Array<f64>#get:length" (; 17 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/array/Array<f64>#get:length (; 17 ;) (type $ii) (param $0 i32) (result i32)
   (return
    (i32.load offset=8
     (get_local $0)
    )
   )
  )
- (func "$(lib)/array/Array<f64>#__get" (; 18 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
+ (func $~lib/array/Array<f64>#__get (; 18 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
   (if
    (i32.ge_u
     (get_local $1)
@@ -2739,7 +2739,7 @@
    )
   )
  )
- (func "$(lib)/array/Array<f64>#__grow" (; 19 ;) (type $iiv) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<f64>#__grow (; 19 ;) (type $iiv) (param $0 i32) (param $1 i32)
   (local $2 i32)
   (if
    (i32.eqz
@@ -2761,7 +2761,7 @@
    )
   )
   (set_local $2
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.mul
      (get_local $1)
      (i32.const 8)
@@ -2773,7 +2773,7 @@
     (get_local $0)
    )
    (block
-    (call "$(lib)/memory/move_memory"
+    (call $~lib/memory/move_memory
      (get_local $2)
      (i32.load
       (get_local $0)
@@ -2785,7 +2785,7 @@
       (i32.const 8)
      )
     )
-    (call "$(lib)/allocator/arena/free_memory"
+    (call $~lib/allocator/arena/free_memory
      (i32.load
       (get_local $0)
      )
@@ -2801,7 +2801,7 @@
    (get_local $1)
   )
  )
- (func "$(lib)/array/Array<f64>#__set" (; 20 ;) (type $iiFv) (param $0 i32) (param $1 i32) (param $2 f64)
+ (func $~lib/array/Array<f64>#__set (; 20 ;) (type $iiFv) (param $0 i32) (param $1 i32) (param $2 f64)
   (local $3 i32)
   (local $4 i32)
   (if
@@ -2818,7 +2818,7 @@
      (get_local $0)
     )
    )
-   (call "$(lib)/array/Array<f64>#__grow"
+   (call $~lib/array/Array<f64>#__grow
     (get_local $0)
     (select
      (tee_local $3
@@ -2856,7 +2856,7 @@
   )
  )
  (func $start (; 21 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/startOffset"
+  (set_global $~lib/allocator/arena/startOffset
    (i32.and
     (i32.add
      (get_global $HEAP_BASE)
@@ -2868,13 +2868,13 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
-   (get_global "$(lib)/allocator/arena/startOffset")
+  (set_global $~lib/allocator/arena/offset
+   (get_global $~lib/allocator/arena/startOffset)
   )
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/array/Array<i32>#get:length"
+     (call $~lib/array/Array<i32>#get:length
       (i32.const 8)
      )
      (i32.const 2)
@@ -2893,7 +2893,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/array/Array<i32>#__get"
+     (call $~lib/array/Array<i32>#__get
       (i32.const 8)
       (i32.const 0)
      )
@@ -2913,7 +2913,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/array/Array<i32>#__get"
+     (call $~lib/array/Array<i32>#__get
       (i32.const 8)
       (i32.const 1)
      )
@@ -2930,7 +2930,7 @@
     (unreachable)
    )
   )
-  (call "$(lib)/array/Array<i32>#__set"
+  (call $~lib/array/Array<i32>#__set
    (i32.const 8)
    (i32.const 0)
    (i32.const 2)
@@ -2938,7 +2938,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/array/Array<i32>#__get"
+     (call $~lib/array/Array<i32>#__get
       (i32.const 8)
       (i32.const 0)
      )
@@ -2958,7 +2958,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/array/Array<i64>#get:length"
+     (call $~lib/array/Array<i64>#get:length
       (i32.const 32)
      )
      (i32.const 2)
@@ -2977,7 +2977,7 @@
   (if
    (i32.eqz
     (i64.eq
-     (call "$(lib)/array/Array<i64>#__get"
+     (call $~lib/array/Array<i64>#__get
       (i32.const 32)
       (i32.const 0)
      )
@@ -2997,7 +2997,7 @@
   (if
    (i32.eqz
     (i64.eq
-     (call "$(lib)/array/Array<i64>#__get"
+     (call $~lib/array/Array<i64>#__get
       (i32.const 32)
       (i32.const 1)
      )
@@ -3014,7 +3014,7 @@
     (unreachable)
    )
   )
-  (call "$(lib)/array/Array<i64>#__set"
+  (call $~lib/array/Array<i64>#__set
    (i32.const 32)
    (i32.const 0)
    (i64.const 4)
@@ -3022,7 +3022,7 @@
   (if
    (i32.eqz
     (i64.eq
-     (call "$(lib)/array/Array<i64>#__get"
+     (call $~lib/array/Array<i64>#__get
       (i32.const 32)
       (i32.const 0)
      )
@@ -3042,7 +3042,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/array/Array<f32>#get:length"
+     (call $~lib/array/Array<f32>#get:length
       (i32.const 64)
      )
      (i32.const 2)
@@ -3061,7 +3061,7 @@
   (if
    (i32.eqz
     (f32.eq
-     (call "$(lib)/array/Array<f32>#__get"
+     (call $~lib/array/Array<f32>#__get
       (i32.const 64)
       (i32.const 0)
      )
@@ -3081,7 +3081,7 @@
   (if
    (i32.eqz
     (f32.eq
-     (call "$(lib)/array/Array<f32>#__get"
+     (call $~lib/array/Array<f32>#__get
       (i32.const 64)
       (i32.const 1)
      )
@@ -3098,7 +3098,7 @@
     (unreachable)
    )
   )
-  (call "$(lib)/array/Array<f32>#__set"
+  (call $~lib/array/Array<f32>#__set
    (i32.const 64)
    (i32.const 0)
    (f32.const 2.5)
@@ -3106,7 +3106,7 @@
   (if
    (i32.eqz
     (f32.eq
-     (call "$(lib)/array/Array<f32>#__get"
+     (call $~lib/array/Array<f32>#__get
       (i32.const 64)
       (i32.const 0)
      )
@@ -3126,7 +3126,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/array/Array<f64>#get:length"
+     (call $~lib/array/Array<f64>#get:length
       (i32.const 88)
      )
      (i32.const 2)
@@ -3145,7 +3145,7 @@
   (if
    (i32.eqz
     (f64.eq
-     (call "$(lib)/array/Array<f64>#__get"
+     (call $~lib/array/Array<f64>#__get
       (i32.const 88)
       (i32.const 0)
      )
@@ -3165,7 +3165,7 @@
   (if
    (i32.eqz
     (f64.eq
-     (call "$(lib)/array/Array<f64>#__get"
+     (call $~lib/array/Array<f64>#__get
       (i32.const 88)
       (i32.const 1)
      )
@@ -3182,7 +3182,7 @@
     (unreachable)
    )
   )
-  (call "$(lib)/array/Array<f64>#__set"
+  (call $~lib/array/Array<f64>#__set
    (i32.const 88)
    (i32.const 0)
    (f64.const 2.25)
@@ -3190,7 +3190,7 @@
   (if
    (i32.eqz
     (f64.eq
-     (call "$(lib)/array/Array<f64>#__get"
+     (call $~lib/array/Array<f64>#__get
       (i32.const 88)
       (i32.const 0)
      )

tests/compiler/std/string.optimized.wat

@@ -9,40 +9,40 @@
  (type $iiiv (func (param i32 i32 i32)))
  (type $v (func))
  (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
- (global "$(lib)/allocator/arena/startOffset" (mut i32) (i32.const 0))
- (global "$(lib)/allocator/arena/offset" (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $std/string/str (mut i32) (i32.const 4))
  (global $argumentCount (mut i32) (i32.const 0))
  (global $std/string/c (mut i32) (i32.const 0))
- (global $HEAP_BASE i32 (i32.const 348))
+ (global $HEAP_BASE i32 (i32.const 344))
  (memory $0 1)
  (data (i32.const 4) "\10\00\00\00h\00i\00,\00 \00I\00\'\00m\00 \00a\00 \00s\00t\00r\00i\00n\00g")
  (data (i32.const 40) "\0d\00\00\00s\00t\00d\00/\00s\00t\00r\00i\00n\00g\00.\00t\00s")
- (data (i32.const 72) "\0f\00\00\00(\00l\00i\00b\00)\00/\00s\00t\00r\00i\00n\00g\00.\00t\00s")
- (data (i32.const 108) "\02\00\00\00h\00i")
- (data (i32.const 116) "\04\00\00\00n\00u\00l\00l")
- (data (i32.const 128) "\06\00\00\00s\00t\00r\00i\00n\00g")
- (data (i32.const 144) "\03\00\00\00I\00\'\00m")
- (data (i32.const 156) "\01\00\00\00,")
- (data (i32.const 164) "\01\00\00\00x")
- (data (i32.const 172) "\01\00\00\000")
- (data (i32.const 180) "\01\00\00\001")
- (data (i32.const 188) "\05\00\00\000\00b\001\000\001")
- (data (i32.const 204) "\05\00\00\000\00o\007\000\007")
- (data (i32.const 220) "\05\00\00\000\00x\00f\000\00f")
- (data (i32.const 236) "\05\00\00\000\00x\00F\000\00F")
- (data (i32.const 252) "\03\00\00\000\001\001")
- (data (i32.const 264) "\04\00\00\000\00x\001\00g")
- (data (i32.const 276) "\03\00\00\000\00.\001")
- (data (i32.const 288) "\03\00\00\00.\002\005")
- (data (i32.const 300) "\08\00\00\00.\001\00f\00o\00o\00b\00a\00r")
- (data (i32.const 320) "\01\00\00\00a")
- (data (i32.const 328) "\01\00\00\00b")
- (data (i32.const 340) "\02\00\00\00a\00b")
+ (data (i32.const 72) "\0e\00\00\00~\00l\00i\00b\00/\00s\00t\00r\00i\00n\00g\00.\00t\00s")
+ (data (i32.const 104) "\02\00\00\00h\00i")
+ (data (i32.const 112) "\04\00\00\00n\00u\00l\00l")
+ (data (i32.const 124) "\06\00\00\00s\00t\00r\00i\00n\00g")
+ (data (i32.const 140) "\03\00\00\00I\00\'\00m")
+ (data (i32.const 152) "\01\00\00\00,")
+ (data (i32.const 160) "\01\00\00\00x")
+ (data (i32.const 168) "\01\00\00\000")
+ (data (i32.const 176) "\01\00\00\001")
+ (data (i32.const 184) "\05\00\00\000\00b\001\000\001")
+ (data (i32.const 200) "\05\00\00\000\00o\007\000\007")
+ (data (i32.const 216) "\05\00\00\000\00x\00f\000\00f")
+ (data (i32.const 232) "\05\00\00\000\00x\00F\000\00F")
+ (data (i32.const 248) "\03\00\00\000\001\001")
+ (data (i32.const 260) "\04\00\00\000\00x\001\00g")
+ (data (i32.const 272) "\03\00\00\000\00.\001")
+ (data (i32.const 284) "\03\00\00\00.\002\005")
+ (data (i32.const 296) "\08\00\00\00.\001\00f\00o\00o\00b\00a\00r")
+ (data (i32.const 316) "\01\00\00\00a")
+ (data (i32.const 324) "\01\00\00\00b")
+ (data (i32.const 336) "\02\00\00\00a\00b")
  (export "getString" (func $std/string/getString))
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/string/String#charCodeAt" (; 1 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#charCodeAt (; 1 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (if
    (i32.eqz
     (get_local $0)
@@ -78,7 +78,7 @@
    )
   )
  )
- (func "$(lib)/memory/compare_memory" (; 2 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/memory/compare_memory (; 2 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (if
    (i32.eq
     (get_local $0)
@@ -138,7 +138,7 @@
    (i32.const 0)
   )
  )
- (func "$(lib)/string/String.__eq" (; 3 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (; 3 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (if
    (get_local $0)
@@ -172,7 +172,7 @@
    )
   )
   (i32.eqz
-   (call "$(lib)/memory/compare_memory"
+   (call $~lib/memory/compare_memory
     (i32.add
      (get_local $0)
      (i32.const 4)
@@ -188,7 +188,7 @@
    )
   )
  )
- (func "$(lib)/string/String#startsWith" (; 4 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#startsWith (; 4 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -207,12 +207,12 @@
    )
   )
   (if
-   (call "$(lib)/string/String.__eq"
+   (call $~lib/string/String.__eq
     (get_local $1)
     (i32.const 0)
    )
    (set_local $1
-    (i32.const 116)
+    (i32.const 112)
    )
   )
   (if
@@ -256,7 +256,7 @@
    )
   )
   (i32.eqz
-   (call "$(lib)/memory/compare_memory"
+   (call $~lib/memory/compare_memory
     (i32.add
      (i32.add
       (get_local $0)
@@ -278,7 +278,7 @@
    )
   )
  )
- (func "$(lib)/string/String#startsWith|trampoline" (; 5 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#startsWith|trampoline (; 5 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (block $1of1
    (block $0of1
     (block $oob
@@ -295,13 +295,13 @@
     (i32.const 0)
    )
   )
-  (call "$(lib)/string/String#startsWith"
+  (call $~lib/string/String#startsWith
    (get_local $0)
    (get_local $1)
    (get_local $2)
   )
  )
- (func "$(lib)/string/String#endsWith" (; 6 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#endsWith (; 6 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (if
    (i32.eqz
@@ -318,7 +318,7 @@
    )
   )
   (if
-   (call "$(lib)/string/String.__eq"
+   (call $~lib/string/String.__eq
     (get_local $1)
     (i32.const 0)
    )
@@ -365,7 +365,7 @@
    )
   )
   (i32.eqz
-   (call "$(lib)/memory/compare_memory"
+   (call $~lib/memory/compare_memory
     (i32.add
      (i32.add
       (get_local $0)
@@ -387,7 +387,7 @@
    )
   )
  )
- (func "$(lib)/string/String#endsWith|trampoline" (; 7 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#endsWith|trampoline (; 7 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (block $1of1
    (block $0of1
     (block $oob
@@ -404,13 +404,13 @@
     (i32.const 2147483647)
    )
   )
-  (call "$(lib)/string/String#endsWith"
+  (call $~lib/string/String#endsWith
    (get_local $0)
    (get_local $1)
    (get_local $2)
   )
  )
- (func "$(lib)/string/String#indexOf" (; 8 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#indexOf (; 8 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -429,12 +429,12 @@
    )
   )
   (if
-   (call "$(lib)/string/String.__eq"
+   (call $~lib/string/String.__eq
     (get_local $1)
     (i32.const 0)
    )
    (set_local $1
-    (i32.const 116)
+    (i32.const 112)
    )
   )
   (set_local $4
@@ -479,7 +479,7 @@
     (block
      (if
       (i32.eqz
-       (call "$(lib)/memory/compare_memory"
+       (call $~lib/memory/compare_memory
         (i32.add
          (i32.add
           (get_local $0)
@@ -516,9 +516,9 @@
   )
   (i32.const -1)
  )
- (func "$(lib)/string/String#includes" (; 9 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#includes (; 9 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (i32.ne
-   (call "$(lib)/string/String#indexOf"
+   (call $~lib/string/String#indexOf
     (get_local $0)
     (get_local $1)
     (get_local $2)
@@ -526,7 +526,7 @@
    (i32.const -1)
   )
  )
- (func "$(lib)/string/String#includes|trampoline" (; 10 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#includes|trampoline (; 10 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (block $1of1
    (block $0of1
     (block $oob
@@ -543,13 +543,13 @@
     (i32.const 0)
    )
   )
-  (call "$(lib)/string/String#includes"
+  (call $~lib/string/String#includes
    (get_local $0)
    (get_local $1)
    (get_local $2)
   )
  )
- (func "$(lib)/string/String#indexOf|trampoline" (; 11 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#indexOf|trampoline (; 11 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (block $1of1
    (block $0of1
     (block $oob
@@ -566,7 +566,7 @@
     (i32.const 0)
    )
   )
-  (call "$(lib)/string/String#indexOf"
+  (call $~lib/string/String#indexOf
    (get_local $0)
    (get_local $1)
    (get_local $2)
@@ -575,7 +575,7 @@
  (func $std/string/getString (; 12 ;) (type $i) (result i32)
   (get_global $std/string/str)
  )
- (func "$(lib)/string/parse<f64>" (; 13 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
+ (func $~lib/string/parse<f64> (; 13 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -940,13 +940,13 @@
    (get_local $5)
   )
  )
- (func "$(lib)/string/parseInt" (; 14 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
-  (call "$(lib)/string/parse<f64>"
+ (func $~lib/string/parseInt (; 14 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
+  (call $~lib/string/parse<f64>
    (get_local $0)
    (get_local $1)
   )
  )
- (func "$(lib)/string/parseInt|trampoline" (; 15 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
+ (func $~lib/string/parseInt|trampoline (; 15 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
   (block $1of1
    (block $0of1
     (block $oob
@@ -963,12 +963,12 @@
     (i32.const 0)
    )
   )
-  (call "$(lib)/string/parseInt"
+  (call $~lib/string/parseInt
    (get_local $0)
    (get_local $1)
   )
  )
- (func "$(lib)/string/parseFloat" (; 16 ;) (type $iF) (param $0 i32) (result f64)
+ (func $~lib/string/parseFloat (; 16 ;) (type $iF) (param $0 i32) (result f64)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1220,7 +1220,7 @@
    (get_local $4)
   )
  )
- (func "$(lib)/allocator/arena/allocate_memory" (; 17 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/allocator/arena/allocate_memory (; 17 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1240,7 +1240,7 @@
       (i32.add
        (i32.add
         (tee_local $1
-         (get_global "$(lib)/allocator/arena/offset")
+         (get_global $~lib/allocator/arena/offset)
         )
         (get_local $0)
        )
@@ -1297,12 +1297,12 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
+  (set_global $~lib/allocator/arena/offset
    (get_local $2)
   )
   (get_local $1)
  )
- (func "$(lib)/string/allocate" (; 18 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/string/allocate (; 18 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.le_s
@@ -1321,7 +1321,7 @@
   )
   (i32.store
    (tee_local $1
-    (call "$(lib)/allocator/arena/allocate_memory"
+    (call $~lib/allocator/arena/allocate_memory
      (i32.add
       (i32.shl
        (get_local $0)
@@ -1335,7 +1335,7 @@
   )
   (get_local $1)
  )
- (func "$(lib)/memory/copy_memory" (; 19 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/copy_memory (; 19 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (loop $continue|0
@@ -2911,7 +2911,7 @@
    )
   )
  )
- (func "$(lib)/memory/move_memory" (; 20 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/move_memory (; 20 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (if
    (i32.eq
@@ -2944,7 +2944,7 @@
     (i32.const 1)
    )
    (block
-    (call "$(lib)/memory/copy_memory"
+    (call $~lib/memory/copy_memory
      (get_local $0)
      (get_local $1)
      (get_local $2)
@@ -3201,7 +3201,7 @@
    )
   )
  )
- (func "$(lib)/string/String#concat" (; 21 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#concat (; 21 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3220,12 +3220,12 @@
    )
   )
   (if
-   (call "$(lib)/string/String.__eq"
+   (call $~lib/string/String.__eq
     (get_local $1)
     (i32.const 0)
    )
    (set_local $1
-    (i32.const 116)
+    (i32.const 112)
    )
   )
   (if
@@ -3246,13 +3246,13 @@
     )
    )
    (return
-    (i32.const 336)
+    (i32.const 332)
    )
   )
-  (call "$(lib)/memory/move_memory"
+  (call $~lib/memory/move_memory
    (i32.add
     (tee_local $2
-     (call "$(lib)/string/allocate"
+     (call $~lib/string/allocate
       (get_local $2)
      )
     )
@@ -3267,7 +3267,7 @@
     (i32.const 1)
    )
   )
-  (call "$(lib)/memory/move_memory"
+  (call $~lib/memory/move_memory
    (i32.add
     (i32.add
      (get_local $2)
@@ -3289,22 +3289,22 @@
   )
   (get_local $2)
  )
- (func "$(lib)/string/String.__concat" (; 22 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__concat (; 22 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (if
    (i32.eqz
     (get_local $0)
    )
    (set_local $0
-    (i32.const 116)
+    (i32.const 112)
    )
   )
-  (call "$(lib)/string/String#concat"
+  (call $~lib/string/String#concat
    (get_local $0)
    (get_local $1)
   )
  )
  (func $start (; 23 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/startOffset"
+  (set_global $~lib/allocator/arena/startOffset
    (i32.and
     (i32.add
      (get_global $HEAP_BASE)
@@ -3313,8 +3313,8 @@
     (i32.const -8)
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
-   (get_global "$(lib)/allocator/arena/startOffset")
+  (set_global $~lib/allocator/arena/offset
+   (get_global $~lib/allocator/arena/startOffset)
   )
   (if
    (i32.ne
@@ -3350,7 +3350,7 @@
   )
   (if
    (i32.ne
-    (call "$(lib)/string/String#charCodeAt"
+    (call $~lib/string/String#charCodeAt
      (get_global $std/string/str)
      (i32.const 0)
     )
@@ -3372,9 +3372,9 @@
      (i32.const 1)
     )
     (i32.eqz
-     (call "$(lib)/string/String#startsWith|trampoline"
+     (call $~lib/string/String#startsWith|trampoline
       (get_global $std/string/str)
-      (i32.const 108)
+      (i32.const 104)
       (i32.const 0)
      )
     )
@@ -3395,9 +3395,9 @@
      (i32.const 1)
     )
     (i32.eqz
-     (call "$(lib)/string/String#endsWith|trampoline"
+     (call $~lib/string/String#endsWith|trampoline
       (get_global $std/string/str)
-      (i32.const 128)
+      (i32.const 124)
       (i32.const 0)
      )
     )
@@ -3418,9 +3418,9 @@
      (i32.const 1)
     )
     (i32.eqz
-     (call "$(lib)/string/String#includes|trampoline"
+     (call $~lib/string/String#includes|trampoline
       (get_global $std/string/str)
-      (i32.const 144)
+      (i32.const 140)
       (i32.const 0)
      )
     )
@@ -3441,9 +3441,9 @@
      (i32.const 1)
     )
     (i32.ne
-     (call "$(lib)/string/String#indexOf|trampoline"
+     (call $~lib/string/String#indexOf|trampoline
       (get_global $std/string/str)
-      (i32.const 156)
+      (i32.const 152)
       (i32.const 0)
      )
      (i32.const 2)
@@ -3465,9 +3465,9 @@
      (i32.const 1)
     )
     (i32.ne
-     (call "$(lib)/string/String#indexOf|trampoline"
+     (call $~lib/string/String#indexOf|trampoline
       (get_global $std/string/str)
-      (i32.const 164)
+      (i32.const 160)
       (i32.const 0)
      )
      (i32.const -1)
@@ -3489,8 +3489,8 @@
      (i32.const 1)
     )
     (f64.ne
-     (call "$(lib)/string/parseInt|trampoline"
-      (i32.const 172)
+     (call $~lib/string/parseInt|trampoline
+      (i32.const 168)
       (i32.const 0)
      )
      (f64.const 0)
@@ -3512,8 +3512,8 @@
      (i32.const 1)
     )
     (f64.ne
-     (call "$(lib)/string/parseInt|trampoline"
-      (i32.const 180)
+     (call $~lib/string/parseInt|trampoline
+      (i32.const 176)
       (i32.const 0)
      )
      (f64.const 1)
@@ -3535,8 +3535,8 @@
      (i32.const 1)
     )
     (f64.ne
-     (call "$(lib)/string/parseInt|trampoline"
-      (i32.const 188)
+     (call $~lib/string/parseInt|trampoline
+      (i32.const 184)
       (i32.const 0)
      )
      (f64.const 5)
@@ -3558,8 +3558,8 @@
      (i32.const 1)
     )
     (f64.ne
-     (call "$(lib)/string/parseInt|trampoline"
-      (i32.const 204)
+     (call $~lib/string/parseInt|trampoline
+      (i32.const 200)
       (i32.const 0)
      )
      (f64.const 455)
@@ -3581,8 +3581,8 @@
      (i32.const 1)
     )
     (f64.ne
-     (call "$(lib)/string/parseInt|trampoline"
-      (i32.const 220)
+     (call $~lib/string/parseInt|trampoline
+      (i32.const 216)
       (i32.const 0)
      )
      (f64.const 3855)
@@ -3604,8 +3604,8 @@
      (i32.const 1)
     )
     (f64.ne
-     (call "$(lib)/string/parseInt|trampoline"
-      (i32.const 236)
+     (call $~lib/string/parseInt|trampoline
+      (i32.const 232)
       (i32.const 0)
      )
      (f64.const 3855)
@@ -3627,8 +3627,8 @@
      (i32.const 1)
     )
     (f64.ne
-     (call "$(lib)/string/parseInt|trampoline"
-      (i32.const 252)
+     (call $~lib/string/parseInt|trampoline
+      (i32.const 248)
       (i32.const 0)
      )
      (f64.const 11)
@@ -3650,8 +3650,8 @@
      (i32.const 1)
     )
     (f64.ne
-     (call "$(lib)/string/parseInt|trampoline"
-      (i32.const 264)
+     (call $~lib/string/parseInt|trampoline
+      (i32.const 260)
       (i32.const 0)
      )
      (f64.const 1)
@@ -3669,8 +3669,8 @@
   )
   (if
    (f64.ne
-    (call "$(lib)/string/parseFloat"
-     (i32.const 172)
+    (call $~lib/string/parseFloat
+     (i32.const 168)
     )
     (f64.const 0)
    )
@@ -3686,8 +3686,8 @@
   )
   (if
    (f64.ne
-    (call "$(lib)/string/parseFloat"
-     (i32.const 180)
+    (call $~lib/string/parseFloat
+     (i32.const 176)
     )
     (f64.const 1)
    )
@@ -3703,8 +3703,8 @@
   )
   (if
    (f64.ne
-    (call "$(lib)/string/parseFloat"
-     (i32.const 276)
+    (call $~lib/string/parseFloat
+     (i32.const 272)
     )
     (f64.const 0.1)
    )
@@ -3720,8 +3720,8 @@
   )
   (if
    (f64.ne
-    (call "$(lib)/string/parseFloat"
-     (i32.const 288)
+    (call $~lib/string/parseFloat
+     (i32.const 284)
     )
     (f64.const 0.25)
    )
@@ -3737,8 +3737,8 @@
   )
   (if
    (f64.ne
-    (call "$(lib)/string/parseFloat"
-     (i32.const 300)
+    (call $~lib/string/parseFloat
+     (i32.const 296)
     )
     (f64.const 0.1)
    )
@@ -3753,16 +3753,16 @@
    )
   )
   (set_global $std/string/c
-   (call "$(lib)/string/String.__concat"
-    (i32.const 320)
-    (i32.const 328)
+   (call $~lib/string/String.__concat
+    (i32.const 316)
+    (i32.const 324)
    )
   )
   (if
    (i32.eqz
-    (call "$(lib)/string/String.__eq"
+    (call $~lib/string/String.__eq
      (get_global $std/string/c)
-     (i32.const 340)
+     (i32.const 336)
     )
    )
    (block

tests/compiler/std/string.untouched.wat

@@ -9,71 +9,71 @@
  (type $iiiv (func (param i32 i32 i32)))
  (type $v (func))
  (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
- (global "$(lib)/allocator/common/alignment/BITS" i32 (i32.const 3))
- (global "$(lib)/allocator/common/alignment/SIZE" i32 (i32.const 8))
- (global "$(lib)/allocator/common/alignment/MASK" i32 (i32.const 7))
- (global "$(lib)/allocator/arena/startOffset" (mut i32) (i32.const 0))
- (global "$(lib)/allocator/arena/offset" (mut i32) (i32.const 0))
+ (global $~lib/allocator/common/alignment/BITS i32 (i32.const 3))
+ (global $~lib/allocator/common/alignment/SIZE i32 (i32.const 8))
+ (global $~lib/allocator/common/alignment/MASK i32 (i32.const 7))
+ (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $std/string/str (mut i32) (i32.const 4))
- (global "$(lib)/string/HEADER_SIZE" i32 (i32.const 4))
+ (global $~lib/string/HEADER_SIZE i32 (i32.const 4))
  (global $argumentCount (mut i32) (i32.const 0))
- (global "$(lib)/string/CharCode.PLUS" i32 (i32.const 43))
- (global "$(lib)/string/CharCode.MINUS" i32 (i32.const 45))
- (global "$(lib)/string/CharCode.DOT" i32 (i32.const 46))
- (global "$(lib)/string/CharCode._0" i32 (i32.const 48))
- (global "$(lib)/string/CharCode._1" i32 (i32.const 49))
- (global "$(lib)/string/CharCode._2" i32 (i32.const 50))
- (global "$(lib)/string/CharCode._3" i32 (i32.const 51))
- (global "$(lib)/string/CharCode._4" i32 (i32.const 52))
- (global "$(lib)/string/CharCode._5" i32 (i32.const 53))
- (global "$(lib)/string/CharCode._6" i32 (i32.const 54))
- (global "$(lib)/string/CharCode._7" i32 (i32.const 55))
- (global "$(lib)/string/CharCode._8" i32 (i32.const 56))
- (global "$(lib)/string/CharCode._9" i32 (i32.const 57))
- (global "$(lib)/string/CharCode.A" i32 (i32.const 65))
- (global "$(lib)/string/CharCode.B" i32 (i32.const 66))
- (global "$(lib)/string/CharCode.E" i32 (i32.const 69))
- (global "$(lib)/string/CharCode.O" i32 (i32.const 79))
- (global "$(lib)/string/CharCode.X" i32 (i32.const 88))
- (global "$(lib)/string/CharCode.Z" i32 (i32.const 90))
- (global "$(lib)/string/CharCode.a" i32 (i32.const 97))
- (global "$(lib)/string/CharCode.b" i32 (i32.const 98))
- (global "$(lib)/string/CharCode.e" i32 (i32.const 101))
- (global "$(lib)/string/CharCode.o" i32 (i32.const 111))
- (global "$(lib)/string/CharCode.x" i32 (i32.const 120))
- (global "$(lib)/string/CharCode.z" i32 (i32.const 122))
- (global "$(lib)/string/EMPTY" i32 (i32.const 336))
+ (global $~lib/string/CharCode.PLUS i32 (i32.const 43))
+ (global $~lib/string/CharCode.MINUS i32 (i32.const 45))
+ (global $~lib/string/CharCode.DOT i32 (i32.const 46))
+ (global $~lib/string/CharCode._0 i32 (i32.const 48))
+ (global $~lib/string/CharCode._1 i32 (i32.const 49))
+ (global $~lib/string/CharCode._2 i32 (i32.const 50))
+ (global $~lib/string/CharCode._3 i32 (i32.const 51))
+ (global $~lib/string/CharCode._4 i32 (i32.const 52))
+ (global $~lib/string/CharCode._5 i32 (i32.const 53))
+ (global $~lib/string/CharCode._6 i32 (i32.const 54))
+ (global $~lib/string/CharCode._7 i32 (i32.const 55))
+ (global $~lib/string/CharCode._8 i32 (i32.const 56))
+ (global $~lib/string/CharCode._9 i32 (i32.const 57))
+ (global $~lib/string/CharCode.A i32 (i32.const 65))
+ (global $~lib/string/CharCode.B i32 (i32.const 66))
+ (global $~lib/string/CharCode.E i32 (i32.const 69))
+ (global $~lib/string/CharCode.O i32 (i32.const 79))
+ (global $~lib/string/CharCode.X i32 (i32.const 88))
+ (global $~lib/string/CharCode.Z i32 (i32.const 90))
+ (global $~lib/string/CharCode.a i32 (i32.const 97))
+ (global $~lib/string/CharCode.b i32 (i32.const 98))
+ (global $~lib/string/CharCode.e i32 (i32.const 101))
+ (global $~lib/string/CharCode.o i32 (i32.const 111))
+ (global $~lib/string/CharCode.x i32 (i32.const 120))
+ (global $~lib/string/CharCode.z i32 (i32.const 122))
+ (global $~lib/string/EMPTY i32 (i32.const 332))
  (global $std/string/c (mut i32) (i32.const 0))
- (global $HEAP_BASE i32 (i32.const 348))
+ (global $HEAP_BASE i32 (i32.const 344))
  (memory $0 1)
  (data (i32.const 4) "\10\00\00\00h\00i\00,\00 \00I\00\'\00m\00 \00a\00 \00s\00t\00r\00i\00n\00g\00")
  (data (i32.const 40) "\0d\00\00\00s\00t\00d\00/\00s\00t\00r\00i\00n\00g\00.\00t\00s\00")
- (data (i32.const 72) "\0f\00\00\00(\00l\00i\00b\00)\00/\00s\00t\00r\00i\00n\00g\00.\00t\00s\00")
- (data (i32.const 108) "\02\00\00\00h\00i\00")
- (data (i32.const 116) "\04\00\00\00n\00u\00l\00l\00")
- (data (i32.const 128) "\06\00\00\00s\00t\00r\00i\00n\00g\00")
- (data (i32.const 144) "\03\00\00\00I\00\'\00m\00")
- (data (i32.const 156) "\01\00\00\00,\00")
- (data (i32.const 164) "\01\00\00\00x\00")
- (data (i32.const 172) "\01\00\00\000\00")
- (data (i32.const 180) "\01\00\00\001\00")
- (data (i32.const 188) "\05\00\00\000\00b\001\000\001\00")
- (data (i32.const 204) "\05\00\00\000\00o\007\000\007\00")
- (data (i32.const 220) "\05\00\00\000\00x\00f\000\00f\00")
- (data (i32.const 236) "\05\00\00\000\00x\00F\000\00F\00")
- (data (i32.const 252) "\03\00\00\000\001\001\00")
- (data (i32.const 264) "\04\00\00\000\00x\001\00g\00")
- (data (i32.const 276) "\03\00\00\000\00.\001\00")
- (data (i32.const 288) "\03\00\00\00.\002\005\00")
- (data (i32.const 300) "\08\00\00\00.\001\00f\00o\00o\00b\00a\00r\00")
- (data (i32.const 320) "\01\00\00\00a\00")
- (data (i32.const 328) "\01\00\00\00b\00")
- (data (i32.const 336) "\00\00\00\00")
- (data (i32.const 340) "\02\00\00\00a\00b\00")
+ (data (i32.const 72) "\0e\00\00\00~\00l\00i\00b\00/\00s\00t\00r\00i\00n\00g\00.\00t\00s\00")
+ (data (i32.const 104) "\02\00\00\00h\00i\00")
+ (data (i32.const 112) "\04\00\00\00n\00u\00l\00l\00")
+ (data (i32.const 124) "\06\00\00\00s\00t\00r\00i\00n\00g\00")
+ (data (i32.const 140) "\03\00\00\00I\00\'\00m\00")
+ (data (i32.const 152) "\01\00\00\00,\00")
+ (data (i32.const 160) "\01\00\00\00x\00")
+ (data (i32.const 168) "\01\00\00\000\00")
+ (data (i32.const 176) "\01\00\00\001\00")
+ (data (i32.const 184) "\05\00\00\000\00b\001\000\001\00")
+ (data (i32.const 200) "\05\00\00\000\00o\007\000\007\00")
+ (data (i32.const 216) "\05\00\00\000\00x\00f\000\00f\00")
+ (data (i32.const 232) "\05\00\00\000\00x\00F\000\00F\00")
+ (data (i32.const 248) "\03\00\00\000\001\001\00")
+ (data (i32.const 260) "\04\00\00\000\00x\001\00g\00")
+ (data (i32.const 272) "\03\00\00\000\00.\001\00")
+ (data (i32.const 284) "\03\00\00\00.\002\005\00")
+ (data (i32.const 296) "\08\00\00\00.\001\00f\00o\00o\00b\00a\00r\00")
+ (data (i32.const 316) "\01\00\00\00a\00")
+ (data (i32.const 324) "\01\00\00\00b\00")
+ (data (i32.const 332) "\00\00\00\00")
+ (data (i32.const 336) "\02\00\00\00a\00b\00")
  (export "getString" (func $std/string/getString))
  (export "memory" (memory $0))
  (start $start)
- (func "$(lib)/string/String#charCodeAt" (; 1 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#charCodeAt (; 1 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (if
    (i32.eqz
     (i32.ne
@@ -114,7 +114,7 @@
    )
   )
  )
- (func "$(lib)/memory/compare_memory" (; 2 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/memory/compare_memory (; 2 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (if
    (i32.eq
     (get_local $0)
@@ -180,7 +180,7 @@
    )
   )
  )
- (func "$(lib)/string/String.__eq" (; 3 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (; 3 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (if
    (i32.eqz
@@ -218,7 +218,7 @@
   )
   (return
    (i32.eqz
-    (call "$(lib)/memory/compare_memory"
+    (call $~lib/memory/compare_memory
      (i32.add
       (get_local $0)
       (i32.const 4)
@@ -235,7 +235,7 @@
    )
   )
  )
- (func "$(lib)/string/String#startsWith" (; 4 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#startsWith (; 4 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -260,12 +260,12 @@
    )
   )
   (if
-   (call "$(lib)/string/String.__eq"
+   (call $~lib/string/String.__eq
     (get_local $1)
     (i32.const 0)
    )
    (set_local $1
-    (i32.const 116)
+    (i32.const 112)
    )
   )
   (set_local $3
@@ -320,7 +320,7 @@
   )
   (return
    (i32.eqz
-    (call "$(lib)/memory/compare_memory"
+    (call $~lib/memory/compare_memory
      (i32.add
       (i32.add
        (get_local $0)
@@ -343,7 +343,7 @@
    )
   )
  )
- (func "$(lib)/string/String#startsWith|trampoline" (; 5 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#startsWith|trampoline (; 5 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (block $1of1
    (block $0of1
     (block $oob
@@ -360,13 +360,13 @@
     (i32.const 0)
    )
   )
-  (call "$(lib)/string/String#startsWith"
+  (call $~lib/string/String#startsWith
    (get_local $0)
    (get_local $1)
    (get_local $2)
   )
  )
- (func "$(lib)/string/String#endsWith" (; 6 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#endsWith (; 6 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -390,7 +390,7 @@
    )
   )
   (if
-   (call "$(lib)/string/String.__eq"
+   (call $~lib/string/String.__eq
     (get_local $1)
     (i32.const 0)
    )
@@ -447,7 +447,7 @@
   )
   (return
    (i32.eqz
-    (call "$(lib)/memory/compare_memory"
+    (call $~lib/memory/compare_memory
      (i32.add
       (i32.add
        (get_local $0)
@@ -470,7 +470,7 @@
    )
   )
  )
- (func "$(lib)/string/String#endsWith|trampoline" (; 7 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#endsWith|trampoline (; 7 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (block $1of1
    (block $0of1
     (block $oob
@@ -487,13 +487,13 @@
     (i32.const 2147483647)
    )
   )
-  (call "$(lib)/string/String#endsWith"
+  (call $~lib/string/String#endsWith
    (get_local $0)
    (get_local $1)
    (get_local $2)
   )
  )
- (func "$(lib)/string/String#indexOf" (; 8 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#indexOf (; 8 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -518,12 +518,12 @@
    )
   )
   (if
-   (call "$(lib)/string/String.__eq"
+   (call $~lib/string/String.__eq
     (get_local $1)
     (i32.const 0)
    )
    (set_local $1
-    (i32.const 116)
+    (i32.const 112)
    )
   )
   (set_local $3
@@ -581,7 +581,7 @@
       (block
        (if
         (i32.eqz
-         (call "$(lib)/memory/compare_memory"
+         (call $~lib/memory/compare_memory
           (i32.add
            (i32.add
             (get_local $0)
@@ -622,10 +622,10 @@
    (i32.const -1)
   )
  )
- (func "$(lib)/string/String#includes" (; 9 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#includes (; 9 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (return
    (i32.ne
-    (call "$(lib)/string/String#indexOf"
+    (call $~lib/string/String#indexOf
      (get_local $0)
      (get_local $1)
      (get_local $2)
@@ -634,7 +634,7 @@
    )
   )
  )
- (func "$(lib)/string/String#includes|trampoline" (; 10 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#includes|trampoline (; 10 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (block $1of1
    (block $0of1
     (block $oob
@@ -651,13 +651,13 @@
     (i32.const 0)
    )
   )
-  (call "$(lib)/string/String#includes"
+  (call $~lib/string/String#includes
    (get_local $0)
    (get_local $1)
    (get_local $2)
   )
  )
- (func "$(lib)/string/String#indexOf|trampoline" (; 11 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#indexOf|trampoline (; 11 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (block $1of1
    (block $0of1
     (block $oob
@@ -674,7 +674,7 @@
     (i32.const 0)
    )
   )
-  (call "$(lib)/string/String#indexOf"
+  (call $~lib/string/String#indexOf
    (get_local $0)
    (get_local $1)
    (get_local $2)
@@ -685,7 +685,7 @@
    (get_global $std/string/str)
   )
  )
- (func "$(lib)/string/parse<f64>" (; 13 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
+ (func $~lib/string/parse<f64> (; 13 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1095,15 +1095,15 @@
    )
   )
  )
- (func "$(lib)/string/parseInt" (; 14 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
+ (func $~lib/string/parseInt (; 14 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
   (return
-   (call "$(lib)/string/parse<f64>"
+   (call $~lib/string/parse<f64>
     (get_local $0)
     (get_local $1)
    )
   )
  )
- (func "$(lib)/string/parseInt|trampoline" (; 15 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
+ (func $~lib/string/parseInt|trampoline (; 15 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
   (block $1of1
    (block $0of1
     (block $oob
@@ -1120,12 +1120,12 @@
     (i32.const 0)
    )
   )
-  (call "$(lib)/string/parseInt"
+  (call $~lib/string/parseInt
    (get_local $0)
    (get_local $1)
   )
  )
- (func "$(lib)/string/parseFloat" (; 16 ;) (type $iF) (param $0 i32) (result f64)
+ (func $~lib/string/parseFloat (; 16 ;) (type $iF) (param $0 i32) (result f64)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1408,7 +1408,7 @@
    )
   )
  )
- (func "$(lib)/allocator/arena/allocate_memory" (; 17 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/allocator/arena/allocate_memory (; 17 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1424,7 +1424,7 @@
    )
   )
   (set_local $1
-   (get_global "$(lib)/allocator/arena/offset")
+   (get_global $~lib/allocator/arena/offset)
   )
   (set_local $2
    (i32.and
@@ -1504,14 +1504,14 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
+  (set_global $~lib/allocator/arena/offset
    (get_local $2)
   )
   (return
    (get_local $1)
   )
  )
- (func "$(lib)/string/allocate" (; 18 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/string/allocate (; 18 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (if
    (i32.eqz
@@ -1531,7 +1531,7 @@
    )
   )
   (set_local $1
-   (call "$(lib)/allocator/arena/allocate_memory"
+   (call $~lib/allocator/arena/allocate_memory
     (i32.add
      (i32.const 4)
      (i32.shl
@@ -1549,7 +1549,7 @@
    (get_local $1)
   )
  )
- (func "$(lib)/memory/copy_memory" (; 19 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/copy_memory (; 19 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -3352,7 +3352,7 @@
    )
   )
  )
- (func "$(lib)/memory/move_memory" (; 20 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/move_memory (; 20 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (if
    (i32.eq
@@ -3385,7 +3385,7 @@
     (i32.const 1)
    )
    (block
-    (call "$(lib)/memory/copy_memory"
+    (call $~lib/memory/copy_memory
      (get_local $0)
      (get_local $1)
      (get_local $2)
@@ -3675,7 +3675,7 @@
    )
   )
  )
- (func "$(lib)/string/String#concat" (; 21 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#concat (; 21 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3698,12 +3698,12 @@
    )
   )
   (if
-   (call "$(lib)/string/String.__eq"
+   (call $~lib/string/String.__eq
     (get_local $1)
     (i32.const 0)
    )
    (set_local $1
-    (i32.const 116)
+    (i32.const 112)
    )
   )
   (set_local $2
@@ -3728,15 +3728,15 @@
     (i32.const 0)
    )
    (return
-    (i32.const 336)
+    (i32.const 332)
    )
   )
   (set_local $5
-   (call "$(lib)/string/allocate"
+   (call $~lib/string/allocate
     (get_local $4)
    )
   )
-  (call "$(lib)/memory/move_memory"
+  (call $~lib/memory/move_memory
    (i32.add
     (get_local $5)
     (i32.const 4)
@@ -3750,7 +3750,7 @@
     (i32.const 1)
    )
   )
-  (call "$(lib)/memory/move_memory"
+  (call $~lib/memory/move_memory
    (i32.add
     (i32.add
      (get_local $5)
@@ -3774,24 +3774,24 @@
    (get_local $5)
   )
  )
- (func "$(lib)/string/String.__concat" (; 22 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__concat (; 22 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (if
    (i32.eqz
     (get_local $0)
    )
    (set_local $0
-    (i32.const 116)
+    (i32.const 112)
    )
   )
   (return
-   (call "$(lib)/string/String#concat"
+   (call $~lib/string/String#concat
     (get_local $0)
     (get_local $1)
    )
   )
  )
  (func $start (; 23 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/startOffset"
+  (set_global $~lib/allocator/arena/startOffset
    (i32.and
     (i32.add
      (get_global $HEAP_BASE)
@@ -3803,8 +3803,8 @@
     )
    )
   )
-  (set_global "$(lib)/allocator/arena/offset"
-   (get_global "$(lib)/allocator/arena/startOffset")
+  (set_global $~lib/allocator/arena/offset
+   (get_global $~lib/allocator/arena/startOffset)
   )
   (if
    (i32.eqz
@@ -3845,7 +3845,7 @@
   (if
    (i32.eqz
     (i32.eq
-     (call "$(lib)/string/String#charCodeAt"
+     (call $~lib/string/String#charCodeAt
       (get_global $std/string/str)
       (i32.const 0)
      )
@@ -3868,9 +3868,9 @@
      (set_global $argumentCount
       (i32.const 1)
      )
-     (call "$(lib)/string/String#startsWith|trampoline"
+     (call $~lib/string/String#startsWith|trampoline
       (get_global $std/string/str)
-      (i32.const 108)
+      (i32.const 104)
       (i32.const 0)
      )
     )
@@ -3891,9 +3891,9 @@
      (set_global $argumentCount
       (i32.const 1)
      )
-     (call "$(lib)/string/String#endsWith|trampoline"
+     (call $~lib/string/String#endsWith|trampoline
       (get_global $std/string/str)
-      (i32.const 128)
+      (i32.const 124)
       (i32.const 0)
      )
     )
@@ -3914,9 +3914,9 @@
      (set_global $argumentCount
       (i32.const 1)
      )
-     (call "$(lib)/string/String#includes|trampoline"
+     (call $~lib/string/String#includes|trampoline
       (get_global $std/string/str)
-      (i32.const 144)
+      (i32.const 140)
       (i32.const 0)
      )
     )
@@ -3938,9 +3938,9 @@
       (set_global $argumentCount
        (i32.const 1)
       )
-      (call "$(lib)/string/String#indexOf|trampoline"
+      (call $~lib/string/String#indexOf|trampoline
        (get_global $std/string/str)
-       (i32.const 156)
+       (i32.const 152)
        (i32.const 0)
       )
      )
@@ -3964,9 +3964,9 @@
       (set_global $argumentCount
        (i32.const 1)
       )
-      (call "$(lib)/string/String#indexOf|trampoline"
+      (call $~lib/string/String#indexOf|trampoline
        (get_global $std/string/str)
-       (i32.const 164)
+       (i32.const 160)
        (i32.const 0)
       )
      )
@@ -3990,8 +3990,8 @@
       (set_global $argumentCount
        (i32.const 1)
       )
-      (call "$(lib)/string/parseInt|trampoline"
-       (i32.const 172)
+      (call $~lib/string/parseInt|trampoline
+       (i32.const 168)
        (i32.const 0)
       )
      )
@@ -4015,8 +4015,8 @@
       (set_global $argumentCount
        (i32.const 1)
       )
-      (call "$(lib)/string/parseInt|trampoline"
-       (i32.const 180)
+      (call $~lib/string/parseInt|trampoline
+       (i32.const 176)
        (i32.const 0)
       )
      )
@@ -4040,8 +4040,8 @@
       (set_global $argumentCount
        (i32.const 1)
       )
-      (call "$(lib)/string/parseInt|trampoline"
-       (i32.const 188)
+      (call $~lib/string/parseInt|trampoline
+       (i32.const 184)
        (i32.const 0)
       )
      )
@@ -4065,8 +4065,8 @@
       (set_global $argumentCount
        (i32.const 1)
       )
-      (call "$(lib)/string/parseInt|trampoline"
-       (i32.const 204)
+      (call $~lib/string/parseInt|trampoline
+       (i32.const 200)
        (i32.const 0)
       )
      )
@@ -4090,8 +4090,8 @@
       (set_global $argumentCount
        (i32.const 1)
       )
-      (call "$(lib)/string/parseInt|trampoline"
-       (i32.const 220)
+      (call $~lib/string/parseInt|trampoline
+       (i32.const 216)
        (i32.const 0)
       )
      )
@@ -4115,8 +4115,8 @@
       (set_global $argumentCount
        (i32.const 1)
       )
-      (call "$(lib)/string/parseInt|trampoline"
-       (i32.const 236)
+      (call $~lib/string/parseInt|trampoline
+       (i32.const 232)
        (i32.const 0)
       )
      )
@@ -4140,8 +4140,8 @@
       (set_global $argumentCount
        (i32.const 1)
       )
-      (call "$(lib)/string/parseInt|trampoline"
-       (i32.const 252)
+      (call $~lib/string/parseInt|trampoline
+       (i32.const 248)
        (i32.const 0)
       )
      )
@@ -4165,8 +4165,8 @@
       (set_global $argumentCount
        (i32.const 1)
       )
-      (call "$(lib)/string/parseInt|trampoline"
-       (i32.const 264)
+      (call $~lib/string/parseInt|trampoline
+       (i32.const 260)
        (i32.const 0)
       )
      )
@@ -4186,8 +4186,8 @@
   (if
    (i32.eqz
     (f64.eq
-     (call "$(lib)/string/parseFloat"
-      (i32.const 172)
+     (call $~lib/string/parseFloat
+      (i32.const 168)
      )
      (f64.const 0)
     )
@@ -4205,8 +4205,8 @@
   (if
    (i32.eqz
     (f64.eq
-     (call "$(lib)/string/parseFloat"
-      (i32.const 180)
+     (call $~lib/string/parseFloat
+      (i32.const 176)
      )
      (f64.const 1)
     )
@@ -4224,8 +4224,8 @@
   (if
    (i32.eqz
     (f64.eq
-     (call "$(lib)/string/parseFloat"
-      (i32.const 276)
+     (call $~lib/string/parseFloat
+      (i32.const 272)
      )
      (f64.const 0.1)
     )
@@ -4243,8 +4243,8 @@
   (if
    (i32.eqz
     (f64.eq
-     (call "$(lib)/string/parseFloat"
-      (i32.const 288)
+     (call $~lib/string/parseFloat
+      (i32.const 284)
      )
      (f64.const 0.25)
     )
@@ -4262,8 +4262,8 @@
   (if
    (i32.eqz
     (f64.eq
-     (call "$(lib)/string/parseFloat"
-      (i32.const 300)
+     (call $~lib/string/parseFloat
+      (i32.const 296)
      )
      (f64.const 0.1)
     )
@@ -4279,16 +4279,16 @@
    )
   )
   (set_global $std/string/c
-   (call "$(lib)/string/String.__concat"
-    (i32.const 320)
-    (i32.const 328)
+   (call $~lib/string/String.__concat
+    (i32.const 316)
+    (i32.const 324)
    )
   )
   (if
    (i32.eqz
-    (call "$(lib)/string/String.__eq"
+    (call $~lib/string/String.__eq
      (get_global $std/string/c)
-     (i32.const 340)
+     (i32.const 336)
     )
    )
    (block

webpack.config.js

@@ -64,7 +64,7 @@ const bin = {
         const libDir = path.join(__dirname, "std", "assembly");
         const libFiles = require("glob").sync("**/*.ts", { cwd: libDir });
         const lib = {};
-        libFiles.forEach(file => lib["(lib)/" + file.replace(/\.ts$/, "")] = bundleFile(path.join(libDir, file)));
+        libFiles.forEach(file => lib["~lib/" + file.replace(/\.ts$/, "")] = bundleFile(path.join(libDir, file)));
         return lib;
       })(),
       BUNDLE_DEFINITIONS: {