Commit c5e1c47

committed

Merge pull request #41 from nightwing/master

String parsing issues

2 parents 8742634 + 0943b0b commit c5e1c47Copy full SHA for c5e1c47

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ PHP.Lexer = function( src, ini ) {`
`535`	`535`
`536`	`536`	`result = result.substring( match[ 0 ].length );`
`537`	`537`
`538`		`- match = result.match(/^(\-\>)([a-zA-Z0-9_\x7f-\xff]*)/);`
	`538`	`+ match = result.match(/^(\-\>)\s([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff])\s*(\()/);`
`539`	`539`
`540`	`540`	`if ( match !== null ) {`
`541`	`541`
`@@ -549,6 +549,8 @@ PHP.Lexer = function( src, ini ) {`
`549`	`549`	`match[ 2 ],`
`550`	`550`	`line`
`551`	`551`	`]);`
	`552`	`+ if (match[3])`
	`553`	`+ results.push(match[3]);`
`552`	`554`	`result = result.substring( match[ 0 ].length );`
`553`	`555`	`}`
`554`	`556`
`@@ -560,9 +562,9 @@ PHP.Lexer = function( src, ini ) {`
`560`	`562`
`561`	`563`	`var re;`
`562`	`564`	`if ( curlyOpen > 0) {`
`563`		`- re = /^([^\\\$"{}\]]\|\\.)+/g;`
	`565`	`+ re = /^([^\\\$"{}\])]\|\\.)+/g;`
`564`	`566`	`} else {`
`565`		`- re = /^([^\\\$"{]\|\\.\|{[^\$])+/g;`
	`567`	`+ re = /^([^\\\$"{]\|\\.\|{[^\$]\|\$(?=[^a-zA-Z_\x7f-\xff]))+/g;;`
`566`	`568`	`}`
`567`	`569`
`568`	`570`	`while(( match = result.match( re )) !== null ) {`

Comments

(0)