From c82d5cdb4493eca1b970a5cb17dc9c114319e7a8 Mon Sep 17 00:00:00 2001
From: rhiannon morris <rhi@rhiannon.website>
Date: Wed, 16 Mar 2022 04:55:30 +0100
Subject: [PATCH] maude syntax updates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- negative rationals
- fix string escapes
- ±Infinity
- strategy modules, decls, etc
- some arrows etc i missed
---
 style/page.css   |  1 +
 syntax/maude.xml | 35 +++++++++++++++++++++++------------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/style/page.css b/style/page.css
index 8be0f5f..712ffb4 100644
--- a/style/page.css
+++ b/style/page.css
@@ -402,3 +402,4 @@ aside {
 .maude .cf { color: hsl(276deg, 75%,  35%); font-weight: 500; }
 .maude .op { color: hsl(220deg, 10%,  28%); }
 .maude .co { color: hsl(221deg, 10%,  39%); font-style: italic; }
+.maude :is(.st, .fl, .dv, .sc) { color: hsl(143deg, 100%, 20%); }
diff --git a/syntax/maude.xml b/syntax/maude.xml
index 2608f28..ecd6df1 100644
--- a/syntax/maude.xml
+++ b/syntax/maude.xml
@@ -7,8 +7,10 @@
     <list name="modules">
       <item>mod</item>  <item>endm</item> <item>is</item>
       <item>fmod</item> <item>endfm</item>
+      <item>smod</item> <item>endsm</item>
       <item>th</item>   <item>endth</item>
       <item>fth</item>  <item>endfth</item>
+      <item>sth</item>  <item>endsth</item>
       <item>view</item> <item>endv</item>
       <item>from</item> <item>to</item>
     </list>
@@ -24,12 +26,14 @@
       <item>subsort</item> <item>subsorts</item>
     </list>
 
-    <list name="ops">     <item>op</item>  <item>ops</item>  </list>
-    <list name="vars">    <item>var</item> <item>vars</item> </list>
-    <list name="eqs">     <item>eq</item>  <item>ceq</item>  </list>
-    <list name="rules">   <item>rl</item>  <item>crl</item>  </list>
-    <list name="members"> <item>mb</item>  <item>cmb</item>  </list>
-    <list name="if">      <item>if</item>                    </list>
+    <list name="ops">     <item>op</item>    <item>ops</item>    </list>
+    <list name="vars">    <item>var</item>   <item>vars</item>   </list>
+    <list name="eqs">     <item>eq</item>    <item>ceq</item>    </list>
+    <list name="rules">   <item>rl</item>    <item>crl</item>    </list>
+    <list name="members"> <item>mb</item>    <item>cmb</item>    </list>
+    <list name="strats">  <item>strat</item> <item>strats</item> </list>
+    <list name="sds">     <item>sd</item>    <item>csd</item>    </list>
+    <list name="if">      <item>if</item>    </list>
 
     <contexts>
       <context attribute="default" lineEndContext="#stay" name="Default">
@@ -46,26 +50,31 @@
         <RegExpr attribute="if" context="#stay" String="/\\" />
 
         <RegExpr attribute="punc" context="#stay"
-          String="(?&lt;=^|\s)(?:::?|->|=>|=(?:=|/=)?)(?=\s|$)" />
+          String="(?&lt;=^|\s)(?::[:=]?|->|&lt;-|=>|=(?:=|/=)?|@)(?=\s|$)" />
 
         <RegExpr attribute="delim" context="#stay"
           String="[{}\[\](),]|(?&lt;=^|\s)\.(?=\s|$)" />
 
         <DetectChar attribute="string" context="String" char="&quot;" />
 
-        <Int     attribute="int"   context="#stay" />
         <Float   attribute="float" context="#stay" />
-        <RegExpr attribute="rat"   context="#stay" String="\d+/\d+" />
+        <RegExpr attribute="float" context="#stay"
+          String="(?&lt;=^|\s|[(\[{])-?Infinity(?=$|\s|[)\]}])" />
+        <RegExpr attribute="rat"   context="#stay" String="-?\d+(?:/\d+)?" />
 
         <RegExpr attribute="comment" context="comment s"
           String="(?:---|\*\*\*)(?!\()" />
         <RegExpr attribute="comment" context="comment m"
           String="(?:---|\*\*\*)\(" />
+
+        <!-- todo make this more exact? -->
+        <RegExpr attribute="qid" context="#stay"
+          String="'(?:\S+|&quot;(?:[^\\&quot;]|\\.)*&quot;)" />
       </context>
 
       <context attribute="string" lineEndContext="#stay" name="String">
-        <RegExpr attribute="string" context="#stay" String="\\." />
-        <DetectChar attribute="string esc" context="#pop" char="&quot;" />
+        <RegExpr attribute="string esc" context="#stay" String="\\." />
+        <DetectChar attribute="string" context="#pop" char="&quot;" />
       </context>
 
       <context attribute="comment" lineEndContext="#pop" name="comment s" />
@@ -86,14 +95,16 @@
       <itemData name="eqs"        defStyleNum="dsFunction"     />
       <itemData name="rules"      defStyleNum="dsControlFlow"  />
       <itemData name="members"    defStyleNum="dsKeyword"      />
+      <itemData name="strats"     defStyleNum="dsControlFlow"  />
+      <itemData name="sds"        defStyleNum="dsControlFlow"  />
       <itemData name="if"         defStyleNum="dsControlFlow"  />
       <itemData name="punc"       defStyleNum="dsOperator"     />
       <itemData name="delim"      defStyleNum="dsNormal"       />
       <itemData name="string"     defStyleNum="dsString"       />
       <itemData name="string esc" defStyleNum="dsSpecialChar"  />
-      <itemData name="int"        defStyleNum="dsDecVal"       />
       <itemData name="float"      defStyleNum="dsFloat"        />
       <itemData name="rat"        defStyleNum="dsFloat"        />
+      <itemData name="qid"        defStyleNum="dsString"       />
       <itemData name="comment"    defStyleNum="dsComment"      />
     </itemDatas>
   </highlighting>