Merge branch 'master' into typed-modules

Author: tohlh

package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-slang",
-  "version": "1.0.79",
+  "version": "1.0.80",
   "license": "Apache-2.0",
   "description": "Javascript-based implementations of Source, written in Typescript",
   "keywords": [
@@ -130,5 +130,6 @@
         }
       ]
     ]
-  }
+  },
+  "packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

src/cse-machine/__tests__/__snapshots__/cse-machine-runtime-context.ts.snap

@@ -532,7 +532,7 @@ exports[`Avoid unnescessary environment instruction 265`] = `5`;
 
 exports[`Avoid unnescessary environment instruction 266`] = `4`;
 
-exports[`Avoid unnescessary environment instruction 267`] = `4`;
+exports[`Avoid unnescessary environment instruction 267`] = `5`;
 
 exports[`Avoid unnescessary environment instruction 268`] = `4`;
 

src/cse-machine/interpreter.ts

@@ -499,9 +499,8 @@ const cmdEvaluators: { [type: string]: CmdEvaluator } = {
     }
 
     if (command.body.length == 1) {
-      // If program only consists of one statement, evaluate it immediately
-      const next = command.body[0]
-      cmdEvaluators[next.type](next, context, control, stash, isPrelude)
+      // If program only consists of one statement, unwrap outer block
+      control.push(...handleSequence(command.body))
     } else {
       // Push block body as statement sequence
       const seq: StatementSequence = ast.statementSequence(command.body, command.loc)
@@ -584,14 +583,12 @@ const cmdEvaluators: { [type: string]: CmdEvaluator } = {
     // Refer to Source §3 specifications https://docs.sourceacademy.org/source_3.pdf
     if (init.type === 'VariableDeclaration' && init.kind === 'let') {
       const id = init.declarations[0].id as es.Identifier
-      const valueExpression = init.declarations[0].init!
-
       control.push(
         ast.blockStatement(
           [
             init,
             ast.forStatement(
-              ast.assignmentExpression(id, valueExpression, command.loc),
+              ast.assignmentExpression(id, ast.identifier(id.name, command.loc), command.loc),
               test,
               update,
               ast.blockStatement(