From b0147bc52d8804f39a717c9336661bcd4463432c Mon Sep 17 00:00:00 2001
From: Anton Tarasenko <dkanus@gmail.com>
Date: Mon, 26 Apr 2021 00:16:13 +0700
Subject: [PATCH] Change some JSON API's printing methods

---
 sources/Text/JSON/JSONAPI.uc | 38 +++++++++++++++++++++---------------
 sources/Text/TextAPI.uc      | 22 +++++++++++++++++++++
 2 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/sources/Text/JSON/JSONAPI.uc b/sources/Text/JSON/JSONAPI.uc
index 1a46d8f..4556ff0 100644
--- a/sources/Text/JSON/JSONAPI.uc
+++ b/sources/Text/JSON/JSONAPI.uc
@@ -28,7 +28,7 @@ class JSONAPI extends AcediaObject
 //  complex value
 var const int TNULL, TTRUE, TFALSE, TDOT, TEXPONENT;
 var const int TOPEN_BRACKET, TCLOSE_BRACKET, TOPEN_BRACE, TCLOSE_BRACE;
-var const int TCOMMA, TCOLON;
+var const int TCOMMA, TCOLON, TQUOTE;
 
 var const int CODEPOINT_BACKSPACE, CODEPOINT_TAB, CODEPOINT_LINE_FEED;
 var const int CODEPOINT_FORM_FEED, CODEPOINT_CARRIAGE_RETURN;
@@ -815,7 +815,7 @@ public final function MutableText Print(AcediaObject toPrint)
     }
     if (    toPrint.class == class'Text'
         ||  toPrint.class == class'MutableText') {
-        return _.text.FromStringM(DisplayText(Text(toPrint)));
+        return DisplayText(Text(toPrint));
     }
     if (toPrint.class == class'DynamicArray') {
         return PrintArray(DynamicArray(toPrint));
@@ -905,7 +905,7 @@ public final function MutableText PrintObject(AssociativeArray toPrint)
         nextValue   = iter.Get();
         if (nextKey == none)                continue;
         if (nextKey.class != class'Text')   continue;
-        printedKey      = _.text.FromStringM(DisplayText(nextKey));
+        printedKey      = DisplayText(nextKey);
         printedValue    = Print(nextValue);
         result.Append(printedKey).Append(T(default.TCOLON));
         printedKey.FreeSelf();
@@ -923,31 +923,35 @@ public final function MutableText PrintObject(AssociativeArray toPrint)
     return result;
 }
 
-//      Auxiliary method to convert `Text` into it's JSON `string`
+//      Auxiliary method to convert `Text` into it's JSON "string"
 //  representation.
 //      We can't just dump `original`'s contents into JSON output as is,
 //  since we have to replace several special characters with escaped sequences.
-//  TODO: replace this with a more sensible solution later
-private final function string DisplayText(Text original)
+private final function MutableText DisplayText(Text original)
 {
-    local int       i, length;
-    local string    result;
-    local int       nextCodePoint;
+    local int               i, length;
+    local MutableText       result;
+    local Text.Character    nextCharacter;
+    local Text.Character    reverseSolidus;
+    reverseSolidus = _.text.CharacterFromCodePoint(CODEPOINT_REVERSE_SOLIDUS);
+    result = T(TQUOTE).MutableCopy();
     length = original.GetLength();
     for (i = 0; i < length; i += 1)
     {
-        nextCodePoint = original.GetCharacter(i).codePoint;
-        if (DoesNeedEscaping(nextCodePoint))
+        nextCharacter = original.GetCharacter(i);
+        if (DoesNeedEscaping(nextCharacter.codePoint))
         {
-            result $= Chr(CODEPOINT_REVERSE_SOLIDUS);
-            nextCodePoint = GetEscapedVersion(nextCodePoint);
-            result $= Chr(nextCodePoint);
+            result.AppendCharacter(reverseSolidus);
+            nextCharacter.codePoint =
+                GetEscapedVersion(nextCharacter.codePoint);
+            result.AppendCharacter(nextCharacter);
         }
         else {
-            result $= Chr(nextCodePoint);
+            result.AppendCharacter(nextCharacter);
         }
     }
-    return "\"" $ result $ "\"";
+    result.Append(T(TQUOTE));
+    return result;
 }
 
 //  Checks whether a certain character (code point) needs to be replaced for
@@ -1014,6 +1018,8 @@ defaultproperties
     stringConstants(9)  = ","
     TCOLON              = 10
     stringConstants(10) = ":"
+    TQUOTE              = 11
+    stringConstants(11) = "\""
 
     CODEPOINT_BACKSPACE         = 8
     CODEPOINT_TAB               = 9
diff --git a/sources/Text/TextAPI.uc b/sources/Text/TextAPI.uc
index 27ba512..b489dad 100644
--- a/sources/Text/TextAPI.uc
+++ b/sources/Text/TextAPI.uc
@@ -219,6 +219,28 @@ public final function bool IsQuotationMark(Text.Character character)
     return false;
 }
 
+/**
+ *  Creates a new character from a provided code point.
+ *
+ *  @param  codePoint   Code point that defines resulting character.
+ *      Must be a valid Unicode code point.
+ *  @param  formatting  Optional parameter that allows to specify resulting
+ *      character's formatting. By default uses default formatting
+ *      (text is not colored).
+ *  @return Character defined by provided code point and, optionally,
+ *      `formatting`.
+ */
+// TODO: Validity checks fro non-negative input code points
+public final function Text.Character CharacterFromCodePoint(
+    int                         codePoint,
+    optional Text.Formatting    formatting)
+{
+    local Text.Character result;
+    result.codePoint    = codePoint;
+    result.formatting   = formatting;
+    return result;
+}
+
 /**
  *  Extracts a character at position `position` from a given plain `string`.
  *