summary refs log tree commit diff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/hi.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/bin/hi.c b/bin/hi.c
index aff7c5f4..66d17254 100644
--- a/bin/hi.c
+++ b/bin/hi.c
@@ -213,28 +213,28 @@ static const struct Syntax ShSyntax[] = {
 		"|" "[.:]|break|continue|eval|exec|exit|export|local|readonly|return"
 		"|" "set|shift|times|trap|unset"
 		")" WB },
-	{ String, .newline = true,
-		.pattern = PATTERN_DQ },
 	{ String, .newline = true, .subexp = 1, .pattern =
 		"<<-?" WS "EOF[^\n]*\n"
 		"(([^\n]|\n\t*[^E]|\n\t*E[^O]|\n\t*EO[^F]|\n\t*EOF[^\n])*)"
 		"\n\t*EOF\n" },
+	{ String, .parent = ~SET(String), .newline = true,
+		.pattern = PATTERN_DQ },
 	{ Escape, .parent = SET(String),
 		.pattern = "[\\][\"$\\`]" },
-	{ String, .parent = ~SET(Escape),
-		.pattern = "[\\]." },
-	{ Interp, .parent = ~SET(Escape),
-		.pattern = "[$]([!#$*?@-]|[_[:alnum:]]+)" },
-	{ Interp, .parent = ~SET(Escape),
-		.pattern = "[$][{][^}]*[}]" },
 	{ Interp, .parent = ~SET(Escape),
 		.pattern = "[$][(][^)]*[)]" "|" "`[^`]*`" },
-	{ String, .newline = true,
-		.pattern = "'[^']*'" },
+	{ String, .parent = SET(Interp),
+		.pattern = PATTERN_DQ },
+	{ Interp, .parent = ~SET(Escape),
+		.pattern = "[$]([!#$*?@-]|[_[:alnum:]]+|[{][^}]*[}])" },
+	{ String, .parent = ~SET(Escape),
+		.pattern = "[\\]." },
 	{ String, .subexp = 1, .newline = true, .pattern =
 		"<<-?" WS "'EOF'[^\n]*\n"
 		"(([^\n]|\n\t*[^E]|\n\t*E[^O]|\n\t*EO[^F]|\n\t*EOF[^\n])*)"
 		"\n\t*EOF\n" },
+	{ String, .parent = ~SET(String), .newline = true,
+		.pattern = "'[^']*'" },
 	{ Comment, .parent = ~SET(String), .subexp = 2,
 		.pattern = "(^|[[:blank:]]+)(#.*)" },
 	{ Todo, .parent = SET(Comment),
td>June McEnroe 2019-02-18Fix function-like #define regexJune McEnroe A define like #define FOO (1) is not function-like. 2019-02-18Match Tag in RustJune McEnroe 2019-02-18Match sh functions as TagJune McEnroe 2019-02-18Match Sh and Ss as Tag in mdocJune McEnroe 2019-02-18Match statics and typedefs as TagJune McEnroe 2019-02-18Clean up htmlHeaderJune McEnroe 2019-02-18Remove hi line numberingJune McEnroe Tags are much better for referring to specific parts of a file and line numbering is better done by a post-processing tool such as cat -n or producing a two-column HTML <table>. 2019-02-18Add Tag class to hiJune McEnroe 2019-02-17Generate HTML with hi -n -f html -o anchorJune McEnroe Running hi twice to insert stuff between the head and the content is a bit of a hack but oh well. 2019-02-17Add hi -f html -o anchor for line number linksJune McEnroe 2019-02-17Simplify temp trap in upJune McEnroe 2019-02-17Add line numbers to hiJune McEnroe Renames previous -n option to -m to stay consistent with cat -n. Prefixing lines with line numbers affects where the first tab indent ends up relative to the text above it. Not sure if it's worth fixing somehow. 2019-02-17Always split spans after newlinesJune McEnroe Simplifies ANSI and IRC output code, and prepares for line numbered output. 2019-02-15Color format specifiers light cyan in vimJune McEnroe 2019-02-15Highlight Interp as yellowJune McEnroe 2019-02-15Highlight strings in sh command substitutionsJune McEnroe 2019-02-15Add nmap gpJune McEnroe 2019-02-14Avoid newline when copying URL to pasteboardJune McEnroe 2019-02-13Add forgotten "sixth" book of H2G2June McEnroe