From 6de9bdf4c5b7361c445ab984cf0258442d3bd9db Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Tue, 29 Dec 2020 15:00:43 -0500
Subject: Reconfigure C macro start conditions

---
 bin/hilex/c.l | 55 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/bin/hilex/c.l b/bin/hilex/c.l
index e6bd9ad0..056867ce 100644
--- a/bin/hilex/c.l
+++ b/bin/hilex/c.l
@@ -21,21 +21,36 @@
 #include "hilex.h"
 %}
 
-%x MacroLine MacroInclude
+%s MacroLine MacroInclude
 %x CharLiteral StringLiteral
 
+ident [_[:alpha:]][_[:alnum:]]*
 width "*"|[0-9]+
 
 %%
 	static int pop = INITIAL;
 
-[[:space:]]+ { return Normal; }
+[[:blank:]]+ { return Normal; }
 
-^"%" {
+^"#"[[:blank:]]*("include"|"import") {
+	BEGIN(pop = MacroInclude);
+	return Macro;
+}
+^[#%][[:blank:]]*{ident} {
 	BEGIN(pop = MacroLine);
 	return Macro;
 }
 
+<MacroInclude>"<"[^>]+">" { return String; }
+
+<MacroLine,MacroInclude>{
+	"\n" {
+		BEGIN(pop = INITIAL);
+		return Normal;
+	}
+	"\\\n" { return Macro; }
+}
+
 ([-+*/%&|^=!<>]|"<<"|">>")"="? |
 [=~.?:]|"++"|"--"|"&&"|"||"|"->" |
 sizeof|(_A|alignof) {
@@ -55,18 +70,19 @@ register|restrict|return|static|struct|switch|typedef|union|volatile|while |
 	return Keyword;
 }
 
-[_[:alpha:]][_[:alnum:]]* { return Identifier; }
+<MacroLine,MacroInclude>{ident} { return Macro; }
+{ident} { return Identifier; }
 
-<INITIAL,MacroLine>"//"([^\n]|"\\\n")* |
-<INITIAL,MacroLine>"/*"([^*]|"*"[^/])*"*"+"/" {
+"//"([^\n]|"\\\n")* |
+"/*"([^*]|"*"[^/])*"*"+"/" {
 	return Comment;
 }
 
-<INITIAL,MacroLine>[LUu]?"'" {
+[LUu]?"'" {
 	BEGIN(CharLiteral);
 	return String;
 }
-<INITIAL,MacroLine,MacroInclude>([LU]|u8?)?"\"" {
+([LU]|u8?)?"\"" {
 	BEGIN(StringLiteral);
 	return String;
 }
@@ -102,28 +118,9 @@ register|restrict|return|static|struct|switch|typedef|union|volatile|while |
 	[^%\\""]+|. { return String; }
 }
 
-^"#" {
-	BEGIN(pop = MacroLine);
-	return Macro;
-}
-^"#"[[:blank:]]*("include"|"import") {
-	BEGIN(pop = MacroInclude);
-	return Macro;
-}
-<MacroInclude>"<"[^>]+">" {
-	BEGIN(pop = MacroLine);
-	return String;
-}
-<MacroLine,MacroInclude>{
-	"\n" {
-		BEGIN(pop = INITIAL);
-		return Macro;
-	}
-	"\\\n" { return Macro; }
-	[^\\\n/<>''""]+|. { return Macro; }
-}
+<MacroLine,MacroInclude>. { return Macro; }
 
-. { return Normal; }
+.|\n { return Normal; }
 
 %{
 	(void)yyunput;
-- 
cgit 1.4.1

atsh?id=05a6358cf5be03769b4b14f8ee9d3c57437dc86a&amp;showmsg=1&amp;follow=1'>catsh</a>/<a href='/src/log/bin/catsh/libedit?id=05a6358cf5be03769b4b14f8ee9d3c57437dc86a&amp;showmsg=1&amp;follow=1'>libedit</a>/<a href='/src/log/bin/catsh/libedit/filecomplete.c?id=05a6358cf5be03769b4b14f8ee9d3c57437dc86a&amp;showmsg=1&amp;follow=1'>filecomplete.c</a> (<a href='/src/log/bin/catsh/libedit/filecomplete.c?id=05a6358cf5be03769b4b14f8ee9d3c57437dc86a&amp;showmsg=1'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/bin/catsh/libedit/filecomplete.c?id=05a6358cf5be03769b4b14f8ee9d3c57437dc86a&amp;follow=1'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2019-05-10 16:29:50 -0400'>2019-05-10</span></td><td class='logsubject'><a href='/src/commit/bin/hi.c?id=de2710da932e3d77c4e7776fcf65862b36ec5f62&amp;follow=1'>Use val instead of suboptarg</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
suboptarg doesn't exist in GNU. Hopefully BSD getsubopt also sets val on
failure?


</td></tr>
<tr class='logheader'><td><span title='2019-05-09 22:37:41 -0400'>2019-05-09</span></td><td class='logsubject'><a href='/src/commit/txt/books.txt?id=58c4a8d7b42adc32be4cf5da27554e59b945b24d&amp;follow=1'>Add Parable of the Sower</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2019-05-07 22:40:21 -0400'>2019-05-07</span></td><td class='logsubject'><a href='/src/commit/bin/bitlex.l?id=240461ae9cd9e69158bf6ae9a159572cdb8f1cc4&amp;follow=1'>Add bit without build</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Need to do some stuff in the Makefile for lex and yacc and generating
HTML pages for it.


</td></tr>
<tr class='logheader'><td><span title='2019-05-04 17:58:11 -0400'>2019-05-04</span></td><td class='logsubject'><a href='/src/commit/bin/Makefile?id=fef06b5cbc44a327a114f77b04896f44d7d638e3&amp;follow=1'>Fix MANDIR typo</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2019-05-04 17:50:38 -0400'>2019-05-04</span></td><td class='logsubject'><a href='/src/commit/bin/relay.c?id=d2a90f4df164c99a7156dc2385a2b9ebce45ee2d&amp;follow=1'>Move relay to bin</a></td><td>June McEnroe