add abstraction where it adds usability / helps to understand code

vlang · Mar 31, 2024 · df570b9 · df570b9
1 parent 480a3a4
commit df570b9
Showing 1 changed file with 24 additions and 59 deletions.
diff --git a/tree_sitter_v/grammar.js b/tree_sitter_v/grammar.js
@@ -6,7 +6,6 @@
 /* eslint-disable camelcase */
 /* eslint-disable-next-line spaced-comment */
 /// <reference types="tree-sitter-cli/dsl" />
-// @ts-check
 
 const PREC = {
 	attributes: 10,
@@ -878,70 +877,21 @@ module.exports = grammar({
 			choice($.interpreted_string_literal, $.c_string_literal, $.raw_string_literal),
 
 		interpreted_string_literal: ($) =>
-			prec(
-				1,
-				choice(
-					seq(
-						"'",
-						repeat(
-							choice(
-								token.immediate(prec.right(1, /[^'\\$]+/)),
-								$.escape_sequence,
-								$.string_interpolation,
-							),
-						),
-						"'",
-					),
-					seq(
-						'"',
-						repeat(
-							choice(
-								token.immediate(prec.right(1, /[^"\\$]+/)),
-								$.escape_sequence,
-								$.string_interpolation,
-							),
-						),
-						'"',
-					),
-				),
+			choice(
+				seq("'", repeat(stringBody(/[^'\\$]+/, $)), "'"),
+				seq('"', repeat(stringBody(/[^"\\$]+/, $)), '"'),
 			),
 
 		c_string_literal: ($) =>
-			prec(
-				1,
-				choice(
-					seq(
-						"c'",
-						repeat(
-							choice(
-								token.immediate(prec.right(1, /[^'\\$]+/)),
-								$.escape_sequence,
-								$.string_interpolation,
-							),
-						),
-						"'",
-					),
-					seq(
-						'c"',
-						repeat(
-							choice(
-								token.immediate(prec.right(1, /[^"\\$]+/)),
-								$.escape_sequence,
-								$.string_interpolation,
-							),
-						),
-						'"',
-					),
-				),
+			choice(
+				seq("c'", repeat(stringBody(/[^'\\$]+/, $)), "'"),
+				seq('c"', repeat(stringBody(/[^"\\$]+/, $)), '"'),
 			),
 
 		raw_string_literal: (_) =>
-			prec(
-				1,
-				choice(
-					seq("r'", repeat(token.immediate(prec.right(1, /[^']+/))), "'"),
-					seq('r"', repeat(token.immediate(prec.right(1, /[^"]+/))), '"'),
-				),
+			choice(
+				seq("r'", repeat(token.immediate(prec.right(1, /[^']+/))), "'"),
+				seq('r"', repeat(token.immediate(prec.right(1, /[^"]+/))), '"'),
 			),
 
 		string_interpolation: ($) =>
@@ -1288,6 +1238,21 @@ function sep(rule) {
 	return seq(rule, repeat(seq(',', rule)));
 }
 
+/**
+ *
+ * @param {RegExp} re
+ * @param {$} $
+ *
+ * @return {SeqRule}
+ *
+ */
+function stringBody(re, $) {
+	return choice(
+		token.immediate(prec.right(1, re)),
+		choice($.escape_sequence, $.string_interpolation),
+	);
+}
+
 /**
  * @param {...string} args - One or more regular expression patterns.
  *