From 118a437acfb7b53d7522c71bd3f99982724b425b Mon Sep 17 00:00:00 2001 From: June McEnroe Date: Tue, 12 Jan 2021 21:40:11 -0500 Subject: Remove hacky tagging from hilex God that makes the lexers so much simpler. --- bin/hilex/c.l | 46 +++------------------------------------------- 1 file changed, 3 insertions(+), 43 deletions(-) (limited to 'bin/hilex/c.l') diff --git a/bin/hilex/c.l b/bin/hilex/c.l index ca99916a..d7a80ae2 100644 --- a/bin/hilex/c.l +++ b/bin/hilex/c.l @@ -21,8 +21,7 @@ #include "hilex.h" %} -%s MacroLine MacroInclude MacroDefine -%s TypeDecl +%s MacroLine MacroInclude %x CharLiteral StringLiteral ident [_[:alpha:]][_[:alnum:]]* @@ -30,7 +29,6 @@ width "*"|[0-9]+ %% static int pop = INITIAL; - static int depth = 0; [[:blank:]]+ { return Normal; } @@ -51,19 +49,6 @@ sizeof|(_A|alignof) { return Number; } -enum|struct|typedef|union { - BEGIN(TypeDecl); - return Keyword; -} -{ident}/[[:space:]]*"{" { - BEGIN(pop); - return IdentifierTag; -} -. { - BEGIN(pop); - REJECT; -} - auto|break|case|const|continue|default|do|else|enum|extern|for|goto|if|inline | register|restrict|return|static|struct|switch|typedef|union|volatile|while | (_A|a)lignas|_Atomic|_Generic|(_N|n)oreturn|(_S|s)tatic_assert | @@ -75,28 +60,14 @@ register|restrict|return|static|struct|switch|typedef|union|volatile|while | BEGIN(pop = MacroInclude); return Macro; } -^"#"[[:blank:]]*define { - BEGIN(pop = MacroDefine); - return Macro; -} ^"#"[[:blank:]]*{ident} { BEGIN(pop = MacroLine); return Macro; } - "<"[^>]+">" { return String; } -{ident}/"(" { - BEGIN(pop = MacroLine); - return IdentifierTag; -} -{ident} { - BEGIN(pop = MacroLine); - return Macro; -} - -{ +{ "\n" { BEGIN(pop = INITIAL); return Normal; @@ -107,14 +78,6 @@ register|restrict|return|static|struct|switch|typedef|union|volatile|while | {ident} { return Identifier; } -{ident}/("["[^]]*"]")*[[:space:]]*"=" | -{ident}/"("[^)]*")"[[:space:]]*"{" { - return (!depth ? IdentifierTag : Identifier); -} -{ident}/"("[^)]*");" { - return (!depth ? IdentifierTag : Identifier); -} - "//"([^\n]|"\\\n")* | "/*"([^*]|"*"[^/])*"*"+"/" { return Comment; @@ -160,10 +123,7 @@ register|restrict|return|static|struct|switch|typedef|union|volatile|while | [^%\\""]+|. { return String; } } -"{" { depth++; REJECT; } -"}" { depth--; REJECT; } - -. { +. { return Macro; } -- cgit 1.4.1 /src/commit/bin/sup.sh?id=f317a01b0020778ca0d11d9b06a40b89b8908286&follow=1'>Add tildenews support to supJune McEnroe 2021-02-16Add sup for setting single-use passwordsJune McEnroe 2021-02-16Add missing %U for RFCs in bibsortJune McEnroe 2021-02-15Set XTerm*charClass to select URLsJune McEnroe 2021-02-15Add xdimmer to "Using OpenBSD"June McEnroe 2021-02-14Publish "Using OpenBSD"June McEnroe 2021-02-14Set font size back down to 11June McEnroe 2021-02-10Add install targets to binJune McEnroe 2021-02-10Colour battery level red when criticalJune McEnroe 2021-02-10Set LC_CTYPE=en_US.UTF-8June McEnroe 2021-02-09Add ~/.local/share/man to MANPATHJune McEnroe 2021-02-09Fix adding /usr/games to PATHJune McEnroe 2021-02-09Show battery level while charging, time while dischargingJune McEnroe 2021-02-09Install sctJune McEnroe 2021-02-09Show minutes left instead of battery percentageJune McEnroe 2021-02-09Set antialiasing and unhinting globallyJune McEnroe 2021-02-09Open youtube and twitch with mpvJune McEnroe 2021-02-09Add volume control bindings to cwmJune McEnroe 2021-02-09Use w3m to open other URLsJune McEnroe 2021-02-09Disable mouse mode in xtermJune McEnroe 2021-02-09Add pbcopy, pbpaste, open dispatch scriptsJune McEnroe 2021-02-09Use flags for pbd client behaviourJune McEnroe 2021-02-08Add macOS-like copy and paste to xtermJune McEnroe 2021-02-08Only update clock script every minuteJune McEnroe 2021-02-08Use 4M- for window resizing in cwmJune McEnroe 2021-02-08Tweak trackpad scaling, mouse accelerationJune McEnroe 2021-02-08Use xsel in up and add it do install.shJune McEnroe 2021-02-07Swap root window coloursJune McEnroe 2021-02-07Add -X flag to install X stuff on OpenBSDJune McEnroe 2021-02-07Adjust brightness by smaller incrementsJune McEnroe 2021-02-07Fix cwm window cycling, move big by defaultJune McEnroe 2021-02-07Use class names for Foreground, Background, BorderColorJune McEnroe 2021-02-07Add simple battery status and clock to xsessionJune McEnroe 2021-02-07Set cursor theme and sizeJune McEnroe 2021-02-07Use scrot for up -s if no screencaptureJune McEnroe 2021-02-07Enable mouse acceleration in XJune McEnroe 2021-02-07Set colours for Xt and cwmJune McEnroe 2021-02-07Set urgency on bell in xtermJune McEnroe 2021-02-07Add bindings for brightness controlJune McEnroe 2021-02-07Set X key repeat rateJune McEnroe 2021-02-07Bump font size to 12June McEnroe 2021-02-07Fully configure and rebind cwmJune McEnroe 2021-02-07Add BintiJune McEnroe 2021-02-07Finish configuring xtermJune McEnroe 2021-02-06Enable tapping, reverse scroll, set scaling in wsconsctlJune McEnroe 2021-02-06Set root window to black on purple snowJune McEnroe 2021-02-06Add xmodmap configurationJune McEnroe 2021-02-06Add initial OpenBSD X configurationJune McEnroe 2021-02-06Add xterm output to schemeJune McEnroe