Chore: Code Reordering

Author: kavishsathia

src/tracer/__tests__/tracer_debug.ts

@@ -112,7 +112,9 @@ function h(f, x) {
 // TODO: Check for -Infinity
 test('general', () => {
   const code = `
-  1 ? 2: 2;
+  const x = 1;
+  const f = x => x + "";
+  f(2);
   `
   const program = parse(code, { ecmaVersion: 10, locations: true })!
   const steps = getSteps(convert(program), { stepLimit: 200 })

src/tracer/generator.ts

@@ -163,6 +163,7 @@ export function explain(redex: StepperBaseNode): string {
         throw new Error('`callee` should be function expression.')
       }
 
+      // Determine whether the called function is built-in or not and create explanation accordingly
       const func: StepperArrowFunctionExpression = node.callee as StepperArrowFunctionExpression
       if (func.name && isBuiltinFunction(func.name)) {
         return `${func.name} runs`

src/tracer/nodes/Statement/ExpressionStatement.ts

@@ -5,6 +5,37 @@ import { StepperExpression, StepperPattern } from '..'
 import { redex } from '../..'
 
 export class StepperExpressionStatement implements ExpressionStatement, StepperBaseNode {
+  type: 'ExpressionStatement'
+  expression: StepperExpression
+  leadingComments?: Comment[] | undefined
+  trailingComments?: Comment[] | undefined
+  loc?: SourceLocation | null | undefined
+  range?: [number, number] | undefined
+  
+  constructor(
+    expression: StepperExpression,
+    leadingComments?: Comment[] | undefined,
+    trailingComments?: Comment[] | undefined,
+    loc?: SourceLocation | null | undefined,
+    range?: [number, number] | undefined,
+  ) {
+    this.type = 'ExpressionStatement'
+    this.expression = expression;
+    this.leadingComments = leadingComments;
+    this.trailingComments = trailingComments;
+    this.loc = loc;
+    this.range = range;
+  }
+
+  static create(node: ExpressionStatement) {
+    return new StepperExpressionStatement(
+      convert(node.expression) as StepperExpression,
+      node.leadingComments,
+      node.trailingComments,
+      node.loc,
+      node.range
+    )
+  }
 
   isContractible(): boolean {
     return this.expression.isContractible()
@@ -38,39 +69,6 @@ export class StepperExpressionStatement implements ExpressionStatement, StepperB
     )
   }
 
-  type: 'ExpressionStatement'
-  expression: StepperExpression
-  leadingComments?: Comment[] | undefined
-  trailingComments?: Comment[] | undefined
-  loc?: SourceLocation | null | undefined
-  range?: [number, number] | undefined
-
-
-  static create(node: ExpressionStatement) {
-    return new StepperExpressionStatement(
-      convert(node.expression) as StepperExpression,
-      node.leadingComments,
-      node.trailingComments,
-      node.loc,
-      node.range
-    )
-  }
-
-  constructor(
-    expression: StepperExpression,
-    leadingComments?: Comment[] | undefined,
-    trailingComments?: Comment[] | undefined,
-    loc?: SourceLocation | null | undefined,
-    range?: [number, number] | undefined,
-  ) {
-    this.type = 'ExpressionStatement'
-    this.expression = expression;
-    this.leadingComments = leadingComments;
-    this.trailingComments = trailingComments;
-    this.loc = loc;
-    this.range = range;
-  }
-
   substitute(id: StepperPattern, value: StepperExpression): StepperBaseNode {
       return new StepperExpressionStatement(
         this.expression.substitute(id, value),

src/tracer/nodes/Statement/ReturnStatement.ts

@@ -11,6 +11,32 @@ export class StepperReturnStatement implements ReturnStatement, StepperBaseNode
   trailingComments?: Comment[] | undefined
   loc?: SourceLocation | null | undefined
   range?: [number, number] | undefined
+
+
+  constructor(
+    argument: StepperExpression | null,
+    leadingComments?: Comment[] | undefined,
+    trailingComments?: Comment[] | undefined,
+    loc?: SourceLocation | null | undefined,
+    range?: [number, number] | undefined,
+  ) {
+    this.type = 'ReturnStatement'
+    this.argument = argument;
+    this.leadingComments = leadingComments;
+    this.trailingComments = trailingComments;
+    this.loc = loc;
+    this.range = range;
+  }
+
+  static create(node: ReturnStatement) {
+    return new StepperReturnStatement(
+      node.argument ? convert(node.argument) as StepperExpression : null,
+      node.leadingComments,
+      node.trailingComments,
+      node.loc,
+      node.range
+    )
+  }
 
   isContractible(): boolean {
     return true;
@@ -41,33 +67,6 @@ export class StepperReturnStatement implements ReturnStatement, StepperBaseNode
     return this.contract();
   }
 
-  
-
-  static create(node: ReturnStatement) {
-    return new StepperReturnStatement(
-      node.argument ? convert(node.argument) as StepperExpression : null,
-      node.leadingComments,
-      node.trailingComments,
-      node.loc,
-      node.range
-    )
-  }
-
-  constructor(
-    argument: StepperExpression | null,
-    leadingComments?: Comment[] | undefined,
-    trailingComments?: Comment[] | undefined,
-    loc?: SourceLocation | null | undefined,
-    range?: [number, number] | undefined,
-  ) {
-    this.type = 'ReturnStatement'
-    this.argument = argument;
-    this.leadingComments = leadingComments;
-    this.trailingComments = trailingComments;
-    this.loc = loc;
-    this.range = range;
-  }
-
   substitute(id: StepperPattern, value: StepperExpression): StepperBaseNode {
     return new StepperReturnStatement(
       this.argument ? this.argument.substitute(id, value) as StepperExpression : null,