Various improvements & refactorings (AssemblyScript#976)

MaxGraey · dcodeIO · commit 1cc33bf842dd · 2019-11-30T16:57:01.000+01:00
diff --git a/src/binary.ts b/src/binary.ts
@@ -72,10 +72,10 @@ export enum NameKind {
 
 /** WebAssembly types. */
 export enum Type {
-  i32 = 0x7f,
-  i64 = 0x7e,
-  f32 = 0x7d,
-  f64 = 0x7c,
+  i32 = 0x7F,
+  i64 = 0x7E,
+  f32 = 0x7D,
+  f64 = 0x7C,
   anyfunc = 0x70,
   func = 0x60,
   none = 0x40
@@ -89,28 +89,28 @@ export enum Op {
   loop = 0x03,
   if_ = 0x04,
   else_ = 0x05,
-  end = 0x0b,
-  br = 0x0c,
-  br_if = 0x0d,
-  br_table = 0x0e,
-  return_ = 0x0f,
+  end = 0x0B,
+  br = 0x0C,
+  br_if = 0x0D,
+  br_table = 0x0E,
+  return_ = 0x0F,
   call = 0x10,
   call_indirect = 0x11,
-  drop = 0x1a,
-  select = 0x1b,
+  drop = 0x1A,
+  select = 0x1B,
   get_local = 0x20,
   set_local = 0x21,
   tee_local = 0x22,
   get_global = 0x23,
   set_global = 0x24,
   i32_load = 0x28,
   i64_load = 0x29,
-  f32_load = 0x2a,
-  f64_load = 0x2b,
-  i32_load8_s = 0x2c,
-  i32_load8_u = 0x2d,
-  i32_load16_s = 0x2e,
-  i32_load16_u = 0x2f,
+  f32_load = 0x2A,
+  f64_load = 0x2B,
+  i32_load8_s = 0x2C,
+  i32_load8_u = 0x2D,
+  i32_load16_s = 0x2E,
+  i32_load16_u = 0x2F,
   i64_load8_s = 0x30,
   i64_load8_u = 0x31,
   i64_load16_s = 0x32,
@@ -121,12 +121,12 @@ export enum Op {
   i64_store = 0x37,
   f32_store = 0x38,
   f64_store = 0x39,
-  i32_store8 = 0x3a,
-  i32_store16 = 0x3b,
-  i64_store8 = 0x3c,
-  i64_store16 = 0x3d,
-  i64_store32 = 0x3e,
-  memory_size = 0x3f,
+  i32_store8 = 0x3A,
+  i32_store16 = 0x3B,
+  i64_store8 = 0x3C,
+  i64_store16 = 0x3D,
+  i64_store32 = 0x3E,
+  memory_size = 0x3F,
   memory_grow = 0x40,
   i32_const = 0x41,
   i64_const = 0x42,
@@ -137,12 +137,12 @@ export enum Op {
   i32_ne = 0x47,
   i32_lt_s = 0x48,
   i32_lt_u = 0x49,
-  i32_gt_s = 0x4a,
-  i32_gt_u = 0x4b,
-  i32_le_s = 0x4c,
-  i32_le_u = 0x4d,
-  i32_ge_s = 0x4e,
-  i32_ge_u = 0x4f,
+  i32_gt_s = 0x4A,
+  i32_gt_u = 0x4B,
+  i32_le_s = 0x4C,
+  i32_le_u = 0x4D,
+  i32_ge_s = 0x4E,
+  i32_ge_u = 0x4F,
   i64_eqz = 0x50,
   i64_eq = 0x51,
   i64_ne = 0x52,
@@ -153,12 +153,12 @@ export enum Op {
   i64_le_s = 0x57,
   i64_le_u = 0x58,
   i64_ge_s = 0x59,
-  i64_ge_u = 0x5a,
-  f32_eq = 0x5b,
-  f32_ne = 0x5c,
-  f32_lt = 0x5d,
-  f32_gt = 0x5e,
-  f32_le = 0x5f,
+  i64_ge_u = 0x5A,
+  f32_eq = 0x5B,
+  f32_ne = 0x5C,
+  f32_lt = 0x5D,
+  f32_gt = 0x5E,
+  f32_le = 0x5F,
   f32_ge = 0x60,
   f64_eq = 0x61,
   f64_ne = 0x62,
@@ -169,12 +169,12 @@ export enum Op {
   i32_clz = 0x67,
   i32_ctz = 0x68,
   i32_popcnt = 0x69,
-  i32_add = 0x6a,
-  i32_sub = 0x6b,
-  i32_mul = 0x6c,
-  i32_div_s = 0x6d,
-  i32_div_u = 0x6e,
-  i32_rem_s = 0x6f,
+  i32_add = 0x6A,
+  i32_sub = 0x6B,
+  i32_mul = 0x6C,
+  i32_div_s = 0x6D,
+  i32_div_u = 0x6E,
+  i32_rem_s = 0x6F,
   i32_rem_u = 0x70,
   i32_and = 0x71,
   i32_or = 0x72,
@@ -185,12 +185,12 @@ export enum Op {
   i32_rotl = 0x77,
   i32_rotr = 0x78,
   i64_clz = 0x79,
-  i64_ctz = 0x7a,
-  i64_popcnt = 0x7b,
-  i64_add = 0x7c,
-  i64_sub = 0x7d,
-  i64_mul = 0x7e,
-  i64_div_s = 0x7f,
+  i64_ctz = 0x7A,
+  i64_popcnt = 0x7B,
+  i64_add = 0x7C,
+  i64_sub = 0x7D,
+  i64_mul = 0x7E,
+  i64_div_s = 0x7F,
   i64_div_u = 0x80,
   i64_rem_s = 0x81,
   i64_rem_u = 0x82,
@@ -201,12 +201,12 @@ export enum Op {
   i64_shr_s = 0x87,
   i64_shr_u = 0x88,
   i64_rotl = 0x89,
-  i64_rotr = 0x8a,
-  f32_abs = 0x8b,
-  f32_neg = 0x8c,
-  f32_ceil = 0x8d,
-  f32_floor = 0x8e,
-  f32_trunc = 0x8f,
+  i64_rotr = 0x8A,
+  f32_abs = 0x8B,
+  f32_neg = 0x8C,
+  f32_ceil = 0x8D,
+  f32_floor = 0x8E,
+  f32_trunc = 0x8F,
   f32_nearest = 0x90,
   f32_sqrt = 0x91,
   f32_add = 0x92,
@@ -217,44 +217,44 @@ export enum Op {
   f32_max = 0x97,
   f32_copysign = 0x98,
   f64_abs = 0x99,
-  f64_neg = 0x9a,
-  f64_ceil = 0x9b,
-  f64_floor = 0x9c,
-  f64_trunc = 0x9d,
-  f64_nearest = 0x9e,
-  f64_sqrt = 0x9f,
-  f64_add = 0xa0,
-  f64_sub = 0xa1,
-  f64_mul = 0xa2,
-  f64_div = 0xa3,
-  f64_min = 0xa4,
-  f64_max = 0xa5,
-  f64_copysign = 0xa6,
-  i32_wrap_i64 = 0xa7,
-  i32_trunc_s_f32 = 0xa8,
-  i32_trunc_u_f32 = 0xa9,
-  i32_trunc_s_f64 = 0xaa,
-  i32_trunc_u_f64 = 0xab,
-  i64_extend_s_i32 = 0xac,
-  i64_extend_u_i32 = 0xad,
-  i64_trunc_s_f32 = 0xae,
-  i64_trunc_u_f32 = 0xaf,
-  i64_trunc_s_f64 = 0xb0,
-  i64_trunc_u_f64 = 0xb1,
-  f32_convert_s_i32 = 0xb2,
-  f32_convert_u_i32 = 0xb3,
-  f32_convert_s_i64 = 0xb4,
-  f32_convert_u_i64 = 0xb5,
-  f32_demote_f64 = 0xb6,
-  f64_convert_s_i32 = 0xb7,
-  f64_convert_u_i32 = 0xb8,
-  f64_convert_s_i64 = 0xb9,
-  f64_convert_u_i64 = 0xba,
-  f64_promote_f32 = 0xbb,
-  i32_reinterpret_f32 = 0xbc,
-  i64_reinterpret_f64 = 0xbd,
-  f32_reinterpret_i32 = 0xbe,
-  f64_reinterpret_i64 = 0xbf
+  f64_neg = 0x9A,
+  f64_ceil = 0x9B,
+  f64_floor = 0x9C,
+  f64_trunc = 0x9D,
+  f64_nearest = 0x9E,
+  f64_sqrt = 0x9F,
+  f64_add = 0xA0,
+  f64_sub = 0xA1,
+  f64_mul = 0xA2,
+  f64_div = 0xA3,
+  f64_min = 0xA4,
+  f64_max = 0xA5,
+  f64_copysign = 0xA6,
+  i32_wrap_i64 = 0xA7,
+  i32_trunc_s_f32 = 0xA8,
+  i32_trunc_u_f32 = 0xA9,
+  i32_trunc_s_f64 = 0xAA,
+  i32_trunc_u_f64 = 0xAB,
+  i64_extend_s_i32 = 0xAC,
+  i64_extend_u_i32 = 0xAD,
+  i64_trunc_s_f32 = 0xAE,
+  i64_trunc_u_f32 = 0xAF,
+  i64_trunc_s_f64 = 0xB0,
+  i64_trunc_u_f64 = 0xB1,
+  f32_convert_s_i32 = 0xB2,
+  f32_convert_u_i32 = 0xB3,
+  f32_convert_s_i64 = 0xB4,
+  f32_convert_u_i64 = 0xB5,
+  f32_demote_f64 = 0xB6,
+  f64_convert_s_i32 = 0xB7,
+  f64_convert_u_i32 = 0xB8,
+  f64_convert_s_i64 = 0xB9,
+  f64_convert_u_i64 = 0xBA,
+  f64_promote_f32 = 0xBB,
+  i32_reinterpret_f32 = 0xBC,
+  i64_reinterpret_f64 = 0xBD,
+  f32_reinterpret_i32 = 0xBE,
+  f64_reinterpret_i64 = 0xBF
 }
 
 enum ReaderState {
diff --git a/src/flow.ts b/src/flow.ts
@@ -488,7 +488,7 @@ export class Flow {
   lookupLocal(name: string): Local | null {
     var current: Flow | null = this;
     var scope: Map<String,Local> | null;
-    do if ((scope = current.scopedLocals) && (scope.has(name))) return scope.get(name)!;
+    do if ((scope = current.scopedLocals) && scope.has(name)) return scope.get(name)!;
     while (current = current.parent);
     return this.parentFunction.localsByName.get(name)!;
   }
@@ -504,30 +504,30 @@ export class Flow {
   isLocalFlag(index: i32, flag: LocalFlags, defaultIfInlined: bool = true): bool {
     if (index < 0) return defaultIfInlined;
     var localFlags = this.localFlags;
-    return index < localFlags.length && (unchecked(this.localFlags[index]) & flag) == flag;
+    return index < localFlags.length && (unchecked(localFlags[index]) & flag) == flag;
   }
 
   /** Tests if the local at the specified index has any of the specified flags. */
   isAnyLocalFlag(index: i32, flag: LocalFlags, defaultIfInlined: bool = true): bool {
     if (index < 0) return defaultIfInlined;
     var localFlags = this.localFlags;
-    return index < localFlags.length && (unchecked(this.localFlags[index]) & flag) != 0;
+    return index < localFlags.length && (unchecked(localFlags[index]) & flag) != 0;
   }
 
   /** Sets the specified flag or flags on the local at the specified index. */
   setLocalFlag(index: i32, flag: LocalFlags): void {
     if (index < 0) return;
     var localFlags = this.localFlags;
     var flags = index < localFlags.length ? unchecked(localFlags[index]) : 0;
-    this.localFlags[index] = flags | flag;
+    localFlags[index] = flags | flag;
   }
 
   /** Unsets the specified flag or flags on the local at the specified index. */
   unsetLocalFlag(index: i32, flag: LocalFlags): void {
     if (index < 0) return;
     var localFlags = this.localFlags;
     var flags = index < localFlags.length ? unchecked(localFlags[index]) : 0;
-    this.localFlags[index] = flags & ~flag;
+    localFlags[index] = flags & ~flag;
   }
 
   /** Pushes a new break label to the stack, for example when entering a loop that one can `break` from. */
@@ -582,10 +582,10 @@ export class Flow {
     for (let i = 0, k = localFlags.length; i < k; ++i) {
       let flags = localFlags[i];
       this.setLocalFlag(i, flags & LocalFlags.ANY_CONDITIONAL);
-      if (flags & LocalFlags.RETAINED) this.setLocalFlag(i, LocalFlags.CONDITIONALLY_RETAINED);
-      if (flags & LocalFlags.READFROM) this.setLocalFlag(i, LocalFlags.CONDITIONALLY_READFROM);
+      if (flags & LocalFlags.RETAINED)  this.setLocalFlag(i, LocalFlags.CONDITIONALLY_RETAINED);
+      if (flags & LocalFlags.READFROM)  this.setLocalFlag(i, LocalFlags.CONDITIONALLY_READFROM);
       if (flags & LocalFlags.WRITTENTO) this.setLocalFlag(i, LocalFlags.CONDITIONALLY_WRITTENTO);
-      if (flags & LocalFlags.RETURNED) this.setLocalFlag(i, LocalFlags.CONDITIONALLY_RETURNED);
+      if (flags & LocalFlags.RETURNED)  this.setLocalFlag(i, LocalFlags.CONDITIONALLY_RETURNED);
     }
   }
 
@@ -786,9 +786,10 @@ export class Flow {
           if (!ifFalse) break;
           // Logical OR: (if (condition 1 ifFalse))
           // the only way this had become false is if condition and ifFalse are false
+          let exprType = getExpressionType(ifTrue);
           if (
-            (getExpressionType(ifTrue) == NativeType.I32 && getConstValueI32(ifTrue) != 0) ||
-            (getExpressionType(ifTrue) == NativeType.I64 && (getConstValueI64Low(ifTrue) != 0 || getConstValueI64High(ifTrue) != 0))
+            (exprType == NativeType.I32 && getConstValueI32(ifTrue) != 0) ||
+            (exprType == NativeType.I64 && (getConstValueI64Low(ifTrue) != 0 || getConstValueI64High(ifTrue) != 0))
           ) {
             this.inheritNonnullIfFalse(getIfCondition(expr));
             this.inheritNonnullIfFalse(getIfFalse(expr));
diff --git a/src/util/charcode.ts b/src/util/charcode.ts
@@ -184,11 +184,11 @@ export function isOctalDigit(c: i32): bool {
 
 /** Tests if the specified character code is a valid start of an identifier. */
 export function isIdentifierStart(c: i32): bool {
-  return c >= CharCode.a && c <= CharCode.z
-      || c >= CharCode.A && c <= CharCode.Z
+  const c0 = c | 32; // unify uppercases and lowercases a|A - z|Z
+  return c0 >= CharCode.a && c0 <= CharCode.z
       || c == CharCode._
       || c == CharCode.DOLLAR
-      || c > 0x7f && isUnicodeIdentifierStart(c);
+      || c > 0x7F && isUnicodeIdentifierStart(c);
 }
 
 /** Tests if the specified character code is a valid keyword character. */
@@ -198,12 +198,12 @@ export function isKeywordCharacter(c: i32): bool {
 
 /** Tests if the specified character code is a valid part of an identifier. */
 export function isIdentifierPart(c: i32): bool {
-  return c >= CharCode.a && c <= CharCode.z
-      || c >= CharCode.A && c <= CharCode.Z
+  const c0 = c | 32; // unify uppercases and lowercases a|A - z|Z
+  return c0 >= CharCode.a && c0 <= CharCode.z
       || c >= CharCode._0 && c <= CharCode._9
       || c == CharCode._
       || c == CharCode.DOLLAR
-      || c > 0x7f && isUnicodeIdentifierPart(c);
+      || c > 0x7F && isUnicodeIdentifierPart(c);
 }
 
 // storing as u16 to save memory
@@ -368,11 +368,11 @@ function lookupInUnicodeMap(code: u16, map: u16[]): bool {
 }
 
 function isUnicodeIdentifierStart(code: i32): bool {
-  return code < 0 || code > 0xffff ? false
+  return code < 170 || code > 65500 ? false
        : lookupInUnicodeMap(code as u16, unicodeIdentifierStart);
 }
 
 function isUnicodeIdentifierPart(code: i32): bool {
-  return code < 0 || code > 0xffff ? false
+  return code < 170 || code > 65500 ? false
        : lookupInUnicodeMap(code as u16, unicodeIdentifierPart);
 }
diff --git a/src/util/collections.ts b/src/util/collections.ts
@@ -1,7 +1,8 @@
 export function makeArray<V>(original: Array<V> | null = null): Array<V> {
   if (original) {
-    let cloned = new Array<V>(original.length);
-    for (let i = 0, k = original.length; i < k; ++i) unchecked(cloned[i] = original[i]);
+    let len = original.length;
+    let cloned = new Array<V>(len);
+    for (let i = 0; i < len; ++i) unchecked(cloned[i] = original[i]);
     return cloned;
   }
   return new Array<V>();
