From 062b5f7398da079e067e6ad1992ac97ed32f707d Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Mon, 18 Feb 2019 18:00:20 -0500
Subject: Match statics and typedefs as Tag

---
 bin/hi.c      | 5 ++++-
 bin/man1/hi.1 | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/hi.c b/bin/hi.c
index 2656313a..e36d1467 100644
--- a/bin/hi.c
+++ b/bin/hi.c
@@ -93,8 +93,11 @@ static const struct Syntax CSyntax[] = {
 		.pattern = "define" BL1 "(" PATTERN_ID ")" BL0 "[(]" },
 	{ Tag, .subexp = 2,
 		.pattern = "(enum|struct|union)" SP1 "(" PATTERN_ID ")" SP0 "[{]" },
-	{ Tag, .parent = ~SET(Keyword), .subexp = 1,
+	{ Tag, .parent = ~SET(Keyword), .newline = true, .subexp = 1,
 		.pattern = "(" PATTERN_ID ")" SP0 "[(][^)]*[)]" SP0 "[{]" },
+	{ Tag, .newline = true, .subexp = 3, .pattern =
+		"(static|typedef)" SP1
+		"(" "(" PATTERN_ID ")" SP0 "([*]|[[][^]]*[]]|[{][^}]*[}])*" SP0 ")+" },
 	{ String, .parent = SET(Macro), .subexp = 1,
 		.pattern = "include" BL0 "(<[^>]*>)" },
 	{ String,
diff --git a/bin/man1/hi.1 b/bin/man1/hi.1
index 0d82ca75..b852bf50 100644
--- a/bin/man1/hi.1
+++ b/bin/man1/hi.1
@@ -72,7 +72,7 @@ The options are as follows:
 .Bl -tag -width "title=..."
 .It Cm anchor
 Output tags
-(type and function definitions)
+(top-level definition names)
 as anchor links.
 .
 .It Cm css Ns = Ns Ar url
-- 
cgit 1.4.1

2f0c12840e7d8950ac025fea1c&amp;follow=1'>diff</a></td><td class='form'><form class='right' method='get' action='/src/log/bin/man1/title.1'>
<input type='hidden' name='id' value='ae064a619bb3972f0c12840e7d8950ac025fea1c'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=ae064a619bb3972f0c12840e7d8950ac025fea1c&amp;follow=1'>root</a>/<a href='/src/log/bin?id=ae064a619bb3972f0c12840e7d8950ac025fea1c&amp;follow=1'>bin</a>/<a href='/src/log/bin/man1?id=ae064a619bb3972f0c12840e7d8950ac025fea1c&amp;follow=1'>man1</a>/<a href='/src/log/bin/man1/title.1?id=ae064a619bb3972f0c12840e7d8950ac025fea1c&amp;follow=1'>title.1</a> (<a href='/src/log/bin/man1/title.1?id=ae064a619bb3972f0c12840e7d8950ac025fea1c'>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/man1/title.1?id=ae064a619bb3972f0c12840e7d8950ac025fea1c&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-06-02 23:17:38 -0400'>2022-06-02</span></td><td><a href='/src/commit/bin/qf.c?id=956c25d98c3c7af4ff78c3175630b281c780b3c7&amp;follow=1'>Set TABSIZE=4</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2022-06-02 22:40:41 -0400'>2022-06-02</span></td><td><a href='/src/commit/bin/qf.c?id=07596633a2d95ff24de1a7a6b9df64534cd9e82e&amp;follow=1'>Do basic match highlighting</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2022-06-02 21:45:47 -0400'>2022-06-02</span></td><td><a href='/src/commit/bin/qf.c?id=557f1deb2b1a18ede48950b5421b71f662ea309d&amp;follow=1'>Clean up parsing a little</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2022-06-02 21:30:03 -0400'>2022-06-02</span></td><td><a href='/src/commit/bin/qf.c?id=77113cf667e1f4fbccc337b508d0f81b1f4b7563&amp;follow=1'>Don't duplicate path string</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2022-06-02 20:53:17 -0400'>2022-06-02</span></td><td><a href='/src/commit/bin/qf.c?id=1da6e2b522a624c1056f4f6cd61f977fded83a37&amp;follow=1'>Use stderr instead of /dev/tty, realloc buffer if lines too long</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2022-06-02 20:14:26 -0400'>2022-06-02</span></td><td><a href='/src/commit/bin/qf.c?id=a8ca43a9dd52ba36aae52fa4345aa0af942803d7&amp;follow=1'>Add initial working version of qf</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2022-05-29 22:20:51 -0400'>2022-05-29</span></td><td><a href='/src/commit/home/.shrc?id=282a40a8ecedc78b87dc74672fde9e0f50d36ba7&amp;follow=1'>Set prompt for oksh</a></td><td>June McEnroe