summaryrefslogtreecommitdiff
path: root/inc/geshi/glsl.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2009-03-23 10:42:53 +0100
committerAndreas Gohr <andi@splitbrain.org>2009-03-23 10:42:53 +0100
commit2b8d02bf0a560f0ee8fa887fed0d2bbf66b10bae (patch)
treed8fd32b508377b76b9213b0b67835eac9b003345 /inc/geshi/glsl.php
parentccf354b192cc6f8e554b4729cb1424b93bf82602 (diff)
downloadrpg-2b8d02bf0a560f0ee8fa887fed0d2bbf66b10bae.tar.gz
rpg-2b8d02bf0a560f0ee8fa887fed0d2bbf66b10bae.tar.bz2
GeSHi 1.0.8.3 update
Ignore-this: d204f804a634d5a537737dc4a50c3c13 darcs-hash:20090323094253-7ad00-003ea6c7b9cb1306ad0623274917bbfc042a0103.gz
Diffstat (limited to 'inc/geshi/glsl.php')
-rw-r--r--inc/geshi/glsl.php12
1 files changed, 9 insertions, 3 deletions
diff --git a/inc/geshi/glsl.php b/inc/geshi/glsl.php
index e5a536575..1f10cf852 100644
--- a/inc/geshi/glsl.php
+++ b/inc/geshi/glsl.php
@@ -4,7 +4,7 @@
* -----
* Author: Benny Baumann (BenBE@omorphia.de)
* Copyright: (c) 2008 Benny Baumann (BenBE@omorphia.de)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.3
* Date Started: 2008/03/20
*
* glSlang language file for GeSHi.
@@ -41,6 +41,12 @@ $language_data = array (
'LANG_NAME' => 'glSlang',
'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
'COMMENT_MULTI' => array('/*' => '*/'),
+ 'COMMENT_REGEXP' => array(
+ //Multiline-continued single-line comments
+ 1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+ //Multiline-continued preprocessor define
+ 2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
+ ),
'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
'QUOTEMARKS' => array("'", '"'),
'ESCAPE_CHAR' => '\\',
@@ -54,7 +60,7 @@ $language_data = array (
'const', 'uniform', 'attribute', 'centroid', 'varying', 'invariant',
'in', 'out', 'inout', 'input', 'output', 'typedef', 'volatile',
'public', 'static', 'extern', 'external', 'packed',
- 'inline', 'noinline'
+ 'inline', 'noinline', 'noperspective', 'flat'
),
3 => array(
'void', 'bool', 'int', 'long', 'short', 'float', 'half', 'fixed',
@@ -196,4 +202,4 @@ $language_data = array (
)
);
-?>
+?> \ No newline at end of file