diff options
author | Andrew Shadura <andrewsh@debian.org> | 2014-09-07 14:06:17 +0200 |
---|---|---|
committer | Andrew Shadura <andrew@shadura.me> | 2015-08-20 15:58:31 +0200 |
commit | 12b25dc3c2a1420b32246e38d7bf1458661454a1 (patch) | |
tree | 6dcc3a854f08051d026c7e5600b91e98d3056620 /reconfigure/parsers/bind9.py | |
parent | e291e1eb02076fde5f2cfee4f1d01091a2319da3 (diff) | |
parent | 52702d36437649ace8a54d49d4d4292184a528d6 (diff) |
Imported Debian patch 0.1.59+git20140824-1
Diffstat (limited to 'reconfigure/parsers/bind9.py')
-rw-r--r-- | reconfigure/parsers/bind9.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/reconfigure/parsers/bind9.py b/reconfigure/parsers/bind9.py index 123a799..ab089c4 100644 --- a/reconfigure/parsers/bind9.py +++ b/reconfigure/parsers/bind9.py @@ -8,14 +8,13 @@ class BIND9Parser (NginxParser): """ tokens = [ - (r"[\w_]+\s*?.*?{", lambda s, t: ('section_start', t)), - (r"[\w\d_:.]+?.*?;", lambda s, t: ('option', t)), - (r"\".*?\"\s*;", lambda s, t: ('option', t)), - (r"\s", lambda s, t: 'whitespace'), - (r"$^", lambda s, t: 'newline'), + (r"(acl|key|masters|server|trusted-keys|managed-keys|controls|logging|lwres|options|view|zone|inet|channel|category|listen-on|search|avoid-v4-udp-ports|avoid-v6-udp-ports|blackhole|listen-on|listen-on-v6|allow-recursion|allow-recursion-on|sortlist|topology|rrset-order|dual-stack-servers|disable-algorithms|dns64|forwarders|rrset-order|update-policy|also-notify|allow-notify|rate-limit)\s+?([^\s{}]*\s*)*{", lambda s, t: ('section_start', t)), (r"\#.*?\n", lambda s, t: ('comment', t)), (r"//.*?\n", lambda s, t: ('comment', t)), (r"/\*.*?\*/", lambda s, t: ('comment', t)), + (r"((([^\s{};#]+)|({\s*([^\s{};#]+;\s*)*}))\s*?)+;", lambda s, t: ('option', t)), + (r"\s", lambda s, t: 'whitespace'), + (r"$^", lambda s, t: 'newline'), (r"\};", lambda s, t: 'section_end'), ] token_section_end = '};' |