From cc0aa9682fa4ab75840c9248ebdaaf56074c6c58 Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Sun, 18 Aug 2019 14:18:56 -0700
Subject: [PATCH] Prefer const in modern

---
 modern/.eslintrc                            | 1 -
 modern/src/initialize.js                    | 3 ++-
 modern/src/maki-interpreter/interpreter.js  | 6 +++---
 modern/src/maki-interpreter/objects.test.js | 4 ++--
 modern/src/utils.js                         | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modern/.eslintrc b/modern/.eslintrc
index 25e1dfe4..937dea65 100644
--- a/modern/.eslintrc
+++ b/modern/.eslintrc
@@ -2,7 +2,6 @@
   "rules": {
     // TODO: Turn these all back on
     "camelcase": "off",
-    "prefer-const": "off",
     "no-shadow": "off",
     "no-nested-ternary": "off",
     "no-undef": "off",
diff --git a/modern/src/initialize.js b/modern/src/initialize.js
index 05e09468..fb6236f1 100644
--- a/modern/src/initialize.js
+++ b/modern/src/initialize.js
@@ -57,7 +57,8 @@ const parsers = {
   sendparams: noop,
   elements: (node, parent) => new JsElements(node, parent),
   bitmap: async (node, parent, zip) => {
-    let { file, gammagroup, h, id, w, x, y } = node.attributes;
+    let { h, w, x, y } = node.attributes;
+    const { file, gammagroup, id } = node.attributes;
     // TODO: Escape file for regex
     const img = getCaseInsensitveFile(zip, file);
     if (img === undefined) {
diff --git a/modern/src/maki-interpreter/interpreter.js b/modern/src/maki-interpreter/interpreter.js
index 92c6ce6b..f458e724 100644
--- a/modern/src/maki-interpreter/interpreter.js
+++ b/modern/src/maki-interpreter/interpreter.js
@@ -135,9 +135,9 @@ export function* interpret(start, program, stack = []) {
       case 24:
       case 112: {
         const methodOffset = command.arg;
-        let { name: methodName, typeOffset: classesOffset } = methods[
-          methodOffset
-        ];
+        const method = methods[methodOffset];
+        let methodName = method.name;
+        const classesOffset = method.typeOffset;
         methodName = methodName.toLowerCase();
 
         const klass = classes[classesOffset];
diff --git a/modern/src/maki-interpreter/objects.test.js b/modern/src/maki-interpreter/objects.test.js
index 144ae446..a480b297 100644
--- a/modern/src/maki-interpreter/objects.test.js
+++ b/modern/src/maki-interpreter/objects.test.js
@@ -10,7 +10,7 @@ const getMakiMethods = obj =>
     );
   });
 
-for (let [key, Klass] of Object.entries(runtime)) {
+for (const [key, Klass] of Object.entries(runtime)) {
   const obj = getClass(key);
   describe(`${obj.name}`, () => {
     test("implements getclassname()", () => {
@@ -30,7 +30,7 @@ for (let [key, Klass] of Object.entries(runtime)) {
 describe("Maki classes", () => {
   const runtimeMethods = new Set();
   const objectMethods = new Set();
-  for (let [key, Klass] of Object.entries(runtime)) {
+  for (const [key, Klass] of Object.entries(runtime)) {
     const obj = getClass(key);
     getMakiMethods(Klass.prototype).forEach(methodName => {
       runtimeMethods.add(`${obj.name}.${methodName}`);
diff --git a/modern/src/utils.js b/modern/src/utils.js
index 14ce94e9..9a3cb121 100644
--- a/modern/src/utils.js
+++ b/modern/src/utils.js
@@ -158,7 +158,7 @@ function findDirectDescendantById(node, id) {
 function* iterateLexicalScope(node) {
   let currentNode = node;
   while (currentNode.parent) {
-    let { parent } = currentNode;
+    const { parent } = currentNode;
     const { children } = parent;
     for (let i = 0; i < children.length; i++) {
       const child = children[i];