Changeset 185

Timestamp:

Dec 18, 2017, 1:32:41 PM (7 years ago)

Author:

Alfredo Fernández Díaz

Message:

New TRP highlight mode, addressing ticket #53:
Regular expressions 0[xX]?[0-9a-fA-F]+ and [0-9a-fA-F]+ don't find hex numbers that start with letters

M config/m_trp.fte

File:

• trunk/config/m_trp.fte (modified) (10 diffs)

trunk/config/m_trp.fte ¶

@@ -1 @@
-# x86 instruction list now nearly complete, 
+# x86 instruction list now nearly complete,
 # also added floating point registers and some nasm directives
 #                                   jsvendsen 07-24-2001
+# did some real plumbing
+#                                   mrwarper 2017-10-23
 colorize TRP {
     SyntaxParser = 'SIMPLE';
-    
+
     color {
         { 'Normal',        'Editor_Default' },
@@ -25 +27 @@
         'test', 'cmp',
         'inc', 'dec',
-        'popa', 'popaw', 'popf', 'popfw', 'popfd', 
+        'popa', 'popaw', 'popf', 'popfw', 'popfd',
         'pusha', 'pushad', 'pushaw', 'pushf', 'pushfd', 'pushfw',
         'scasd', 'scasw', 'scasb',
@@ -31 +33 @@
         'stosd', 'stosw', 'stosb',
         'out', 'outsd', 'outsw', 'outsb',
-        'in', 'insd', 'insw', 'insb', 
-        'int', 'nop', 'rep', 'repz', 'repnz', 'repe', 'repne', 
+        'in', 'insd', 'insw', 'insb',
+        'int', 'nop', 'rep', 'repz', 'repnz', 'repe', 'repne',
         'int1', 'icepb', 'int01', 'int3', 'into',
         'cld', 'clc', 'cli', 'clts', 'stc',
@@ -49 +51 @@
         'ficom', 'ficomp', 'fidiv', 'fidivr', 'fild', 'fist', 'fistp',
         'fimul', 'fincstp', 'finit', 'fninit', 'fisub', 'fisubr',
-        'fld', 'fld1', 'fldl2e', 'fldl2t', 'fldlg2', 'fldln2', 'fldpi', 
+        'fld', 'fld1', 'fldl2e', 'fldl2t', 'fldlg2', 'fldln2', 'fldpi',
         'fldz', 'fldcw', 'fldenv', 'fmul', 'fmulp', 'fnop', 'fpatan', 'fptan',
         'fprem', 'fprem1', 'frndint', 'fsave', 'frstor', 'fscale',
@@ -55 +57 @@
         'fstenv', 'fnstenv', 'fsub', 'fsubr', 'fsubp', 'fsubrp', 'ftst',
         'fucom', 'fucomp', 'fucompp', 'fucomi', 'fucomip', 'fxam', 'fxch',
-        'fxtract', 'fyl2x', 'fyl2xp1', 
+        'fxtract', 'fyl2x', 'fyl2xp1',
         'invd', 'invlpg', 'lahf', 'lar', 'lds', 'les', 'lfs', 'lgs', 'lss',
         'lgdt', 'lidt', 'lldt', 'sgdt', 'sidt', 'sldt', 'lmsw', 'smsw',
@@ -71 +73 @@
         'salc', 'shld', 'shrd', 'smi', 'stc', 'std', 'sti', 'str',
         'umov', 'verr', 'verw', 'wait', 'wbinvd', 'wrmsr', 'xadd', 'xbts',
-        'xchg', 'xlatb', 
+        'xchg', 'xlatb',
         'enter', 'leave',
     };
@@ -88 +90 @@
 
     keyword 'Editor_Keywords2' {
-        'ffffffff',  'ffff',
         'call', 'ret', 'retf', 'retn',
         'iret', 'iretw', 'iretd',
@@ -101 +102 @@
         'jcxz', 'jecxz',
         'loop', 'loope', 'loopz', 'loopne', 'loopnz',
-        
+
     };
 
     keyword 'Editor_Keywords4' {
-        'invalid',  'address', 'valid', 'process', 'PID', 'TID', 'priority', 
+        'invalid',  'address', 'valid', 'process', 'PID', 'TID', 'priority',
         'filename', 'cause', 'module', 'symbol', 'nearest', 'labels', 'thread',
         'size', 'base', 'max', 'top', 'offset',
-        'near', 'far', 'short', 'seg', 
+        'near', 'far', 'short', 'seg',
         'ptr', 'word', 'byte', 'dword', 'qword', 'dup',
     };
-    
+
     keyword 'Editor_Keywords5' {
         'trap', 'stack', 'public', 'obj',
@@ -128 +129 @@
     };
 
-    h_state 0 { 'Normal' }    
-    h_trans { 2, '-s', 'a-zA-Z_$@', 'Normal' }
-    h_trans { 1, '-s', '0-9', 'Number' }
-    h_trans { 0, 'S', 'a-zA-Z0-9_$@', 'Punctuation' }
+    h_state 0 { 'Normal' }
+    # Next two (not real punctuation) can be removed
+    h_trans { 0, 'x', '[\-\.][\-\.]+', 'Normal' }
+    h_trans { 0, '', ':\\', 'Normal' }
+    h_trans { 0, 's', '-+([:])/.,>=', 'Punctuation' } # '-' is normally a range separator, so it must go first
+    h_trans { 0, 'x', '0x[A-Fa-f0-9]+', 'Number' } # "i" flag does not quite work ?!
+    h_trans { 1, '-x', '[A-Za-z0-9]*[G-Zg-z][A-Za-z0-9]*', 'Normal' }
+    h_trans { 0, 'x', ' [a-f] ', 'Normal' } # Just a distraction
+    h_trans { 0, 'x', '[A-Fa-f0-9]+', 'Number' }
 
-    h_state 1 { 'Number' }
-    h_trans { 0, '$', '', 'Normal' }
-    h_trans { 0, 's', 'Xx', 'Number' }   
-    h_trans { 0, '-x', /\W[0-9A-Fa-f]+\s/, 'Number' }
-    h_trans { 0, 'S', '0-9A-Fa-f_$@', 'Punctuation' }
-    
-    h_state 2 { 'Normal' }
-    h_trans { 0, '$', '', 'Normal' }
+    h_state 1 { 'Normal' } # Just keyword highlight
     h_wtype { 0, 0, 0, 'i', 'a-zA-Z0-9_$@' }
 }
@@ -149 +148 @@
     Colorizer           = 'TRP';
     AutoHilitParen      = 1;
-    
+
     SaveFolds           = 2;      # save fold info at end of line
 }