summaryrefslogtreecommitdiffstats
path: root/kate/data/cpp.xml
diff options
context:
space:
mode:
Diffstat (limited to 'kate/data/cpp.xml')
-rw-r--r--kate/data/cpp.xml130
1 files changed, 89 insertions, 41 deletions
diff --git a/kate/data/cpp.xml b/kate/data/cpp.xml
index 790c0d8f9..e9f0ac85a 100644
--- a/kate/data/cpp.xml
+++ b/kate/data/cpp.xml
@@ -1,6 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
-<language name="C++" version="1.38" kateversion="2.4" section="Sources" extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.hh;*.H;*.h++;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="9">
+<language name="C++" section="Sources"
+ version="1.44" kateversion="2.4"
+ indenter="cstyle"
+ mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr"
+ extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.hh;*.H;*.h++;*.hxx;*.hpp;*.hcc;*.moc"
+ priority="9">
+<!--
+##########################################################################
+## Fixes by Sebastian Pipping (webmaster@hartwork.org)
+##
+## NOTE: Keep in sync with C highlighter! (c.xml)
+##########################################################################
+-->
<highlighting>
<list name="keywords">
<item> asm </item>
@@ -71,46 +83,48 @@
</list>
<list name="extensions">
<item> K_DCOP </item>
- <item> SLOT </item>
- <item> SIGNAL </item>
+ <item> Q_ARG </item>
+ <item> Q_ASSERT </item>
+ <item> Q_ASSERT_X </item>
+ <item> Q_CHECK_PTR </item>
<item> Q_CLASSINFO </item>
- <item> Q_ENUMS </item>
- <item> Q_EXPORT </item>
- <item> Q_OBJECT </item>
- <item> Q_OVERRIDE </item>
- <item> Q_PROPERTY </item>
- <item> Q_SETS </item>
- <item> Q_SIGNALS </item>
- <item> Q_SLOTS </item>
- <item> Q_FOREACH </item>
- <item> Q_DECLARE_FLAGS </item>
- <item> Q_INIT_RESOURCE </item>
<item> Q_CLEANUP_RESOURCE </item>
- <item> Q_GLOBAL_STATIC </item>
- <item> Q_GLOBAL_STATIC_WITH_ARGS </item>
- <item> Q_DECLARE_INTERFACE </item>
- <item> Q_DECLARE_TYPEINFO </item>
- <item> Q_DECLARE_SHARED </item>
+ <item> Q_D </item>
<item> Q_DECLARE_FLAGS </item>
+ <item> Q_DECLARE_FLAGS </item>
+ <item> Q_DECLARE_INTERFACE </item>
+ <item> Q_DECLARE_METATYPE </item>
<item> Q_DECLARE_OPERATORS_FOR_FLAGS </item>
- <item> Q_FOREVER </item>
<item> Q_DECLARE_PRIVATE </item>
<item> Q_DECLARE_PUBLIC </item>
- <item> Q_D </item>
- <item> Q_Q </item>
+ <item> Q_DECLARE_SHARED </item>
+ <item> Q_DECLARE_TYPEINFO </item>
<item> Q_DISABLE_COPY </item>
- <item> Q_INTERFACES </item>
+ <item> Q_ENUMS </item>
+ <item> Q_EXPORT </item>
<item> Q_FLAGS </item>
- <item> Q_SCRIPTABLE </item>
- <item> Q_INVOKABLE </item>
+ <item> Q_FOREACH </item>
+ <item> Q_FOREVER </item>
<item> Q_GADGET </item>
- <item> Q_ARG </item>
- <item> Q_RETURN_ARG </item>
- <item> Q_ASSERT </item>
- <item> Q_ASSERT_X </item>
- <item> Q_PRIVATE_SLOT </item>
- <item> Q_DECLARE_METATYPE </item>
+ <item> Q_GLOBAL_STATIC </item>
+ <item> Q_GLOBAL_STATIC_WITH_ARGS </item>
+ <item> Q_INIT_RESOURCE </item>
+ <item> Q_INTERFACES </item>
+ <item> Q_INVOKABLE </item>
<item> Q_NOREPLY </item>
+ <item> Q_OBJECT </item>
+ <item> Q_OVERRIDE </item>
+ <item> Q_PRIVATE_SLOT </item>
+ <item> Q_PROPERTY </item>
+ <item> Q_Q </item>
+ <item> Q_RETURN_ARG </item>
+ <item> Q_SCRIPTABLE </item>
+ <item> Q_SETS </item>
+ <item> Q_SIGNALS </item>
+ <item> Q_SLOTS </item>
+ <item> Q_UNUSED </item>
+ <item> SIGNAL </item>
+ <item> SLOT </item>
<item> TRUE </item>
<item> FALSE </item>
<item> connect </item>
@@ -120,6 +134,20 @@
<item> slots </item>
<item> foreach </item>
<item> forever </item>
+
+ <item> qint8 </item>
+ <item> qint16 </item>
+ <item> qint32 </item>
+ <item> qint64 </item>
+ <item> qlonglong </item>
+ <item> qptrdiff </item>
+ <item> qreal </item>
+ <item> quint8 </item>
+ <item> quint16 </item>
+ <item> quint32 </item>
+ <item> quint64 </item>
+ <item> quintptr </item>
+ <item> qulonglong </item>
</list>
<list name="types">
<item> auto </item>
@@ -153,8 +181,8 @@
<contexts>
<context attribute="Normal Text" lineEndContext="#stay" name="Normal">
<DetectSpaces />
- <RegExpr attribute="Preprocessor" context="Outscoped" String="#\s*if\s+0" beginRegion="Outscoped" firstNonSpace="true" />
- <DetectChar attribute="Preprocessor" context="Preprocessor" char="#" firstNonSpace="true" />
+ <RegExpr attribute="Preprocessor" context="Outscoped" String="#\s*if\s+0" beginRegion="PP" firstNonSpace="true" />
+ <DetectChar context="AfterHash" char="#" firstNonSpace="true" lookAhead="true" />
<StringDetect attribute="Region Marker" context="Region Marker" String="//BEGIN" beginRegion="Region1" firstNonSpace="true" />
<StringDetect attribute="Region Marker" context="Region Marker" String="//END" endRegion="Region1" firstNonSpace="true" />
<keyword attribute="Keyword" context="#stay" String="keywords" />
@@ -185,42 +213,59 @@
<DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
<AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]{|}~^&#59;"/>
</context>
+
<context attribute="String" lineEndContext="#pop" name="String">
<LineContinue attribute="String" context="#stay"/>
<HlCStringChar attribute="String Char" context="#stay"/>
<DetectChar attribute="String" context="#pop" char="&quot;"/>
</context>
+
<context attribute="Region Marker" lineEndContext="#pop" name="Region Marker">
</context>
+
<context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
+ <LineContinue attribute="Comment" context="#stay"/>
<DetectSpaces />
<IncludeRules context="##Alerts" />
<DetectIdentifier />
</context>
+
<context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
<DetectSpaces />
<Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
<IncludeRules context="##Alerts" />
<DetectIdentifier />
</context>
+
+ <context attribute="Error" lineEndContext="#pop" name="AfterHash">
+ <!-- define, elif, else, endif, error, if, ifdef, ifndef, include, include_next, line, pragma, undef, warning -->
+ <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*if(?:def|ndef)?(?=\s+\S)" insensitive="true" beginRegion="PP" firstNonSpace="true" />
+ <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*endif" insensitive="true" endRegion="PP" firstNonSpace="true" />
+ <RegExpr attribute="Preprocessor" context="Define" String="#\s*define.*((?=\\))" insensitive="true" firstNonSpace="true" />
+ <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*(?:el(?:se|if)|include(?:_next)?|define|undef|line|error|warning|pragma)" insensitive="true" firstNonSpace="true" />
+ <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s+[0-9]+" insensitive="true" firstNonSpace="true" />
+ </context>
+
<context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor">
<LineContinue attribute="Preprocessor" context="#stay"/>
- <RegExpr attribute="Preprocessor" context="Define" String="define.*((?=\\))"/>
- <RegExpr attribute="Preprocessor" context="#stay" String="define.*"/>
<RangeDetect attribute="Prep. Lib" context="#stay" char="&quot;" char1="&quot;"/>
<RangeDetect attribute="Prep. Lib" context="#stay" char="&lt;" char1="&gt;"/>
<IncludeRules context="##Doxygen" />
+ <Detect2Chars attribute="Comment" context="Commentar/Preprocessor" char="/" char1="*" beginRegion="Comment2" />
+
<Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
- <Detect2Chars attribute="Comment" context="Commentar/Preprocessor" char="/" char1="*"/>
</context>
+
<context attribute="Preprocessor" lineEndContext="#pop" name="Define">
<LineContinue attribute="Preprocessor" context="#stay"/>
</context>
+
<context attribute="Comment" lineEndContext="#stay" name="Commentar/Preprocessor">
<DetectSpaces />
- <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" />
+ <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment2" />
<DetectIdentifier />
</context>
+
<context attribute="Comment" lineEndContext="#stay" name="Outscoped" >
<DetectSpaces />
<IncludeRules context="##Alerts" />
@@ -229,9 +274,11 @@
<IncludeRules context="##Doxygen" />
<Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
<Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
- <RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="Outscoped" firstNonSpace="true" />
- <RegExpr attribute="Preprocessor" context="#pop" String="#\s*(endif|else|elif)" endRegion="Outscoped" firstNonSpace="true" />
+ <RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="PP" firstNonSpace="true" />
+ <RegExpr attribute="Preprocessor" context="#pop" String="#\s*el(?:se|if)" firstNonSpace="true" />
+ <RegExpr attribute="Preprocessor" context="#pop" String="#\s*endif" endRegion="PP" firstNonSpace="true" />
</context>
+
<context attribute="Comment" lineEndContext="#stay" name="Outscoped intern">
<DetectSpaces />
<IncludeRules context="##Alerts" />
@@ -240,8 +287,8 @@
<IncludeRules context="##Doxygen" />
<Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
<Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
- <RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="Outscoped" firstNonSpace="true"/>
- <RegExpr attribute="Comment" context="#pop" String="#\s*endif" endRegion="Outscoped" firstNonSpace="true"/>
+ <RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="PP" firstNonSpace="true" />
+ <RegExpr attribute="Comment" context="#pop" String="#\s*endif" endRegion="PP" firstNonSpace="true" />
</context>
</contexts>
<itemDatas>
@@ -261,6 +308,7 @@
<itemData name="Preprocessor" defStyleNum="dsOthers"/>
<itemData name="Prep. Lib" defStyleNum="dsOthers"/>
<itemData name="Region Marker" defStyleNum="dsRegionMarker" />
+ <itemData name="Error" defStyleNum="dsError" />
</itemDatas>
</highlighting>
<general>