add \v escaping char

tact-lang · Mar 28, 2024 · 9452129 · 9452129
1 parent 1bb6f5a
commit 9452129
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/src/generator/writers/writeExpression.ts b/src/generator/writers/writeExpression.ts
@@ -132,7 +132,7 @@ export function writeExpression(f: ASTExpression, ctx: WriterContext): string {
     //
 
     if (f.kind === 'string') {
-        const s = f.value.replace(/\\\\|\\"|\\n|\\r|\\t|\\b|\\f|\\u{([0-9A-Fa-f]+)}|\\u([0-9A-Fa-f]{4})|\\x([0-9A-Fa-f]{2})/g, (match, unicodeCodePoint, unicodeEscape, hexEscape) => {
+        const s = f.value.replace(/\\\\|\\"|\\n|\\r|\\t|\\v|\\b|\\f|\\u{([0-9A-Fa-f]+)}|\\u([0-9A-Fa-f]{4})|\\x([0-9A-Fa-f]{2})/g, (match, unicodeCodePoint, unicodeEscape, hexEscape) => {
             switch (match) {
                 case '\\\\':
                     return '\\';
@@ -144,6 +144,8 @@ export function writeExpression(f: ASTExpression, ctx: WriterContext): string {
                     return '\r';
                 case '\\t':
                     return '\t';
+                case '\\v':
+                    return '\v';
                 case '\\b':
                     return '\b';
                 case '\\f':

diff --git a/src/grammar/grammar.ohm b/src/grammar/grammar.ohm
@@ -222,6 +222,7 @@ Tact {
                    | "\\n" -- newline
                    | "\\r" -- carriageReturn
                    | "\\t" -- tab
+                   | "\\v" -- verticalTab
                    | "\\b" -- backspace
                    | "\\f" -- formFeed
                    | "\\u{" hexDigit hexDigit? hexDigit? hexDigit? hexDigit? hexDigit? "}" -- unicodeCodePoint

diff --git a/src/grammar/grammar.ohm-bundle.d.ts b/src/grammar/grammar.ohm-bundle.d.ts
@@ -169,6 +169,7 @@ export interface TactActionDict<T> extends ActionDict<T> {
   escapeSequence_newline?: (this: NonterminalNode, arg0: TerminalNode) => T;
   escapeSequence_carriageReturn?: (this: NonterminalNode, arg0: TerminalNode) => T;
   escapeSequence_tab?: (this: NonterminalNode, arg0: TerminalNode) => T;
+  escapeSequence_verticalTab?: (this: NonterminalNode, arg0: TerminalNode) => T;
   escapeSequence_backspace?: (this: NonterminalNode, arg0: TerminalNode) => T;
   escapeSequence_formFeed?: (this: NonterminalNode, arg0: TerminalNode) => T;
   escapeSequence_unicodeCodePoint?: (this: NonterminalNode, arg0: TerminalNode, arg1: NonterminalNode, arg2: IterationNode, arg3: IterationNode, arg4: IterationNode, arg5: IterationNode, arg6: IterationNode, arg7: TerminalNode) => T;

diff --git a/src/grammar/grammar.ohm-bundle.js b/src/grammar/grammar.ohm-bundle.js
diff --git a/src/test/feature-strings.spec.ts b/src/test/feature-strings.spec.ts
@@ -54,7 +54,7 @@ describe('feature-strings', () => {
             "test \n test \t test \r test \b test \f test \" test ' test \\ \\\\ \"_\" \"\" test"
         );
         expect(await contract.getStringWithEscapedChars3()).toEqual(
-            "test \\n test \\t test \\r test \\\\b\b test \\f test \\\" test \\' test \\\\ \\\\\\\\ \\\"_\\\" \\\"\\\" test"
+            "test \\n test \\t test \\r test \\\\b\b test \\f test \\\" test \\' test \v \v \\\\ \\\\\\\\ \\\"_\\\" \\\"\\\" test"
         );
         expect(await contract.getStringWithEscapedChars4()).toEqual(
             "\u{2028}\u{2029} \u0044 \x41\x42\x43"

diff --git a/src/test/features/strings.tact b/src/test/features/strings.tact
@@ -87,7 +87,7 @@ contract StringsTester {
     }
 
     get fun stringWithEscapedChars3(): String {
-        return "test \\n test \\t test \\r test \\\\b\b test \\f test \\\" test \\' test \\\\ \\\\\\\\ \\\"_\\\" \\\"\\\" test";
+        return "test \\n test \\t test \\r test \\\\b\b test \\f test \\\" test \\' test \v \v \\\\ \\\\\\\\ \\\"_\\\" \\\"\\\" test";
     }
 
     get fun stringWithEscapedChars4(): String {