Provide context to parser (#517)

master
Futago-za Ryuu 6 years ago
parent 04dfef3b63
commit 30cfa29553

@ -13,6 +13,7 @@ const reportUndefinedRules = require( "./passes/report-undefined-rules" );
const inferenceMatchResult = require( "./passes/inference-match-result" );
const Session = require( "./session" );
const util = require( "../util" );
const vm = require( "./vm" );
function processOptions( options, defaults ) {
@ -28,6 +29,7 @@ function processOptions( options, defaults ) {
const compiler = {
Session: Session,
vm: vm,
// Compiler passes.
//
@ -65,6 +67,7 @@ const compiler = {
options = processOptions( options, {
allowedStartRules: [ ast.rules[ 0 ].name ],
cache: false,
context: {},
dependencies: {},
exportVar: null,
format: "bare",
@ -86,7 +89,7 @@ const compiler = {
switch ( options.output ) {
case "parser":
return eval( ast.code );
return session.vm.runInContext( ast.code, options.context );
case "source":
return ast.code;

@ -6,6 +6,7 @@ const ast = require( "../ast" );
const GrammarError = require( "../grammar-error" );
const opcodes = require( "./opcodes" );
const parser = require( "../parser" );
const vm = require( "./vm" );
function fatal( message, location ) {
@ -28,6 +29,7 @@ class Session {
this.parser = options.parser || parser;
this.passes = options.passes || [];
this.visitor = options.visitor || ast.visitor;
this.vm = options.vm || vm;
if ( typeof options.warn === "function" ) this.warn = options.warn;
if ( typeof options.error === "function" ) this.error = options.error;

@ -0,0 +1,25 @@
"use strict";
const vm = {
runInContext( code, context ) {
const peg$context = typeof context !== "undefined" ? context : {};
/* eslint indent: 0 */
return eval( `
${
Object.keys( peg$context )
.map( key => `var ${ key } = peg$context.${ key };` )
.join( "" )
}
var vm = null, code = null, context = null;
${ code }
` );
},
};
module.exports = vm;

@ -102,10 +102,6 @@ describe( "plugin API", function () {
config.parser = peg.generate( `
{
const ast = require( process.cwd() + "/lib/ast" );
}
start = .* {
return new ast.Grammar( void 0, [{
type: "rule",
@ -118,7 +114,7 @@ describe( "plugin API", function () {
}] );
}
` );
`, { context: { ast: peg.ast } } );
}
};

Loading…
Cancel
Save