Commiteb2f057

authored

Fix#11, add test cases relative to#11, release 0.2.2 (#16)

1 parent93e1c74 commiteb2f057Copy full SHA for eb2f057

File tree

+28

-5

lines changed

+28

-5

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,13 @@ function buildQuery(query, builder = new Builder()) {`
`42`	`42`	`// Now, append that method to the builder object.`
`43`	`43`	`method.setParameters(parameters).callMethodOn(builder)`
`44`	`44`	`}catch(e){`
`45`		`-if(Array.isArray(parameters[0])){`
	`45`	`+constlastIndex=parameters.length-1`
	`46`	`+if(Array.isArray(parameters[lastIndex])){`
	`47`	`+if(lastIndex!==0){`
	`48`	`+method.setParameters(parameters.slice(0,lastIndex))`
	`49`	`+}`
`46`	`50`	`method.callMethodOn(builder)`
`47`		`-builder.and(buildQuery(parameters[0],newNonCapture()))`
	`51`	`+builder.and(buildQuery(parameters[lastIndex],newNonCapture()))`
`48`	`52`	`}else{`
`49`	`53`	thrownewSyntaxException(`Invalid parameter given for${method.origin}`)
`50`	`54`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name":"srl",`
`3`		`-"version":"0.2.1",`
	`3`	`+"version":"0.2.2",`
`4`	`4`	`"description":"Simple Regex Language",`
`5`	`5`	`"main":"lib/SRL.js",`
`6`	`6`	`"scripts": {`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,19 @@`
	`1`	`+'use strict'`
	`2`	`+`
	`3`	`+constassert=require('assert')`
	`4`	`+constSRL=require('../')`
	`5`	`+`
	`6`	`+describe('Fix issue 11',()=>{`
	`7`	`+it('Numerical quantifies & non-capturing group',()=>{`
	`8`	`+constquery=newSRL('digit, exactly 5 times, (letter, twice) optional')`
	`9`	`+assert.ok(query.isMatching('12345'))`
	`10`	`+assert.ok(query.isMatching('12345aa'))`
	`11`	`+})`
	`12`	`+`
	`13`	`+it('Complicated case',()=>{`
	`14`	`+constquery=newSRL('begin with, digit, exactly 5 times, ( literally \'-\', digit, exactly 4 times ), optional, must end')`
	`15`	`+assert.ok(query.isMatching('12345-1234'))`
	`16`	`+})`
	`17`	`+})`
	`18`	`+`
	`19`	`+`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ describe('ParseParentheses Test', () => {`
`18`	`18`	`assert.deepEqual(parseParentheses('foo (0)'),['foo',['0']])`
`19`	`19`
`20`	`20`	`assert.deepEqual(`
`21`		`-parseParentheses('foo (bar (nested)) baz'),`
`22`		`-['foo',['bar',['nested']],'baz']`
	`21`	`+parseParentheses('foo (bar (nested)) baz'),`
	`22`	`+['foo',['bar',['nested']],'baz']`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`assert.deepEqual(`

Comments

(0)