summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-01-20 02:15:42 -0500
committerJune McEnroe <june@causal.agency>2020-01-20 02:15:42 -0500
commitbdde021f94ae15a6724a28370d051030e1372266 (patch)
tree66627e08375b5f18bfaa5422ceba2e3dde7ec4cf
parentAdd litterbox to causal.agency (diff)
downloadsrc-bdde021f94ae15a6724a28370d051030e1372266.tar.gz
src-bdde021f94ae15a6724a28370d051030e1372266.zip
Use C syntax for Objective-C .m files
And match #import like #include.
-rw-r--r--bin/hi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/hi.c b/bin/hi.c
index 63463580..e29fa48e 100644
--- a/bin/hi.c
+++ b/bin/hi.c
@@ -101,8 +101,8 @@ static const struct Syntax CSyntax[] = {
 		"(static|typedef)" SP1
 		"(" "(" PATTERN_ID ")" SP0
 		"(" "[*]" "|" "[[][^]]*[]]" "|" "[{][^}]*[}]" "|" SP0 ")*" ")+" },
-	{ String, .parent = SET(Macro), .subexp = 1,
-		.pattern = "include" BL0 "(<[^>]*>)" },
+	{ String, .parent = SET(Macro), .subexp = 2,
+		.pattern = "(include|import)" BL0 "(<[^>]*>)" },
 	{ String,
 		.pattern = "[LUu]?" PATTERN_SQ },
 	{ String, .parent = ~SET(String),
@@ -281,7 +281,7 @@ static const struct Language {
 	const struct Syntax *syntax;
 	size_t len;
 } Languages[] = {
-	{ "c",    "[.][chly]$", CSyntax, ARRAY_LEN(CSyntax) },
+	{ "c",    "[.][chlmy]$", CSyntax, ARRAY_LEN(CSyntax) },
 	{ "diff", "[.](diff|patch)$", DiffSyntax, ARRAY_LEN(DiffSyntax) },
 	{ "make", "[.]mk$|^Makefile$", MakeSyntax, ARRAY_LEN(MakeSyntax) },
 	{ "mdoc", "[.][1-9]$", MdocSyntax, ARRAY_LEN(MdocSyntax) },