From 04dc80ccbf3ba015483f2237f2b4b5ddde6f35cb Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Mon, 28 Dec 2020 22:09:13 -0500
Subject: Lex strings inside macros

---
 bin/hilex/c.l | 68 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 36 insertions(+), 32 deletions(-)

(limited to 'bin/hilex')

diff --git a/bin/hilex/c.l b/bin/hilex/c.l
index 159980e2..e208d76b 100644
--- a/bin/hilex/c.l
+++ b/bin/hilex/c.l
@@ -27,9 +27,15 @@
 width "*"|[0-9]+
 
 %%
+	static int pop = INITIAL;
 
 [[:space:]]+ { return Normal; }
 
+^"%" {
+	BEGIN(pop = MacroLine);
+	return Macro;
+}
+
 ([-+*/%&|^=!<>]|"<<"|">>")"="? |
 [=~.?:]|"++"|"--"|"&&"|"||"|"->" |
 sizeof|(_A|alignof) {
@@ -51,45 +57,22 @@ register|restrict|return|static|struct|switch|typedef|union|volatile|while |
 
 [_[:alpha:]][_[:alnum:]]* { return Identifier; }
 
-^"#" {
-	BEGIN(MacroLine);
-	return Macro;
-}
-^"#"[[:blank:]]*"include" {
-	BEGIN(MacroInclude);
-	return Macro;
-}
-<MacroLine,MacroInclude>{
-	"\n" {
-		BEGIN(0);
-		return Macro;
-	}
-	"\\\n" { return Macro; }
-	[^\\\n<"]+|. { return Macro; }
-}
-<MacroInclude>{
-	"<"[^>]+">" |
-	"\""[^"]+"\"" {
-		return String;
-	}
-}
-
-"//"([^\n]|"\\\n")* |
-"/*"([^*]|"*"[^/])*"*"+"/" {
+<INITIAL,MacroLine>"//"([^\n]|"\\\n")* |
+<INITIAL,MacroLine>"/*"([^*]|"*"[^/])*"*"+"/" {
 	return Comment;
 }
 
-[LUu]?"'" {
+<INITIAL,MacroLine>[LUu]?"'" {
 	BEGIN(CharLiteral);
 	return String;
 }
-([LU]|u8?)?"\"" {
+<INITIAL,MacroLine,MacroInclude>([LU]|u8?)?"\"" {
 	BEGIN(StringLiteral);
 	return String;
 }
 
 <CharLiteral,StringLiteral>{
-	"\\"['""?\\abfnrtv] |
+	"\\"[''""?\\abfnrtv] |
 	"\\"([0-7]{1,3}) |
 	"\\x"([[:xdigit:]]{2}) |
 	"\\u"([[:xdigit:]]{4}) |
@@ -106,17 +89,38 @@ register|restrict|return|static|struct|switch|typedef|union|volatile|while |
 
 <CharLiteral>{
 	"'" {
-		BEGIN(0);
+		BEGIN(pop);
 		return String;
 	}
-	[^\\']+|. { return String; }
+	[^\\'']+|. { return String; }
 }
 <StringLiteral>{
 	"\"" {
-		BEGIN(0);
+		BEGIN(pop);
 		return String;
 	}
-	[^%\\"]+|. { return String; }
+	[^%\\""]+|. { return String; }
+}
+
+^"#" {
+	BEGIN(pop = MacroLine);
+	return Macro;
+}
+^"#"[[:blank:]]*"include" {
+	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; }
 }
 
 . { return Normal; }
-- 
cgit 1.4.1

mit message (<a href='/src/log/files/Tarmak4.keylayout?id=8dd24fbfac017e322de045cf00964775af48aaef&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-07-21 19:57:46 -0400'>2017-07-21</span></td><td><a href='/src/commit/link.sh?id=d39bbb65606d06d26abaca21bf065ca35c70babe&amp;follow=1'>Add hnel</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-07-19 21:15:06 -0400'>2017-07-19</span></td><td><a href='/src/commit/home/.bin/dtch.c?id=56f57e376929e20560284aec737a41ccca2b9ee7&amp;follow=1'>chmod 600 in dtch</a></td><td>June McEnroe -0400'>2020-06-01</span></td><td class='logsubject'><a href='/src/commit/bin/man1/ever.1?id=c33f7d27df55d454029f2c9542ebe7fc46c0e368&amp;follow=1'>Allow redirecting input in ever</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='2020-05-31 14:13:42 -0400'>2020-05-31</span></td><td class='logsubject'><a href='/src/commit/bin/c.sh?id=d92bdfe4bf1ac7cc0804aa2a06a4748cee38fc5d&amp;follow=1'>Add %c conversion to c script</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='2020-05-31 13:13:52 -0400'>2020-05-31</span></td><td class='logsubject'><a href='/src/commit/bin/README.7?id=23d2de658ec0f99dbde8cb0d07e71acb15f853ab&amp;follow=1'>Add c script to README</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='2020-05-31 13:12:23 -0400'>2020-05-31</span></td><td class='logsubject'><a href='/src/commit/bin/man1/c.1?id=7daba199347fce96e47b7c59b9c008801f2668ec&amp;follow=1'>Add c script</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='2020-05-31 02:17:51 -0400'>2020-05-31</span></td><td class='logsubject'><a href='/src/commit/www/text.causal.agency/005-testing-c.7?id=cdd81f368de8988efd9c018df1b29e8d10f03ae3&amp;follow=1'>Update mdoc source URLs</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='2020-05-26 11:12:08 -0400'>2020-05-26</span></td><td class='logsubject'><a href='/src/commit/etc/psf/serif8x16.psf?id=4caf14dfccc5ca6538eb1118f20977cff776f766&amp;follow=1'>Remove unfinished PSF fonts</a></td><td>June McEnroe