[GeSHi-commit] SF.net SVN: geshi:[2215] trunk/geshi-src/geshi/classes/class. geshicodecontext.php

[<be...@us...>]

Revision: 2215
          http://geshi.svn.sourceforge.net/geshi/?rev=2215&view=rev
Author:   benbe
Date:     2009-12-06 09:39:23 +0000 (Sun, 06 Dec 2009)

Log Message:
-----------
add: Added support for actually using DisallowedBefore settings in Code Contexts

Modified Paths:
--------------
    trunk/geshi-src/geshi/classes/class.geshicodecontext.php

Modified: trunk/geshi-src/geshi/classes/class.geshicodecontext.php
===================================================================
--- trunk/geshi-src/geshi/classes/class.geshicodecontext.php	2009-12-06 09:16:35 UTC (rev 2214)
+++ trunk/geshi-src/geshi/classes/class.geshicodecontext.php	2009-12-06 09:39:23 UTC (rev 2215)
@@ -531,6 +531,13 @@
 
             $regexps = geshi_optimize_regexp_list($keyword_group_array[0]);
 
+            $before = '/';
+            if (!empty($this->_contextCharactersDisallowedBeforeKeywords)) {
+                $before .= '(?<!['. implode($this->_contextCharactersDisallowedBeforeKeywords) .'])';
+            } else {
+                $before .= '(?<![a-zA-Z0-9_])';
+            }
+
             $append = '';
             if (!empty($this->_contextCharactersDisallowedAfterKeywords)) {
                 $append .= '(?!['. implode($this->_contextCharactersDisallowedAfterKeywords) .'])';
@@ -545,7 +552,7 @@
             }
 
             foreach ($regexps as &$regexp) {
-                $regexp = '/(?:'. $regexp .')'. $append;
+                $regexp = $before . '(?:'. $regexp .')'. $append;
             }
 
             // get min length
@@ -644,4 +651,4 @@
 
 }
 
-?>
+?>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.