Merge pull request #23 from Nitro-Bolt/next-up

The Next Compiler

Author: CubesterYT

package-lock.json

@@ -50,7 +50,7 @@
     "jszip": "^3.1.5",
     "scratch-parser": "github:Nitro-Bolt/scratch-parser#master",
     "scratch-sb1-converter": "0.2.7",
-    "scratch-translate-extension-languages": "0.0.20191118205314",
+    "scratch-translate-extension-languages": "^1.0.7",
     "text-encoding": "0.7.0",
     "uuid": "8.3.2",
     "worker-loader": "^1.1.1"

package.json

@@ -1,13 +1,16 @@
+// @ts-check
+
 const BlockUtility = require('../engine/block-utility');
 
 class CompatibilityLayerBlockUtility extends BlockUtility {
     constructor () {
         super();
+        this._stackFrame = {};
         this._startedBranch = null;
     }
 
     get stackFrame () {
-        return this.thread.compatibilityStackFrame;
+        return this.thread?.compatibilityStackFrame;
     }
 
     startBranch (branchNumber, isLoop) {

src/compiler/compat-block-utility.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 /**
  * @fileoverview List of blocks to be supported in the compiler compatibility layer.
  * This is only for native blocks. Extensions should not be listed here.

src/compiler/compat-blocks.js

@@ -1,14 +1,20 @@
+// @ts-check
+
 const {IRGenerator} = require('./irgen');
+const {IROptimizer} = require('./iroptimizer');
 const JSGenerator = require('./jsgen');
 
-const compile = thread => {
+const compile = (/** @type {import("../engine/thread")} */ thread) => {
     const irGenerator = new IRGenerator(thread);
     const ir = irGenerator.generate();
 
+    const irOptimizer = new IROptimizer(ir);
+    irOptimizer.optimize();
+
     const procedures = {};
     const target = thread.target;
 
-    const compileScript = script => {
+    const compileScript = (/** @type {import("./intermediate").IntermediateScript} */ script) => {
         if (script.cachedCompileResult) {
             return script.cachedCompileResult;
         }