summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Siwek <jsiwek@corelight.com>2019-11-25 10:55:56 -0800
committerGeorg Brandl <georg@python.org>2019-11-25 20:39:24 +0100
commitdff6629557c3bac8324bdbe4ef9da5f001a863b4 (patch)
tree62b545d494a055650c1dba5635a91498f3498d47
parenta14aa22e55651413d77d4617237ba0b87950a5d8 (diff)
downloadpygments-git-dff6629557c3bac8324bdbe4ef9da5f001a863b4.tar.gz
Set BroLexer = ZeekLexer
This also removes BroLexer from LEXERS.
-rw-r--r--pygments/lexers/_mapping.py3
-rw-r--r--pygments/lexers/dsls.py17
2 files changed, 5 insertions, 15 deletions
diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py
index 2533f651..81e03c37 100644
--- a/pygments/lexers/_mapping.py
+++ b/pygments/lexers/_mapping.py
@@ -65,7 +65,6 @@ LEXERS = {
'BooLexer': ('pygments.lexers.dotnet', 'Boo', ('boo',), ('*.boo',), ('text/x-boo',)),
'BoogieLexer': ('pygments.lexers.verification', 'Boogie', ('boogie',), ('*.bpl',), ()),
'BrainfuckLexer': ('pygments.lexers.esoteric', 'Brainfuck', ('brainfuck', 'bf'), ('*.bf', '*.b'), ('application/x-brainfuck',)),
- 'BroLexer': ('pygments.lexers.dsls', 'Bro', ('bro',), ('*.bro',), ()),
'BugsLexer': ('pygments.lexers.modeling', 'BUGS', ('bugs', 'winbugs', 'openbugs'), ('*.bug',), ()),
'CAmkESLexer': ('pygments.lexers.esoteric', 'CAmkES', ('camkes', 'idl4'), ('*.camkes', '*.idl4'), ()),
'CLexer': ('pygments.lexers.c_cpp', 'C', ('c',), ('*.c', '*.h', '*.idc'), ('text/x-chdr', 'text/x-csrc')),
@@ -475,7 +474,7 @@ LEXERS = {
'XtlangLexer': ('pygments.lexers.lisp', 'xtlang', ('extempore',), ('*.xtm',), ()),
'YamlJinjaLexer': ('pygments.lexers.templates', 'YAML+Jinja', ('yaml+jinja', 'salt', 'sls'), ('*.sls',), ('text/x-yaml+jinja', 'text/x-sls')),
'YamlLexer': ('pygments.lexers.data', 'YAML', ('yaml',), ('*.yaml', '*.yml'), ('text/x-yaml',)),
- 'ZeekLexer': ('pygments.lexers.dsls', 'Zeek', ('zeek',), ('*.zeek',), ()),
+ 'ZeekLexer': ('pygments.lexers.dsls', 'Zeek', ('zeek', 'bro'), ('*.zeek', '*.bro'), ()),
'ZephirLexer': ('pygments.lexers.php', 'Zephir', ('zephir',), ('*.zep',), ()),
'ZigLexer': ('pygments.lexers.zig', 'Zig', ('zig',), ('*.zig',), ('text/zig',)),
}
diff --git a/pygments/lexers/dsls.py b/pygments/lexers/dsls.py
index d88bac99..0af3c6c2 100644
--- a/pygments/lexers/dsls.py
+++ b/pygments/lexers/dsls.py
@@ -16,7 +16,7 @@ from pygments.lexer import ExtendedRegexLexer, RegexLexer, bygroups, words, \
from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
Number, Punctuation, Literal, Whitespace
-__all__ = ['ProtoBufLexer', 'ZeekLexer', 'BroLexer', 'PuppetLexer', 'RslLexer',
+__all__ = ['ProtoBufLexer', 'ZeekLexer', 'PuppetLexer', 'RslLexer',
'MscgenLexer', 'VGLLexer', 'AlloyLexer', 'PanLexer',
'CrmshLexer', 'ThriftLexer', 'FlatlineLexer', 'SnowballLexer']
@@ -195,8 +195,8 @@ class ZeekLexer(RegexLexer):
.. versionadded:: 2.5
"""
name = 'Zeek'
- aliases = ['zeek']
- filenames = ['*.zeek']
+ aliases = ['zeek', 'bro']
+ filenames = ['*.zeek', '*.bro']
_hex = r'[0-9a-fA-F]'
_float = r'((\d*\.?\d+)|(\d+\.?\d*))([eE][-+]?\d+)?'
@@ -345,16 +345,7 @@ class ZeekLexer(RegexLexer):
}
-class BroLexer(ZeekLexer):
- """
- For `Zeek <https://www.zeek.org/>`_ scripts.
- Note, this is equivalent to ZeekLexer (Bro is the old name for Zeek).
-
- .. versionadded:: 1.5
- """
- name = 'Bro'
- aliases = ['bro']
- filenames = ['*.bro']
+BroLexer = ZeekLexer
class PuppetLexer(RegexLexer):