Changing when subexpression numbers are generated

Generating subexp numbers during setup was leading to nested expressions
being numbered in reverse order.

Fixes #7
This commit is contained in:
Jeff Avallone 2015-03-13 20:18:46 -04:00
parent 1fa1e71b39
commit 7328825204
2 changed files with 54 additions and 20 deletions

View File

@ -12,25 +12,17 @@ describe('parser/javascript/subexp.js', function() {
_.forIn({ _.forIn({
'(test)': { '(test)': {
label: 'group #1', regexp: jasmine.objectContaining({ textValue: 'test' })
regexp: jasmine.objectContaining({ textValue: 'test' }),
state: { groupCounter: 2 }
}, },
'(?=test)': { '(?=test)': {
label: 'positive lookahead', regexp: jasmine.objectContaining({ textValue: 'test' })
regexp: jasmine.objectContaining({ textValue: 'test' }),
state: { groupCounter: 1 }
}, },
'(?!test)': { '(?!test)': {
label: 'negative lookahead', regexp: jasmine.objectContaining({ textValue: 'test' })
regexp: jasmine.objectContaining({ textValue: 'test' }),
state: { groupCounter: 1 }
}, },
'(?:test)': { '(?:test)': {
label: '',
regexp: jasmine.objectContaining({ textValue: 'test' }), regexp: jasmine.objectContaining({ textValue: 'test' }),
proxy: jasmine.objectContaining({ textValue: 'test' }), proxy: jasmine.objectContaining({ textValue: 'test' })
state: { groupCounter: 1 }
} }
}, (content, str) => { }, (content, str) => {
it(`parses "${str}" as a Subexp`, function() { it(`parses "${str}" as a Subexp`, function() {
@ -71,9 +63,9 @@ describe('parser/javascript/subexp.js', function() {
this.renderDeferred = Q.defer(); this.renderDeferred = Q.defer();
this.node = new javascript.Parser('(test)').__consume__subexp(); this.node = new javascript.Parser('(test)').__consume__subexp();
this.node.label = 'example label';
this.node.regexp = jasmine.createSpyObj('regexp', ['render']); this.node.regexp = jasmine.createSpyObj('regexp', ['render']);
this.node.container = jasmine.createSpyObj('container', ['addClass', 'group']); this.node.container = jasmine.createSpyObj('container', ['addClass', 'group']);
spyOn(this.node, 'label').and.returnValue('example label')
this.node.regexp.render.and.returnValue(this.renderDeferred.promise); this.node.regexp.render.and.returnValue(this.renderDeferred.promise);
}); });
@ -96,4 +88,33 @@ describe('parser/javascript/subexp.js', function() {
}); });
describe('#label', function() {
_.forIn({
'(test)': {
label: 'group #1',
groupCounter: 2
},
'(?=test)': {
label: 'positive lookahead',
groupCounter: 1
},
'(?!test)': {
label: 'negative lookahead',
groupCounter: 1
},
'(?:test)': {
label: '',
groupCounter: 1
}
}, (data, str) => {
it(`generates the correct label for "${str}"`, function() {
var node = new javascript.Parser(str).__consume__subexp();
expect(node.label()).toEqual(data.label);
expect(node.state.groupCounter).toEqual(data.groupCounter);
});
});
});
}); });

View File

@ -25,24 +25,37 @@ export default {
}, },
_render() { _render() {
// NOTE: this.label() MUST be called here, in _render and before any child
// nodes are rendered. This is to keep the group numbers in the correct
// order.
var label = this.label();
return this.regexp.render(this.container.group()) return this.regexp.render(this.container.group())
.then(() => { .then(() => {
return this.renderLabeledBox(this.label, this.regexp, { return this.renderLabeledBox(label, this.regexp, {
padding: 10 padding: 10
}); });
}); });
}, },
setup() { label() {
if (_.has(this.labelMap, this.properties.capture.textValue)) { if (typeof this._label === 'undefined') {
this.label = this.labelMap[this.properties.capture.textValue]; if (_.has(this.labelMap, this.properties.capture.textValue)) {
} else { this._label = this.labelMap[this.properties.capture.textValue];
this.label = 'group #' + (this.state.groupCounter++); } else {
this._label = 'group #' + (this.state.groupCounter++);
}
} }
return this._label;
},
setup() {
// NOTE: DO NOT call this.label() in setup. It will lead to groups being
// numbered in reverse order
this.regexp = this.properties.regexp; this.regexp = this.properties.regexp;
if (!this.label) { if (this.properties.capture.textValue == '?:') {
this.proxy = this.regexp; this.proxy = this.regexp;
} }
} }