summary refs log tree commit diff
path: root/bin/hilex/c.l
diff options
context:
space:
mode:
Diffstat (limited to 'bin/hilex/c.l')
-rw-r--r--bin/hilex/c.l23
1 files changed, 19 insertions, 4 deletions
diff --git a/bin/hilex/c.l b/bin/hilex/c.l
index c0bd516d..29988c3f 100644
--- a/bin/hilex/c.l
+++ b/bin/hilex/c.l
@@ -21,7 +21,7 @@
 #include "hilex.h"
 %}
 
-%s MacroLine MacroInclude
+%s MacroLine MacroInclude MacroDefine
 %x CharLiteral StringLiteral
 
 ident [_[:alpha:]][_[:alnum:]]*
@@ -36,6 +36,10 @@ width "*"|[0-9]+
 	BEGIN(pop = MacroInclude);
 	return Macro;
 }
+^"#"[[:blank:]]*"define" {
+	BEGIN(pop = MacroDefine);
+	return Macro;
+}
 ^[#%][[:blank:]]*{ident} {
 	BEGIN(pop = MacroLine);
 	return Macro;
@@ -43,7 +47,18 @@ width "*"|[0-9]+
 
 <MacroInclude>"<"[^>]+">" { return String; }
 
-<MacroLine,MacroInclude>{
+<MacroDefine>{
+	{ident}/"(" {
+		BEGIN(pop = MacroLine);
+		return IdentifierTag;
+	}
+	{ident} {
+		BEGIN(pop = MacroLine);
+		return Macro;
+	}
+}
+
+<MacroLine,MacroInclude,MacroDefine>{
 	"\n" {
 		BEGIN(pop = INITIAL);
 		return Normal;
@@ -70,7 +85,7 @@ register|restrict|return|static|struct|switch|typedef|union|volatile|while |
 	return Keyword;
 }
 
-<MacroLine,MacroInclude>{ident} { return Macro; }
+<MacroLine>{ident} { return Macro; }
 {ident} { return Identifier; }
 
 "//"([^\n]|"\\\n")* |
@@ -118,7 +133,7 @@ register|restrict|return|static|struct|switch|typedef|union|volatile|while |
 	[^%\\""]+|. { return String; }
 }
 
-<MacroLine,MacroInclude>. { return Macro; }
+<MacroLine,MacroInclude,MacroDefine>. { return Macro; }
 
 .|\n { return Normal; }
 
d7ab869d040a438b328d5abc3bcebae&follow=1'>Add server map generationJune McEnroe 2018-07-17Tabify sourceJune McEnroe And other style changes. 2018-05-13Fix ncurses color pair numberingJune McEnroe This was dumb. Of course all the color pairs fit in 64, but I was shifting too much because my own representation includes the bright bit. 2018-04-09Use anonymous unionJune McEnroe 2018-04-09Replace #define with enum or const where possibleJune McEnroe 2018-03-31Link against ncursesJune McEnroe 2018-03-05Miscellaneous code cleanupJune McEnroe 2018-03-05Pass message structs by valueJune McEnroe 2018-03-05Use stdio in merge and metaJune McEnroe 2018-03-05Clean up spawn constantsJune McEnroe 2018-03-05Rename Tile timestamps {create,modify,access}TimeJune McEnroe 2018-03-05Pack message type enumsJune McEnroe 2018-03-05Undef COLOR_ constants in torus.hJune McEnroe 2018-03-05Generate tagsJune McEnroe 2017-10-03Simplify Makefile with pattern ruleJune McEnroe Insert rant about how GNU make handles the .c rule with extra dependencies. Also I don't care that everything links curses now. 2017-09-27Remove leading blank linesJune McEnroe 2017-09-27Add merge.c to READMEJune McEnroe 2017-09-03Assert client coords are valid after movementJune McEnroe 2017-09-03Relicense AGPLJune McEnroe I know it's already published under a permissive license in what is probably its final form, but I want to license it AGPL anyway on principle following some conversations I had about open source, corporations and copyleft. 2017-09-01Revert "Add client readOnly mode"June McEnroe This reverts commit 34f25ae40a3db9369e9d98b3814f2b93bbc21451. 2017-09-01Remove clientRemove call from clientCastJune McEnroe If an error occurs on a client socket during a broadcast, that client will show up in the kqueue loop with EV_EOF and get removed that way. Tested by sending SIGKILL to a client and watching its cursor disappear. 2017-09-01Add client readOnly modeJune McEnroe 2017-08-31Clean up merge toolJune McEnroe Choose the version with the most recent access if the modify times are the same. 2017-08-31Choose B for tiles with equal modify timesJune McEnroe This way newer access counts and times will be preserved. 2017-08-31Add quick data file merge toolJune McEnroe Hopefully I won't have to use it ever again. 2017-08-30Use only foreground color for selecting spawnJune McEnroe 2017-08-29Add four additional spawnsJune McEnroe 2017-08-28Add respawningJune McEnroe 2017-08-26Move license above includesJune McEnroe Why was it down there? 2017-08-26Snapshot metadataJune McEnroe 2017-08-26Add meta.c to READMEJune McEnroe 2017-08-26Use MakefileJune McEnroe