From 7439a4b0e05832e047040ab8bf9ef13abd9288b2 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 11 Jan 2012 16:14:23 -0600
Subject: Update kate synatax highlighting files This closes Bug 764

---
 kate/data/gnuassembler.xml | 39 ++++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

(limited to 'kate/data/gnuassembler.xml')

diff --git a/kate/data/gnuassembler.xml b/kate/data/gnuassembler.xml
index 754e4fa02..73db06cff 100644
--- a/kate/data/gnuassembler.xml
+++ b/kate/data/gnuassembler.xml
@@ -9,6 +9,10 @@
 *                                                                       *
 *************************************************************************
 
+Updated:  Miquel Sabaté <mikisabate@gmail.com>
+Date:     14th September, 2010
+Version:  1.02
+
 Updated:  Roland Pabel <roland@pabel.name>
 Date:     15th August, 2002
 Version:  1.01
@@ -39,19 +43,22 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 -->
 
-<language name="GNU Assembler" version="1.05" kateversion="2.4" section="Assembler" extensions="*.s;*.S" mimetype="text/x-asm" author="John Zaitseff (J.Zaitseff@zap.org.au), Roland Pabel (roland@pabel.name)" license="GPL">
+<language name="GNU Assembler" version="1.10" kateversion="2.4" section="Assembler" extensions="*.s;*.S" mimetype="text/x-asm" author="John Zaitseff (J.Zaitseff@zap.org.au), Roland Pabel (roland@pabel.name), Miquel Sabaté (mikisabate@gmail.com)" license="GPL">
   <highlighting>
     <list name="keywords">
       <item>.abort</item>
       <item>.align</item>
-      <item>.appfile</item>
+      <item>.app-file</item>
       <item>.appline</item>
       <item>.ascii</item>
       <item>.asciz</item>
+      <item>.att_syntax</item>
       <item>.balign</item>
       <item>.balignl</item>
       <item>.balignw</item>
       <item>.byte</item>
+      <item>.code16</item>
+      <item>.code32</item>
       <item>.comm</item>
       <item>.common.s</item>
       <item>.common</item>
@@ -128,6 +135,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
       <item>.ifnotdef</item>
       <item>.include</item>
       <item>.int</item>
+      <item>.intel_syntax</item>
       <item>.internal</item>
       <item>.irep</item>
       <item>.irepc</item>
@@ -148,6 +156,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
       <item>.noformat</item>
       <item>.nolist</item>
       <item>.nopage</item>
+      <item>noprefix</item>
       <item>.octa</item>
       <item>.offset</item>
       <item>.org</item>
@@ -164,6 +173,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
       <item>.purgem</item>
       <item>.pushsection</item>
       <item>.quad</item>
+      <item>.rodata</item>
       <item>.rep</item>
       <item>.rept</item>
       <item>.rva</item>
@@ -225,7 +235,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
     <contexts>
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
-        <RegExpr      attribute="Label" context="#stay" String="[A-Za-z0-9_.$]+:" firstNonSpace="true"/>
+        <RegExpr      attribute="Label" context="#stay" String="[_\w\d-]*\s*:" />
         <keyword      attribute="Keyword" context="#stay" String="keywords"/>
         <HlCOct       attribute="Octal" context="#stay" />
         <HlCHex       attribute="Hex" context="#stay" />
@@ -233,29 +243,39 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <Int          attribute="Decimal" context="#stay" />
         <RegExpr      attribute="Float" context="#stay" String="0[fFeEdD][-+]?[0-9]*\.?[0-9]*[eE]?[-+]?[0-9]+" />
         <RegExpr      attribute="Normal Text" context="#stay" String="[A-Za-z_.$][A-Za-z0-9_.$]*" />
+        <HlCChar      attribute="Char" context="#stay" />
         <RegExpr      attribute="Char" context="#stay" String="'(\\x[0-9a-fA-F][0-9a-fA-F]?|\\[0-7]?[0-7]?[0-7]?|\\.|.)" />
         <DetectChar   attribute="String" context="String" char="&quot;" />
+        <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)" firstNonSpace="true" />
         <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="*" />
-        <AnyChar      attribute="Comment" context="Commentar 2" String="@;" />
+        <AnyChar      attribute="Comment" context="Commentar 2" String="@;#" />
         <AnyChar      attribute="Symbol" context="#stay" String="!#%&amp;*()+,-&lt;=&gt;?/:[]^{|}~" />
-        <RegExpr      attribute="Preprocessor" context="Preprocessor" String="^#" />
       </context>
       <context attribute="Comment" lineEndContext="#stay" name="Commentar 1">
+        <IncludeRules context="##Alerts" />
         <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" />
       </context>
-      <context attribute="Comment" lineEndContext="#pop" name="Commentar 2" />
-      <context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor" />
+      <context attribute="Comment" lineEndContext="#pop" name="Commentar 2" >
+        <IncludeRules context="##Alerts" />
+      </context>
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue  attribute="String" context="Some Context" />
         <HlCStringChar attribute="String Char" context="#stay" />
         <DetectChar    attribute="String" context="#pop" char="&quot;" />
       </context>
+      <context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor" />
+      <context attribute="Preprocessor" lineEndContext="#pop" name="Define">
+        <LineContinue attribute="Preprocessor" context="#stay"/>
+      </context>
       <context attribute="Normal Text" lineEndContext="#pop" name="Some Context" />
     </contexts>
 
     <itemDatas>
       <itemData name="Normal Text"  defStyleNum="dsNormal"   />
-      <itemData name="Label"        defStyleNum="dsNormal"   />
+      <itemData name="Label"        defStyleNum="dsKeyword"  />
       <itemData name="Keyword"      defStyleNum="dsKeyword"  />
       <itemData name="Decimal"      defStyleNum="dsDecVal"   />
       <itemData name="Octal"        defStyleNum="dsBaseN"    />
@@ -273,8 +293,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
   <general>
     <comments>
-      <comment name="singleLine" start=";" />
+      <!--<comment name="singleLine" start=";" />
       <comment name="singleLine" start="@" />
+      <comment name="singleLine" start="#" />-->
       <comment name="multiLine"  start="/*" end="*/" />
     </comments>
     <keywords casesensitive="1" weakDeliminator="_.$" />
-- 
cgit v1.2.1