Merged in micclly/pygments-main/add_mql_lexer (pull request #285)

1 files changed, 8 insertions, 4 deletions

diff --git a/pygments/lexers/other.py b/pygments/lexers/other.py
index 9a338c0e..d9e7440a 100644
--- a/pygments/lexers/other.py
+++ b/pygments/lexers/other.py
@@ -1217,16 +1217,20 @@ class ModelicaLexer(RegexLexer):
         ],
         'statements': [
             (r'"', String, 'string'),
-            (r'\'', Name, 'quoted_ident'),
             (r'(\d+\.\d*|\.\d+|\d+|\d.)[eE][+-]?\d+[lL]?', Number.Float),
             (r'(\d+\.\d*|\.\d+)', Number.Float),
             (r'\d+[Ll]?', Number.Integer),
             (r'[~!%^&*+=|?:<>/-]', Operator),
-            (r'[()\[\]{},.;]', Punctuation),
             (r'(true|false|NULL|Real|Integer|Boolean)\b', Name.Builtin),
-            (r'([a-zA-Z_][\w\[\]]*|\'[a-zA-Z_\+\-\*\/\^][\w]*\')'
-             r'(\.([a-zA-Z_\][\w\[\]]*|\'[a-zA-Z_\+\-\*\/\^][\w]*\'))+', Name.Class),
+            (r'([a-zA-Z_][\w]*|[\'][^\']+[\'])'
+             r'([\[\d,:\]]*)'
+             r'(\.([a-zA-Z_][\w]*|[\'][^\']+[\']))+'
+             r'([\[\d,:\]]*)', Name.Class),
+            (r'([a-zA-Z_][\w]*|[\'][^\']+[\'])'
+             r'([\[\d,:\]]+)', Name.Class),
             (r'(\'[\w\+\-\*\/\^]+\'|\w+)', Name),
+            (r'[()\[\]{},.;]', Punctuation),
+            (r'\'', Name, 'quoted_ident'),
         ],
         'root': [
             include('whitespace'),