From: <ora...@us...> - 2007-04-01 10:43:11
|
Revision: 953 http://geshi.svn.sourceforge.net/geshi/?rev=953&view=rev Author: oracleshinoda Date: 2007-04-01 03:43:10 -0700 (Sun, 01 Apr 2007) Log Message: ----------- Merged regex fixes to trunk Modified Paths: -------------- trunk/geshi-1.0.X/src/docs/CHANGES trunk/geshi-1.0.X/src/geshi/asm.php trunk/geshi-1.0.X/src/geshi/bnf.php Modified: trunk/geshi-1.0.X/src/docs/CHANGES =================================================================== --- trunk/geshi-1.0.X/src/docs/CHANGES 2007-04-01 10:38:04 UTC (rev 952) +++ trunk/geshi-1.0.X/src/docs/CHANGES 2007-04-01 10:43:10 UTC (rev 953) @@ -19,6 +19,8 @@ - Fixed invalid HTML being generated and doctypes not being highlighted over multiple lines properly when line numbers are on (Validome) - Improved the ruby syntax highlighting by basing it off the Rails file + - Changed some regular expressions to possibly help with badly performing + regex support in PHP (Tim Starling) Version 1.0.7.18 - Added language files * ZiLOG Z80 Assembly (BenBE) Modified: trunk/geshi-1.0.X/src/geshi/asm.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/asm.php 2007-04-01 10:38:04 UTC (rev 952) +++ trunk/geshi-1.0.X/src/geshi/asm.php 2007-04-01 10:43:10 UTC (rev 953) @@ -185,7 +185,7 @@ 'OBJECT_SPLITTERS' => array( ), 'REGEXPS' => array( - 0 => '0[0-9a-fA-F][0-9a-fA-F]*[hH]', + 0 => '0[0-9a-fA-F]{1,32}[hH]', 1 => '[01][01]*[bB]' ), 'STRICT_MODE_APPLIES' => GESHI_NEVER, Modified: trunk/geshi-1.0.X/src/geshi/bnf.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/bnf.php 2007-04-01 10:38:04 UTC (rev 952) +++ trunk/geshi-1.0.X/src/geshi/bnf.php 2007-04-01 10:43:10 UTC (rev 953) @@ -92,7 +92,7 @@ 'OBJECT_SPLITTERS' => array(), 'REGEXPS' => array( 0 => array( - GESHI_SEARCH => '(<)(.+?)(>)', + GESHI_SEARCH => '(<)([^&]+?)(>)', GESHI_REPLACE => '\\2', GESHI_MODIFIERS => '', GESHI_BEFORE => '\\1', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |