summaryrefslogtreecommitdiffstats
path: root/application/libraries/geshi/erlang.php
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2012-02-14 01:17:10 +0100
committerFlorian Pritz <bluewind@xinu.at>2012-02-14 01:17:10 +0100
commita635c931ff8aa79728d93a4835e06a75e8f90be8 (patch)
treeec99bc646bca4cd8d37e58378d07c1ebd1f0499f /application/libraries/geshi/erlang.php
parent798a4824a2aa099de9eb05454ebb62b1522bee65 (diff)
bump geshi to 1.0.8.10
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/libraries/geshi/erlang.php')
-rw-r--r--application/libraries/geshi/erlang.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/application/libraries/geshi/erlang.php b/application/libraries/geshi/erlang.php
index cb7f25bf8..ede55917c 100644
--- a/application/libraries/geshi/erlang.php
+++ b/application/libraries/geshi/erlang.php
@@ -7,7 +7,7 @@
* - Uwe Dauernheim (uwe@dauernheim.net)
* - Dan Forest-Barbier (dan@twisted.in)
* Copyright: (c) 2008 Uwe Dauernheim (http://www.kreisquadratur.de/)
- * Release Version: 1.0.8.6
+ * Release Version: 1.0.8.10
* Date Started: 2008-09-27
*
* Erlang language file for GeSHi.
@@ -355,7 +355,7 @@ $language_data = array(
2 => ':'
),
'REGEXPS' => array(
- // Macro definitions
+ //�Macro definitions
0 => array(
GESHI_SEARCH => '(-define\s*\()([a-zA-Z0-9_]+)(\(|,)',
GESHI_REPLACE => '\2',
@@ -381,7 +381,7 @@ $language_data = array(
),
// Functions
3 => array(
- GESHI_SEARCH => '([a-z][a-zA-Z0-9_]*|\'[a-zA-Z0-9_]*\')\s*(\()',
+ GESHI_SEARCH => '([a-z]\w*|\'\w*\')(\s*\()',
GESHI_REPLACE => '\1',
GESHI_MODIFIERS => '',
GESHI_BEFORE => '',
@@ -397,13 +397,13 @@ $language_data = array(
),
// Variables - With hack to avoid interfering wish GeSHi internals
5 => array(
- GESHI_SEARCH => '([([{,<+*-\/=\s!]|&lt;)(?!(?:PIPE|SEMI|DOT|NUM|REG3XP\d*)[^a-zA-Z0-9_])([A-Z_][a-zA-Z0-9_]*)',
+ GESHI_SEARCH => '([([{,<+*-\/=\s!]|&lt;)(?!(?:PIPE|SEMI|DOT|NUM|REG3XP\d*)\W)([A-Z_]\w*)(?!\w)',
GESHI_REPLACE => '\2',
GESHI_MODIFIERS => '',
GESHI_BEFORE => '\1',
GESHI_AFTER => ''
),
- // ASCII codes
+ // ASCII�codes
6 => '(\$[a-zA-Z0-9_])',
// Records
7 => array(
@@ -423,8 +423,8 @@ $language_data = array(
'PARSER_CONTROL' => array(
'KEYWORDS' => array(
3 => array(
- 'DISALLOWED_BEFORE' => '',
- 'DISALLOWED_AFTER' => '(?=\s*\()'
+ 'DISALLOWED_BEFORE' => '(?<![\w])',
+ 'DISALLOWED_AFTER' => ''//'(?=\s*\()'
),
5 => array(
'DISALLOWED_BEFORE' => '(?<=\'|)',