|
 |
163dd4 |
diff --git a/pygments/lexers/ml.py b/pygments/lexers/ml.py
|
|
|
163dd4 |
index f80d5bf..4fd2c58 100644
|
|
|
163dd4 |
--- a/pygments/lexers/ml.py
|
|
|
163dd4 |
+++ b/pygments/lexers/ml.py
|
|
|
163dd4 |
@@ -142,7 +142,7 @@ class SMLLexer(RegexLexer):
|
|
|
163dd4 |
(r'#\s+(%s)' % symbolicid_re, Name.Label),
|
|
|
163dd4 |
# Some reserved words trigger a special, local lexer state change
|
|
|
163dd4 |
(r'\b(datatype|abstype)\b(?!\')', Keyword.Reserved, 'dname'),
|
|
|
163dd4 |
- (r'(?=\b(exception)\b(?!\'))', Text, ('ename')),
|
|
|
163dd4 |
+ (r'\b(exception)\b(?!\')', Keyword.Reserved, 'ename'),
|
|
|
163dd4 |
(r'\b(functor|include|open|signature|structure)\b(?!\')',
|
|
|
163dd4 |
Keyword.Reserved, 'sname'),
|
|
|
163dd4 |
(r'\b(type|eqtype)\b(?!\')', Keyword.Reserved, 'tname'),
|
|
|
163dd4 |
@@ -315,15 +315,14 @@ class SMLLexer(RegexLexer):
|
|
|
163dd4 |
'ename': [
|
|
|
163dd4 |
include('whitespace'),
|
|
|
163dd4 |
|
|
|
163dd4 |
- (r'(exception|and)\b(\s+)(%s)' % alphanumid_re,
|
|
|
163dd4 |
+ (r'(and\b)(\s+)(%s)' % alphanumid_re,
|
|
|
163dd4 |
bygroups(Keyword.Reserved, Text, Name.Class)),
|
|
|
163dd4 |
- (r'(exception|and)\b(\s*)(%s)' % symbolicid_re,
|
|
|
163dd4 |
+ (r'(and\b)(\s*)(%s)' % symbolicid_re,
|
|
|
163dd4 |
bygroups(Keyword.Reserved, Text, Name.Class)),
|
|
|
163dd4 |
(r'\b(of)\b(?!\')', Keyword.Reserved),
|
|
|
163dd4 |
+ (r'(%s)|(%s)' % (alphanumid_re, symbolicid_re), Name.Class),
|
|
|
163dd4 |
|
|
|
163dd4 |
- include('breakout'),
|
|
|
163dd4 |
- include('core'),
|
|
|
163dd4 |
- (r'\S+', Error),
|
|
|
163dd4 |
+ default('#pop'),
|
|
|
163dd4 |
],
|
|
|
163dd4 |
|
|
|
163dd4 |
'datcon': [
|