Better argument splitting;

Fix a bug with re-referencing strings;

Author: onepiecefreak3

XtractQuery/Parsers/Models/Argument.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;

XtractQuery/Parsers/Models/Instruction.cs

@@ -9,7 +9,7 @@ namespace XtractQuery.Parsers.Models
     class Instruction
     {
         private static readonly Regex ParseCheck = new Regex("\\$[pvxy]\\d+.*=.+\\(.*\\)");
-        private static readonly Regex ArgumentSplit = new Regex(", *");
+        private static readonly Regex ArgumentSplit = new Regex(".*?<[\\d]+>");
 
         public int InstructionType { get; }
 
@@ -96,7 +96,17 @@ private static string GetArgumentBody(string input)
 
         private static IEnumerable<string> GetArguments(string argumentBody)
         {
-            return ArgumentSplit.Split(argumentBody);
+            var matches= ArgumentSplit.Matches(argumentBody);
+            foreach (var matchValue in matches.Select(x=>x.Value))
+            {
+                if (matchValue.StartsWith(", "))
+                {
+                    yield return matchValue.Substring(2);
+                    continue;
+                }
+
+                yield return matchValue;
+            }
         }
 
         private static IDictionary<int, string> RoutineMap = new Dictionary<int, string>

XtractQuery/Parsers/StringWriter/BaseStringWriter.cs

@@ -43,7 +43,7 @@ public long Write(string value)
             if (!string.IsNullOrEmpty(value) && _stringMap.Keys.Any(x => x.EndsWith(value)))
             {
                 var element = _stringMap.First(x => x.Key.EndsWith(value));
-                var internalPosition = element.Value.Item2 + element.Key.LastIndexOf(value, StringComparison.InvariantCulture);
+                var internalPosition = element.Value.Item2 + SjisEncoding.GetByteCount(element.Key) - SjisEncoding.GetByteCount(value);
                 _stringMap[value] = (CreateHash(value), internalPosition);
 
                 return internalPosition;

XtractQuery/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "XtractQuery": {
       "commandName": "Project",
-      "commandLineArgs": "-o c -t xq32 -f D:\\Users\\Kirito\\Desktop\\party.xq.txt"
+      "commandLineArgs": "-o e -t xq32 -f D:\\Users\\Kirito\\Desktop\\strinput.xq.txt.xq"
     }
   }
 }