(hide internals) Remove access form user code to pegjs internals. Thi…

…s break some grammars, that need that,

for example, BerTLV or intendation-based parsers, that need access to `peg$currPos`.

lib/compiler/passes/generate-js.js

@@ -64,20 +64,12 @@ function generateJS(ast, options) {
       }
     }
 
-    function buildFunc(a) {
-      return "function(" + a.params.join(", ") + ") {"
-             + a.body
-             + "}";
-    }
-
     return ast.literals.map(
       (c, i) => "var " + l(i) + " = " + buildLiteral(c) + ";"
     ).concat("", ast.classes.map(
       (c, i) => "var " + r(i) + " = " + buildRegexp(c) + ";"
     )).concat("", ast.expectations.map(
       (c, i) => "var " + e(i) + " = " + buildExpectation(c) + ";"
-    )).concat("", ast.functions.map(
-      (c, i) => "var " + f(i) + " = " + buildFunc(c) + ";"
     )).join("\n");
   }
 
@@ -577,9 +569,32 @@ function generateJS(ast, options) {
     return parts.join("\n");
   }
 
+  function generateSandbox() {
+    let parts = [
+      "function peg$sandbox(input, options, text, offset, range, location, expected, error) {"
+    ];
+
+    if (ast.initializer) {
+      parts.push(indent2(ast.initializer.code));
+      parts.push("");
+    }
+
+    parts.push("  return [");
+    ast.functions.forEach(f => {
+      parts.push("    function(" + f.params.join(", ") + ") {" + f.body + "},");
+    });
+    parts.push("  ];");
+
+    parts.push("}");
+
+    return parts.join("\n");
+  }
+
   function generateToplevel() {
     let parts = [];
 
+    parts.push(generateSandbox());
+
     parts.push([
       "function peg$subclass(child, parent) {",
       "  function C() { this.constructor = child; }",
@@ -985,19 +1000,20 @@ function generateJS(ast, options) {
       "        : peg$computeLocation(failPos, failPos)",
       "    );",
       "  }",
-      ""
+      "",
+      "  var peg$functions = peg$sandbox(input, options, text, offset, range, location, expected, error);",
+      "",
     ].join("\n"));
 
+    ast.functions.forEach((_, i) => {
+      parts.push(indent2("var " + f(i) + " = peg$functions[" + i + "];"));
+    });
+    parts.push("");
     ast.rules.forEach(rule => {
       parts.push(indent2(generateRuleFunction(rule)));
       parts.push("");
     });
 
-    if (ast.initializer) {
-      parts.push(indent2(ast.initializer.code));
-      parts.push("");
-    }
-
     parts.push([
       "  peg$begin();",
       "  peg$result = peg$startRuleFunction();",