Fix two bugs with nested evaluation

* Fix bug causing the active mode to not be passed down into
  recursively rendered text.
* Fix bug causing named choices executed inside recursively rendered
  text to not propagate upward.

Author: ajyoon

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
 ### 0.0.17
+* Fix bug causing the active mode to not be passed down into
+  recursively rendered text.
+* Fix bug causing named choices executed inside recursively rendered
+  text to not propagate upward.
 * tbd...
 
 ### 0.0.16

src/renderer.js

@@ -74,13 +74,14 @@ function resolveBackReference(choiceResultMap, backReference) {
  *
  * @returns {String} the rendered text.
  */
-function renderText(string, startIndex, evalBlock,
-                    modes, renderDefaultSettings, isTopLevel) {
+function renderText(string, startIndex, evalBlock, modes, activeMode,
+                    renderDefaultSettings, choiceResultMap, isTopLevel) {
   // TODO this function is way too complex and badly needs refactor
-  let activeMode = null;
+  // TODO replace isTopLevel with incrementing depth tracker
+  choiceResultMap = choiceResultMap || new Map();
+  activeMode = activeMode || null;
   let isEscaped = false;
   let inLiteralBlock = false;
-  let choiceResultMap = new Map();
   let out = '';
   let index = startIndex;
   let currentRule = null;
@@ -151,7 +152,7 @@ function renderText(string, startIndex, evalBlock,
           // To handle nested choices and to run rules over chosen text,
           // we recursively render the chosen text.
           renderedReplacement = renderText(
-            replacement, 0, null, modes, activeMode, settings, false);
+            replacement, 0, null, modes, activeMode, settings, choiceResultMap, false);
         }
         if (!(replacer && replacer.isSilent)) {
           out += renderedReplacement;
@@ -196,7 +197,7 @@ function renderText(string, startIndex, evalBlock,
                   // To handle nested choices and to run rules over replaced text,
                   // we recursively render the chosen text.
                   let renderedReplacement = renderText(
-                    replacement, 0, null, modes, activeMode, settings, false);
+                    replacement, 0, null, modes, activeMode, settings, choiceResultMap, false);
                   out += renderedReplacement;
                 }
                 index += currentMatch[0].length;
@@ -260,7 +261,7 @@ function render(bmlDocumentString, renderSettings, defaultDocumentSettings) {
     evalBlock = null;
   }
   return renderText(
-    bmlDocumentString, preludeEndIndex, evalBlock, modes, defaultDocumentSettings, true);
+    bmlDocumentString, preludeEndIndex, evalBlock, modes, null, defaultDocumentSettings, null, true);
 }
 
 exports.renderText = renderText;

test/endToEnd.js

@@ -44,6 +44,18 @@ describe('bml', function() {
     }
   });
 
+  it('respects the active mode on recursively rendered text', function() {
+    let testString =
+        `mode test {
+            (foo) as (bar) 100
+        }
+        {use test}
+        {(foo)}
+        `;
+    let result = bml(testString).trim();
+    expect(result).to.equal('bar');
+  });
+  
   it('can process recursive inline choices', function() {
     let testString = 'hello {(simple), ({(very ), ()}recursive)} world!';
     let result = bml(testString);
@@ -106,6 +118,14 @@ describe('bml', function() {
       assert.fail(`Unexpected output: ${result}`);
     }
   });
+  
+  it('tracks named choices made inside recursively rendered text', function() {
+    let testString = `
+      {({TestChoice: (foo)})} {@TestChoice}
+    `;
+    let result = bml(testString).trim();
+    expect(result).to.equal('foo foo');
+  });
 
   it('produces the exact same document when using a fixed random seed', function() {
     const testString = '' + fs.readFileSync(require.resolve('./randomSmokeTest.bml'));