Skip to content
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

Fix for #32: Allow single-element actions #49

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

Fix for #32: Allow single-element actions #49

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
7 changes: 6 additions & 1 deletion src/ast/reference.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,13 @@ util.assign(Reference.prototype, {
return ['reference', this.refName];
},

compile: function(builder, address) {
compile: function(builder, address, action) {
builder.jump_(address, this.refName);
if (action) {
builder.ifNode_(address, function(builder){
builder.assign_(address, builder.action_(address, action));
}, this);
}
}
});

Expand Down
6 changes: 6 additions & 0 deletions src/builders/java.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,12 @@ util.assign(Builder.prototype, {
this.conditional_('while', expression + ' != ' + this.nullNode_(), block, context);
},

action_: function(address, action) {
var args = ['input', -1, -1, address];
action = 'actions.' + action;
return action + '(' + args.join(', ') + ')';
},

stringMatch_: function(expression, string) {
return expression + ' != null && ' + expression + '.equals(' + this._quote(string) + ')';
},
Expand Down
6 changes: 6 additions & 0 deletions src/builders/javascript.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,12 @@ util.assign(Builder.prototype, {
this.conditional_('while', expression + ' !== ' + this.nullNode_(), block, context);
},

action_: function(address, action) {
var args = ['this._input', -1, -1, address];
action = 'this._actions.' + action;
return action + '(' + args.join(', ') + ')';
},

stringMatch_: function(expression, string) {
return expression + ' === ' + this._quote(string);
},
Expand Down
6 changes: 6 additions & 0 deletions src/builders/python.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,12 @@ util.assign(Builder.prototype, {
this._indent(block, context);
},

action_: function(address, action) {
var args = ['self._input', -1, -1, address];
action = 'self._actions.' + action;
return action + '(' + args.join(', ') + ')';
},

stringMatch_: function(expression, string) {
return expression + ' == ' + this._quote(string);
},
Expand Down
6 changes: 6 additions & 0 deletions src/builders/ruby.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,12 @@ util.assign(Builder.prototype, {
this._line('end');
},

action_: function(address, action) {
var args = ['@input', -1, -1, address];
action = '@actions.' + action;
return action + '(' + args.join(', ') + ')';
},

stringMatch_: function(expression, string) {
return expression + ' == ' + this._quote(string);
},
Expand Down
172 changes: 88 additions & 84 deletions src/meta_grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,88 +1173,95 @@
address0 = this._read_maybe_atom();
if (address0 === FAILURE) {
this._offset = index1;
address0 = this._read_terminal();
address0 = this._read_reference();
if (address0 === FAILURE) {
this._offset = index1;
var index2 = this._offset, elements0 = new Array(5);
var address1 = FAILURE;
var chunk0 = null, max0 = this._offset + 1;
if (max0 <= this._inputSize) {
chunk0 = this._input.substring(this._offset, max0);
}
if (chunk0 === '(') {
address1 = new TreeNode(this._input.substring(this._offset, this._offset + 1), this._offset, []);
this._offset = this._offset + 1;
} else {
address1 = FAILURE;
if (this._offset > this._failure) {
this._failure = this._offset;
this._expected = [];
}
if (this._offset === this._failure) {
this._expected.push('"("');
}
}
if (address1 !== FAILURE) {
elements0[0] = address1;
var address2 = FAILURE;
var remaining0 = 0, index3 = this._offset, elements1 = [], address3 = true;
while (address3 !== FAILURE) {
address3 = this._read__();
if (address3 !== FAILURE) {
elements1.push(address3);
--remaining0;
}
address0 = this._read_terminal();
if (address0 === FAILURE) {
this._offset = index1;
var index2 = this._offset, elements0 = new Array(5);
var address1 = FAILURE;
var chunk0 = null, max0 = this._offset + 1;
if (max0 <= this._inputSize) {
chunk0 = this._input.substring(this._offset, max0);
}
if (remaining0 <= 0) {
address2 = new TreeNode(this._input.substring(index3, this._offset), index3, elements1);
this._offset = this._offset;
if (chunk0 === '(') {
address1 = new TreeNode(this._input.substring(this._offset, this._offset + 1), this._offset, []);
this._offset = this._offset + 1;
} else {
address2 = FAILURE;
address1 = FAILURE;
if (this._offset > this._failure) {
this._failure = this._offset;
this._expected = [];
}
if (this._offset === this._failure) {
this._expected.push('"("');
}
}
if (address2 !== FAILURE) {
elements0[1] = address2;
var address4 = FAILURE;
address4 = this._read_actionable();
if (address4 !== FAILURE) {
elements0[2] = address4;
var address5 = FAILURE;
var remaining1 = 0, index4 = this._offset, elements2 = [], address6 = true;
while (address6 !== FAILURE) {
address6 = this._read__();
if (address6 !== FAILURE) {
elements2.push(address6);
--remaining1;
}
}
if (remaining1 <= 0) {
address5 = new TreeNode(this._input.substring(index4, this._offset), index4, elements2);
this._offset = this._offset;
} else {
address5 = FAILURE;
if (address1 !== FAILURE) {
elements0[0] = address1;
var address2 = FAILURE;
var remaining0 = 0, index3 = this._offset, elements1 = [], address3 = true;
while (address3 !== FAILURE) {
address3 = this._read__();
if (address3 !== FAILURE) {
elements1.push(address3);
--remaining0;
}
if (address5 !== FAILURE) {
elements0[3] = address5;
var address7 = FAILURE;
var chunk1 = null, max1 = this._offset + 1;
if (max1 <= this._inputSize) {
chunk1 = this._input.substring(this._offset, max1);
}
if (remaining0 <= 0) {
address2 = new TreeNode(this._input.substring(index3, this._offset), index3, elements1);
this._offset = this._offset;
} else {
address2 = FAILURE;
}
if (address2 !== FAILURE) {
elements0[1] = address2;
var address4 = FAILURE;
address4 = this._read_actionable();
if (address4 !== FAILURE) {
elements0[2] = address4;
var address5 = FAILURE;
var remaining1 = 0, index4 = this._offset, elements2 = [], address6 = true;
while (address6 !== FAILURE) {
address6 = this._read__();
if (address6 !== FAILURE) {
elements2.push(address6);
--remaining1;
}
}
if (chunk1 === ')') {
address7 = new TreeNode(this._input.substring(this._offset, this._offset + 1), this._offset, []);
this._offset = this._offset + 1;
if (remaining1 <= 0) {
address5 = new TreeNode(this._input.substring(index4, this._offset), index4, elements2);
this._offset = this._offset;
} else {
address7 = FAILURE;
if (this._offset > this._failure) {
this._failure = this._offset;
this._expected = [];
address5 = FAILURE;
}
if (address5 !== FAILURE) {
elements0[3] = address5;
var address7 = FAILURE;
var chunk1 = null, max1 = this._offset + 1;
if (max1 <= this._inputSize) {
chunk1 = this._input.substring(this._offset, max1);
}
if (this._offset === this._failure) {
this._expected.push('")"');
if (chunk1 === ')') {
address7 = new TreeNode(this._input.substring(this._offset, this._offset + 1), this._offset, []);
this._offset = this._offset + 1;
} else {
address7 = FAILURE;
if (this._offset > this._failure) {
this._failure = this._offset;
this._expected = [];
}
if (this._offset === this._failure) {
this._expected.push('")"');
}
}
if (address7 !== FAILURE) {
elements0[4] = address7;
} else {
elements0 = null;
this._offset = index2;
}
}
if (address7 !== FAILURE) {
elements0[4] = address7;
} else {
elements0 = null;
this._offset = index2;
Expand All @@ -1271,18 +1278,15 @@
elements0 = null;
this._offset = index2;
}
} else {
elements0 = null;
this._offset = index2;
}
if (elements0 === null) {
address0 = FAILURE;
} else {
address0 = this._actions.paren_expr(this._input, index2, this._offset, elements0);
this._offset = this._offset;
}
if (address0 === FAILURE) {
this._offset = index1;
if (elements0 === null) {
address0 = FAILURE;
} else {
address0 = this._actions.paren_expr(this._input, index2, this._offset, elements0);
this._offset = this._offset;
}
if (address0 === FAILURE) {
this._offset = index1;
}
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/meta_grammar.peg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ action_expression <- actionable _+ action_tag %action
actionable <- sequence
/ repeated_atom
/ maybe_atom
/ reference
/ terminal
/ "(" _* actionable _* ")" %paren_expr

Expand Down
35 changes: 35 additions & 0 deletions test/canopy/compiler/action_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,4 +191,39 @@ jstest.describe("Compiler.Action", function() { with(this) {
assertEqual( 0, ChoiceActionTest.parse('0', {actions: actions}) )
}})
}})

describe('constructing a referenced node', function() { with(this) {
before(function() { with(this) {
compile('grammar global.RefActionTest \
rule <- begin %override \
begin <- "begin" %begin')

this.actions = {
begin: function() { return {type: 'tBEGIN'} },
override: function(input, start, end, elements) { return elements.type.toLowerCase(); }
}
}})

it('creates nodes using the named action', function() { with(this) {
assertEqual('tbegin', RefActionTest.parse('begin', {actions: actions}) )
}})
}})
describe('constructing another referenced node', function() { with(this) {
before(function() { with(this) {
compile('grammar global.RefActionTest \
rule <- (notbegin %override) / (begin %override) \
notbegin <- "notbegin" %notbegin\
begin <- "begin" %begin')

this.actions = {
begin: function() { return {type: 'tBEGIN'} },
notbegin: function() { return {type: 'tNOTBEGIN'} },
override: function(input, start, end, elements) { return elements.type.toLowerCase(); }
}
}})

it('creates nodes using the named action', function() { with(this) {
assertEqual('tbegin', RefActionTest.parse('begin', {actions: actions}) )
}})
}})
}})
21 changes: 21 additions & 0 deletions test/canopy/meta_grammar_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,27 @@ jstest.describe("MetaGrammar", function() { with(this) {
}})
}})

describe('with an actionable referencing rule', function() { with(this) {
before(function() { with(this) {
this.compiler = new Compiler(' \
grammar References \
first <- second %make_rep \
second <- "done" \
')
}})

it('compiles a referencing-rule parser', function() { with(this) {
assertEqual(['grammar', 'References',
['rule', 'first',
['action', 'make_rep',
['reference', 'second']]],
['rule', 'second',
['string', 'done']]],

compiler.toSexp() )
}})
}})

describe('with comments', function() { with(this) {
before(function() { with(this) {
this.compiler = new Compiler(' \
Expand Down