Escape Sequence for Brackets

Source/AtlusScriptLibrary/MessageScriptLanguage/Compiler/MessageScriptCompiler.cs

@@ -22,6 +22,11 @@ namespace AtlusScriptLibrary.MessageScriptLanguage.Compiler;
 /// </summary>
 public class MessageScriptCompiler
 {
+    public static readonly Dictionary<string, string> ESCAPE_SEQUENCES = new Dictionary<string, string>(){
+        { "\\[", "[" },
+        { "\\]", "]" }
+    };
+
     private readonly Logger mLogger;
     private readonly FormatVersion mVersion;
     private readonly HashSet<int> mImportedFileHashSet;
@@ -659,7 +664,13 @@ private bool TryCompileTokenText(MessageScriptParser.TokenTextContext context, o
                     if (textWithoutNewlines.Length == 0)
                         continue; // filter out standalone newlines
 
-                    lineToken = new StringToken(textWithoutNewlines);
+                    var textWithoutEscapeChars = textWithoutNewlines;
+                    foreach(var sequence in ESCAPE_SEQUENCES)
+                    {
+                        textWithoutEscapeChars = textWithoutEscapeChars.Replace(sequence.Key, sequence.Value);
+                    }
+
+                    lineToken = new StringToken(textWithoutEscapeChars);
                 }
                 else
                 {

Source/AtlusScriptLibrary/MessageScriptLanguage/Compiler/Parser/MessageScriptLexer.cs

@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     ANTLR Version: 4.6.4
+//     ANTLR Version: 4.6.6
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from ..\..\..\AtlusScriptLibrary\MessageScriptLanguage\Compiler\Parser\MessageScriptLexer.g4 by ANTLR 4.6.4
+// Generated from Compiler/Parser/MessageScriptLexer.g4 by ANTLR 4.6.6
 
 // Unreachable code detected
 #pragma warning disable 0162
@@ -25,13 +25,13 @@ namespace AtlusScriptLibrary.FlowScriptLanguage.Compiler.Parser {
 using Antlr4.Runtime.Misc;
 using DFA = Antlr4.Runtime.Dfa.DFA;
 
-[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.6.4")]
+[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.6.6")]
 [System.CLSCompliant(false)]
 public partial class MessageScriptLexer : Lexer {
 	public const int
 		OpenCode=1, CloseText=2, Text=3, MessageDialogTagId=4, SelectionDialogTagId=5, 
 		SelectionDialogPatternId=6, CloseCode=7, OpenText=8, IntLiteral=9, Identifier=10, 
-		Whitespace=11, BlockComment=12;
+		Whitespace=11;
 	public const int MessageScriptCode = 1;
 	public static string[] modeNames = {
 		"DEFAULT_MODE", "MessageScriptCode"
@@ -41,7 +41,7 @@ public const int
 		"OpenCode", "CloseText", "Text", "MessageDialogTagId", "SelectionDialogTagId", 
 		"SelectionDialogPatternId", "CloseCode", "OpenText", "IdentifierEscape", 
 		"IntLiteral", "Identifier", "DecIntLiteral", "HexIntLiteral", "Letter", 
-		"Digit", "HexDigit", "HexLiteralPrefix", "Sign", "Whitespace", "BlockComment"
+		"Digit", "HexDigit", "HexLiteralPrefix", "Sign", "Whitespace"
 	};
 
 
@@ -57,7 +57,7 @@ public MessageScriptLexer(ICharStream input)
 	private static readonly string[] _SymbolicNames = {
 		null, "OpenCode", "CloseText", "Text", "MessageDialogTagId", "SelectionDialogTagId", 
 		"SelectionDialogPatternId", "CloseCode", "OpenText", "IntLiteral", "Identifier", 
-		"Whitespace", "BlockComment"
+		"Whitespace"
 	};
 	public static readonly IVocabulary DefaultVocabulary = new Vocabulary(_LiteralNames, _SymbolicNames);
 
@@ -107,67 +107,62 @@ public override IVocabulary Vocabulary
 	public override string SerializedAtn { get { return _serializedATN; } }
 
 	public static readonly string _serializedATN =
-		"\x3\xAF6F\x8320\x479D\xB75C\x4880\x1605\x191C\xAB37\x2\xE\xA6\b\x1\b\x1"+
+		"\x3\xAF6F\x8320\x479D\xB75C\x4880\x1605\x191C\xAB37\x2\r\x9A\b\x1\b\x1"+
 		"\x4\x2\t\x2\x4\x3\t\x3\x4\x4\t\x4\x4\x5\t\x5\x4\x6\t\x6\x4\a\t\a\x4\b"+
 		"\t\b\x4\t\t\t\x4\n\t\n\x4\v\t\v\x4\f\t\f\x4\r\t\r\x4\xE\t\xE\x4\xF\t\xF"+
-		"\x4\x10\t\x10\x4\x11\t\x11\x4\x12\t\x12\x4\x13\t\x13\x4\x14\t\x14\x4\x15"+
-		"\t\x15\x3\x2\x3\x2\x3\x2\x3\x2\x3\x3\x3\x3\x3\x3\x3\x3\x3\x4\x6\x4\x36"+
-		"\n\x4\r\x4\xE\x4\x37\x3\x5\x3\x5\x3\x5\x3\x5\x3\x5\x3\x5\x5\x5@\n\x5\x3"+
-		"\x6\x3\x6\x3\x6\x3\x6\x3\a\x3\a\x3\a\x3\a\x3\a\x3\a\x3\a\x3\a\x3\a\x5"+
-		"\aO\n\a\x3\b\x3\b\x3\b\x3\b\x3\t\x3\t\x3\t\x3\t\x3\n\x3\n\x3\n\x3\v\x3"+
-		"\v\x5\v^\n\v\x3\f\x3\f\x5\f\x62\n\f\x3\f\x3\f\x3\f\a\fg\n\f\f\f\xE\fj"+
-		"\v\f\x3\f\x3\f\a\fn\n\f\f\f\xE\fq\v\f\x3\f\x3\f\x5\fu\n\f\x3\r\x5\rx\n"+
-		"\r\x3\r\x6\r{\n\r\r\r\xE\r|\x3\xE\x5\xE\x80\n\xE\x3\xE\x3\xE\x6\xE\x84"+
-		"\n\xE\r\xE\xE\xE\x85\x3\xF\x3\xF\x3\x10\x3\x10\x3\x11\x3\x11\x5\x11\x8E"+
-		"\n\x11\x3\x12\x3\x12\x3\x12\x3\x13\x3\x13\x3\x14\x3\x14\x3\x14\x3\x14"+
-		"\x3\x15\x3\x15\x3\x15\x3\x15\a\x15\x9D\n\x15\f\x15\xE\x15\xA0\v\x15\x3"+
-		"\x15\x3\x15\x3\x15\x3\x15\x3\x15\x3\x9E\x2\x2\x16\x4\x2\x3\x6\x2\x4\b"+
-		"\x2\x5\n\x2\x6\f\x2\a\xE\x2\b\x10\x2\t\x12\x2\n\x14\x2\x2\x16\x2\v\x18"+
-		"\x2\f\x1A\x2\x2\x1C\x2\x2\x1E\x2\x2 \x2\x2\"\x2\x2$\x2\x2&\x2\x2(\x2\r"+
-		"*\x2\xE\x4\x2\x3\n\x4\x2]]__\x3\x2\x62\x62\x4\x2\x43\\\x63|\x3\x2\x32"+
-		";\x4\x2\x43H\x63h\x4\x2ZZzz\x4\x2--//\x5\x2\v\f\xF\xF\"\"\xAC\x2\x4\x3"+
-		"\x2\x2\x2\x2\x6\x3\x2\x2\x2\x2\b\x3\x2\x2\x2\x3\n\x3\x2\x2\x2\x3\f\x3"+
-		"\x2\x2\x2\x3\xE\x3\x2\x2\x2\x3\x10\x3\x2\x2\x2\x3\x12\x3\x2\x2\x2\x3\x16"+
-		"\x3\x2\x2\x2\x3\x18\x3\x2\x2\x2\x3(\x3\x2\x2\x2\x3*\x3\x2\x2\x2\x4,\x3"+
-		"\x2\x2\x2\x6\x30\x3\x2\x2\x2\b\x35\x3\x2\x2\x2\n?\x3\x2\x2\x2\f\x41\x3"+
-		"\x2\x2\x2\xEN\x3\x2\x2\x2\x10P\x3\x2\x2\x2\x12T\x3\x2\x2\x2\x14X\x3\x2"+
-		"\x2\x2\x16]\x3\x2\x2\x2\x18t\x3\x2\x2\x2\x1Aw\x3\x2\x2\x2\x1C\x7F\x3\x2"+
-		"\x2\x2\x1E\x87\x3\x2\x2\x2 \x89\x3\x2\x2\x2\"\x8D\x3\x2\x2\x2$\x8F\x3"+
-		"\x2\x2\x2&\x92\x3\x2\x2\x2(\x94\x3\x2\x2\x2*\x98\x3\x2\x2\x2,-\a]\x2\x2"+
-		"-.\x3\x2\x2\x2./\b\x2\x2\x2/\x5\x3\x2\x2\x2\x30\x31\a_\x2\x2\x31\x32\x3"+
-		"\x2\x2\x2\x32\x33\b\x3\x2\x2\x33\a\x3\x2\x2\x2\x34\x36\n\x2\x2\x2\x35"+
-		"\x34\x3\x2\x2\x2\x36\x37\x3\x2\x2\x2\x37\x35\x3\x2\x2\x2\x37\x38\x3\x2"+
-		"\x2\x2\x38\t\x3\x2\x2\x2\x39:\ao\x2\x2:;\au\x2\x2;@\ai\x2\x2<=\a\x66\x2"+
-		"\x2=>\an\x2\x2>@\ai\x2\x2?\x39\x3\x2\x2\x2?<\x3\x2\x2\x2@\v\x3\x2\x2\x2"+
-		"\x41\x42\au\x2\x2\x42\x43\ag\x2\x2\x43\x44\an\x2\x2\x44\r\x3\x2\x2\x2"+
-		"\x45\x46\av\x2\x2\x46G\aq\x2\x2GO\ar\x2\x2HI\a\x64\x2\x2IJ\aq\x2\x2JK"+
-		"\av\x2\x2KL\av\x2\x2LM\aq\x2\x2MO\ao\x2\x2N\x45\x3\x2\x2\x2NH\x3\x2\x2"+
-		"\x2O\xF\x3\x2\x2\x2PQ\a_\x2\x2QR\x3\x2\x2\x2RS\b\b\x3\x2S\x11\x3\x2\x2"+
-		"\x2TU\a]\x2\x2UV\x3\x2\x2\x2VW\b\t\x3\x2W\x13\x3\x2\x2\x2XY\a\x62\x2\x2"+
-		"YZ\a\x62\x2\x2Z\x15\x3\x2\x2\x2[^\x5\x1A\r\x2\\^\x5\x1C\xE\x2][\x3\x2"+
-		"\x2\x2]\\\x3\x2\x2\x2^\x17\x3\x2\x2\x2_\x62\x5\x1E\xF\x2`\x62\a\x61\x2"+
-		"\x2\x61_\x3\x2\x2\x2\x61`\x3\x2\x2\x2\x62h\x3\x2\x2\x2\x63g\x5\x1E\xF"+
-		"\x2\x64g\a\x61\x2\x2\x65g\x5 \x10\x2\x66\x63\x3\x2\x2\x2\x66\x64\x3\x2"+
-		"\x2\x2\x66\x65\x3\x2\x2\x2gj\x3\x2\x2\x2h\x66\x3\x2\x2\x2hi\x3\x2\x2\x2"+
-		"iu\x3\x2\x2\x2jh\x3\x2\x2\x2ko\x5\x14\n\x2ln\n\x3\x2\x2ml\x3\x2\x2\x2"+
-		"nq\x3\x2\x2\x2om\x3\x2\x2\x2op\x3\x2\x2\x2pr\x3\x2\x2\x2qo\x3\x2\x2\x2"+
-		"rs\x5\x14\n\x2su\x3\x2\x2\x2t\x61\x3\x2\x2\x2tk\x3\x2\x2\x2u\x19\x3\x2"+
-		"\x2\x2vx\x5&\x13\x2wv\x3\x2\x2\x2wx\x3\x2\x2\x2xz\x3\x2\x2\x2y{\x5 \x10"+
-		"\x2zy\x3\x2\x2\x2{|\x3\x2\x2\x2|z\x3\x2\x2\x2|}\x3\x2\x2\x2}\x1B\x3\x2"+
-		"\x2\x2~\x80\x5&\x13\x2\x7F~\x3\x2\x2\x2\x7F\x80\x3\x2\x2\x2\x80\x81\x3"+
-		"\x2\x2\x2\x81\x83\x5$\x12\x2\x82\x84\x5\"\x11\x2\x83\x82\x3\x2\x2\x2\x84"+
-		"\x85\x3\x2\x2\x2\x85\x83\x3\x2\x2\x2\x85\x86\x3\x2\x2\x2\x86\x1D\x3\x2"+
-		"\x2\x2\x87\x88\t\x4\x2\x2\x88\x1F\x3\x2\x2\x2\x89\x8A\t\x5\x2\x2\x8A!"+
-		"\x3\x2\x2\x2\x8B\x8E\x5 \x10\x2\x8C\x8E\t\x6\x2\x2\x8D\x8B\x3\x2\x2\x2"+
-		"\x8D\x8C\x3\x2\x2\x2\x8E#\x3\x2\x2\x2\x8F\x90\a\x32\x2\x2\x90\x91\t\a"+
-		"\x2\x2\x91%\x3\x2\x2\x2\x92\x93\t\b\x2\x2\x93\'\x3\x2\x2\x2\x94\x95\t"+
-		"\t\x2\x2\x95\x96\x3\x2\x2\x2\x96\x97\b\x14\x4\x2\x97)\x3\x2\x2\x2\x98"+
-		"\x99\a\x31\x2\x2\x99\x9A\a,\x2\x2\x9A\x9E\x3\x2\x2\x2\x9B\x9D\v\x2\x2"+
-		"\x2\x9C\x9B\x3\x2\x2\x2\x9D\xA0\x3\x2\x2\x2\x9E\x9F\x3\x2\x2\x2\x9E\x9C"+
-		"\x3\x2\x2\x2\x9F\xA1\x3\x2\x2\x2\xA0\x9E\x3\x2\x2\x2\xA1\xA2\a,\x2\x2"+
-		"\xA2\xA3\a\x31\x2\x2\xA3\xA4\x3\x2\x2\x2\xA4\xA5\b\x15\x4\x2\xA5+\x3\x2"+
-		"\x2\x2\x13\x2\x3\x37?N]\x61\x66hotw|\x7F\x85\x8D\x9E\x5\a\x3\x2\x6\x2"+
-		"\x2\b\x2\x2";
+		"\x4\x10\t\x10\x4\x11\t\x11\x4\x12\t\x12\x4\x13\t\x13\x4\x14\t\x14\x3\x2"+
+		"\x3\x2\x3\x2\x3\x2\x3\x3\x3\x3\x3\x3\x3\x3\x3\x4\x3\x4\x3\x4\x3\x4\x3"+
+		"\x4\x6\x4\x38\n\x4\r\x4\xE\x4\x39\x3\x5\x3\x5\x3\x5\x3\x5\x3\x5\x3\x5"+
+		"\x5\x5\x42\n\x5\x3\x6\x3\x6\x3\x6\x3\x6\x3\a\x3\a\x3\a\x3\a\x3\a\x3\a"+
+		"\x3\a\x3\a\x3\a\x5\aQ\n\a\x3\b\x3\b\x3\b\x3\b\x3\t\x3\t\x3\t\x3\t\x3\n"+
+		"\x3\n\x3\n\x3\v\x3\v\x5\v`\n\v\x3\f\x3\f\x5\f\x64\n\f\x3\f\x3\f\x3\f\a"+
+		"\fi\n\f\f\f\xE\fl\v\f\x3\f\x3\f\a\fp\n\f\f\f\xE\fs\v\f\x3\f\x3\f\x5\f"+
+		"w\n\f\x3\r\x5\rz\n\r\x3\r\x6\r}\n\r\r\r\xE\r~\x3\xE\x5\xE\x82\n\xE\x3"+
+		"\xE\x3\xE\x6\xE\x86\n\xE\r\xE\xE\xE\x87\x3\xF\x3\xF\x3\x10\x3\x10\x3\x11"+
+		"\x3\x11\x5\x11\x90\n\x11\x3\x12\x3\x12\x3\x12\x3\x13\x3\x13\x3\x14\x3"+
+		"\x14\x3\x14\x3\x14\x2\x2\x2\x15\x4\x2\x3\x6\x2\x4\b\x2\x5\n\x2\x6\f\x2"+
+		"\a\xE\x2\b\x10\x2\t\x12\x2\n\x14\x2\x2\x16\x2\v\x18\x2\f\x1A\x2\x2\x1C"+
+		"\x2\x2\x1E\x2\x2 \x2\x2\"\x2\x2$\x2\x2&\x2\x2(\x2\r\x4\x2\x3\n\x4\x2]"+
+		"]__\x3\x2\x62\x62\x4\x2\x43\\\x63|\x3\x2\x32;\x4\x2\x43H\x63h\x4\x2ZZ"+
+		"zz\x4\x2--//\x5\x2\v\f\xF\xF\"\"\xA1\x2\x4\x3\x2\x2\x2\x2\x6\x3\x2\x2"+
+		"\x2\x2\b\x3\x2\x2\x2\x3\n\x3\x2\x2\x2\x3\f\x3\x2\x2\x2\x3\xE\x3\x2\x2"+
+		"\x2\x3\x10\x3\x2\x2\x2\x3\x12\x3\x2\x2\x2\x3\x16\x3\x2\x2\x2\x3\x18\x3"+
+		"\x2\x2\x2\x3(\x3\x2\x2\x2\x4*\x3\x2\x2\x2\x6.\x3\x2\x2\x2\b\x37\x3\x2"+
+		"\x2\x2\n\x41\x3\x2\x2\x2\f\x43\x3\x2\x2\x2\xEP\x3\x2\x2\x2\x10R\x3\x2"+
+		"\x2\x2\x12V\x3\x2\x2\x2\x14Z\x3\x2\x2\x2\x16_\x3\x2\x2\x2\x18v\x3\x2\x2"+
+		"\x2\x1Ay\x3\x2\x2\x2\x1C\x81\x3\x2\x2\x2\x1E\x89\x3\x2\x2\x2 \x8B\x3\x2"+
+		"\x2\x2\"\x8F\x3\x2\x2\x2$\x91\x3\x2\x2\x2&\x94\x3\x2\x2\x2(\x96\x3\x2"+
+		"\x2\x2*+\a]\x2\x2+,\x3\x2\x2\x2,-\b\x2\x2\x2-\x5\x3\x2\x2\x2./\a_\x2\x2"+
+		"/\x30\x3\x2\x2\x2\x30\x31\b\x3\x2\x2\x31\a\x3\x2\x2\x2\x32\x33\a^\x2\x2"+
+		"\x33\x38\a]\x2\x2\x34\x35\a^\x2\x2\x35\x38\a_\x2\x2\x36\x38\n\x2\x2\x2"+
+		"\x37\x32\x3\x2\x2\x2\x37\x34\x3\x2\x2\x2\x37\x36\x3\x2\x2\x2\x38\x39\x3"+
+		"\x2\x2\x2\x39\x37\x3\x2\x2\x2\x39:\x3\x2\x2\x2:\t\x3\x2\x2\x2;<\ao\x2"+
+		"\x2<=\au\x2\x2=\x42\ai\x2\x2>?\a\x66\x2\x2?@\an\x2\x2@\x42\ai\x2\x2\x41"+
+		";\x3\x2\x2\x2\x41>\x3\x2\x2\x2\x42\v\x3\x2\x2\x2\x43\x44\au\x2\x2\x44"+
+		"\x45\ag\x2\x2\x45\x46\an\x2\x2\x46\r\x3\x2\x2\x2GH\av\x2\x2HI\aq\x2\x2"+
+		"IQ\ar\x2\x2JK\a\x64\x2\x2KL\aq\x2\x2LM\av\x2\x2MN\av\x2\x2NO\aq\x2\x2"+
+		"OQ\ao\x2\x2PG\x3\x2\x2\x2PJ\x3\x2\x2\x2Q\xF\x3\x2\x2\x2RS\a_\x2\x2ST\x3"+
+		"\x2\x2\x2TU\b\b\x3\x2U\x11\x3\x2\x2\x2VW\a]\x2\x2WX\x3\x2\x2\x2XY\b\t"+
+		"\x3\x2Y\x13\x3\x2\x2\x2Z[\a\x62\x2\x2[\\\a\x62\x2\x2\\\x15\x3\x2\x2\x2"+
+		"]`\x5\x1A\r\x2^`\x5\x1C\xE\x2_]\x3\x2\x2\x2_^\x3\x2\x2\x2`\x17\x3\x2\x2"+
+		"\x2\x61\x64\x5\x1E\xF\x2\x62\x64\a\x61\x2\x2\x63\x61\x3\x2\x2\x2\x63\x62"+
+		"\x3\x2\x2\x2\x64j\x3\x2\x2\x2\x65i\x5\x1E\xF\x2\x66i\a\x61\x2\x2gi\x5"+
+		" \x10\x2h\x65\x3\x2\x2\x2h\x66\x3\x2\x2\x2hg\x3\x2\x2\x2il\x3\x2\x2\x2"+
+		"jh\x3\x2\x2\x2jk\x3\x2\x2\x2kw\x3\x2\x2\x2lj\x3\x2\x2\x2mq\x5\x14\n\x2"+
+		"np\n\x3\x2\x2on\x3\x2\x2\x2ps\x3\x2\x2\x2qo\x3\x2\x2\x2qr\x3\x2\x2\x2"+
+		"rt\x3\x2\x2\x2sq\x3\x2\x2\x2tu\x5\x14\n\x2uw\x3\x2\x2\x2v\x63\x3\x2\x2"+
+		"\x2vm\x3\x2\x2\x2w\x19\x3\x2\x2\x2xz\x5&\x13\x2yx\x3\x2\x2\x2yz\x3\x2"+
+		"\x2\x2z|\x3\x2\x2\x2{}\x5 \x10\x2|{\x3\x2\x2\x2}~\x3\x2\x2\x2~|\x3\x2"+
+		"\x2\x2~\x7F\x3\x2\x2\x2\x7F\x1B\x3\x2\x2\x2\x80\x82\x5&\x13\x2\x81\x80"+
+		"\x3\x2\x2\x2\x81\x82\x3\x2\x2\x2\x82\x83\x3\x2\x2\x2\x83\x85\x5$\x12\x2"+
+		"\x84\x86\x5\"\x11\x2\x85\x84\x3\x2\x2\x2\x86\x87\x3\x2\x2\x2\x87\x85\x3"+
+		"\x2\x2\x2\x87\x88\x3\x2\x2\x2\x88\x1D\x3\x2\x2\x2\x89\x8A\t\x4\x2\x2\x8A"+
+		"\x1F\x3\x2\x2\x2\x8B\x8C\t\x5\x2\x2\x8C!\x3\x2\x2\x2\x8D\x90\x5 \x10\x2"+
+		"\x8E\x90\t\x6\x2\x2\x8F\x8D\x3\x2\x2\x2\x8F\x8E\x3\x2\x2\x2\x90#\x3\x2"+
+		"\x2\x2\x91\x92\a\x32\x2\x2\x92\x93\t\a\x2\x2\x93%\x3\x2\x2\x2\x94\x95"+
+		"\t\b\x2\x2\x95\'\x3\x2\x2\x2\x96\x97\t\t\x2\x2\x97\x98\x3\x2\x2\x2\x98"+
+		"\x99\b\x14\x4\x2\x99)\x3\x2\x2\x2\x13\x2\x3\x37\x39\x41P_\x63hjqvy~\x81"+
+		"\x87\x8F\x5\a\x3\x2\x6\x2\x2\b\x2\x2";
 	public static readonly ATN _ATN =
 		new ATNDeserializer().Deserialize(_serializedATN.ToCharArray());
 }

Source/AtlusScriptLibrary/MessageScriptLanguage/Compiler/Parser/MessageScriptLexer.g4

@@ -18,7 +18,7 @@ CloseText
 
 // match actual text
 Text
-	: ~( '[' | ']' )+
+	: ( '\\[' | '\\]' | ~( '[' | ']' ))+
 	;
 
 //
@@ -89,4 +89,4 @@ Sign
 	: '+' | '-';
 
 Whitespace
-	: [ \t\r\n] -> skip;
+	: [ \t\r\n] -> skip;

Source/AtlusScriptLibrary/MessageScriptLanguage/Compiler/Parser/MessageScriptLexer.tokens

@@ -9,5 +9,4 @@ OpenText=8
 IntLiteral=9
 Identifier=10
 Whitespace=11
-BlockComment=12
 'sel'=5

Source/AtlusScriptLibrary/MessageScriptLanguage/Decompiler/MessageScriptDecompiler.cs

@@ -217,7 +217,12 @@ public void Decompile(FunctionToken token)
 
     public void Decompile(StringToken token)
     {
-        mWriter.Write(token.Value);
+        var textWithEscapeChars = token.Value;
+        foreach(var sequence in MessageScriptLanguage.Compiler.MessageScriptCompiler.ESCAPE_SEQUENCES)
+        {
+            textWithEscapeChars = textWithEscapeChars.Replace(sequence.Value, sequence.Key);
+        }
+        mWriter.Write(token.Value.Replace("[", "\\[").Replace("]", "\\]"));
     }
 
     public void Decompile(CodePointToken token)

Source/AtlusScriptLibraryTests/MessageScriptLanguage/MessageScriptTests.cs

@@ -1,6 +1,9 @@
 using System;
 using System.IO;
+using AtlusScriptLibrary.Common.Libraries;
 using AtlusScriptLibrary.MessageScriptLanguage.BinaryModel;
+using AtlusScriptLibrary.MessageScriptLanguage.Compiler;
+using AtlusScriptLibrary.MessageScriptLanguage.Decompiler;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace AtlusScriptLibrary.MessageScriptLanguage.Tests
@@ -82,6 +85,30 @@ public void ToBinary_ShouldMatchSourceBinary_Version1BigEndian()
             Compare(binary, newBinary);
         }
 
+        [TestMethod]
+        public void EscapeChars_CanDecompileAndRecompileWithBrackets()
+        {
+            var library = LibraryLookup.GetLibrary("p3re");
+
+            var binary = MessageScriptBinary.FromFile("TestResources/EscapeChar.bmd");
+            var script = MessageScript.FromBinary(binary, FormatVersion.Version1Reload);
+
+            var writer = new StringWriter();
+            using (var decompiler = new MessageScriptDecompiler(writer))
+            {
+                decompiler.Library = library;
+                decompiler.Decompile(script);
+            }
+            string text = writer.ToString();
+
+            var compiler = new MessageScriptCompiler(FormatVersion.Version1Reload, System.Text.Encoding.UTF8);
+            compiler.Library = library;
+            compiler.TryCompile(text, out var recompiledScript);
+
+            var newBinary = recompiledScript.ToBinary();
+            Compare(binary, newBinary);
+        }
+
         private void Compare(MessageScriptBinary binary, MessageScriptBinary newBinary)
         {
             // compare headers