joepie91/pegjs
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Improve location info in tracing events

Browse source 
Replace |line|, |column|, and |offset| properties of tracing events with
the |location| property. It contains an object similar to the one
returned by the |location| function available in action code:

  {
    start: { offset: 23, line: 5, column: 6 },
    end:   { offset: 25, line: 5, column: 8 }
  }

For the |rule.match| event, |start| refers to the position at the
beginning of the matched input and |end| refers to the position after
the end of the matched input.

For |rule.enter| and |rule.fail| events, both |start| and |end| refer to
the current position at the time the rule was entered.
This commit is contained in:
David Majda 2015-04-03 17:28:48 +02:00
parent 065f4e1b75
commit d1fe86683b
3 changed files with 99 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
lib/compiler/passes/generate-javascript.js
View file

@ -44,9 +44,10 @@ function generateJavascript(ast, options) {
if (options.trace) { if (options.trace) {
parts.push([ parts.push([
'peg$trace({', 'peg$tracer.trace({',
' type: "rule.enter",', ' type: "rule.enter",',
' rule: ' + ruleNameCode, ' rule: ' + ruleNameCode + ',',
' location: peg$computeLocation(startPos, startPos)',
'});', '});',
'' ''
].join('\n')); ].join('\n'));
@ -65,15 +66,17 @@ function generateJavascript(ast, options) {
if (options.trace) { if (options.trace) {
parts.push([ parts.push([
'if (cached.result !== peg$FAILED) {', 'if (cached.result !== peg$FAILED) {',
' peg$trace({', ' peg$tracer.trace({',
' type: "rule.match",', ' type: "rule.match",',
' rule: ' + ruleNameCode + ',', ' rule: ' + ruleNameCode + ',',
' result: cached.result', ' result: cached.result,',
' location: peg$computeLocation(startPos, peg$currPos)',
' });', ' });',
'} else {', '} else {',
' peg$trace({', ' peg$tracer.trace({',
' type: "rule.fail",', ' type: "rule.fail",',
' rule: ' + ruleNameCode, ' rule: ' + ruleNameCode + ',',
' location: peg$computeLocation(startPos, startPos)',
' });', ' });',
'}', '}',
'' ''
@ -104,15 +107,17 @@ function generateJavascript(ast, options) {
parts.push([ parts.push([
'', '',
'if (' + resultCode + ' !== peg$FAILED) {', 'if (' + resultCode + ' !== peg$FAILED) {',
' peg$trace({', ' peg$tracer.trace({',
' type: "rule.match",', ' type: "rule.match",',
' rule: ' + ruleNameCode + ',', ' rule: ' + ruleNameCode + ',',
' result: ' + resultCode, ' result: ' + resultCode + ',',
' location: peg$computeLocation(startPos, peg$currPos)',
' });', ' });',
'} else {', '} else {',
' peg$trace({', ' peg$tracer.trace({',
' type: "rule.fail",', ' type: "rule.fail",',
' rule: ' + ruleNameCode, ' rule: ' + ruleNameCode + ',',
' location: peg$computeLocation(startPos, startPos)',
' });', ' });',
'}' '}'
].join('\n')); ].join('\n'));
@ -202,15 +207,31 @@ function generateJavascript(ast, options) {
'}', '}',
'', '',
'function peg$parseRule(index) {', 'function peg$parseRule(index) {',
' var bc = peg$bytecode[index],',
' ip = 0,',
' ips = [],',
' end = bc.length,',
' ends = [],',
' stack = [],',
' params, i;',
].join('\n')); ].join('\n'));
if (options.trace) {
parts.push([
' var bc = peg$bytecode[index],',
' ip = 0,',
' ips = [],',
' end = bc.length,',
' ends = [],',
' stack = [],',
' startPos = peg$currPos,',
' params, i;',
].join('\n'));
} else {
parts.push([
' var bc = peg$bytecode[index],',
' ip = 0,',
' ips = [],',
' end = bc.length,',
' ends = [],',
' stack = [],',
' params, i;',
].join('\n'));
}
parts.push(indent2(generateRuleHeader('peg$ruleNames[index]', 'index'))); parts.push(indent2(generateRuleHeader('peg$ruleNames[index]', 'index')));
parts.push([ parts.push([
@ -705,10 +726,18 @@ function generateJavascript(ast, options) {
code = compile(rule.bytecode); code = compile(rule.bytecode);
parts.push([ parts.push('function peg$parse' + rule.name + '() {');
'function peg$parse' + rule.name + '() {',
' var ' + arrays.map(arrays.range(0, stack.maxSp + 1), s).join(', ') + ';', if (options.trace) {
].join('\n')); parts.push([
' var ' + arrays.map(arrays.range(0, stack.maxSp + 1), s).join(', ') + ',',
' startPos = peg$currPos;'
].join('\n'));
} else {
parts.push(
' var ' + arrays.map(arrays.range(0, stack.maxSp + 1), s).join(', ') + ';'
);
}
parts.push(indent2(generateRuleHeader( parts.push(indent2(generateRuleHeader(
'"' + js.stringEscape(rule.name) + '"', '"' + js.stringEscape(rule.name) + '"',
@ -782,7 +811,8 @@ function generateJavascript(ast, options) {
' }', ' }',
'', '',
' console.log(', ' console.log(',
' event.line + ":" + event.column + " "', ' event.location.start.line + ":" + event.location.start.column + "-"',
' + event.location.end.line + ":" + event.location.end.column + " "',
' + pad(event.type, 10) + " "', ' + pad(event.type, 10) + " "',
' + repeat(" ", that.indentLevel) + event.rule', ' + repeat(" ", that.indentLevel) + event.rule',
' );', ' );',
@ -1102,21 +1132,6 @@ function generateJavascript(ast, options) {
'' ''
].join('\n')); ].join('\n'));
if (options.trace) {
parts.push([
' function peg$trace(event) {',
' var posDetails = peg$computePosDetails(peg$currPos);',
'',
' event.offset = peg$currPos;',
' event.line = posDetails.line;',
' event.column = posDetails.column;',
'',
' peg$tracer.trace(event);',
' }',
'',
].join('\n'));
}
if (options.optimize === "size") { if (options.optimize === "size") {
parts.push(indent4(generateInterpreter())); parts.push(indent4(generateInterpreter()));
parts.push(''); parts.push('');

82
spec/api/generated-parser-api.spec.js
View file

@ -54,12 +54,12 @@ describe("generated parser API", function() {
parser.parse("b"); parser.parse("b");
expect(console.log).toHaveBeenCalledWith("1:1 rule.enter start"); expect(console.log).toHaveBeenCalledWith("1:1-1:1 rule.enter start");
expect(console.log).toHaveBeenCalledWith("1:1 rule.enter a"); expect(console.log).toHaveBeenCalledWith("1:1-1:1 rule.enter a");
expect(console.log).toHaveBeenCalledWith("1:1 rule.fail a"); expect(console.log).toHaveBeenCalledWith("1:1-1:1 rule.fail a");
expect(console.log).toHaveBeenCalledWith("1:1 rule.enter b"); expect(console.log).toHaveBeenCalledWith("1:1-1:1 rule.enter b");
expect(console.log).toHaveBeenCalledWith("1:2 rule.match b"); expect(console.log).toHaveBeenCalledWith("1:1-1:2 rule.match b");
expect(console.log).toHaveBeenCalledWith("1:2 rule.match start"); expect(console.log).toHaveBeenCalledWith("1:1-1:2 rule.match start");
}); });
}); });
@ -73,48 +73,54 @@ describe("generated parser API", function() {
parser.parse("b", { tracer: tracer }); parser.parse("b", { tracer: tracer });
expect(tracer.trace).toHaveBeenCalledWith({ expect(tracer.trace).toHaveBeenCalledWith({
type: 'rule.enter', type: 'rule.enter',
rule: 'start', rule: 'start',
offset: 0, location: {
line: 1, start: { offset: 0, line: 1, column: 1 },
column: 1 end: { offset: 0, line: 1, column: 1 }
}
}); });
expect(tracer.trace).toHaveBeenCalledWith({ expect(tracer.trace).toHaveBeenCalledWith({
type: 'rule.enter', type: 'rule.enter',
rule: 'a', rule: 'a',
offset: 0, location: {
line: 1, start: { offset: 0, line: 1, column: 1 },
column: 1 end: { offset: 0, line: 1, column: 1 }
}
}); });
expect(tracer.trace).toHaveBeenCalledWith({ expect(tracer.trace).toHaveBeenCalledWith({
type: 'rule.fail', type: 'rule.fail',
rule: 'a', rule: 'a',
offset: 0, location: {
line: 1, start: { offset: 0, line: 1, column: 1 },
column: 1 end: { offset: 0, line: 1, column: 1 }
}
}); });
expect(tracer.trace).toHaveBeenCalledWith({ expect(tracer.trace).toHaveBeenCalledWith({
type: 'rule.enter', type: 'rule.enter',
rule: 'b', rule: 'b',
offset: 0, location: {
line: 1, start: { offset: 0, line: 1, column: 1 },
column: 1 end: { offset: 0, line: 1, column: 1 }
}
}); });
expect(tracer.trace).toHaveBeenCalledWith({ expect(tracer.trace).toHaveBeenCalledWith({
type: 'rule.match', type: 'rule.match',
rule: 'b', rule: 'b',
result: 'b', result: 'b',
offset: 1, location: {
line: 1, start: { offset: 0, line: 1, column: 1 },
column: 2 end: { offset: 1, line: 1, column: 2 }
}
}); });
expect(tracer.trace).toHaveBeenCalledWith({ expect(tracer.trace).toHaveBeenCalledWith({
type: 'rule.match', type: 'rule.match',
rule: 'start', rule: 'start',
result: 'b', result: 'b',
offset: 1, location: {
line: 1, start: { offset: 0, line: 1, column: 1 },
column: 2 end: { offset: 1, line: 1, column: 2 }
}
}); });
}); });
}); });

4
spec/api/pegjs-api.spec.js
View file

@ -157,8 +157,8 @@ describe("PEG.js API", function() {
parser.parse("a"); parser.parse("a");
expect(console.log).toHaveBeenCalledWith("1:1 rule.enter start"); expect(console.log).toHaveBeenCalledWith("1:1-1:1 rule.enter start");
expect(console.log).toHaveBeenCalledWith("1:2 rule.match start"); expect(console.log).toHaveBeenCalledWith("1:1-1:2 rule.match start");
}); });
}); });
}); });