Add block scoping for conditional statements and expressions (#44)

* add tests for block scoping

* Get block scoping working

Author: yyc

src/__tests__/__snapshots__/index.ts.snap

@@ -252,4 +252,11 @@ Object {
 }
 `;
 
+exports[`const uses block scoping instead of function scoping 1`] = `
+Object {
+  "status": "finished",
+  "value": true,
+}
+`;
+
 exports[`parseError for missing semicolon 1`] = `"Line 1: Missing semicolon at the end of statement"`;

src/__tests__/index.ts

@@ -131,3 +131,26 @@ test(
   },
   30000
 )
+
+// This is bad practice. Don't do this!
+test('const uses block scoping instead of function scoping', () => {
+  const code = `
+    function test(){
+      const x = true;
+      if(true) {
+          const x = false;
+      } else {
+          const x = false;
+      }
+      return x;
+    }
+    test();
+  `;
+  const context = mockContext()
+  const promise = runInContext(code, context, { scheduler: 'preemptive' })
+  return promise.then(obj => {
+    expect(obj).toMatchSnapshot()
+    expect(obj.status).toBe('finished')
+    expect((obj as Finished).value).toBe(true)
+  })
+})

src/interpreter.ts

@@ -43,6 +43,20 @@ const createFrame = (
   return frame
 }
 
+const createBlockFrame = (
+  context: Context,
+  vars: es.Identifier[],
+  args: Value[],
+): Frame => {
+  const frame: Frame = {
+    name: 'ifStatementBlock',
+    parent: currentFrame(context),
+    environment: {},
+    thisContext: context
+  }
+  return frame
+}
+
 const handleError = (context: Context, error: SourceError) => {
   context.errors.push(error)
   if (error.severity === ErrorSeverity.ERROR) {
@@ -369,10 +383,18 @@ export const evaluators: { [nodeType: string]: Evaluator<es.Node> } = {
       return undefined
     }
 
+    // Create a new frame (block scoping)
+    const frame = createBlockFrame(context, [], [])
+    pushFrame(context, frame)
+
     if (test) {
-      return yield* evaluate(node.consequent, context)
+      const result = yield* evaluate(node.consequent, context)
+      popFrame(context)
+      return result
     } else if (node.alternate) {
-      return yield* evaluate(node.alternate, context)
+      const result = yield* evaluate(node.alternate, context)
+      popFrame(context)
+      return result
     } else {
       return undefined
     }