Fix attributes and <, > in Odin Lexer (#803)

alecthomas · Jul 21, 2023 · b8c853d · b8c853d
1 parent e1e698d
commit b8c853d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/lexers/embedded/odin.xml b/lexers/embedded/odin.xml
@@ -51,7 +51,7 @@
         <rule pattern = "\#[a-zA-Z_]+\b">
             <token type = "NameDecorator"/>
         </rule>
-        <rule pattern = "\@\(?[a-zA-Z_]+\b\s*(=\s*&quot;?[0-9a-zA-Z_.]+&quot;?)?\)?">
+        <rule pattern = "\@(\([a-zA-Z_]+\b\s*.*\)|\(?[a-zA-Z_]+\)?)">
             <token type = "NameAttribute"/>
         </rule>
         <rule pattern="[a-zA-Z_]\w*">
@@ -102,7 +102,7 @@
         <rule pattern = "&quot;(\\\\|\\&quot;|[^&quot;])*&quot;" >
             <token type = "LiteralString"/>
         </rule>
-        <rule pattern = "(&lt;&lt;=|&gt;&gt;=|&lt;&lt;|&gt;&gt;|&lt;=|&gt;=|&amp;=|&amp;|\+=|-=|\*=|/=|%=|\||\^|=|&amp;&amp;|\|\||--|-&gt;|=|==|!=|:=|:|::|\.\.\&lt;|\.\.=|[+\-*/%&amp;])" >
+        <rule pattern = "(&lt;&lt;=|&gt;&gt;=|&lt;&lt;|&gt;&gt;|&lt;=|&gt;=|&amp;=|&amp;|\+=|-=|\*=|/=|%=|\||\^|=|&amp;&amp;|\|\||--|-&gt;|=|==|!=|:=|:|::|\.\.\&lt;|\.\.=|[&lt;&gt;+\-*/%&amp;])" >
             <token type = "Operator"/>
         </rule>
         <rule pattern="[{}()\[\],.;]">

diff --git a/lexers/testdata/odin.actual b/lexers/testdata/odin.actual
@@ -73,7 +73,7 @@ a_test_proc :: proc(t: ^testing.T) {
 	testing.errnof("a format: %s", value)
 }
 
-@(disable = ODIN_DEBUG)
+@(disable = LOG_LEVEL >= .Debug)
 debug_thing :: proc(x, y, z: int) {
 	fmt.println(x, y, z)
 }

diff --git a/lexers/testdata/odin.expected b/lexers/testdata/odin.expected
@@ -390,7 +390,7 @@
   {"type":"TextWhitespace","value":"\n"},
   {"type":"Punctuation","value":"}"},
   {"type":"TextWhitespace","value":"\n\n"},
-  {"type":"NameAttribute","value":"@(disable = ODIN_DEBUG)"},
+  {"type":"NameAttribute","value":"@(disable = LOG_LEVEL \u003e= .Debug)"},
   {"type":"TextWhitespace","value":"\n"},
   {"type":"Name","value":"debug_thing"},
   {"type":"TextWhitespace","value":" "},
@@ -427,7 +427,8 @@
   {"type":"TextWhitespace","value":"\n"},
   {"type":"Punctuation","value":"}"},
   {"type":"TextWhitespace","value":"\n\n"},
-  {"type":"NameAttribute","value":"@private\n"},
+  {"type":"NameAttribute","value":"@private"},
+  {"type":"TextWhitespace","value":"\n"},
   {"type":"Name","value":"program"},
   {"type":"TextWhitespace","value":" "},
   {"type":"Operator","value":":="},