From b9b444e3fcb60960f2142d8fab3d7b2574ca10d5 Mon Sep 17 00:00:00 2001
From: Forest0923 <tropicalrainforest23@gmail.com>
Date: Sun, 21 Aug 2022 19:09:07 +0900
Subject: [PATCH 1/2] Update GAS lexer

---
 lexers/embedded/gas.xml | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/lexers/embedded/gas.xml b/lexers/embedded/gas.xml
index 1ef31dec9..ea43a7ca3 100644
--- a/lexers/embedded/gas.xml
+++ b/lexers/embedded/gas.xml
@@ -48,10 +48,24 @@
       <rule pattern="(?:0[xX][a-zA-Z0-9]+|\d+)">
         <token type="LiteralNumberInteger"/>
       </rule>
+      <rule pattern="%(?:[a-zA-Z$_][\w$.@-]*|\.[\w$.@-]+)">
+        <token type="NameVariable">
+      </rule>
       <rule pattern="[\r\n]+">
         <token type="Text"/>
         <pop depth="1"/>
       </rule>
+      <rule pattern="([;#]|//).*?\n">
+        <token type="CommentSingle"/>
+        <pop depth="1"/>
+      </rule>
+      <rule pattern="/[*].*?[*]/">
+        <token type="CommentMultiline"/>
+      </rule>
+      <rule pattern="/[*].*?\n[\w\W]*?[*]/">
+        <token type="CommentMultiline"/>
+        <pop depth="1"/>
+      </rule>
       <rule>
         <include state="punctuation"/>
       </rule>
@@ -99,6 +113,17 @@
         <token type="Text"/>
         <pop depth="1"/>
       </rule>
+      <rule pattern="([;#]|//).*?\n">
+        <token type="CommentSingle"/>
+        <pop depth="1"/>
+      </rule>
+      <rule pattern="/[*].*?[*]/">
+        <token type="CommentMultiline"/>
+      </rule>
+      <rule pattern="/[*].*?\n[\w\W]*?[*]/">
+        <token type="CommentMultiline"/>
+        <pop depth="1"/>
+      </rule>
       <rule>
         <include state="punctuation"/>
       </rule>
@@ -113,9 +138,12 @@
       <rule pattern="\s+">
         <token type="Text"/>
       </rule>
-      <rule pattern="[;#].*?\n">
-        <token type="Comment"/>
+      <rule pattern="([;#]|//).*?\n">
+        <token type="CommentSingle"/>
+      </rule>
+      <rule pattern="/[*][\w\W]*?[*]/">
+        <token type="CommentMultiline"/>
       </rule>
     </state>
   </rules>
-</lexer>
\ No newline at end of file
+</lexer>

From 19aec985eeded6246dab61f37c16770019b27e7a Mon Sep 17 00:00:00 2001
From: Masahiro Mori <47715365+Forest0923@users.noreply.github.com>
Date: Mon, 22 Aug 2022 19:17:52 +0900
Subject: [PATCH 2/2] Fix: add missing '/'

---
 lexers/embedded/gas.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lexers/embedded/gas.xml b/lexers/embedded/gas.xml
index ea43a7ca3..1feda85f7 100644
--- a/lexers/embedded/gas.xml
+++ b/lexers/embedded/gas.xml
@@ -49,7 +49,7 @@
         <token type="LiteralNumberInteger"/>
       </rule>
       <rule pattern="%(?:[a-zA-Z$_][\w$.@-]*|\.[\w$.@-]+)">
-        <token type="NameVariable">
+        <token type="NameVariable"/>
       </rule>
       <rule pattern="[\r\n]+">
         <token type="Text"/>