diff options
author | Mike Nolta <mike@nolta.net> | 2012-03-11 01:26:19 -0500 |
---|---|---|
committer | Mike Nolta <mike@nolta.net> | 2012-03-11 01:26:19 -0500 |
commit | 086deed92ba378e3d8e37d18f1d0ce668967908d (patch) | |
tree | 0bb94cca3f9be46317bc383751e2e8769be17813 /pygments/lexers/math.py | |
parent | 8db91bc577691c7f4ad2a649a734e5067ce58d32 (diff) | |
parent | 9e80de2655ac91392e77fdb851cb8af940cff89d (diff) | |
download | pygments-086deed92ba378e3d8e37d18f1d0ce668967908d.tar.gz |
upstream pull
Diffstat (limited to 'pygments/lexers/math.py')
-rw-r--r-- | pygments/lexers/math.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pygments/lexers/math.py b/pygments/lexers/math.py index 92eebef1..7ae7d6b2 100644 --- a/pygments/lexers/math.py +++ b/pygments/lexers/math.py @@ -230,8 +230,8 @@ class MuPADLexer(RegexLexer): #(r'\b(?:adt|linalg|newDomain|hold)\b', Name.Builtin), (r'''(?x) ((?:[a-zA-Z_#][a-zA-Z_#0-9]*|`[^`]*`) - (?:::[a-zA-Z_#][a-zA-Z_#0-9]*|`[^`]*`)*)\s*([(])''', - bygroups(Name.Function, Punctuation)), + (?:::[a-zA-Z_#][a-zA-Z_#0-9]*|`[^`]*`)*)(\s*)([(])''', + bygroups(Name.Function, Text, Punctuation)), (r'''(?x) (?:[a-zA-Z_#][a-zA-Z_#0-9]*|`[^`]*`) (?:::[a-zA-Z_#][a-zA-Z_#0-9]*|`[^`]*`)*''', Name.Variable), @@ -823,7 +823,7 @@ class ScilabLexer(RegexLexer): _scilab_builtins.macros_kw ) + r')\b', Name.Builtin), - ("(" + "|".join(_scilab_builtins.builtin_consts) + r')\b', + (r'(%s)\b' % "|".join(map(re.escape, _scilab_builtins.builtin_consts)), Name.Constant), # operators: @@ -832,7 +832,7 @@ class ScilabLexer(RegexLexer): (r'\.\*|\*|\+|\.\^|\.\\|\.\/|\/|\\', Operator), # punctuation: - (r'[\[\](){}:@.,=:;]', Punctuation), + (r'[\[\](){}@.,=:;]', Punctuation), (r'"[^"]*"', String), |