Cleanup: Make use of type inference and use 'var' in functions to match actual WebAssembly semantics

Author: dcodeIO

src/ast.ts

@@ -83,7 +83,7 @@ export function initialize(program: Program): void {
   addFunction(program, "assert");
 
   // conversions and limits
-  let i32Func: FunctionPrototype,
+  var i32Func: FunctionPrototype,
       u32Func: FunctionPrototype,
       i64Func: FunctionPrototype,
       u64Func: FunctionPrototype;
@@ -144,7 +144,7 @@ export function initialize(program: Program): void {
 
 /** Adds a built-in constant to the specified program. */
 function addConstant(program: Program, name: string, type: Type): Global {
-  const global: Global = new Global(program, name, name, null);
+  var global = new Global(program, name, name, null);
   global.isBuiltIn = true;
   global.isConstant = true;
   global.type = type;
@@ -154,9 +154,10 @@ function addConstant(program: Program, name: string, type: Type): Global {
 
 /** Adds a built-in function to the specified program. */
 function addFunction(program: Program, name: string, isGeneric: bool = false): FunctionPrototype {
-  let prototype: FunctionPrototype = new FunctionPrototype(program, name, name, null, null);
+  var prototype = new FunctionPrototype(program, name, name, null, null);
   prototype.isBuiltIn = true;
-  if (isGeneric) prototype.isGeneric = true;
+  if (isGeneric)
+    prototype.isGeneric = true;
   program.elements.set(name, prototype);
   return prototype;
 }
@@ -187,18 +188,18 @@ export function compileGetConstant(compiler: Compiler, global: Global): Expressi
 
 /** Compiles a call to a built-in function. */
 export function compileCall(compiler: Compiler, prototype: FunctionPrototype, typeArguments: Type[], operands: Expression[], reportNode: Node): ExpressionRef {
-  const module: Module = compiler.module;
-  const usizeType: Type = select<Type>(Type.usize64, Type.usize32, compiler.options.target == Target.WASM64);
-  const nativeUsizeType: NativeType = select<NativeType>(NativeType.I64, NativeType.I32, compiler.options.target == Target.WASM64);
+  var module = compiler.module;
+  var usizeType = select<Type>(Type.usize64, Type.usize32, compiler.options.target == Target.WASM64);
+  var nativeUsizeType = select<NativeType>(NativeType.I64, NativeType.I32, compiler.options.target == Target.WASM64);
 
-  let arg0: ExpressionRef,
+  var arg0: ExpressionRef,
       arg1: ExpressionRef,
       arg2: ExpressionRef;
 
-  let tempLocal0: Local;
-  let tempLocal1: Local;
+  var tempLocal0: Local,
+      tempLocal1: Local;
 
-  let ftype: FunctionTypeRef;
+  var ftype: FunctionTypeRef;
 
   switch (prototype.internalName) {
 

src/builtins.ts

@@ -20,7 +20,7 @@ import {
 export class Decompiler {
 
   static decompile(module: Module): string {
-    const decompiler: Decompiler = new Decompiler();
+    var decompiler = new Decompiler();
     decompiler.decompile(module);
     return decompiler.finish();
   }
@@ -39,13 +39,12 @@ export class Decompiler {
   }
 
   decompileFunction(func: FunctionRef): void {
-    const name: string = readString(_BinaryenFunctionGetName(func)) || "$" + this.functionId.toString(10);
-    const body: ExpressionRef = _BinaryenFunctionGetBody(func);
+    var name = readString(_BinaryenFunctionGetName(func)) || "$" + this.functionId.toString(10);
+    var body = _BinaryenFunctionGetBody(func);
     this.push("function ");
     this.push(name);
     this.push("(");
-    let k: Index = _BinaryenFunctionGetNumParams(func);
-    for (let i: Index = 0; i < k; ++i) {
+     for (var i: Index = 0, k: Index = _BinaryenFunctionGetNumParams(func); i < k; ++i) {
       if (i > 0)
         this.push(", ");
       this.push("$");
@@ -67,12 +66,12 @@ export class Decompiler {
   }
 
   decompileExpression(expr: ExpressionRef): void {
-    const id: ExpressionId = _BinaryenExpressionGetId(expr);
-    const type: NativeType = _BinaryenExpressionGetType(expr);
+    var id = _BinaryenExpressionGetId(expr);
+    var type = _BinaryenExpressionGetType(expr);
 
-    let nested: ExpressionRef;
-    let string: string | null;
-    let i: Index, k: Index;
+    var nested: ExpressionRef;
+    var string: string | null;
+    var i: Index, k: Index;
 
     switch (id) {
 
@@ -829,7 +828,7 @@ export class Decompiler {
   }
 
   finish(): string {
-    const ret: string = this.text.join("");
+    var ret = this.text.join("");
     this.text = [];
     return ret;
   }

src/compiler.ts

@@ -64,7 +64,7 @@ export class DiagnosticMessage {
   }
 
   static create(code: DiagnosticCode, category: DiagnosticCategory, arg0: string | null = null, arg1: string | null = null): DiagnosticMessage {
-    let message: string = diagnosticCodeToString(code);
+    var message = diagnosticCodeToString(code);
     if (arg0 != null)
       message = message.replace("{0}", arg0);
     if (arg1 != null)
@@ -98,7 +98,7 @@ export class DiagnosticMessage {
 
 export function formatDiagnosticMessage(message: DiagnosticMessage, useColors: bool = false, showContext: bool = false): string {
   // format context first (uses same string builder)
-  let context: string = "";
+  var context = "";
   if (message.range && showContext)
     context = formatDiagnosticContext(message.range, useColors);
 
@@ -114,16 +114,16 @@ export function formatDiagnosticMessage(message: DiagnosticMessage, useColors: b
 
   // range information if available
   if (message.range) {
-    const range: Range = message.range;
-    const text: string = range.source.text;
+    var range = message.range;
+    var text = range.source.text;
     if (showContext) {
       sb.push("\n");
       sb.push(context);
     }
     sb.push("\n");
-    let pos: i32 = range.start;
-    let line: i32 = 1;
-    let column: i32 = 1;
+    var pos = range.start;
+    var line = 1;
+    var column = 1;
     while (pos-- > 0)
       if (text.charCodeAt(pos) == CharCode.LINEFEED)
         line++;
@@ -141,10 +141,10 @@ export function formatDiagnosticMessage(message: DiagnosticMessage, useColors: b
 }
 
 export function formatDiagnosticContext(range: Range, useColors: bool = false): string {
-  const text: string = range.source.text;
-  const len: i32 = text.length;
-  let start: i32 = range.start;
-  let end: i32 = range.end;
+  var text = range.source.text;
+  var len = text.length;
+  var start = range.start;
+  var end = range.end;
   while (start > 0 && !isLineBreak(text.charCodeAt(start - 1)))
     start--;
   while (end < len && !isLineBreak(text.charCodeAt(end)))
@@ -176,7 +176,7 @@ export abstract class DiagnosticEmitter {
   }
 
   emitDiagnostic(code: DiagnosticCode, category: DiagnosticCategory, range: Range, arg0: string | null = null, arg1: string | null = null) {
-    const message: DiagnosticMessage = DiagnosticMessage.create(code, category, arg0, arg1).withRange(range);
+    var message = DiagnosticMessage.create(code, category, arg0, arg1).withRange(range);
     this.diagnostics.push(message);
     if (!this.silentDiagnostics) {
       console.log(formatDiagnosticMessage(message, true, true) + "\n"); // temporary

src/decompiler.ts

@@ -67,7 +67,7 @@ export function nextFile(parser: Parser): string | null {
 
 /** Obtains the next diagnostic message. Returns `null` once there are no more messages. */
 export function nextDiagnostic(parser: Parser): DiagnosticMessage | null {
-  const program: Program = parser.program;
+  var program = parser.program;
   if (program.diagnosticsOffset < program.diagnostics.length)
     return program.diagnostics[program.diagnosticsOffset++];
   return null;
@@ -120,14 +120,14 @@ export function setNoMemory(options: Options, noMemory: bool): void {
 
 /** Compiles the sources computed by the parser to a module. */
 export function compile(parser: Parser, options: Options | null = null): Module {
-  const program: Program = parser.finish();
-  const compiler: Compiler = new Compiler(program, options);
+  var program = parser.finish();
+  var compiler = new Compiler(program, options);
   return compiler.compile();
 }
 
 /** Decompiles a module to its (low level) source. */
 export function decompile(module: Module): string {
-  const decompiler: Decompiler = new Decompiler();
+  var decompiler = new Decompiler();
   decompiler.decompile(module);
   return decompiler.finish();
 }