Clean up p5.strands in a finally block

Author: davepagurek

src/strands/p5.strands.js

@@ -65,39 +65,41 @@ function strands(p5, fn) {
 
   p5.Shader.prototype.modify = function(shaderModifier, scope = {}) {
     if (shaderModifier instanceof Function) {
-      // Reset the context object every time modify is called;
-      // const backend = glslBackend;
-      initStrandsContext(strandsContext, glslBackend, { active: true });
-      createShaderHooksFunctions(strandsContext, fn, this);
-      // TODO: expose this, is internal for debugging for now.
-      const options = { parser: true, srcLocations: false };
+      try {
+        // Reset the context object every time modify is called;
+        // const backend = glslBackend;
+        initStrandsContext(strandsContext, glslBackend, { active: true });
+        createShaderHooksFunctions(strandsContext, fn, this);
+        // TODO: expose this, is internal for debugging for now.
+        const options = { parser: true, srcLocations: false };
 
-      // 1. Transpile from strands DSL to JS
-      let strandsCallback;
-      if (options.parser) {
-        // #7955 Wrap function declaration code in brackets so anonymous functions are not top level statements, which causes an error in acorn when parsing
-        // https://github.com/acornjs/acorn/issues/1385
-        const sourceString = `(${shaderModifier.toString()})`;
-        strandsCallback = transpileStrandsToJS(p5, sourceString, options.srcLocations, scope);
-      } else {
-        strandsCallback = shaderModifier;
-      }
-
-      // 2. Build the IR from JavaScript API
-      const globalScope = createBasicBlock(strandsContext.cfg, BlockType.GLOBAL);
-      pushBlock(strandsContext.cfg, globalScope);
-      strandsCallback();
-      popBlock(strandsContext.cfg);
+        // 1. Transpile from strands DSL to JS
+        let strandsCallback;
+        if (options.parser) {
+          // #7955 Wrap function declaration code in brackets so anonymous functions are not top level statements, which causes an error in acorn when parsing
+          // https://github.com/acornjs/acorn/issues/1385
+          const sourceString = `(${shaderModifier.toString()})`;
+          strandsCallback = transpileStrandsToJS(p5, sourceString, options.srcLocations, scope);
+        } else {
+          strandsCallback = shaderModifier;
+        }
 
-      // 3. Generate shader code hooks object from the IR
-      // .......
-      const hooksObject = generateShaderCode(strandsContext);
+        // 2. Build the IR from JavaScript API
+        const globalScope = createBasicBlock(strandsContext.cfg, BlockType.GLOBAL);
+        pushBlock(strandsContext.cfg, globalScope);
+        strandsCallback();
+        popBlock(strandsContext.cfg);
 
-      // Reset the strands runtime context
-      deinitStrandsContext(strandsContext);
+        // 3. Generate shader code hooks object from the IR
+        // .......
+        const hooksObject = generateShaderCode(strandsContext);
 
-      // Call modify with the generated hooks object
-      return oldModify.call(this, hooksObject);
+        // Call modify with the generated hooks object
+        return oldModify.call(this, hooksObject);
+      } finally {
+        // Reset the strands runtime context
+        deinitStrandsContext(strandsContext);
+      }
     }
     else {
       return oldModify.call(this, shaderModifier)