Skip to content

friendly 'rule not defined' message (updated pull request) #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shamrin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

friendly 'rule not defined' message (updated pull request) #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions lib/compiledgrammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,15 @@ function CompiledGrammar(/*String*/ aGrammar)

var tree = getLanguageParser().parse(aGrammar);

compileOpcodeTableFromRules(this.table, this.nameToUID, buildRulesFromSyntaxTree(tree));
var r = buildRulesFromSyntaxTree(tree);
compileOpcodeTableFromRules(this.table, this.nameToUID, r.rules, r.firstUsageNodes)

return this;
}

module.exports = CompiledGrammar;

function compileOpcodeTableFromRules(/*Array*/ table, /*Object*/ nameToUID, /*Object*/ rules)
function compileOpcodeTableFromRules(/*Array*/ table, /*Object*/ nameToUID, /*Object*/ rules, /*Object*/ firstUsageNodes)
{
table[0] = [0, "source", 1];
table.length = 1;
Expand Down Expand Up @@ -102,8 +103,8 @@ function compileOpcodeTableFromRules(/*Array*/ table, /*Object*/ nameToUID, /*Ob
return true;
}

traverseRulesAnchoredAtName(rules, "start", process);
traverseRulesAnchoredAtName(rules, "%start", process);
traverseRulesAnchoredAtName(rules, firstUsageNodes, "start", process);
traverseRulesAnchoredAtName(rules, firstUsageNodes, "%start", process);

var hasOwnProperty = Object.prototype.hasOwnProperty,
remainingRules = { };
Expand Down Expand Up @@ -137,7 +138,7 @@ function compileOpcodeTableFromRules(/*Array*/ table, /*Object*/ nameToUID, /*Ob
}
}

function traverseRulesAnchoredAtName(/*Object*/ rules, /*String*/ aName, /*Function*/ process)
function traverseRulesAnchoredAtName(/*Object*/ rules, /*Object*/ firstUsageNodes, /*String*/ aName, /*Function*/ process)
{
var index = 0,
stack = [aName];
Expand All @@ -148,7 +149,7 @@ function traverseRulesAnchoredAtName(/*Object*/ rules, /*String*/ aName, /*Funct
rule = rules[hash];

if (!rule)
throw "Rule \"" + hash + "\" is not defined.";
throw firstUsageNodes[hash].message("Rule \"" + hash + "\" is not defined.");

if (process(rule) === false)
continue;
Expand All @@ -163,14 +164,15 @@ function traverseRulesAnchoredAtName(/*Object*/ rules, /*String*/ aName, /*Funct
function buildRulesFromSyntaxTree(/*SyntaxNode*/ aNode)
{
var rules = { },
walker = { traversesTextNodes:false };
walker = { traversesTextNodes:false },
firstUsageNodes = { };

walker.exitedNode = function(aNode)
{
var builder = RULE_BUILDERS[aNode.name];

if (builder)
aNode.hash = builder(aNode, rules);
aNode.hash = builder(aNode, rules, firstUsageNodes);
}

aNode.traverse(walker);
Expand All @@ -181,12 +183,12 @@ function buildRulesFromSyntaxTree(/*SyntaxNode*/ aNode)
builder = RULE_BUILDERS["%" + name] || RULE_BUILDERS[name];

if (builder)
aNode.hash = builder(aNode, rules);
aNode.hash = builder(aNode, rules, firstUsageNodes);
}

aNode.traverse(walker);

return rules;
return {rules: rules, firstUsageNodes: firstUsageNodes};
}

var RULE_BUILDERS = { };
Expand Down Expand Up @@ -289,9 +291,14 @@ RULE_BUILDERS["%ErrorChoiceExpression"] = function(aNode, rules)
return hash;
}

RULE_BUILDERS["Identifier"] = function(aNode, rules)
RULE_BUILDERS["Identifier"] = function(aNode, rules, firstUsageNodes)
{
return aNode.innerText();
var hash = aNode.innerText();

if(!firstUsageNodes[hash])
firstUsageNodes[hash] = aNode;

return hash;
}

RULE_BUILDERS["%Identifier"] = function(aNode, rules)
Expand Down
7 changes: 5 additions & 2 deletions lib/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,11 @@ function SyntaxNode(/*String*/ aName, /*String*/ aSource, /*Number*/ aLocation,
this.error = anErrorMessage;
}

SyntaxNode.prototype.message = function()
SyntaxNode.prototype.message = function(error)
{
if(!error)
error = this.error;

var source = this.source,
lineNumber = 1,
index = 0,
Expand All @@ -302,7 +305,7 @@ SyntaxNode.prototype.message = function()

message += (new Array(this.range.location - start + 1)).join(" ");
message += (new Array(Math.min(range.length, line.length) + 1)).join("^") + "\n";
message += "ERROR line " + lineNumber + ": " + this.error;
message += "ERROR line " + lineNumber + ": " + error;

return message;
}
Expand Down