diff options
author | Mauricio Caceres Bravo <mauricio.caceres.bravo@gmail.com> | 2019-02-12 10:27:34 -0500 |
---|---|---|
committer | Mauricio Caceres Bravo <mauricio.caceres.bravo@gmail.com> | 2019-02-12 10:27:34 -0500 |
commit | 62ff49874c8a405fc24a83cb6611e8a5cf818bd5 (patch) | |
tree | 8b33912d57eb8bedcc75f30f146608ea59f43e8a /pygments/lexers/verification.py | |
parent | df656b31ecabd8a1b649f79de050854a2974e395 (diff) | |
parent | 77e24d5ab193f6c3fa8492f5410a2e841f9ebfad (diff) | |
download | pygments-62ff49874c8a405fc24a83cb6611e8a5cf818bd5.tar.gz |
Merged default branch to hopefully solve merge conflicts
Diffstat (limited to 'pygments/lexers/verification.py')
-rw-r--r-- | pygments/lexers/verification.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pygments/lexers/verification.py b/pygments/lexers/verification.py index 4042d44e..5322e17f 100644 --- a/pygments/lexers/verification.py +++ b/pygments/lexers/verification.py @@ -5,7 +5,7 @@ Lexer for Intermediate Verification Languages (IVLs). - :copyright: Copyright 2006-2016 by the Pygments team, see AUTHORS. + :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. """ @@ -69,7 +69,7 @@ class SilverLexer(RegexLexer): """ name = 'Silver' aliases = ['silver'] - filenames = ['*.sil'] + filenames = ['*.sil', '*.vpr'] tokens = { 'root': [ @@ -88,13 +88,14 @@ class SilverLexer(RegexLexer): 'assume', 'goto', 'while', 'if', 'elseif', 'else', 'fresh', 'constraining', 'Seq', 'Set', 'Multiset', 'union', 'intersection', 'setminus', 'subset', 'unfolding', 'in', 'old', 'forall', 'exists', - 'acc', 'wildcard', 'write', 'none', 'epsilon', 'perm', 'unique'), + 'acc', 'wildcard', 'write', 'none', 'epsilon', 'perm', 'unique', + 'apply', 'package', 'folding', 'label', 'forperm'), suffix=r'\b'), Keyword), (words(('Int', 'Perm', 'Bool', 'Ref'), suffix=r'\b'), Keyword.Type), include('numbers'), - (r'[!%&*+=|?:<>/-]', Operator), - (r"([{}():;,.])", Punctuation), + (r'[!%&*+=|?:<>/\-\[\]]', Operator), + (r'([{}():;,.])', Punctuation), # Identifier (r'[\w$]\w*', Name), ], |