summaryrefslogtreecommitdiff
path: root/pygments/lexers/other.py
diff options
context:
space:
mode:
authorTim Hatch <tim@timhatch.com>2013-05-05 23:29:02 -0700
committerTim Hatch <tim@timhatch.com>2013-05-05 23:29:02 -0700
commitfb36d2de4d57833084466de07fdbc52d6baa2741 (patch)
tree3e6cbed0b54573e7f1d4fae0f55a47169a797396 /pygments/lexers/other.py
parentd0166615eef115dbea294d9f9442e0f78334167a (diff)
parentc9855f8191cdc73912c151db662f863e0a8b9df3 (diff)
downloadpygments-fb36d2de4d57833084466de07fdbc52d6baa2741.tar.gz
Merged in gentoo90/pygments-main (pull request #185)
PowerShellLexer: minor fixes
Diffstat (limited to 'pygments/lexers/other.py')
-rw-r--r--pygments/lexers/other.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/pygments/lexers/other.py b/pygments/lexers/other.py
index 35350de4..803212b0 100644
--- a/pygments/lexers/other.py
+++ b/pygments/lexers/other.py
@@ -1397,8 +1397,6 @@ class RebolLexer(RegexLexer):
(r';.*\n', Comment),
(r'%"', Name.Decorator, 'stringFile'),
(r'%[^(\^{^")\s\[\]]+', Name.Decorator),
- (r'<[a-zA-Z0-9:._-]*>', Name.Tag),
- (r'<[^(<>\s")]+', Name.Tag, 'tag'),
(r'[+-]?([a-zA-Z]{1,3})?\$\d+(\.\d+)?', Number.Float), # money
(r'[+-]?\d+\:\d+(\:\d+)?(\.\d+)?', String.Other), # time
(r'\d+\-[0-9a-zA-Z]+\-\d+(\/\d+\:\d+(\:\d+)?'
@@ -1415,6 +1413,8 @@ class RebolLexer(RegexLexer):
(r'comment\s', Comment, 'comment'),
(r'/[^(\^{^")\s/[\]]*', Name.Attribute),
(r'([^(\^{^")\s/[\]]+)(?=[:({"\s/\[\]])', word_callback),
+ (r'<[a-zA-Z0-9:._-]*>', Name.Tag),
+ (r'<[^(<>\s")]+', Name.Tag, 'tag'),
(r'([^(\^{^")\s]+)', Text),
],
'string': [
@@ -2839,8 +2839,8 @@ class BroLexer(RegexLexer):
(r'\\\n', Text),
# Keywords
(r'(add|alarm|break|case|const|continue|delete|do|else|enum|event'
- r'|export|for|function|if|global|local|module|next'
- r'|of|print|redef|return|schedule|type|when|while)\b', Keyword),
+ r'|export|for|function|if|global|hook|local|module|next'
+ r'|of|print|redef|return|schedule|switch|type|when|while)\b', Keyword),
(r'(addr|any|bool|count|counter|double|file|int|interval|net'
r'|pattern|port|record|set|string|subnet|table|time|timer'
r'|vector)\b', Keyword.Type),