summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDietmar Winkler <dietmar.winkler@dwe.no>2014-04-22 13:49:13 +0200
committerDietmar Winkler <dietmar.winkler@dwe.no>2014-04-22 13:49:13 +0200
commit2d6032314e9599982400004db759df586fc90ace (patch)
treec531aa9a18c51c82e11e83ad70a0a55db6f743f4
parent6747ef30d28dbc52edf019e47f6edb7fb773b3db (diff)
downloadpygments-2d6032314e9599982400004db759df586fc90ace.tar.gz
Adds `end` to the list of keywords again.
At the same time change the order of includes so that keywords are only parsed after "classes" and "functions".
-rw-r--r--pygments/lexers/other.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pygments/lexers/other.py b/pygments/lexers/other.py
index 261fa304..caf398bb 100644
--- a/pygments/lexers/other.py
+++ b/pygments/lexers/other.py
@@ -1315,16 +1315,16 @@ class ModelicaLexer(RegexLexer):
],
'root': [
include('whitespace'),
- include('keywords'),
include('classes'),
include('functions'),
+ include('keywords'),
include('operators'),
(r'("<html>|<html>)', Name.Tag, 'html-content'),
include('statements'),
],
'keywords': [
(r'(algorithm|annotation|break|connect|constant|constrainedby|'
- r'discrete|each|else|elseif|elsewhen|encapsulated|enumeration|'
+ r'discrete|each|end|else|elseif|elsewhen|encapsulated|enumeration|'
r'equation|exit|expandable|extends|'
r'external|false|final|flow|for|if|import|impure|in|initial\sequation|'
r'inner|input|loop|nondiscrete|outer|output|parameter|partial|'