kate: consolidate integer suffixes with &rustIntSuf; entity

diff --git a/src/etc/kate/rust.xml b/src/etc/kate/rust.xml
index 9a99c32943e34def49a6e7b531504378614314c1..7bb4a769f945e14d1cd7b9fae41a7c7203eccd98 100644 (file)
--- a/src/etc/kate/rust.xml
+++ b/src/etc/kate/rust.xml
@@ -5,6 +5,7 @@
        predefined char classes, so making rustIdent consistent with actual
        Rust identifiers will be a bit difficult -->
        <!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*">
+       <!ENTITY rustIntSuf "([iu](8|16|32|64)?)?">
 ]>
 <language name="Rust" version="0.6" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
 <highlighting>
@@ -198,10 +199,10 @@
                        <keyword String="cconstants" attribute="CConstant" context="#stay"/>
                        <Detect2Chars char="/" char1="/" attribute="Comment" context="Commentar 1"/>
                        <Detect2Chars char="/" char1="*" attribute="Comment" context="Commentar 2" beginRegion="Comment"/>
-                       <RegExpr String="0x[0-9a-fA-F_]+(u8|u16|u32|u64|i8|i16|i32|i64|u|i)?" attribute="Number" context="#stay"/>
-                       <RegExpr String="0b[0-1_]+(u8|u16|u32|u64|i8|i16|i32|i64|u|i)?" attribute="Number" context="#stay"/>
+                       <RegExpr String="0x[0-9a-fA-F_]+&rustIntSuf;" attribute="Number" context="#stay"/>
+                       <RegExpr String="0b[0-1_]+&rustIntSuf;" attribute="Number" context="#stay"/>
                        <RegExpr String="[0-9][0-9_]*\.[0-9_]*([eE][+-]?[0-9_]+)?(f32|f64|f)?" attribute="Number" context="#stay"/>
-                       <RegExpr String="[0-9][0-9_]*(u8|u16|u32|u64|i8|i16|i32|i64|u|i)?" attribute="Number" context="#stay"/>
+                       <RegExpr String="[0-9][0-9_]*&rustIntSuf;" attribute="Number" context="#stay"/>
                        <RegExpr String="&rustIdent;::" attribute="Scope"/>
                        <RegExpr String="&rustIdent;!" attribute="Macro"/>
                        <RegExpr String="&apos;&rustIdent;(?!&apos;)" attribute="Lifetime"/>