diff options
| author | Dietmar Winkler <dietmarw@gmx.de> | 2014-04-10 16:29:41 +0200 |
|---|---|---|
| committer | Dietmar Winkler <dietmarw@gmx.de> | 2014-04-10 16:29:41 +0200 |
| commit | c711531373e5d068f77b23f0649f4c2893ce6e2e (patch) | |
| tree | ecf7f34ae9e6905a8669484999e5bacedb0f0a89 | |
| parent | 948dffaaeae77b83aa3e506495c6a89e5093d869 (diff) | |
| parent | 82d310b012b75777e8b76c74a57618c9cec68877 (diff) | |
| download | pygments-c711531373e5d068f77b23f0649f4c2893ce6e2e.tar.gz | |
Merged birkenfeld/pygments-main into default
| -rw-r--r-- | pygments/lexers/other.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pygments/lexers/other.py b/pygments/lexers/other.py index 80b06b28..ba777e28 100644 --- a/pygments/lexers/other.py +++ b/pygments/lexers/other.py @@ -1235,9 +1235,9 @@ class ModelicaLexer(RegexLexer): 'root': [ include('whitespace'), include('keywords'), + include('classes'), include('functions'), include('operators'), - include('classes'), (r'("<html>|<html>)', Name.Tag, 'html-content'), include('statements'), ], @@ -1264,9 +1264,9 @@ class ModelicaLexer(RegexLexer): r'terminate)\b', Name.Builtin), ], 'classes': [ - (r'(block|class|connector|end|function|model|package|' + (r'(operator)?(\s+)?(block|class|connector|end|function|model|operator|package|' r'record|type)(\s+)((?!if|when|while)[A-Za-z_]\w*|[\'][^\']+[\'])([;]?)', - bygroups(Keyword, Text, Name.Class, Text)) + bygroups(Keyword, Text, Keyword, Text, Name.Class, Text)) ], 'quoted_ident': [ (r'\'', Name, '#pop'), |